Title: [117070] trunk
- Revision
- 117070
- Author
- [email protected]
- Date
- 2012-05-15 08:15:51 -0700 (Tue, 15 May 2012)
Log Message
[Qt][WK2] fast/loader/create-frame-in-DOMContentLoaded.html crashes
https://bugs.webkit.org/show_bug.cgi?id=83578
Source/WebKit2:
Retrieve and save page ID only for a valid page in WebFrameNetworkingContext.
The page will be null if the frame was detached from the page.
Patch by Dinu Jacob <[email protected]> on 2012-05-15
Reviewed by Simon Hausmann.
* WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp:
(WebCore::WebFrameNetworkingContext::WebFrameNetworkingContext):
LayoutTests:
Unskip passing test.
Patch by Dinu Jacob <[email protected]> on 2012-05-15
Reviewed by Simon Hausmann.
* platform/qt-5.0-wk2/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (117069 => 117070)
--- trunk/LayoutTests/ChangeLog 2012-05-15 15:07:59 UTC (rev 117069)
+++ trunk/LayoutTests/ChangeLog 2012-05-15 15:15:51 UTC (rev 117070)
@@ -1,3 +1,14 @@
+2012-05-15 Dinu Jacob <[email protected]>
+
+ [Qt][WK2] fast/loader/create-frame-in-DOMContentLoaded.html crashes
+ https://bugs.webkit.org/show_bug.cgi?id=83578
+
+ Unskip passing test.
+
+ Reviewed by Simon Hausmann.
+
+ * platform/qt-5.0-wk2/Skipped:
+
2012-05-15 Vsevolod Vlasov <[email protected]>
Web Inspector: Refactor SnippetsModel: extract SnippetStorage, make SnippetScriptMapping delegate calls to ScriptSnippetModel and provide public interface on ScriptSnippetModel in terms of uiSourceCodes
Modified: trunk/LayoutTests/platform/qt-5.0-wk2/Skipped (117069 => 117070)
--- trunk/LayoutTests/platform/qt-5.0-wk2/Skipped 2012-05-15 15:07:59 UTC (rev 117069)
+++ trunk/LayoutTests/platform/qt-5.0-wk2/Skipped 2012-05-15 15:15:51 UTC (rev 117070)
@@ -574,10 +574,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=83575
fast/frames/iframe-window-focus.html
-# [Qt][WK2] fast/loader/create-frame-in-DOMContentLoaded.html crashes
-# https://bugs.webkit.org/show_bug.cgi?id=83578
-fast/loader/create-frame-in-DOMContentLoaded.html
-
# Missing layoutTestController.numberOfPendingGeolocationPermissionRequests() implementation
fast/dom/Geolocation/page-reload-cancel-permission-requests.html
Modified: trunk/Source/WebKit2/ChangeLog (117069 => 117070)
--- trunk/Source/WebKit2/ChangeLog 2012-05-15 15:07:59 UTC (rev 117069)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-15 15:15:51 UTC (rev 117070)
@@ -1,3 +1,16 @@
+2012-05-15 Dinu Jacob <[email protected]>
+
+ [Qt][WK2] fast/loader/create-frame-in-DOMContentLoaded.html crashes
+ https://bugs.webkit.org/show_bug.cgi?id=83578
+
+ Retrieve and save page ID only for a valid page in WebFrameNetworkingContext.
+ The page will be null if the frame was detached from the page.
+
+ Reviewed by Simon Hausmann.
+
+ * WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp:
+ (WebCore::WebFrameNetworkingContext::WebFrameNetworkingContext):
+
2012-05-15 Allan Sandfeld Jensen <[email protected]>
[Qt][WK2] Fix scrolling in touch mode
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp (117069 => 117070)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp 2012-05-15 15:07:59 UTC (rev 117069)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp 2012-05-15 15:15:51 UTC (rev 117070)
@@ -31,11 +31,13 @@
WebFrameNetworkingContext::WebFrameNetworkingContext(WebKit::WebFrame* frame)
: FrameNetworkingContext(frame->coreFrame())
- , m_originatingObject(adoptPtr(new QObject))
, m_mimeSniffingEnabled(true)
{
- // The page ID is needed later for HTTP authentication and SSL errors.
- m_originatingObject->setProperty("pageID", qulonglong(frame->page()->pageID()));
+ // Save the page ID for a valid page as it is needed later for HTTP authentication and SSL errors.
+ if (frame->page()) {
+ m_originatingObject = adoptPtr(new QObject);
+ m_originatingObject->setProperty("pageID", qulonglong(frame->page()->pageID()));
+ }
}
WebFrameNetworkingContext::~WebFrameNetworkingContext()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
