Bug 847367 - Fix EGLSurface namespace conflict in AndroidBridge.cpp. r=blassey a=bajaj
authorChris Lord <chrislord.net@gmail.com>
Mon, 18 Mar 2013 23:00:04 +0100
changeset 132421 dc0ea82288b57ecaa7c3f5d7e0dca19a6ca585ce
parent 132420 5aa5a4e399e13ae458cf56ba140275ff5346107b
child 132422 bab7bc14c912b7d8455abfe5dc68420653a69caa
push id2323
push userbbajaj@mozilla.com
push dateMon, 01 Apr 2013 19:47:02 +0000
treeherdermozilla-beta@7712be144d91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey, bajaj
bugs847367
milestone21.0a2
Bug 847367 - Fix EGLSurface namespace conflict in AndroidBridge.cpp. r=blassey a=bajaj
widget/android/AndroidBridge.h
--- a/widget/android/AndroidBridge.h
+++ b/widget/android/AndroidBridge.h
@@ -49,16 +49,18 @@ extern "C" int jsjni_CallStaticIntMethod
 
 extern bool mozilla_AndroidBridge_SetMainThread(void *);
 extern jclass GetGeckoAppShellClass();
 
 namespace base {
 class Thread;
 } // end namespace base
 
+typedef void* EGLSurface;
+
 namespace mozilla {
 
 namespace hal {
 class BatteryInformation;
 class NetworkInformation;
 } // namespace hal
 
 namespace dom {
@@ -83,18 +85,16 @@ typedef struct AndroidSystemColors {
     nscolor textColorTertiaryInverse;
     nscolor textColorHighlight;
     nscolor colorForeground;
     nscolor colorBackground;
     nscolor panelColorForeground;
     nscolor panelColorBackground;
 } AndroidSystemColors;
 
-typedef void* EGLSurface;
-
 class nsFilePickerCallback : nsISupports {
 public:
     NS_DECL_ISUPPORTS
     virtual void handleResult(nsAString& filePath) = 0;
     nsFilePickerCallback() {}
 protected:
     virtual ~nsFilePickerCallback() {}
 };