Title: [148466] trunk/Source/WebKit/blackberry
- Revision
- 148466
- Author
- [email protected]
- Date
- 2013-04-15 14:07:05 -0700 (Mon, 15 Apr 2013)
Log Message
[BlackBerry] Crash from null m_webSettings in WebPagePrivate
https://bugs.webkit.org/show_bug.cgi?id=114633
RIM PR 303745
Patch by Liam Quinn <[email protected]> on 2013-04-15
Reviewed by Rob Buis.
Internally reviewed by Leo Yang.
Speculative fix suggested by George Staikos--initialize m_webSettings first thing in the init() method.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::init):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (148465 => 148466)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-04-15 21:05:25 UTC (rev 148465)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-04-15 21:07:05 UTC (rev 148466)
@@ -510,6 +510,9 @@
void WebPagePrivate::init(const BlackBerry::Platform::String& pageGroupName)
{
+ m_webSettings = WebSettings::createFromStandardSettings();
+ m_webSettings->setUserAgentString(defaultUserAgent());
+
ChromeClientBlackBerry* chromeClient = new ChromeClientBlackBerry(this);
#if ENABLE(CONTEXT_MENUS)
ContextMenuClientBlackBerry* contextMenuClient = 0;
@@ -579,8 +582,6 @@
WebCore::provideNetworkInfoTo(m_page, new WebCore::NetworkInfoClientBlackBerry(this));
#endif
- m_webSettings = WebSettings::createFromStandardSettings();
- m_webSettings->setUserAgentString(defaultUserAgent());
m_page->setDeviceScaleFactor(m_webSettings->devicePixelRatio());
m_page->addLayoutMilestones(DidFirstVisuallyNonEmptyLayout);
Modified: trunk/Source/WebKit/blackberry/ChangeLog (148465 => 148466)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-04-15 21:05:25 UTC (rev 148465)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-04-15 21:07:05 UTC (rev 148466)
@@ -1,3 +1,17 @@
+2013-04-15 Liam Quinn <[email protected]>
+
+ [BlackBerry] Crash from null m_webSettings in WebPagePrivate
+ https://bugs.webkit.org/show_bug.cgi?id=114633
+ RIM PR 303745
+
+ Reviewed by Rob Buis.
+ Internally reviewed by Leo Yang.
+
+ Speculative fix suggested by George Staikos--initialize m_webSettings first thing in the init() method.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::init):
+
2013-04-15 Andy Chen <[email protected]>
[BlackBerry] Forward userGesture when creating a new window
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
