Title: [125573] trunk/Source/WebKit/blackberry
- Revision
- 125573
- Author
- kpias...@rim.com
- Date
- 2012-08-14 10:01:37 -0700 (Tue, 14 Aug 2012)
Log Message
[BlackBerry] Change the call to setUserScalable to use the setting.
https://bugs.webkit.org/show_bug.cgi?id=93974
Reviewed by Rob Buis.
We should be using the WebSetting and not the current value of m_userScalable.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::recomputeVirtualViewportFromViewportArguments):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (125572 => 125573)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-14 16:52:00 UTC (rev 125572)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-14 17:01:37 UTC (rev 125573)
@@ -3541,7 +3541,7 @@
int deviceHeight = Platform::Graphics::Screen::primaryScreen()->height();
ViewportAttributes result = computeViewportAttributes(m_viewportArguments, desktopWidth, deviceWidth, deviceHeight, m_webSettings->devicePixelRatio(), m_defaultLayoutSize);
- setUserScalable(m_userScalable && result.userScalable);
+ setUserScalable(m_webSettings->isUserScalable() && result.userScalable);
if (result.initialScale > 0)
setInitialScale(result.initialScale * result.devicePixelRatio);
if (result.minimumScale > 0)
Modified: trunk/Source/WebKit/blackberry/ChangeLog (125572 => 125573)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-08-14 16:52:00 UTC (rev 125572)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-08-14 17:01:37 UTC (rev 125573)
@@ -1,3 +1,15 @@
+2012-08-14 Konrad Piascik <kpias...@rim.com>
+
+ [BlackBerry] Change the call to setUserScalable to use the setting.
+ https://bugs.webkit.org/show_bug.cgi?id=93974
+
+ Reviewed by Rob Buis.
+
+ We should be using the WebSetting and not the current value of m_userScalable.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::recomputeVirtualViewportFromViewportArguments):
+
2012-08-14 Charles Wei <charles....@torchmobile.com.cn>
[BlackBerry] Some callback of Select onchange doesn't work
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
