Title: [123526] trunk/Source/WebKit/blackberry
- Revision
- 123526
- Author
- [email protected]
- Date
- 2012-07-24 14:09:44 -0700 (Tue, 24 Jul 2012)
Log Message
[BlackBerry] Do not call settings setters twice on page construction
https://bugs.webkit.org/show_bug.cgi?id=92157
Reviewed by Yong Li.
The WebPagePrivate init method sets some settings value that were
already set in didChangeSettings.
Also call didChangeSettings explicitly from init, before that we are
not calling it since the delegate is not set yet.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::init):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (123525 => 123526)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-07-24 20:59:14 UTC (rev 123525)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-07-24 21:09:44 UTC (rev 123526)
@@ -547,8 +547,9 @@
// so that we only get one didChangeSettings() callback when we set the page group name. This causes us
// to make a copy of the WebSettings since some WebSettings method make use of the page group name.
// Instead, we shouldn't be storing the page group name in WebSettings.
- m_webSettings->setDelegate(this);
m_webSettings->setPageGroupName(pageGroupName);
+ m_webSettings->setDelegate(this);
+ didChangeSettings(m_webSettings);
RefPtr<Frame> newFrame = Frame::create(m_page, /* HTMLFrameOwnerElement* */ 0, frameLoaderClient);
@@ -564,22 +565,16 @@
m_page->settings()->setCanvasUsesAcceleratedDrawing(true);
m_page->settings()->setAccelerated2dCanvasEnabled(true);
#endif
-#if ENABLE(VIEWPORT_REFLOW)
- m_page->settings()->setTextReflowEnabled(m_webSettings->textReflowMode() == WebSettings::TextReflowEnabled);
-#endif
m_page->settings()->setInteractiveFormValidationEnabled(true);
m_page->settings()->setAllowUniversalAccessFromFileURLs(false);
m_page->settings()->setAllowFileAccessFromFileURLs(false);
- m_page->settings()->setShouldUseCrossOriginProtocolCheck(!m_webSettings->allowCrossSiteRequests());
- m_page->settings()->setWebSecurityEnabled(!m_webSettings->allowCrossSiteRequests());
m_backingStoreClient = BackingStoreClient::create(m_mainFrame, /* parent frame */ 0, m_webPage);
// The direct access to BackingStore is left here for convenience since it
// is owned by BackingStoreClient and then deleted by its destructor.
m_backingStore = m_backingStoreClient->backingStore();
- m_page->settings()->setSpatialNavigationEnabled(m_webSettings->isSpatialNavigationEnabled());
blockClickRadius = int(roundf(0.35 * Platform::Graphics::Screen::primaryScreen()->pixelsPerInch(0).width())); // The clicked rectangle area should be a fixed unit of measurement.
m_page->settings()->setDelegateSelectionPaint(true);
Modified: trunk/Source/WebKit/blackberry/ChangeLog (123525 => 123526)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-07-24 20:59:14 UTC (rev 123525)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-07-24 21:09:44 UTC (rev 123526)
@@ -1,3 +1,19 @@
+2012-07-24 Rob Buis <[email protected]>
+
+ [BlackBerry] Do not call settings setters twice on page construction
+ https://bugs.webkit.org/show_bug.cgi?id=92157
+
+ Reviewed by Yong Li.
+
+ The WebPagePrivate init method sets some settings value that were
+ already set in didChangeSettings. setUseHixie76WebSocketProtocol just
+ sets the default value, no need to set it again.
+ Also call didChangeSettings explicitly from init, before that we are
+ not calling it since the delegate is not set yet.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::init):
+
2012-07-24 Mike Fenton <[email protected]>
Throttle calls to request the virtual keyboard be shown.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
