Title: [148565] trunk/Source/WebKit/blackberry
- Revision
- 148565
- Author
- [email protected]
- Date
- 2013-04-16 16:01:38 -0700 (Tue, 16 Apr 2013)
Log Message
[BlackBerry] Viewport not rendered correctly
https://bugs.webkit.org/show_bug.cgi?id=114704
Patch by Jacky Jiang <[email protected]> on 2013-04-16.
Reviewed by Rob Buis.
Internally reviewed by Konrad Piascik.
PR: 326260
The applyDeviceScaleFactorInCompositor setting is now generated from
Settings.in after rebase, the setter should be setApplyDeviceScaleFactorInCompositor()
instead of setApplyPageScaleFactorInCompositor().
The setting can be removed from WebSettings and use a simpler way
instead in the future if there are no issues when TextAutoSizer is
enabled. Just keep it for now.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::didChangeSettings):
* Api/WebSettings.cpp:
(BlackBerry::WebKit::WebSettings::setApplyDeviceScaleFactorInCompositor):
* Api/WebSettings.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (148564 => 148565)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-04-16 23:01:02 UTC (rev 148564)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-04-16 23:01:38 UTC (rev 148565)
@@ -5921,7 +5921,7 @@
coreSettings->setShouldUseCrossOriginProtocolCheck(!webSettings->allowCrossSiteRequests());
coreSettings->setWebSecurityEnabled(!webSettings->allowCrossSiteRequests());
- coreSettings->setApplyPageScaleFactorInCompositor(webSettings->applyDeviceScaleFactorInCompositor());
+ coreSettings->setApplyDeviceScaleFactorInCompositor(webSettings->applyDeviceScaleFactorInCompositor());
updateBackgroundColor(webSettings->backgroundColor());
Modified: trunk/Source/WebKit/blackberry/Api/WebSettings.cpp (148564 => 148565)
--- trunk/Source/WebKit/blackberry/Api/WebSettings.cpp 2013-04-16 23:01:02 UTC (rev 148564)
+++ trunk/Source/WebKit/blackberry/Api/WebSettings.cpp 2013-04-16 23:01:38 UTC (rev 148565)
@@ -838,7 +838,7 @@
return m_private->getBoolean(BlackBerryApplyDeviceScaleFactorInCompositor);
}
-void WebSettings::setApplyPageScaleFactorInCompositor(bool applyDeviceScaleFactorInCompositor)
+void WebSettings::setApplyDeviceScaleFactorInCompositor(bool applyDeviceScaleFactorInCompositor)
{
m_private->setBoolean(BlackBerryApplyDeviceScaleFactorInCompositor, applyDeviceScaleFactorInCompositor);
}
Modified: trunk/Source/WebKit/blackberry/Api/WebSettings.h (148564 => 148565)
--- trunk/Source/WebKit/blackberry/Api/WebSettings.h 2013-04-16 23:01:02 UTC (rev 148564)
+++ trunk/Source/WebKit/blackberry/Api/WebSettings.h 2013-04-16 23:01:38 UTC (rev 148565)
@@ -242,7 +242,7 @@
void setBackingStoreEnabled(bool);
bool applyDeviceScaleFactorInCompositor() const;
- void setApplyPageScaleFactorInCompositor(bool);
+ void setApplyDeviceScaleFactorInCompositor(bool);
private:
WebSettingsPrivate* m_private;
Modified: trunk/Source/WebKit/blackberry/ChangeLog (148564 => 148565)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-04-16 23:01:02 UTC (rev 148564)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-04-16 23:01:38 UTC (rev 148565)
@@ -1,3 +1,25 @@
+2013-04-16 Jacky Jiang <[email protected]>
+
+ [BlackBerry] Viewport not rendered correctly
+ https://bugs.webkit.org/show_bug.cgi?id=114704
+
+ Reviewed by Rob Buis.
+ Internally reviewed by Konrad Piascik.
+
+ PR: 326260
+ The applyDeviceScaleFactorInCompositor setting is now generated from
+ Settings.in after rebase, the setter should be setApplyDeviceScaleFactorInCompositor()
+ instead of setApplyPageScaleFactorInCompositor().
+ The setting can be removed from WebSettings and use a simpler way
+ instead in the future if there are no issues when TextAutoSizer is
+ enabled. Just keep it for now.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::didChangeSettings):
+ * Api/WebSettings.cpp:
+ (BlackBerry::WebKit::WebSettings::setApplyDeviceScaleFactorInCompositor):
+ * Api/WebSettings.h:
+
2013-04-16 Leo Yang <[email protected]>
[BlackBerry] Update WebPage.{h, cpp} for supporting web filesystem
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
