summaryrefslogtreecommitdiffstats
path: root/dom/plugins/base/nsPluginInstanceOwner.h
diff options
context:
space:
mode:
Diffstat (limited to 'dom/plugins/base/nsPluginInstanceOwner.h')
-rw-r--r--dom/plugins/base/nsPluginInstanceOwner.h30
1 files changed, 3 insertions, 27 deletions
diff --git a/dom/plugins/base/nsPluginInstanceOwner.h b/dom/plugins/base/nsPluginInstanceOwner.h
index 589bcb02c..2fa67c86e 100644
--- a/dom/plugins/base/nsPluginInstanceOwner.h
+++ b/dom/plugins/base/nsPluginInstanceOwner.h
@@ -29,7 +29,7 @@ class nsPluginDOMContextMenuListener;
class nsPluginFrame;
class nsDisplayListBuilder;
-#if defined(MOZ_X11) || defined(ANDROID)
+#ifdef MOZ_X11
class gfxContext;
#endif
@@ -108,7 +108,7 @@ public:
void Paint(const gfxRect& aDirtyRect, CGContextRef cgContext);
void RenderCoreAnimation(CGContextRef aCGContext, int aWidth, int aHeight);
void DoCocoaEventDrawRect(const gfxRect& aDrawRect, CGContextRef cgContext);
-#elif defined(MOZ_X11) || defined(ANDROID)
+#elif defined(MOZ_X11)
void Paint(gfxContext* aContext,
const gfxRect& aFrameRect,
const gfxRect& aDirtyRect);
@@ -254,21 +254,6 @@ public:
already_AddRefed<nsIURI> GetBaseURI() const;
-#ifdef MOZ_WIDGET_ANDROID
- // Returns the image container for the specified VideoInfo
- void GetVideos(nsTArray<nsNPAPIPluginInstance::VideoInfo*>& aVideos);
- already_AddRefed<mozilla::layers::ImageContainer> GetImageContainerForVideo(nsNPAPIPluginInstance::VideoInfo* aVideoInfo);
-
- void Invalidate();
- void Recomposite();
-
- void RequestFullScreen();
- void ExitFullScreen();
-
- // Called from nsAppShell when we removed the fullscreen view.
- static void ExitFullScreen(jobject view);
-#endif
-
void NotifyHostAsyncInitFailed();
void NotifyHostCreateWidget();
void NotifyDestroyPending();
@@ -306,16 +291,7 @@ private:
size == nsIntSize(mPluginWindow->width, mPluginWindow->height);
}
-#ifdef MOZ_WIDGET_ANDROID
- mozilla::LayoutDeviceRect GetPluginRect();
- bool AddPluginView(const mozilla::LayoutDeviceRect& aRect = mozilla::LayoutDeviceRect(0, 0, 0, 0));
- void RemovePluginView();
-
- bool mFullScreen;
- void* mJavaView;
-#endif
-
-#if defined(XP_WIN)
+#ifdef XP_WIN
nsIWidget* GetContainingWidgetIfOffset();
already_AddRefed<mozilla::TextComposition> GetTextComposition();
void HandleNoConsumedCompositionMessage(