Changeset 194398 in webkit

Timestamp:

Dec 23, 2015, 3:25:28 PM (11 years ago)

Author:

Brent Fulgham

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.

Location:

trunk

Files:

• Source/WebKit/win/ChangeLog (modified) (1 diff)
• Source/WebKit/win/WebKitCOMAPI.cpp (modified) (2 diffs)
• Source/WebKit/win/WebKitCOMAPI.h (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/win/TestRunnerWin.cpp (modified) (1 diff)

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2015-12-23  Brent Fulgham  <bfulgham@apple.com>
+
+        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  <mitz@apple.com>
 

trunk/Source/WebKit/win/WebKitCOMAPI.cpp

@@ -30 +30 @@
 
 #include <WebCore/COMPtr.h>
+#include <WebCore/WebCoreBundleWin.h>
 
 struct CLSIDHash {
@@ -75 +76 @@
     return factory->CreateInstance(pUnkOuter, riid, ppvObject);
 }
+
+CFBundleRef webKitBundle()
+{
+    return WebCore::webKitBundle();
+}

trunk/Source/WebKit/win/WebKitCOMAPI.h

@@ -1 +1 @@
 /*
- * 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
@@ -43 +43 @@
 HRESULT WEBKIT_API WebKitCreateInstance(REFCLSID, IUnknown* pUnkOuter, REFIID, _COM_Outptr_ void** ppvObject);
 
+typedef struct __CFBundle* CFBundleRef;
+CFBundleRef WEBKIT_API webKitBundle();
+
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2015-12-23  Brent Fulgham  <bfulgham@apple.com>
+
+        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  <eric.carlson@apple.com>
 

trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp

@@ -1096 +1096 @@
 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");
-
-    return nullptr;
+    CFBundleRef webkitBundle = webKitBundle();
+    if (!webkitBundle)
+        return nullptr;
+
+    RetainPtr<CFURLRef> url = adoptCF(CFBundleCopyResourceURL(webkitBundle, CFSTR("TestStub"), CFSTR("html"), CFSTR("WebInspectorUI")));
+    if (!url)
+        return nullptr;
+
+    return JSStringCreateWithCFString(CFURLGetString(url.get()));
 }