Title: [194398] trunk
- Revision
- 194398
- Author
- [email protected]
- Date
- 2015-12-23 15:25:28 -0800 (Wed, 23 Dec 2015)
Log Message
Web Inspector: add support for running protocol-test.js tests on Windows
https://bugs.webkit.org/show_bug.cgi?id=148037
<rdar://problem/22292237>
Reviewed by Simon Fraser.
Source/WebKit/win:
Provide API for WebKit.dll clients to request its CFBundleRef.
* WebKitCOMAPI.cpp:
(webKitBundle): Added.
* WebKitCOMAPI.h:
Tools:
* DumpRenderTree/win/TestRunnerWin.cpp:
(TestRunner::inspectorTestStubURL): Provide implementation.
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (194397 => 194398)
--- trunk/Source/WebKit/win/ChangeLog 2015-12-23 22:51:28 UTC (rev 194397)
+++ trunk/Source/WebKit/win/ChangeLog 2015-12-23 23:25:28 UTC (rev 194398)
@@ -1,3 +1,17 @@
+2015-12-23 Brent Fulgham <[email protected]>
+
+ Web Inspector: add support for running protocol-test.js tests on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=148037
+ <rdar://problem/22292237>
+
+ Reviewed by Simon Fraser.
+
+ Provide API for WebKit.dll clients to request its CFBundleRef.
+
+ * WebKitCOMAPI.cpp:
+ (webKitBundle): Added.
+ * WebKitCOMAPI.h:
+
2015-12-20 Dan Bernstein <[email protected]>
Remove unused setToolbarHeight
Modified: trunk/Source/WebKit/win/WebKitCOMAPI.cpp (194397 => 194398)
--- trunk/Source/WebKit/win/WebKitCOMAPI.cpp 2015-12-23 22:51:28 UTC (rev 194397)
+++ trunk/Source/WebKit/win/WebKitCOMAPI.cpp 2015-12-23 23:25:28 UTC (rev 194398)
@@ -29,6 +29,7 @@
#include "WebKitDLL.h"
#include <WebCore/COMPtr.h>
+#include <WebCore/WebCoreBundleWin.h>
struct CLSIDHash {
static unsigned hash(const CLSID& clsid)
@@ -74,3 +75,8 @@
return factory->CreateInstance(pUnkOuter, riid, ppvObject);
}
+
+CFBundleRef webKitBundle()
+{
+ return WebCore::webKitBundle();
+}
Modified: trunk/Source/WebKit/win/WebKitCOMAPI.h (194397 => 194398)
--- trunk/Source/WebKit/win/WebKitCOMAPI.h 2015-12-23 22:51:28 UTC (rev 194397)
+++ trunk/Source/WebKit/win/WebKitCOMAPI.h 2015-12-23 23:25:28 UTC (rev 194398)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2009, 2015 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -42,6 +42,9 @@
// This bypasses CoCreateInstance entirely, so registry keys and isolated COM manifests aren't needed.
HRESULT WEBKIT_API WebKitCreateInstance(REFCLSID, IUnknown* pUnkOuter, REFIID, _COM_Outptr_ void** ppvObject);
+typedef struct __CFBundle* CFBundleRef;
+CFBundleRef WEBKIT_API webKitBundle();
+
}
#endif // !defined(WebKitCOMAPI_h)
Modified: trunk/Tools/ChangeLog (194397 => 194398)
--- trunk/Tools/ChangeLog 2015-12-23 22:51:28 UTC (rev 194397)
+++ trunk/Tools/ChangeLog 2015-12-23 23:25:28 UTC (rev 194398)
@@ -1,3 +1,14 @@
+2015-12-23 Brent Fulgham <[email protected]>
+
+ Web Inspector: add support for running protocol-test.js tests on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=148037
+ <rdar://problem/22292237>
+
+ Reviewed by Simon Fraser.
+
+ * DumpRenderTree/win/TestRunnerWin.cpp:
+ (TestRunner::inspectorTestStubURL): Provide implementation.
+
2015-12-23 Eric Carlson <[email protected]>
[MediaStream] MediaDeviceInfo.label must be empty in some situations
Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (194397 => 194398)
--- trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2015-12-23 22:51:28 UTC (rev 194397)
+++ trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2015-12-23 23:25:28 UTC (rev 194398)
@@ -1095,11 +1095,15 @@
JSStringRef TestRunner::inspectorTestStubURL()
{
- // FIXME: Implement this to support Web Inspector tests using `protocol-test.js`.
- // See https://bugs.webkit.org/show_bug.cgi?id=148025.
- printf("ERROR: TestRunner::inspectorTestStubURL() not implemented\n");
+ CFBundleRef webkitBundle = webKitBundle();
+ if (!webkitBundle)
+ return nullptr;
- return nullptr;
+ RetainPtr<CFURLRef> url = "" CFSTR("TestStub"), CFSTR("html"), CFSTR("WebInspectorUI")));
+ if (!url)
+ return nullptr;
+
+ return JSStringCreateWithCFString(CFURLGetString(url.get()));
}
typedef HashMap<unsigned, COMPtr<IWebScriptWorld> > WorldMap;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
