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

Merge mc->Maple

Browse Source
This commit is contained in:
Benoit Girard
2012-03-13 11:05:28 -04:00
parent db205def09 83a08cc477
commit bbefdec4f2
578 changed files with 12639 additions and 4868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
widget/android/nsAppShell.cpp
View File

@@ -445,11 +445,23 @@ nsAppShell::ProcessNextNativeEvent(bool mayWait)
break;
nsCOMPtr<nsIDOMWindow> domWindow;
mBrowserApp->GetWindowForTab(curEvent->MetaState(), getter_AddRefs(domWindow));
nsCOMPtr<nsIBrowserTab> tab;
float scale;
mBrowserApp->GetBrowserTab(curEvent->MetaState(), getter_AddRefs(tab));
if (!tab)
break;
tab->GetWindow(getter_AddRefs(domWindow));
if (!domWindow)
break;
if (NS_FAILED(tab->GetScale(&scale)))
break;
nsTArray<nsIntPoint> points = curEvent->Points();
NS_ASSERTION(points.Length() == 2, "Screenshot event does not have enough coordinates");
if (domWindow)
bridge->TakeScreenshot(domWindow, 0, 0, points[0].x, points[0].y, points[1].x, points[1].y, curEvent->MetaState());
bridge->TakeScreenshot(domWindow, 0, 0, points[0].x, points[0].y, points[1].x, points[1].y, curEvent->MetaState(), scale);
break;
}