Bug 810933 - Fix regression in bug 809199 caused by incorrect order of parameters. r=Cwiiis
authorKartikaya Gupta <kgupta@mozilla.com>
Mon, 12 Nov 2012 18:44:59 -0800
changeset 113053 cd854e9fe7c1261507c8c0de712bdddbdb1898f4
parent 113052 039875aeaf2b4d6c7096a38eec630e5b6f2b74c5
child 113054 f60b494448f881a35c5a1d7806bdd2aabb8d436d
push id17913
push userkgupta@mozilla.com
push dateTue, 13 Nov 2012 02:45:07 +0000
treeherdermozilla-inbound@cd854e9fe7c1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCwiiis
bugs810933, 809199
milestone19.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 810933 - Fix regression in bug 809199 caused by incorrect order of parameters. r=Cwiiis
widget/android/AndroidJavaWrappers.cpp
--- a/widget/android/AndroidJavaWrappers.cpp
+++ b/widget/android/AndroidJavaWrappers.cpp
@@ -902,19 +902,20 @@ jobject ConvertToJavaViewportMetrics(JNI
     metrics->GetPageBottom(&pageBottom);
     metrics->GetCssPageLeft(&cssPageLeft);
     metrics->GetCssPageTop(&cssPageTop);
     metrics->GetCssPageRight(&cssPageRight);
     metrics->GetCssPageBottom(&cssPageBottom);
     metrics->GetZoom(&zoom);
 
     jobject jobj = env->NewObject(AndroidGeckoLayerClient::jViewportClass, AndroidGeckoLayerClient::jViewportCtor,
-                                  x, y, width, height,
                                   pageLeft, pageTop, pageRight, pageBottom,
-                                  cssPageLeft, cssPageTop, cssPageRight, cssPageBottom, zoom);
+                                  cssPageLeft, cssPageTop, cssPageRight, cssPageBottom,
+                                  x, y, x + width, y + height,
+                                  zoom);
     return jobj;
 }
 
 class nsAndroidDisplayport : public nsIAndroidDisplayport
 {
 public:
     NS_DECL_ISUPPORTS
     virtual nsresult GetLeft(float *aLeft) { *aLeft = mLeft; return NS_OK; }