<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194398] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194398">194398</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-12-23 15:25:28 -0800 (Wed, 23 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebKitCOMAPIcpp">trunk/Source/WebKit/win/WebKitCOMAPI.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebKitCOMAPIh">trunk/Source/WebKit/win/WebKitCOMAPI.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinTestRunnerWincpp">trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (194397 => 194398)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+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:
+
</ins><span class="cx"> 2015-12-20 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused setToolbarHeight
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitCOMAPIcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitCOMAPI.cpp (194397 => 194398)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "WebKitDLL.h"
</span><span class="cx">
</span><span class="cx"> #include <WebCore/COMPtr.h>
</span><ins>+#include <WebCore/WebCoreBundleWin.h>
</ins><span class="cx">
</span><span class="cx"> struct CLSIDHash {
</span><span class="cx"> static unsigned hash(const CLSID& clsid)
</span><span class="lines">@@ -74,3 +75,8 @@
</span><span class="cx">
</span><span class="cx"> return factory->CreateInstance(pUnkOuter, riid, ppvObject);
</span><span class="cx"> }
</span><ins>+
+CFBundleRef webKitBundle()
+{
+ return WebCore::webKitBundle();
+}
</ins></span></pre></div>
<a id="trunkSourceWebKitwinWebKitCOMAPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitCOMAPI.h (194397 => 194398)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2009, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -42,6 +42,9 @@
</span><span class="cx"> // This bypasses CoCreateInstance entirely, so registry keys and isolated COM manifests aren't needed.
</span><span class="cx"> HRESULT WEBKIT_API WebKitCreateInstance(REFCLSID, IUnknown* pUnkOuter, REFIID, _COM_Outptr_ void** ppvObject);
</span><span class="cx">
</span><ins>+typedef struct __CFBundle* CFBundleRef;
+CFBundleRef WEBKIT_API webKitBundle();
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // !defined(WebKitCOMAPI_h)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (194397 => 194398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-12-23 22:51:28 UTC (rev 194397)
+++ trunk/Tools/ChangeLog 2015-12-23 23:25:28 UTC (rev 194398)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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.
+
</ins><span class="cx"> 2015-12-23 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] MediaDeviceInfo.label must be empty in some situations
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinTestRunnerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (194397 => 194398)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1095,11 +1095,15 @@
</span><span class="cx">
</span><span class="cx"> JSStringRef TestRunner::inspectorTestStubURL()
</span><span class="cx"> {
</span><del>- // 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");
</del><ins>+ CFBundleRef webkitBundle = webKitBundle();
+ if (!webkitBundle)
+ return nullptr;
</ins><span class="cx">
</span><del>- return nullptr;
</del><ins>+ RetainPtr<CFURLRef> url = adoptCF(CFBundleCopyResourceURL(webkitBundle, CFSTR("TestStub"), CFSTR("html"), CFSTR("WebInspectorUI")));
+ if (!url)
+ return nullptr;
+
+ return JSStringCreateWithCFString(CFURLGetString(url.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef HashMap<unsigned, COMPtr<IWebScriptWorld> > WorldMap;
</span></span></pre>
</div>
</div>
</body>
</html>