- Revision
- 185691
- Author
- [email protected]
- Date
- 2015-06-17 21:11:05 -0700 (Wed, 17 Jun 2015)
Log Message
Source/WebKit/win:
[Win]Implement layoutTestController.dispatchPendingLoadRequests.
https://bugs.webkit.org/show_bug.cgi?id=26481
Patch by Hyungwook Lee <[email protected]> on 2015-06-17
Reviewed by Darin Adler.
Implement WebView::dispatchPendingLoadRequests() private API for test runner.
* Interfaces/IWebViewPrivate.idl:
* WebView.cpp:
(WebView::scaleWebView):
(WebView::dispatchPendingLoadRequests):
* WebView.h:
Tools:
[Win]Implement layoutTestController.dispatchPendingLoadRequests.
https://bugs.webkit.org/show_bug.cgi?id=26481
Patch by Hyungwook Lee <[email protected]> on 2015-06-17
Reviewed by Darin Adler.
Implement WebView::dispatchPendingLoadRequests() private API for test runner.
* DumpRenderTree/win/TestRunnerWin.cpp:
(TestRunner::dispatchPendingLoadRequests):
(TestRunner::overridePreference):
LayoutTests:
[Win]Implement layoutTestController.dispatchPendingLoadRequests.
https://bugs.webkit.org/show_bug.cgi?id=26481
Patch by Hyungwook Lee <[email protected]> on 2015-06-17
Reviewed by Darin Adler.
Implement WebView::dispatchPendingLoadRequests() private API for test runner.
* platform/win/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (185690 => 185691)
--- trunk/LayoutTests/ChangeLog 2015-06-18 04:05:50 UTC (rev 185690)
+++ trunk/LayoutTests/ChangeLog 2015-06-18 04:11:05 UTC (rev 185691)
@@ -1,3 +1,14 @@
+2015-06-17 Hyungwook Lee <[email protected]>
+
+ [Win]Implement layoutTestController.dispatchPendingLoadRequests.
+ https://bugs.webkit.org/show_bug.cgi?id=26481
+
+ Reviewed by Darin Adler.
+
+ Implement WebView::dispatchPendingLoadRequests() private API for test runner.
+
+ * platform/win/TestExpectations:
+
2015-06-17 Chris Fleizach <[email protected]>
AX: VoiceOver in iOS not announcing generic WAI-ARIA region, even if labelled properly
Modified: trunk/LayoutTests/platform/win/TestExpectations (185690 => 185691)
--- trunk/LayoutTests/platform/win/TestExpectations 2015-06-18 04:05:50 UTC (rev 185690)
+++ trunk/LayoutTests/platform/win/TestExpectations 2015-06-18 04:11:05 UTC (rev 185691)
@@ -135,9 +135,6 @@
# TODO DumpRenderTree code to enable Java is currently a no-op. Windows doesn't come with Java by default.
java/ [ Skip ]
-# TODO Implement testRunner.dispatchPendingLoadRequests
-webkit.org/b/26481 http/tests/loading/deleted-host-in-resource-load-delegate-callback.html [ Skip ]
-
# TODO No support for print-to-pdf in Windows DRT
printing/compositing-layer-printing.html [ Skip ]
printing/media-queries-print.html [ Skip ]
Modified: trunk/Source/WebKit/win/ChangeLog (185690 => 185691)
--- trunk/Source/WebKit/win/ChangeLog 2015-06-18 04:05:50 UTC (rev 185690)
+++ trunk/Source/WebKit/win/ChangeLog 2015-06-18 04:11:05 UTC (rev 185691)
@@ -1,3 +1,18 @@
+2015-06-17 Hyungwook Lee <[email protected]>
+
+ [Win]Implement layoutTestController.dispatchPendingLoadRequests.
+ https://bugs.webkit.org/show_bug.cgi?id=26481
+
+ Reviewed by Darin Adler.
+
+ Implement WebView::dispatchPendingLoadRequests() private API for test runner.
+
+ * Interfaces/IWebViewPrivate.idl:
+ * WebView.cpp:
+ (WebView::scaleWebView):
+ (WebView::dispatchPendingLoadRequests):
+ * WebView.h:
+
2015-06-17 Commit Queue <[email protected]>
Unreviewed, rolling out r185636.
Modified: trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl (185690 => 185691)
--- trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl 2015-06-18 04:05:50 UTC (rev 185690)
+++ trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl 2015-06-18 04:11:05 UTC (rev 185691)
@@ -295,4 +295,6 @@
HRESULT setLoadResourcesSerially([in] BOOL serialize);
HRESULT scaleWebView([in] double scale, [in] POINT origin);
+
+ HRESULT dispatchPendingLoadRequests();
}
Modified: trunk/Source/WebKit/win/WebView.cpp (185690 => 185691)
--- trunk/Source/WebKit/win/WebView.cpp 2015-06-18 04:05:50 UTC (rev 185690)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-06-18 04:11:05 UTC (rev 185691)
@@ -7126,3 +7126,9 @@
return S_OK;
}
+
+HRESULT WebView::dispatchPendingLoadRequests()
+{
+ resourceLoadScheduler()->servePendingRequests();
+ return S_OK;
+}
Modified: trunk/Source/WebKit/win/WebView.h (185690 => 185691)
--- trunk/Source/WebKit/win/WebView.h 2015-06-18 04:05:50 UTC (rev 185690)
+++ trunk/Source/WebKit/win/WebView.h 2015-06-18 04:11:05 UTC (rev 185691)
@@ -1021,6 +1021,7 @@
HRESULT STDMETHODCALLTYPE setLoadResourcesSerially(BOOL);
HRESULT STDMETHODCALLTYPE scaleWebView(double scale, POINT origin);
+ HRESULT STDMETHODCALLTYPE dispatchPendingLoadRequests();
protected:
static bool registerWebViewWindowClass();
Modified: trunk/Tools/ChangeLog (185690 => 185691)
--- trunk/Tools/ChangeLog 2015-06-18 04:05:50 UTC (rev 185690)
+++ trunk/Tools/ChangeLog 2015-06-18 04:11:05 UTC (rev 185691)
@@ -1,3 +1,16 @@
+2015-06-17 Hyungwook Lee <[email protected]>
+
+ [Win]Implement layoutTestController.dispatchPendingLoadRequests.
+ https://bugs.webkit.org/show_bug.cgi?id=26481
+
+ Reviewed by Darin Adler.
+
+ Implement WebView::dispatchPendingLoadRequests() private API for test runner.
+
+ * DumpRenderTree/win/TestRunnerWin.cpp:
+ (TestRunner::dispatchPendingLoadRequests):
+ (TestRunner::overridePreference):
+
2015-06-17 Alex Christensen <[email protected]>
[Content Extensions] Fail to parse invalid arrays
Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (185690 => 185691)
--- trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2015-06-18 04:05:50 UTC (rev 185690)
+++ trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2015-06-18 04:11:05 UTC (rev 185691)
@@ -812,8 +812,15 @@
void TestRunner::dispatchPendingLoadRequests()
{
- // FIXME: Implement for testing fix for 6727495
- printf("ERROR: TestRunner::dispatchPendingLoadRequests() not implemented\n");
+ COMPtr<IWebView> webView;
+ if (FAILED(frame->webView(&webView)))
+ return;
+
+ COMPtr<IWebViewPrivate> viewPrivate;
+ if (FAILED(webView->QueryInterface(&viewPrivate)))
+ return;
+
+ viewPrivate->dispatchPendingLoadRequests();
}
void TestRunner::overridePreference(JSStringRef key, JSStringRef value)
