Title: [122371] trunk/Source/WebKit/blackberry
- Revision
- 122371
- Author
- [email protected]
- Date
- 2012-07-11 14:14:25 -0700 (Wed, 11 Jul 2012)
Log Message
[BlackBerry] UserViewportArguments are not properly respected.
https://bugs.webkit.org/show_bug.cgi?id=91005
Patch by Mike Lattanzio <[email protected]> on 2012-07-11
Reviewed by Rob Buis.
PR# 170088.
Move scale and zooming reset on Committed before applying
the user viewport to avoid overriding it immediately.
Internal review by Konrad Piascik, Jacky Jiang.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::setLoadState):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (122370 => 122371)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-07-11 21:11:57 UTC (rev 122370)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-07-11 21:14:25 UTC (rev 122371)
@@ -1084,14 +1084,13 @@
frameLoadType = m_mainFrame->loader()->loadType();
if (!((m_didRestoreFromPageCache && documentHasViewportArguments) || (frameLoadType == FrameLoadTypeReload || frameLoadType == FrameLoadTypeReloadFromOrigin))) {
m_viewportArguments = ViewportArguments();
+ m_userScalable = m_webSettings->isUserScalable();
+ resetScales();
// At the moment we commit a new load, set the viewport arguments
// to any fallback values. If there is a meta viewport in the
// content it will overwrite the fallback arguments soon.
dispatchViewportPropertiesDidChange(m_userViewportArguments);
-
- m_userScalable = m_webSettings->isUserScalable();
- resetScales();
} else {
IntSize virtualViewport = recomputeVirtualViewportFromViewportArguments();
m_webPage->setVirtualViewportSize(virtualViewport.width(), virtualViewport.height());
Modified: trunk/Source/WebKit/blackberry/ChangeLog (122370 => 122371)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-07-11 21:11:57 UTC (rev 122370)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-07-11 21:14:25 UTC (rev 122371)
@@ -1,3 +1,19 @@
+2012-07-11 Mike Lattanzio <[email protected]>
+
+ [BlackBerry] UserViewportArguments are not properly respected.
+ https://bugs.webkit.org/show_bug.cgi?id=91005
+
+ Reviewed by Rob Buis.
+
+ PR# 170088.
+ Move scale and zooming reset on Committed before applying
+ the user viewport to avoid overriding it immediately.
+
+ Internal review by Konrad Piascik, Jacky Jiang.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::setLoadState):
+
2012-07-11 Crystal Zhang <[email protected]>
[BlackBerry] Implement Date/Time picker
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes