Bug 723148 - b2g build broken since Bug 721741 landed [r=snorp]
authorFabrice Desré <fabrice@mozilla.com>
Wed, 01 Feb 2012 09:28:57 -0800
changeset 88850 f5f6600c76b93b1d941165c939347c51d6838278
parent 88849 9aac714775b91362f5178ab446d1e2b5501a414a
child 88851 f09662d2ba1f435f49df064d6cf259c20aef03b0
push id783
push userlsblakk@mozilla.com
push dateTue, 24 Apr 2012 17:33:42 +0000
treeherdermozilla-beta@11faed19f136 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp
bugs723148, 721741
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 723148 - b2g build broken since Bug 721741 landed [r=snorp]
dom/plugins/base/nsPluginInstanceOwner.h
--- a/dom/plugins/base/nsPluginInstanceOwner.h
+++ b/dom/plugins/base/nsPluginInstanceOwner.h
@@ -299,17 +299,17 @@ public:
   // The eventual target of these operations is PluginInstanceParent,
   // but it takes several hops to get there.
   void SetBackgroundUnknown();
   already_AddRefed<gfxContext> BeginUpdateBackground(const nsIntRect& aRect);
   void EndUpdateBackground(gfxContext* aContext, const nsIntRect& aRect);
   
   bool UseAsyncRendering();
 
-#ifdef ANDROID
+#ifdef MOZ_WIDGET_ANDROID
   nsIntRect GetVisibleRect() {
     return nsIntRect(0, 0, mPluginWindow->width, mPluginWindow->height);
   }
 
   void SetInverted(bool aInverted) {
     mInverted = aInverted;
   }
 
@@ -330,17 +330,17 @@ private:
   bool IsUpToDate()
   {
     nsIntSize size;
     return NS_SUCCEEDED(mInstance->GetImageSize(&size)) &&
     size == nsIntSize(mPluginWindow->width, mPluginWindow->height);
   }
   
   void FixUpURLS(const nsString &name, nsAString &value);
-#ifdef ANDROID
+#ifdef MOZ_WIDGET_ANDROID
   void SendSize(int width, int height);
   void SendOnScreenEvent(bool onScreen);
 
   bool AddPluginView(const gfxRect& aRect);
   void RemovePluginView();
 
   bool mOnScreen;
   bool mInverted;