<!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>[209198] trunk/Source/WebCore</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/209198">209198</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-12-01 13:39:18 -0800 (Thu, 01 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Automation: expose navigator.webdriver if the page is controlled by automation
https://bugs.webkit.org/show_bug.cgi?id=165245
<rdar://problem/29449874>
Reviewed by Joseph Pecoraro.
Move the implementation into OpenSource. It's in Modules/webdriver/.
* CMakeLists.txt:
* DerivedSources.make:
Add new paths and files.
* Modules/webdriver/NavigatorWebDriver.cpp: Added.
(WebCore::NavigatorWebDriver::NavigatorWebDriver):
(WebCore::NavigatorWebDriver::~NavigatorWebDriver):
(WebCore::NavigatorWebDriver::supplementName):
(WebCore::NavigatorWebDriver::isControlledByAutomation):
(WebCore::NavigatorWebDriver::from):
(WebCore::JSNavigator::webdriver):
* Modules/webdriver/NavigatorWebDriver.h: Added.
* Modules/webdriver/NavigatorWebDriver.idl: Added.
* WebCore.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebCore/Modules/webdriver/</li>
<li><a href="#trunkSourceWebCoreModuleswebdriverNavigatorWebDrivercpp">trunk/Source/WebCore/Modules/webdriver/NavigatorWebDriver.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdriverNavigatorWebDriverh">trunk/Source/WebCore/Modules/webdriver/NavigatorWebDriver.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdriverNavigatorWebDriveridl">trunk/Source/WebCore/Modules/webdriver/NavigatorWebDriver.idl</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformcocoaWebKitAdditionsmm">trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (209197 => 209198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-12-01 21:33:17 UTC (rev 209197)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-12-01 21:39:18 UTC (rev 209198)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/Modules/vibration"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/webaudio"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/webdatabase"
</span><ins>+ "${WEBCORE_DIR}/Modules/webdriver"
</ins><span class="cx"> "${WEBCORE_DIR}/Modules/websockets"
</span><span class="cx"> "${WEBCORE_DIR}/accessibility"
</span><span class="cx"> "${WEBCORE_DIR}/animation"
</span><span class="lines">@@ -313,6 +314,8 @@
</span><span class="cx"> Modules/webdatabase/SQLTransactionCallback.idl
</span><span class="cx"> Modules/webdatabase/SQLTransactionErrorCallback.idl
</span><span class="cx">
</span><ins>+ Modules/webdriver/NavigatorWebDriver.idl
+
</ins><span class="cx"> Modules/websockets/CloseEvent.idl
</span><span class="cx"> Modules/websockets/WebSocket.idl
</span><span class="cx">
</span><span class="lines">@@ -1017,6 +1020,8 @@
</span><span class="cx"> Modules/webdatabase/SQLTransactionCoordinator.cpp
</span><span class="cx"> Modules/webdatabase/SQLTransactionStateMachine.cpp
</span><span class="cx">
</span><ins>+ Modules/webdriver/NavigatorWebDriver.cpp
+
</ins><span class="cx"> Modules/websockets/ThreadableWebSocketChannel.cpp
</span><span class="cx"> Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
</span><span class="cx"> Modules/websockets/WebSocket.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209197 => 209198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-01 21:33:17 UTC (rev 209197)
+++ trunk/Source/WebCore/ChangeLog 2016-12-01 21:39:18 UTC (rev 209198)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-12-01 Brian Burg <bburg@apple.com>
+
+ Web Automation: expose navigator.webdriver if the page is controlled by automation
+ https://bugs.webkit.org/show_bug.cgi?id=165245
+ <rdar://problem/29449874>
+
+ Reviewed by Joseph Pecoraro.
+
+ Move the implementation into OpenSource. It's in Modules/webdriver/.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ Add new paths and files.
+
+ * Modules/webdriver/NavigatorWebDriver.cpp: Added.
+ (WebCore::NavigatorWebDriver::NavigatorWebDriver):
+ (WebCore::NavigatorWebDriver::~NavigatorWebDriver):
+ (WebCore::NavigatorWebDriver::supplementName):
+ (WebCore::NavigatorWebDriver::isControlledByAutomation):
+ (WebCore::NavigatorWebDriver::from):
+ (WebCore::JSNavigator::webdriver):
+ * Modules/webdriver/NavigatorWebDriver.h: Added.
+ * Modules/webdriver/NavigatorWebDriver.idl: Added.
+ * WebCore.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2016-12-01 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IndexedDB 2.0: Implement IDBObjectStore.getKey().
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (209197 => 209198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-12-01 21:33:17 UTC (rev 209197)
+++ trunk/Source/WebCore/DerivedSources.make 2016-12-01 21:39:18 UTC (rev 209198)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> $(WebCore)/Modules/streams \
</span><span class="cx"> $(WebCore)/Modules/webaudio \
</span><span class="cx"> $(WebCore)/Modules/webdatabase \
</span><ins>+ $(WebCore)/Modules/webdriver \
</ins><span class="cx"> $(WebCore)/Modules/websockets \
</span><span class="cx"> $(WebCore)/animation \
</span><span class="cx"> $(WebCore)/bindings/generic \
</span><span class="lines">@@ -240,6 +241,7 @@
</span><span class="cx"> $(WebCore)/Modules/webdatabase/SQLTransaction.idl \
</span><span class="cx"> $(WebCore)/Modules/webdatabase/SQLTransactionCallback.idl \
</span><span class="cx"> $(WebCore)/Modules/webdatabase/SQLTransactionErrorCallback.idl \
</span><ins>+ $(WebCore)/Modules/webdriver/NavigatorWebDriver.idl \
</ins><span class="cx"> $(WebCore)/Modules/websockets/CloseEvent.idl \
</span><span class="cx"> $(WebCore)/Modules/websockets/WebSocket.idl \
</span><span class="cx"> $(WebCore)/animation/Animatable.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdriverNavigatorWebDrivercppfromrev209197trunkSourceWebCoreplatformcocoaWebKitAdditionsmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/Modules/webdriver/NavigatorWebDriver.cpp (from rev 209197, trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm) (0 => 209198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdriver/NavigatorWebDriver.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/webdriver/NavigatorWebDriver.cpp 2016-12-01 21:39:18 UTC (rev 209198)
</span><span class="lines">@@ -0,0 +1,77 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "NavigatorWebDriver.h"
+
+#include "Frame.h"
+#include "JSNavigator.h"
+#include "Navigator.h"
+#include "Page.h"
+
+using namespace JSC;
+
+namespace WebCore {
+
+NavigatorWebDriver::NavigatorWebDriver(Frame* frame)
+ : m_frame(frame)
+{
+}
+
+NavigatorWebDriver::~NavigatorWebDriver()
+{
+}
+
+const char* NavigatorWebDriver::supplementName()
+{
+ return "NavigatorWebDriver";
+}
+
+bool NavigatorWebDriver::isControlledByAutomation() const
+{
+ if (!m_frame || !m_frame->page())
+ return false;
+
+ return m_frame->page()->isControlledByAutomation();
+}
+
+NavigatorWebDriver* NavigatorWebDriver::from(Navigator* navigator)
+{
+ NavigatorWebDriver* supplement = static_cast<NavigatorWebDriver*>(Supplement<Navigator>::from(navigator, supplementName()));
+ if (!supplement) {
+ auto newSupplement = std::make_unique<NavigatorWebDriver>(navigator->frame());
+ supplement = newSupplement.get();
+ provideTo(navigator, supplementName(), WTFMove(newSupplement));
+ }
+ return supplement;
+}
+
+JSValue JSNavigator::webdriver(ExecState&) const
+{
+ bool isControlledByAutomation = NavigatorWebDriver::from(&wrapped())->isControlledByAutomation();
+ return isControlledByAutomation ? jsBoolean(true) : jsUndefined();
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdriverNavigatorWebDriverhfromrev209197trunkSourceWebCoreplatformcocoaWebKitAdditionsmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/Modules/webdriver/NavigatorWebDriver.h (from rev 209197, trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm) (0 => 209198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdriver/NavigatorWebDriver.h (rev 0)
+++ trunk/Source/WebCore/Modules/webdriver/NavigatorWebDriver.h 2016-12-01 21:39:18 UTC (rev 209198)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "Supplementable.h"
+
+namespace WebCore {
+
+class Frame;
+class Navigator;
+
+class NavigatorWebDriver final : public Supplement<Navigator> {
+public:
+ explicit NavigatorWebDriver(Frame*);
+ virtual ~NavigatorWebDriver();
+
+ bool isControlledByAutomation() const;
+
+ static NavigatorWebDriver* from(Navigator*);
+ static bool isControlledByAutomation(Navigator& navigator);
+private:
+ static const char* supplementName();
+
+ Frame* m_frame { nullptr };
+};
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdriverNavigatorWebDriveridlfromrev209197trunkSourceWebCoreplatformcocoaWebKitAdditionsmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/Modules/webdriver/NavigatorWebDriver.idl (from rev 209197, trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm) (0 => 209198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdriver/NavigatorWebDriver.idl (rev 0)
+++ trunk/Source/WebCore/Modules/webdriver/NavigatorWebDriver.idl 2016-12-01 21:39:18 UTC (rev 209198)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+partial interface Navigator {
+ [NotEnumerable, Custom] readonly attribute boolean webdriver;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (209197 => 209198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-12-01 21:33:17 UTC (rev 209197)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-12-01 21:39:18 UTC (rev 209198)
</span><span class="lines">@@ -800,7 +800,6 @@
</span><span class="cx"> 1A762C780A074F2600989F5B /* JSXPathNSResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A762C700A074F2600989F5B /* JSXPathNSResolver.h */; };
</span><span class="cx"> 1A762C790A074F2600989F5B /* JSXPathResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A762C710A074F2600989F5B /* JSXPathResult.cpp */; };
</span><span class="cx"> 1A762C7A0A074F2600989F5B /* JSXPathResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A762C720A074F2600989F5B /* JSXPathResult.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 1A7E19461C5863BE00CCDDF3 /* WebKitAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E19441C5863BE00CCDDF3 /* WebKitAdditions.mm */; };
</del><span class="cx"> 1A7E3C291710997300367935 /* ThreadableLoaderClientWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E3C281710997300367935 /* ThreadableLoaderClientWrapper.h */; };
</span><span class="cx"> 1A7FA6190DDA3B3A0028F8A5 /* NetworkStateNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7FA6180DDA3B3A0028F8A5 /* NetworkStateNotifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1A7FA61B0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7FA61A0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp */; };
</span><span class="lines">@@ -3774,6 +3773,8 @@
</span><span class="cx"> 98EB1F951313FE0500D0E1EA /* NotImplemented.h in Headers */ = {isa = PBXBuildFile; fileRef = 98EB1F941313FE0500D0E1EA /* NotImplemented.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 9920398218B95BC600B39AF9 /* UserInputBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9920398018B95BC600B39AF9 /* UserInputBridge.cpp */; };
</span><span class="cx"> 9920398318B95BC600B39AF9 /* UserInputBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 9920398118B95BC600B39AF9 /* UserInputBridge.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 996E59DE1DF01285006612B9 /* NavigatorWebDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 996E59DB1DF00D90006612B9 /* NavigatorWebDriver.cpp */; };
+ 996E59DF1DF0128D006612B9 /* NavigatorWebDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 996E59DC1DF00D90006612B9 /* NavigatorWebDriver.h */; };
</ins><span class="cx"> 99C7CCB318C663E40032E413 /* MemoizedDOMResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 99C7CCB218C663E40032E413 /* MemoizedDOMResult.h */; };
</span><span class="cx"> 99C7CCB518C6B8990032E413 /* MemoizedDOMResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99C7CCB418C6B8990032E413 /* MemoizedDOMResult.cpp */; };
</span><span class="cx"> 99CC0B4D18BE9849006CEBCC /* AllReplayInputs.h in Headers */ = {isa = PBXBuildFile; fileRef = 99CC0B3818BE9849006CEBCC /* AllReplayInputs.h */; };
</span><span class="lines">@@ -7838,7 +7839,6 @@
</span><span class="cx"> 1A762C700A074F2600989F5B /* JSXPathNSResolver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSXPathNSResolver.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A762C710A074F2600989F5B /* JSXPathResult.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSXPathResult.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A762C720A074F2600989F5B /* JSXPathResult.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSXPathResult.h; sourceTree = "<group>"; };
</span><del>- 1A7E19441C5863BE00CCDDF3 /* WebKitAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebKitAdditions.mm; sourceTree = "<group>"; };
</del><span class="cx"> 1A7E3C281710997300367935 /* ThreadableLoaderClientWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadableLoaderClientWrapper.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A7FA6180DDA3B3A0028F8A5 /* NetworkStateNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkStateNotifier.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A7FA61A0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkStateNotifier.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -11408,6 +11408,9 @@
</span><span class="cx"> 9908B0FF1BCAD07D00ED0F65 /* ReadableStreamDefaultReaderBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamDefaultReaderBuiltins.h; sourceTree = "<group>"; };
</span><span class="cx"> 9920398018B95BC600B39AF9 /* UserInputBridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserInputBridge.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9920398118B95BC600B39AF9 /* UserInputBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInputBridge.h; sourceTree = "<group>"; };
</span><ins>+ 996E59DB1DF00D90006612B9 /* NavigatorWebDriver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigatorWebDriver.cpp; sourceTree = "<group>"; };
+ 996E59DC1DF00D90006612B9 /* NavigatorWebDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorWebDriver.h; sourceTree = "<group>"; };
+ 996E59DD1DF00D90006612B9 /* NavigatorWebDriver.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NavigatorWebDriver.idl; sourceTree = "<group>"; };
</ins><span class="cx"> 99C7CCB218C663E40032E413 /* MemoizedDOMResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoizedDOMResult.h; sourceTree = "<group>"; };
</span><span class="cx"> 99C7CCB418C6B8990032E413 /* MemoizedDOMResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoizedDOMResult.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 99CC0B3818BE9849006CEBCC /* AllReplayInputs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllReplayInputs.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -19125,6 +19128,7 @@
</span><span class="cx"> 41A023EA1A39DB7900F722CF /* streams */,
</span><span class="cx"> FD315FA212B025B100C1A359 /* webaudio */,
</span><span class="cx"> 97BC69D51505F054001B74AC /* webdatabase */,
</span><ins>+ 996E59DA1DF00D45006612B9 /* webdriver */,
</ins><span class="cx"> 97AABCF714FA09B5007457AE /* websockets */,
</span><span class="cx"> );
</span><span class="cx"> path = Modules;
</span><span class="lines">@@ -19441,6 +19445,16 @@
</span><span class="cx"> path = parser;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ 996E59DA1DF00D45006612B9 /* webdriver */ = {
+ isa = PBXGroup;
+ children = (
+ 996E59DB1DF00D90006612B9 /* NavigatorWebDriver.cpp */,
+ 996E59DC1DF00D90006612B9 /* NavigatorWebDriver.h */,
+ 996E59DD1DF00D90006612B9 /* NavigatorWebDriver.idl */,
+ );
+ path = webdriver;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 99E45A1318A021760026D88F /* replay */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -19649,7 +19663,6 @@
</span><span class="cx"> 46DB7D561B20FE3C005651B2 /* VNodeTrackerCocoa.cpp */,
</span><span class="cx"> CDC979F31C498C0900DB50D4 /* WebCoreNSErrorExtras.h */,
</span><span class="cx"> CDC979F21C498C0900DB50D4 /* WebCoreNSErrorExtras.mm */,
</span><del>- 1A7E19441C5863BE00CCDDF3 /* WebKitAdditions.mm */,
</del><span class="cx"> 5DFEBAB618592B6D00C75BEB /* WebKitAvailability.h */,
</span><span class="cx"> CDA29A081CBD99F400901CCF /* WebPlaybackSessionInterface.h */,
</span><span class="cx"> CDA29A0A1CBD9A7400901CCF /* WebPlaybackSessionModel.h */,
</span><span class="lines">@@ -25231,6 +25244,7 @@
</span><span class="cx"> 650F53DC09D15DDA00C9B0C8 /* CSSGrammar.h in Headers */,
</span><span class="cx"> E11003311C9AC3DE00412DD0 /* CSSGridAutoRepeatValue.h in Headers */,
</span><span class="cx"> CD7DBB2918CA19C600C11066 /* CSSGridLineNamesValue.h in Headers */,
</span><ins>+ 996E59DF1DF0128D006612B9 /* NavigatorWebDriver.h in Headers */,
</ins><span class="cx"> CD3E252418046BCD00E27F56 /* CSSGridTemplateAreasValue.h in Headers */,
</span><span class="cx"> FB3056C2169E5DAC0096A232 /* CSSGroupingRule.h in Headers */,
</span><span class="cx"> BC772B3C0C4EA91E0083285F /* CSSHelper.h in Headers */,
</span><span class="lines">@@ -29643,6 +29657,7 @@
</span><span class="cx"> 510192D118B6B9AB007FC7A1 /* ImageControlsRootElementMac.cpp in Sources */,
</span><span class="cx"> A77979190D6B9D0C003851B9 /* ImageData.cpp in Sources */,
</span><span class="cx"> 555B87EC1CAAF0AB00349425 /* ImageDecoderCG.cpp in Sources */,
</span><ins>+ 996E59DE1DF01285006612B9 /* NavigatorWebDriver.cpp in Sources */,
</ins><span class="cx"> 97205AB51239291000B17380 /* ImageDocument.cpp in Sources */,
</span><span class="cx"> 5576A5641D88A70800CCC04C /* ImageFrame.cpp in Sources */,
</span><span class="cx"> 5597F8261D91C3130066BC21 /* ImageFrameCache.cpp in Sources */,
</span><span class="lines">@@ -31734,7 +31749,6 @@
</span><span class="cx"> 77A17A7712F28642004E02F6 /* WebGLVertexArrayObjectOES.cpp in Sources */,
</span><span class="cx"> A5840E24187B8AC200843B10 /* WebInjectedScriptHost.cpp in Sources */,
</span><span class="cx"> A584FE2F1864CB8400843B10 /* WebInjectedScriptManager.cpp in Sources */,
</span><del>- 1A7E19461C5863BE00CCDDF3 /* WebKitAdditions.mm in Sources */,
</del><span class="cx"> 31C0FF210E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp in Sources */,
</span><span class="cx"> 976D6C7B122B8A3D001FD1F7 /* BlobBuilder.cpp in Sources */,
</span><span class="cx"> 498391580F1E776900C23782 /* WebKitCSSMatrix.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaWebKitAdditionsmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm (209197 => 209198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm 2016-12-01 21:33:17 UTC (rev 209197)
+++ trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm 2016-12-01 21:39:18 UTC (rev 209198)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/WebCoreAdditions.cpp>
-#endif
-
</del></span></pre>
</div>
</div>
</body>
</html>