<!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>[209504] 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/209504">209504</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-07 17:19:03 -0800 (Wed, 07 Dec 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>One esc to exit fullscreen and pointer lock
https://bugs.webkit.org/show_bug.cgi?id=165416
rdar://problem/29430711

Patch by Jeremy Jones &lt;jeremyj@apple.com&gt; on 2016-12-07
Reviewed by Jer Noble.

Source/WebCore:

Test: pointer-lock/lock-lost-on-esc-in-fullscreen.html

When handling escape, also exit fullscreen on escape.
This also means that escape can exit fullscreen in TestRunner.

* page/EventHandler.cpp:
(WebCore::EventHandler::keyEvent):

Source/WebKit2:

Fix a crash when didLosePointerLock is not specified.

* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageUIClient):

Tools:

Implement WKPageUIClientV8 for pointer lock support.
Add &quot;escape&quot; key support in EventSenderProxy.

* WebKitTestRunner/TestController.cpp:
(WTR::requestPointerLock):
(WTR::TestController::createOtherPage):
(WTR::TestController::createWebViewWithOptions):
* WebKitTestRunner/mac/EventSenderProxy.mm:
(WTR::EventSenderProxy::keyDown):

LayoutTests:

* platform/mac-wk2/TestExpectations:
* pointer-lock/lock-lost-on-esc-in-fullscreen-expected.txt: Added.
* pointer-lock/lock-lost-on-esc-in-fullscreen.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacEventSenderProxymm">trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestspointerlocklocklostonescinfullscreenexpectedtxt">trunk/LayoutTests/pointer-lock/lock-lost-on-esc-in-fullscreen-expected.txt</a></li>
<li><a href="#trunkLayoutTestspointerlocklocklostonescinfullscreenhtml">trunk/LayoutTests/pointer-lock/lock-lost-on-esc-in-fullscreen.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209503 => 209504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-12-08 01:13:40 UTC (rev 209503)
+++ trunk/LayoutTests/ChangeLog        2016-12-08 01:19:03 UTC (rev 209504)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-12-07  Jeremy Jones  &lt;jeremyj@apple.com&gt;
+
+        One esc to exit fullscreen and pointer lock
+        https://bugs.webkit.org/show_bug.cgi?id=165416
+        rdar://problem/29430711
+
+        Reviewed by Jer Noble.
+
+        * platform/mac-wk2/TestExpectations:
+        * pointer-lock/lock-lost-on-esc-in-fullscreen-expected.txt: Added.
+        * pointer-lock/lock-lost-on-esc-in-fullscreen.html: Added.
+
</ins><span class="cx"> 2016-12-07  Dave Hyatt  &lt;hyatt@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [CSS Parser] Remove tests that depend on SVG CSS OM that has been removed
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (209503 => 209504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations        2016-12-08 01:13:40 UTC (rev 209503)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations        2016-12-08 01:19:03 UTC (rev 209504)
</span><span class="lines">@@ -19,6 +19,8 @@
</span><span class="cx"> fast/media/mq-monochrome-live-update.html [ Pass ]
</span><span class="cx"> fast/media/mq-prefers-reduced-motion-live-update.html [ Pass ]
</span><span class="cx"> 
</span><ins>+pointer-lock/lock-lost-on-esc-in-fullscreen.html [ Pass ]
+
</ins><span class="cx"> #//////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End platform-specific directories.
</span><span class="cx"> #//////////////////////////////////////////////////////////////////////////////////////////
</span></span></pre></div>
<a id="trunkLayoutTestspointerlocklocklostonescinfullscreenexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/pointer-lock/lock-lost-on-esc-in-fullscreen-expected.txt (0 => 209504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/pointer-lock/lock-lost-on-esc-in-fullscreen-expected.txt                                (rev 0)
+++ trunk/LayoutTests/pointer-lock/lock-lost-on-esc-in-fullscreen-expected.txt        2016-12-08 01:19:03 UTC (rev 209504)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+Test that pointerlockchange event is dispatched on esc in fullscreen.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+PASS window.testRunner is defined.
+PASS onwebkitfullscreenchange received after: Entered fullscreen
+     Lock targetDiv1.
+PASS onpointerlockchange received after: Lock targetDiv1.
+PASS document.pointerLockElement is targetDiv1
+Sending Escape keyDown event.
+PASS onpointerlockchange received after: Sending Escape keyDown event.
+PASS onwebkitfullscreenchange received after: Sending Escape keyDown event.
+PASS document.pointerLockElement is null
+PASS document.webkitIsFullScreen is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestspointerlocklocklostonescinfullscreenhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/pointer-lock/lock-lost-on-esc-in-fullscreen.html (0 => 209504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/pointer-lock/lock-lost-on-esc-in-fullscreen.html                                (rev 0)
+++ trunk/LayoutTests/pointer-lock/lock-lost-on-esc-in-fullscreen.html        2016-12-08 01:19:03 UTC (rev 209504)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+&lt;!DOCTYPE HTML&gt;&lt;!-- webkit-test-runner [ enablePointerLock=true ] --&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;script src=&quot;../http/tests/resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
+&lt;script src=&quot;../http/tests/resources/pointer-lock/pointer-lock-test-harness.js&quot;&gt;&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div&gt;
+  &lt;div id=&quot;target1&quot;&gt;&lt;/div&gt;
+&lt;/div&gt;
+&lt;script&gt;
+    description(&quot;Test that pointerlockchange event is dispatched on esc in fullscreen.&quot;)
+    window.jsTestIsAsync = true;
+    shouldBeDefined(&quot;window.testRunner&quot;);
+
+    targetDiv1 = document.getElementById(&quot;target1&quot;);
+
+    todo = [
+        function () {
+            document.documentElement.webkitRequestFullScreen();
+            eventExpected(&quot;onwebkitfullscreenchange&quot;, &quot;Entered fullscreen&quot;, 1, document);
+            // doNextStep called by event handler.
+        },
+        function () {
+            doNextStepWithUserGesture();
+        },
+        function () {
+            expectOnlyChangeEvent(&quot;Lock targetDiv1.&quot;);
+            targetDiv1.requestPointerLock();
+            // doNextStep called by event handler.
+        },
+        function () {
+            shouldBe(&quot;document.pointerLockElement&quot;, &quot;targetDiv1&quot;);
+            doNextStepWithUserGesture();
+        },
+        function() {
+            document[&quot;onpointerlockchange&quot;] = function () {
+                testPassed(&quot;onpointerlockchange&quot; + &quot; received after: &quot; + &quot;Sending Escape keyDown event.&quot;);
+            };
+            //expectOnlyChangeEvent(&quot;Lock targetDiv1.&quot;);
+            eventExpected(&quot;onwebkitfullscreenchange&quot;, &quot;Sending Escape keyDown event.&quot;, 1, document);
+            debug(&quot;Sending Escape keyDown event.&quot;);
+            if (window.eventSender)
+                eventSender.keyDown(&quot;escape&quot;);
+        },
+        function() {
+            shouldBe(&quot;document.pointerLockElement&quot;, &quot;null&quot;);
+            shouldBe(&quot;document.webkitIsFullScreen&quot;, &quot;false&quot;);
+            doNextStep();
+        },
+    ];
+    doNextStepWithUserGesture();
+&lt;/script&gt;
+&lt;script src=&quot;../http/tests/resources/js-test-post.js&quot;&gt;&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209503 => 209504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-12-08 01:13:40 UTC (rev 209503)
+++ trunk/Source/WebCore/ChangeLog        2016-12-08 01:19:03 UTC (rev 209504)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-12-07  Jeremy Jones  &lt;jeremyj@apple.com&gt;
+
+        One esc to exit fullscreen and pointer lock
+        https://bugs.webkit.org/show_bug.cgi?id=165416
+        rdar://problem/29430711
+
+        Reviewed by Jer Noble.
+
+        Test: pointer-lock/lock-lost-on-esc-in-fullscreen.html
+
+        When handling escape, also exit fullscreen on escape.
+        This also means that escape can exit fullscreen in TestRunner.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::keyEvent):
+
</ins><span class="cx"> 2016-12-07  Yusuke Suzuki  &lt;utatane.tea@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [JSC] Drop translate phase in module loader
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (209503 => 209504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp        2016-12-08 01:13:40 UTC (rev 209503)
+++ trunk/Source/WebCore/page/EventHandler.cpp        2016-12-08 01:19:03 UTC (rev 209504)
</span><span class="lines">@@ -3065,13 +3065,19 @@
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><span class="cx">     if (initialKeyEvent.type() == PlatformEvent::KeyDown &amp;&amp; initialKeyEvent.windowsVirtualKeyCode() == VK_ESCAPE &amp;&amp; m_frame.page()-&gt;pointerLockController().element()) {
</span><span class="cx">         m_frame.page()-&gt;pointerLockController().requestPointerUnlockAndForceCursorVisible();
</span><del>-        return true;
</del><span class="cx">     }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><del>-    if (m_frame.document()-&gt;webkitIsFullScreen() &amp;&amp; !isKeyEventAllowedInFullScreen(initialKeyEvent))
-        return false;
</del><ins>+    if (m_frame.document()-&gt;webkitIsFullScreen()) {
+        if (initialKeyEvent.windowsVirtualKeyCode() == VK_ESCAPE) {
+            m_frame.document()-&gt;webkitCancelFullScreen();
+            return true;
+        }
+
+        if (!isKeyEventAllowedInFullScreen(initialKeyEvent))
+            return false;
+    }
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     if (initialKeyEvent.windowsVirtualKeyCode() == VK_CAPITAL) {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209503 => 209504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2016-12-08 01:13:40 UTC (rev 209503)
+++ trunk/Source/WebKit2/ChangeLog        2016-12-08 01:19:03 UTC (rev 209504)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-12-07  Jeremy Jones  &lt;jeremyj@apple.com&gt;
+
+        One esc to exit fullscreen and pointer lock
+        https://bugs.webkit.org/show_bug.cgi?id=165416
+        rdar://problem/29430711
+
+        Reviewed by Jer Noble.
+
+        Fix a crash when didLosePointerLock is not specified.
+
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageSetPageUIClient):
+
</ins><span class="cx"> 2016-12-07  Keith Rollin  &lt;krollin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Network event record/replay
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (209503 => 209504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp        2016-12-08 01:13:40 UTC (rev 209503)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp        2016-12-08 01:19:03 UTC (rev 209504)
</span><span class="lines">@@ -2229,7 +2229,7 @@
</span><span class="cx"> 
</span><span class="cx">         void didLosePointerLock(WebPageProxy* page) override
</span><span class="cx">         {
</span><del>-            if (!m_client.requestPointerLock)
</del><ins>+            if (!m_client.didLosePointerLock)
</ins><span class="cx">                 return;
</span><span class="cx"> 
</span><span class="cx">             m_client.didLosePointerLock(toAPI(page), m_client.base.clientInfo);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209503 => 209504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-12-08 01:13:40 UTC (rev 209503)
+++ trunk/Tools/ChangeLog        2016-12-08 01:19:03 UTC (rev 209504)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-12-07  Jeremy Jones  &lt;jeremyj@apple.com&gt;
+
+        One esc to exit fullscreen and pointer lock
+        https://bugs.webkit.org/show_bug.cgi?id=165416
+        rdar://problem/29430711
+
+        Reviewed by Jer Noble.
+
+        Implement WKPageUIClientV8 for pointer lock support.
+        Add &quot;escape&quot; key support in EventSenderProxy.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::requestPointerLock):
+        (WTR::TestController::createOtherPage):
+        (WTR::TestController::createWebViewWithOptions):
+        * WebKitTestRunner/mac/EventSenderProxy.mm:
+        (WTR::EventSenderProxy::keyDown):
+
</ins><span class="cx"> 2016-12-07  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add system trace points for JavaScript VM entry/exit
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (209503 => 209504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp        2016-12-08 01:13:40 UTC (rev 209503)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp        2016-12-08 01:19:03 UTC (rev 209504)
</span><span class="lines">@@ -197,6 +197,11 @@
</span><span class="cx">     TestController::singleton().handleCheckOfUserMediaPermissionForOrigin(frame, userMediaDocumentOrigin, topLevelDocumentOrigin, checkRequest);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static void requestPointerLock(WKPageRef page, const void*)
+{
+    WKPageDidAllowPointerLock(page);
+}
+
</ins><span class="cx"> WKPageRef TestController::createOtherPage(WKPageRef oldPage, WKPageConfigurationRef configuration, WKNavigationActionRef navigationAction, WKWindowFeaturesRef windowFeatures, const void *clientInfo)
</span><span class="cx"> {
</span><span class="cx">     PlatformWebView* parentView = static_cast&lt;PlatformWebView*&gt;(const_cast&lt;void*&gt;(clientInfo));
</span><span class="lines">@@ -206,8 +211,8 @@
</span><span class="cx"> 
</span><span class="cx">     view-&gt;resizeTo(800, 600);
</span><span class="cx"> 
</span><del>-    WKPageUIClientV6 otherPageUIClient = {
-        { 6, view },
</del><ins>+    WKPageUIClientV8 otherPageUIClient = {
+        { 8, view },
</ins><span class="cx">         0, // createNewPage_deprecatedForUseWithV0
</span><span class="cx">         0, // showPage
</span><span class="cx">         closeOtherPage,
</span><span class="lines">@@ -270,6 +275,10 @@
</span><span class="cx">         0, // runJavaScriptConfirm
</span><span class="cx">         0, // runJavaScriptPrompt
</span><span class="cx">         checkUserMediaPermissionForOrigin,
</span><ins>+        0, // runBeforeUnloadConfirmPanel
+        0, // fullscreenMayReturnToInline
+        requestPointerLock,
+        0,
</ins><span class="cx">     };
</span><span class="cx">     WKPageSetPageUIClient(newPage, &amp;otherPageUIClient.base);
</span><span class="cx">     
</span><span class="lines">@@ -474,8 +483,8 @@
</span><span class="cx">     resetPreferencesToConsistentValues(options);
</span><span class="cx"> 
</span><span class="cx">     platformCreateWebView(configuration.get(), options);
</span><del>-    WKPageUIClientV6 pageUIClient = {
-        { 6, m_mainWebView.get() },
</del><ins>+    WKPageUIClientV8 pageUIClient = {
+        { 8, m_mainWebView.get() },
</ins><span class="cx">         0, // createNewPage_deprecatedForUseWithV0
</span><span class="cx">         0, // showPage
</span><span class="cx">         0, // close
</span><span class="lines">@@ -538,6 +547,10 @@
</span><span class="cx">         0, // runJavaScriptConfirm
</span><span class="cx">         0, // runJavaScriptPrompt
</span><span class="cx">         checkUserMediaPermissionForOrigin,
</span><ins>+        0, // runBeforeUnloadConfirmPanel
+        0, // fullscreenMayReturnToInline
+        requestPointerLock,
+        0,
</ins><span class="cx">     };
</span><span class="cx">     WKPageSetPageUIClient(m_mainWebView-&gt;page(), &amp;pageUIClient.base);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacEventSenderProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm (209503 => 209504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm        2016-12-08 01:13:40 UTC (rev 209503)
+++ trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm        2016-12-08 01:19:03 UTC (rev 209504)
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx"> 
</span><span class="cx"> void EventSenderProxy::keyDown(WKStringRef key, WKEventModifiers modifiers, unsigned keyLocation)
</span><span class="cx"> {
</span><del>-    NSString* character = [NSString stringWithCString:toSTD(key).c_str() 
</del><ins>+    NSString* character = [NSString stringWithCString:toSTD(key).c_str()
</ins><span class="cx">                                    encoding:[NSString defaultCStringEncoding]];
</span><span class="cx"> 
</span><span class="cx">     NSString *eventCharacter = character;
</span><span class="lines">@@ -707,6 +707,10 @@
</span><span class="cx">         const unichar ch = 0xFFE8;
</span><span class="cx">         eventCharacter = [NSString stringWithCharacters:&amp;ch length:1];
</span><span class="cx">         keyCode = 0x3D;
</span><ins>+    } else if ([character isEqualToString:@&quot;escape&quot;]) {
+        const unichar ch = 0x1B;
+        eventCharacter = [NSString stringWithCharacters:&amp;ch length:1];
+        keyCode = 0x35;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // Compare the input string with the function-key names defined by the DOM spec (i.e. &quot;F1&quot;,...,&quot;F24&quot;).
</span></span></pre>
</div>
</div>

</body>
</html>