Title: [135532] trunk
- Revision
- 135532
- Author
- [email protected]
- Date
- 2012-11-22 10:37:50 -0800 (Thu, 22 Nov 2012)
Log Message
[Qt] REGRESSION(r135515): It made 3-3 tests fail and crash
https://bugs.webkit.org/show_bug.cgi?id=103073
Rubber-stamped by Simon Hausmann.
Source/WebKit/qt:
Removing the QNetworkAccessManager member in FrameNetworkingContextQt
was right, but we need to be careful as to how we fetch it back.
Since the WebCore Page is not always valid, get the QNAM instance
straight from the frame adapter through its page adapter instead.
* WebCoreSupport/ChromeClientQt.cpp: [Style nit] Remove stray emit.
* WebCoreSupport/FrameNetworkingContextQt.cpp:
(WebCore::FrameNetworkingContextQt::networkAccessManager):
LayoutTests:
Unskip the tests that had regressed.
* platform/qt/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (135531 => 135532)
--- trunk/LayoutTests/ChangeLog 2012-11-22 18:18:48 UTC (rev 135531)
+++ trunk/LayoutTests/ChangeLog 2012-11-22 18:37:50 UTC (rev 135532)
@@ -1,3 +1,14 @@
+2012-11-22 Pierre Rossi <[email protected]>
+
+ [Qt] REGRESSION(r135515): It made 3-3 tests fail and crash
+ https://bugs.webkit.org/show_bug.cgi?id=103073
+
+ Rubber-stamped by Simon Hausmann.
+
+ Unskip the tests that had regressed.
+
+ * platform/qt/TestExpectations:
+
2012-11-22 Stephen Chenney <[email protected]>
[Chromium] Test expectations update after enabling Skia changes.
Modified: trunk/LayoutTests/platform/qt/TestExpectations (135531 => 135532)
--- trunk/LayoutTests/platform/qt/TestExpectations 2012-11-22 18:18:48 UTC (rev 135531)
+++ trunk/LayoutTests/platform/qt/TestExpectations 2012-11-22 18:37:50 UTC (rev 135532)
@@ -2399,12 +2399,3 @@
mhtml/shared_buffer_bug.mht
mhtml/simple_page_ie.mht
mhtml/simple_page_unmht.mht
-
-# [Qt] REGRESSION(r135515): It made 3-3 tests fail and crash
-# https://bugs.webkit.org/show_bug.cgi?id=103073
-http/tests/appcache/origin-quota-continued-download-multiple-manifests.html
-http/tests/appcache/origin-quota-continued-download.html
-http/tests/appcache/origin-quota.html
-fast/dom/beforeload/remove-frame-in-beforeload-listener.html
-fast/parser/remove-misnested-iframe-parent-in-beforeload.html
-fast/parser/remove-misnested-iframe-in-beforeload.html
Modified: trunk/Source/WebKit/qt/ChangeLog (135531 => 135532)
--- trunk/Source/WebKit/qt/ChangeLog 2012-11-22 18:18:48 UTC (rev 135531)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-11-22 18:37:50 UTC (rev 135532)
@@ -1,3 +1,19 @@
+2012-11-22 Pierre Rossi <[email protected]>
+
+ [Qt] REGRESSION(r135515): It made 3-3 tests fail and crash
+ https://bugs.webkit.org/show_bug.cgi?id=103073
+
+ Rubber-stamped by Simon Hausmann.
+
+ Removing the QNetworkAccessManager member in FrameNetworkingContextQt
+ was right, but we need to be careful as to how we fetch it back.
+ Since the WebCore Page is not always valid, get the QNAM instance
+ straight from the frame adapter through its page adapter instead.
+
+ * WebCoreSupport/ChromeClientQt.cpp: [Style nit] Remove stray emit.
+ * WebCoreSupport/FrameNetworkingContextQt.cpp:
+ (WebCore::FrameNetworkingContextQt::networkAccessManager):
+
2012-11-22 Simon Hausmann <[email protected]>
Unreviewed MSVC Windows build fix: Include header files referenced in RefPtr
Modified: trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (135531 => 135532)
--- trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp 2012-11-22 18:18:48 UTC (rev 135531)
+++ trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp 2012-11-22 18:37:50 UTC (rev 135532)
@@ -559,7 +559,7 @@
if (!WebCore::cacheStorage().calculateQuotaForOrigin(origin, quota))
WebCore::cacheStorage().storeUpdatedQuotaForOrigin(origin, defaultOriginQuota);
- emit m_webPage->applicationCacheQuotaExceeded(securityOrigin, defaultOriginQuota, static_cast<quint64>(totalSpaceNeeded));
+ m_webPage->applicationCacheQuotaExceeded(securityOrigin, defaultOriginQuota, static_cast<quint64>(totalSpaceNeeded));
}
#if ENABLE(INPUT_TYPE_COLOR)
Modified: trunk/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp (135531 => 135532)
--- trunk/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp 2012-11-22 18:18:48 UTC (rev 135531)
+++ trunk/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp 2012-11-22 18:37:50 UTC (rev 135532)
@@ -20,6 +20,7 @@
#include "config.h"
#include "FrameNetworkingContextQt.h"
+#include "QWebFrameAdapter.h"
#include "QWebPageAdapter.h"
#include "qwebsettings.h"
@@ -48,7 +49,7 @@
QNetworkAccessManager* FrameNetworkingContextQt::networkAccessManager() const
{
- return QWebPageAdapter::kit(frame()->page())->networkAccessManager();
+ return QWebFrameAdapter::kit(frame())->pageAdapter->networkAccessManager();
}
bool FrameNetworkingContextQt::mimeSniffingEnabled() const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
