Diff
Modified: trunk/LayoutTests/fast/events/overflow-viewport-renderer-deleted-expected.txt (177578 => 177579)
--- trunk/LayoutTests/fast/events/overflow-viewport-renderer-deleted-expected.txt 2014-12-19 18:48:25 UTC (rev 177578)
+++ trunk/LayoutTests/fast/events/overflow-viewport-renderer-deleted-expected.txt 2014-12-19 18:58:55 UTC (rev 177579)
@@ -0,0 +1 @@
+ERROR: nil result from IDOMElement::innerText
\ No newline at end of file
Modified: trunk/Source/WebKit/win/ChangeLog (177578 => 177579)
--- trunk/Source/WebKit/win/ChangeLog 2014-12-19 18:48:25 UTC (rev 177578)
+++ trunk/Source/WebKit/win/ChangeLog 2014-12-19 18:58:55 UTC (rev 177579)
@@ -1,3 +1,15 @@
+2014-12-19 Brent Fulgham <[email protected]>
+
+ [Win] Add accessor for serializing HTTP loads.
+ https://bugs.webkit.org/show_bug.cgi?id=139817
+
+ Reviewed by Mark Lam.
+
+ * Interfaces/IWebViewPrivate.idl: Add new method.
+ * WebView.cpp:
+ (WebView::setLoadResourcesSerially): Provide implementation.
+ * WebView.h:
+
2014-12-18 [email protected] <[email protected]>
[WinCairo] Compile error in code for creating GL context.
Modified: trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl (177578 => 177579)
--- trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl 2014-12-19 18:48:25 UTC (rev 177578)
+++ trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl 2014-12-19 18:58:55 UTC (rev 177579)
@@ -290,4 +290,7 @@
HRESULT firstRectForCharacterRangeForTesting([in] UINT location, [in] UINT length, [out, retval] RECT* resultRect);
HRESULT selectedRangeForTesting([out] UINT* location, [out] UINT* length);
+
+ // SPI for DumpRenderTree
+ HRESULT setLoadResourcesSerially([in] BOOL serialize);
}
Modified: trunk/Source/WebKit/win/WebView.cpp (177578 => 177579)
--- trunk/Source/WebKit/win/WebView.cpp 2014-12-19 18:48:25 UTC (rev 177578)
+++ trunk/Source/WebKit/win/WebView.cpp 2014-12-19 18:58:55 UTC (rev 177579)
@@ -32,6 +32,7 @@
#include "DOMCoreClasses.h"
#include "FullscreenVideoController.h"
#include "MarshallingHelpers.h"
+#include "ResourceLoadScheduler.h"
#include "SoftLinking.h"
#include "SubframeLoader.h"
#include "TextIterator.h"
@@ -7048,3 +7049,9 @@
return S_OK;
}
+HRESULT WebView::setLoadResourcesSerially(BOOL serialize)
+{
+ WebPlatformStrategies::initialize();
+ resourceLoadScheduler()->setSerialLoadingEnabled(serialize);
+ return S_OK;
+}
Modified: trunk/Source/WebKit/win/WebView.h (177578 => 177579)
--- trunk/Source/WebKit/win/WebView.h 2014-12-19 18:48:25 UTC (rev 177578)
+++ trunk/Source/WebKit/win/WebView.h 2014-12-19 18:58:55 UTC (rev 177579)
@@ -1019,6 +1019,8 @@
bool m_shouldInvertColors;
void setShouldInvertColors(bool);
+ HRESULT STDMETHODCALLTYPE setLoadResourcesSerially(BOOL);
+
protected:
static bool registerWebViewWindowClass();
static LRESULT CALLBACK WebViewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
Modified: trunk/Tools/ChangeLog (177578 => 177579)
--- trunk/Tools/ChangeLog 2014-12-19 18:48:25 UTC (rev 177578)
+++ trunk/Tools/ChangeLog 2014-12-19 18:58:55 UTC (rev 177579)
@@ -1,3 +1,14 @@
+2014-12-19 Brent Fulgham <[email protected]>
+
+ [Win] Add accessor for serializing HTTP loads
+ https://bugs.webkit.org/show_bug.cgi?id=139817
+
+ Reviewed by Mark Lam.
+
+ * DumpRenderTree/win/DumpRenderTree.cpp: Reset serialized HTTP loads in our reset method.
+ * DumpRenderTree/win/TestRunnerWin.cpp: Provide implementation for serializing HTTP. Also
+ remove some redundant code from the destructor.
+
2014-12-19 Alexey Proskuryakov <[email protected]>
Clean up a fix for performance test bot failing to build
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (177578 => 177579)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2014-12-19 18:48:25 UTC (rev 177578)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2014-12-19 18:58:55 UTC (rev 177579)
@@ -884,6 +884,8 @@
if (SUCCEEDED(webView->preferences(&preferences)))
resetDefaultsToConsistentValues(preferences.get());
+ TestRunner::setSerializeHTTPLoads(false);
+
if (gTestRunner) {
JSGlobalContextRef context = frame->globalContext();
WebCoreTestSupport::resetInternalsObject(context);
Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (177578 => 177579)
--- trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2014-12-19 18:48:25 UTC (rev 177578)
+++ trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2014-12-19 18:58:55 UTC (rev 177579)
@@ -63,11 +63,6 @@
return;
// reset webview-related states back to default values in preparation for next test
-
- COMPtr<IWebViewPrivate> viewPrivate;
- if (SUCCEEDED(webView->QueryInterface(&viewPrivate)))
- viewPrivate->setTabKeyCyclesThroughElements(TRUE);
-
COMPtr<IWebViewEditing> viewEditing;
if (FAILED(webView->QueryInterface(&viewEditing)))
return;
@@ -1212,10 +1207,17 @@
// Nothing to do
}
-void TestRunner::setSerializeHTTPLoads(bool)
+void TestRunner::setSerializeHTTPLoads(bool serializeLoads)
{
- // FIXME: Implement.
- printf("ERROR: TestRunner::setSerializeHTTPLoads() not implemented\n");
+ COMPtr<IWebView> webView;
+ if (FAILED(frame->webView(&webView)))
+ return;
+
+ COMPtr<IWebViewPrivate> viewPrivate;
+ if (FAILED(webView->QueryInterface(&viewPrivate)))
+ return;
+
+ viewPrivate->setLoadResourcesSerially(serializeLoads);
}
void TestRunner::setTextDirection(JSStringRef direction)
