Title: [119721] trunk/Source/WebKit/blackberry
- Revision
- 119721
- Author
- [email protected]
- Date
- 2012-06-07 07:30:56 -0700 (Thu, 07 Jun 2012)
Log Message
[BlackBerry] User viewport arguments are not respected
https://bugs.webkit.org/show_bug.cgi?id=88530
Patch by Arvid Nilsson <[email protected]> on 2012-06-07
Reviewed by Antonio Gomes.
RIM PR #163767
Fixed by applying the user supplied viewport arguments if the page
specifies default viewport arguments (i.e. the page has no viewport
meta tag).
If the user didn't supply any viewport arguments either, the behaviour
is the same as before the patch, the caller will successfully reset to
default viewport arguments.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::dispatchViewportPropertiesDidChange):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (119720 => 119721)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-06-07 14:19:34 UTC (rev 119720)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-06-07 14:30:56 UTC (rev 119721)
@@ -3411,7 +3411,12 @@
if (arguments == m_viewportArguments)
return;
- m_viewportArguments = arguments;
+ // If the caller is trying to reset to default arguments, use the user supplied ones instead.
+ static const ViewportArguments defaultViewportArguments;
+ if (arguments == defaultViewportArguments)
+ m_viewportArguments = m_userViewportArguments;
+ else
+ m_viewportArguments = arguments;
// 0 width or height in viewport arguments makes no sense, and results in a very large initial scale.
// In real world, a 0 width or height is usually caused by a syntax error in "content" field of viewport
Modified: trunk/Source/WebKit/blackberry/ChangeLog (119720 => 119721)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-06-07 14:19:34 UTC (rev 119720)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-06-07 14:30:56 UTC (rev 119721)
@@ -1,5 +1,25 @@
2012-06-07 Arvid Nilsson <[email protected]>
+ [BlackBerry] User viewport arguments are not respected
+ https://bugs.webkit.org/show_bug.cgi?id=88530
+
+ Reviewed by Antonio Gomes.
+
+ RIM PR #163767
+
+ Fixed by applying the user supplied viewport arguments if the page
+ specifies default viewport arguments (i.e. the page has no viewport
+ meta tag).
+
+ If the user didn't supply any viewport arguments either, the behaviour
+ is the same as before the patch, the caller will successfully reset to
+ default viewport arguments.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::dispatchViewportPropertiesDidChange):
+
+2012-06-07 Arvid Nilsson <[email protected]>
+
[BlackBerry] Allow WebPageCompositor to blend a transparent web page
https://bugs.webkit.org/show_bug.cgi?id=88233
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
