corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backout changeset c1161ca4bf13

Browse Source
This commit is contained in:
Ehsan Akhgari
2012-02-20 16:37:51 -05:00
parent 4deea01828
commit f5fd405a30
5 changed files with 6 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
widget/android/nsAppShell.cpp
View File

@@ -60,7 +60,7 @@
#include <android/log.h>
#include <pthread.h>
#include <wchar.h>
#include "nsContentUtils.h"
#ifdef MOZ_ANDROID_HISTORY
#include "nsAndroidHistory.h"
#endif
@@ -453,32 +453,6 @@ nsAppShell::ProcessNextNativeEvent(bool mayWait)
break;
}
case AndroidGeckoEvent::META_VIEWPORT_QUERY:
{
nsCOMPtr<nsIDOMWindow> domWindow;
mBrowserApp->GetWindowForTab(curEvent->TabId(), getter_AddRefs(domWindow));
if (!domWindow)
break;
nsCOMPtr<nsIDOMDocument> domDocument;
domWindow->GetDocument(getter_AddRefs(domDocument));
nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDocument);
ViewportInfo vi = nsContentUtils::GetViewportInfo(doc);
nsAutoString data;
data.AppendLiteral("{");
data.AppendPrintf("\"defaultZoom\": %f,", vi.defaultZoom);
data.AppendPrintf("\"minZoom\": %f,", vi.minZoom);
data.AppendPrintf("\"maxZoom\": %f,", vi.maxZoom);
data.AppendPrintf("\"width\": %d,", vi.width);
data.AppendPrintf("\"height\": %d,", vi.height);
data.AppendPrintf("\"autoSize\": %s,", vi.autoSize ? "true" : "false");
data.AppendPrintf("\"allowZoom\": %s,", vi.allowZoom ? "true" : "false");
data.AppendPrintf("\"autoScale\": %s", vi.autoScale ? "true" : "false");
data.AppendLiteral("}");
curEvent->DoCallback(data);
}
break;
case AndroidGeckoEvent::VIEWPORT:
case AndroidGeckoEvent::BROADCAST: {