<!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>[170585] 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/170585">170585</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-30 09:59:24 -0700 (Mon, 30 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove webkit prefix from pointer lock.
https://bugs.webkit.org/show_bug.cgi?id=134312
Patch by Alex Christensen <achristensen@webkit.org> on 2014-06-30
Reviewed by Dean Jackson.
* dom/Document.cpp:
(WebCore::Document::exitPointerLock):
(WebCore::Document::pointerLockElement):
(WebCore::Document::webkitExitPointerLock): Deleted.
(WebCore::Document::webkitPointerLockElement): Deleted.
* dom/Document.h:
* dom/Document.idl:
* dom/Element.cpp:
(WebCore::Element::requestPointerLock):
(WebCore::Element::webkitRequestPointerLock): Deleted.
* dom/Element.h:
* dom/Element.idl:
* dom/EventNames.h:
* dom/MouseEvent.idl:
* dom/MouseRelatedEvent.h:
(WebCore::MouseRelatedEvent::movementX):
(WebCore::MouseRelatedEvent::movementY):
(WebCore::MouseRelatedEvent::webkitMovementX): Deleted.
(WebCore::MouseRelatedEvent::webkitMovementY): Deleted.
* page/PointerLockController.cpp:
(WebCore::PointerLockController::PointerLockController):
Initialize all data members.
(WebCore::PointerLockController::requestPointerLock):
(WebCore::PointerLockController::didAcquirePointerLock):
(WebCore::PointerLockController::didNotAcquirePointerLock):
(WebCore::PointerLockController::didLosePointerLock):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentidl">trunk/Source/WebCore/dom/Document.idl</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomElementidl">trunk/Source/WebCore/dom/Element.idl</a></li>
<li><a href="#trunkSourceWebCoredomEventNamesh">trunk/Source/WebCore/dom/EventNames.h</a></li>
<li><a href="#trunkSourceWebCoredomMouseEventidl">trunk/Source/WebCore/dom/MouseEvent.idl</a></li>
<li><a href="#trunkSourceWebCoredomMouseRelatedEventh">trunk/Source/WebCore/dom/MouseRelatedEvent.h</a></li>
<li><a href="#trunkSourceWebCorepagePointerLockControllercpp">trunk/Source/WebCore/page/PointerLockController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170584 => 170585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-30 15:13:25 UTC (rev 170584)
+++ trunk/Source/WebCore/ChangeLog 2014-06-30 16:59:24 UTC (rev 170585)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-06-30 Alex Christensen <achristensen@webkit.org>
+
+ Remove webkit prefix from pointer lock.
+ https://bugs.webkit.org/show_bug.cgi?id=134312
+
+ Reviewed by Dean Jackson.
+
+ * dom/Document.cpp:
+ (WebCore::Document::exitPointerLock):
+ (WebCore::Document::pointerLockElement):
+ (WebCore::Document::webkitExitPointerLock): Deleted.
+ (WebCore::Document::webkitPointerLockElement): Deleted.
+ * dom/Document.h:
+ * dom/Document.idl:
+ * dom/Element.cpp:
+ (WebCore::Element::requestPointerLock):
+ (WebCore::Element::webkitRequestPointerLock): Deleted.
+ * dom/Element.h:
+ * dom/Element.idl:
+ * dom/EventNames.h:
+ * dom/MouseEvent.idl:
+ * dom/MouseRelatedEvent.h:
+ (WebCore::MouseRelatedEvent::movementX):
+ (WebCore::MouseRelatedEvent::movementY):
+ (WebCore::MouseRelatedEvent::webkitMovementX): Deleted.
+ (WebCore::MouseRelatedEvent::webkitMovementY): Deleted.
+ * page/PointerLockController.cpp:
+ (WebCore::PointerLockController::PointerLockController):
+ Initialize all data members.
+ (WebCore::PointerLockController::requestPointerLock):
+ (WebCore::PointerLockController::didAcquirePointerLock):
+ (WebCore::PointerLockController::didNotAcquirePointerLock):
+ (WebCore::PointerLockController::didLosePointerLock):
+
</ins><span class="cx"> 2014-06-30 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> U16_IS_SURROGATE should not be called with a UChar32
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (170584 => 170585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-06-30 15:13:25 UTC (rev 170584)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-06-30 16:59:24 UTC (rev 170585)
</span><span class="lines">@@ -5536,7 +5536,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><del>-void Document::webkitExitPointerLock()
</del><ins>+void Document::exitPointerLock()
</ins><span class="cx"> {
</span><span class="cx"> if (!page())
</span><span class="cx"> return;
</span><span class="lines">@@ -5547,7 +5547,7 @@
</span><span class="cx"> page()->pointerLockController().requestPointerUnlock();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Element* Document::webkitPointerLockElement() const
</del><ins>+Element* Document::pointerLockElement() const
</ins><span class="cx"> {
</span><span class="cx"> if (!page() || page()->pointerLockController().lockPending())
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (170584 => 170585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-06-30 15:13:25 UTC (rev 170584)
+++ trunk/Source/WebCore/dom/Document.h 2014-06-30 16:59:24 UTC (rev 170585)
</span><span class="lines">@@ -389,8 +389,8 @@
</span><span class="cx"> DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitfullscreenerror);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><del>- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitpointerlockchange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitpointerlockerror);
</del><ins>+ DEFINE_ATTRIBUTE_EVENT_LISTENER(pointerlockchange);
+ DEFINE_ATTRIBUTE_EVENT_LISTENER(pointerlockerror);
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSP_NEXT)
</span><span class="cx"> DEFINE_ATTRIBUTE_EVENT_LISTENER(securitypolicyviolation);
</span><span class="lines">@@ -1150,8 +1150,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><del>- void webkitExitPointerLock();
- Element* webkitPointerLockElement() const;
</del><ins>+ void exitPointerLock();
+ Element* pointerLockElement() const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Used to allow element that loads data without going through a FrameLoader to delay the 'load' event.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.idl (170584 => 170585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.idl 2014-06-30 15:13:25 UTC (rev 170584)
+++ trunk/Source/WebCore/dom/Document.idl 2014-06-30 16:59:24 UTC (rev 170585)
</span><span class="lines">@@ -232,8 +232,8 @@
</span><span class="cx"> void webkitExitFullscreen();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- [Conditional=POINTER_LOCK] void webkitExitPointerLock();
- [Conditional=POINTER_LOCK] readonly attribute Element webkitPointerLockElement;
</del><ins>+ [Conditional=POINTER_LOCK] void exitPointerLock();
+ [Conditional=POINTER_LOCK] readonly attribute Element pointerLockElement;
</ins><span class="cx">
</span><span class="cx"> [Conditional=CSS_REGIONS] DOMNamedFlowCollection webkitGetNamedFlows();
</span><span class="cx">
</span><span class="lines">@@ -317,8 +317,8 @@
</span><span class="cx"> [NotEnumerable,Conditional=TOUCH_EVENTS] attribute EventListener ontouchcancel;
</span><span class="cx"> [NotEnumerable, Conditional=FULLSCREEN_API] attribute EventListener onwebkitfullscreenchange;
</span><span class="cx"> [NotEnumerable, Conditional=FULLSCREEN_API] attribute EventListener onwebkitfullscreenerror;
</span><del>- [NotEnumerable, Conditional=POINTER_LOCK] attribute EventListener onwebkitpointerlockchange;
- [NotEnumerable, Conditional=POINTER_LOCK] attribute EventListener onwebkitpointerlockerror;
</del><ins>+ [NotEnumerable, Conditional=POINTER_LOCK] attribute EventListener onpointerlockchange;
+ [NotEnumerable, Conditional=POINTER_LOCK] attribute EventListener onpointerlockerror;
</ins><span class="cx"> [NotEnumerable, Conditional=CSP_NEXT] attribute EventListener onsecuritypolicyviolation;
</span><span class="cx"> [NotEnumerable, Conditional=WILL_REVEAL_EDGE_EVENTS] attribute EventListener onwebkitwillrevealbottom;
</span><span class="cx"> [NotEnumerable, Conditional=WILL_REVEAL_EDGE_EVENTS] attribute EventListener onwebkitwillrevealleft;
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (170584 => 170585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-06-30 15:13:25 UTC (rev 170584)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-06-30 16:59:24 UTC (rev 170585)
</span><span class="lines">@@ -2480,7 +2480,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><del>-void Element::webkitRequestPointerLock()
</del><ins>+void Element::requestPointerLock()
</ins><span class="cx"> {
</span><span class="cx"> if (document().page())
</span><span class="cx"> document().page()->pointerLockController().requestPointerLock(this);
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (170584 => 170585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2014-06-30 15:13:25 UTC (rev 170584)
+++ trunk/Source/WebCore/dom/Element.h 2014-06-30 16:59:24 UTC (rev 170585)
</span><span class="lines">@@ -512,7 +512,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><del>- void webkitRequestPointerLock();
</del><ins>+ void requestPointerLock();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDIE_UI)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.idl (170584 => 170585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.idl 2014-06-30 15:13:25 UTC (rev 170584)
+++ trunk/Source/WebCore/dom/Element.idl 2014-06-30 16:59:24 UTC (rev 170585)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> [Reflect] attribute DOMString uiactions;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- [Conditional=POINTER_LOCK] void webkitRequestPointerLock();
</del><ins>+ [Conditional=POINTER_LOCK] void requestPointerLock();
</ins><span class="cx">
</span><span class="cx"> // CSS Regions API
</span><span class="cx"> [Conditional=CSS_REGIONS] readonly attribute DOMString webkitRegionOverset;
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventNames.h (170584 => 170585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventNames.h 2014-06-30 15:13:25 UTC (rev 170584)
+++ trunk/Source/WebCore/dom/EventNames.h 2014-06-30 16:59:24 UTC (rev 170585)
</span><span class="lines">@@ -258,8 +258,8 @@
</span><span class="cx"> \
</span><span class="cx"> macro(show) \
</span><span class="cx"> \
</span><del>- macro(webkitpointerlockchange) \
- macro(webkitpointerlockerror) \
</del><ins>+ macro(pointerlockchange) \
+ macro(pointerlockerror) \
</ins><span class="cx"> \
</span><span class="cx"> macro(webkitregionoversetchange) \
</span><span class="cx"> \
</span></span></pre></div>
<a id="trunkSourceWebCoredomMouseEventidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MouseEvent.idl (170584 => 170585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MouseEvent.idl 2014-06-30 15:13:25 UTC (rev 170584)
+++ trunk/Source/WebCore/dom/MouseEvent.idl 2014-06-30 16:59:24 UTC (rev 170585)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> [InitializedByEventConstructor] readonly attribute boolean metaKey;
</span><span class="cx"> [InitializedByEventConstructor] readonly attribute unsigned short button;
</span><span class="cx"> [InitializedByEventConstructor] readonly attribute EventTarget relatedTarget;
</span><del>- [Conditional=POINTER_LOCK] readonly attribute long webkitMovementX;
- [Conditional=POINTER_LOCK] readonly attribute long webkitMovementY;
</del><ins>+ [Conditional=POINTER_LOCK] readonly attribute long movementX;
+ [Conditional=POINTER_LOCK] readonly attribute long movementY;
</ins><span class="cx">
</span><span class="cx"> [ObjCLegacyUnnamedParameters] void initMouseEvent([Default=Undefined] optional DOMString type,
</span><span class="cx"> [Default=Undefined] optional boolean canBubble,
</span></span></pre></div>
<a id="trunkSourceWebCoredomMouseRelatedEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MouseRelatedEvent.h (170584 => 170585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MouseRelatedEvent.h 2014-06-30 15:13:25 UTC (rev 170584)
+++ trunk/Source/WebCore/dom/MouseRelatedEvent.h 2014-06-30 16:59:24 UTC (rev 170585)
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx"> int clientX() const { return m_clientLocation.x(); }
</span><span class="cx"> int clientY() const { return m_clientLocation.y(); }
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><del>- int webkitMovementX() const { return m_movementDelta.x(); }
- int webkitMovementY() const { return m_movementDelta.y(); }
</del><ins>+ int movementX() const { return m_movementDelta.x(); }
+ int movementY() const { return m_movementDelta.y(); }
</ins><span class="cx"> #endif
</span><span class="cx"> const LayoutPoint& clientLocation() const { return m_clientLocation; }
</span><span class="cx"> int layerX() override;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePointerLockControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PointerLockController.cpp (170584 => 170585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PointerLockController.cpp 2014-06-30 15:13:25 UTC (rev 170584)
+++ trunk/Source/WebCore/page/PointerLockController.cpp 2014-06-30 16:59:24 UTC (rev 170585)
</span><span class="lines">@@ -39,36 +39,36 @@
</span><span class="cx">
</span><span class="cx"> PointerLockController::PointerLockController(Page& page)
</span><span class="cx"> : m_page(page)
</span><ins>+ , m_lockPending(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PointerLockController::requestPointerLock(Element* target)
</span><span class="cx"> {
</span><span class="cx"> if (!target || !target->inDocument() || m_documentOfRemovedElementWhileWaitingForUnlock) {
</span><del>- enqueueEvent(eventNames().webkitpointerlockerrorEvent, target);
</del><ins>+ enqueueEvent(eventNames().pointerlockerrorEvent, target);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (target->document().isSandboxed(SandboxPointerLock)) {
</span><span class="cx"> // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
</span><span class="cx"> target->document().addConsoleMessage(MessageSource::Security, MessageLevel::Error, ASCIILiteral("Blocked pointer lock on an element because the element's frame is sandboxed and the 'allow-pointer-lock' permission is not set."));
</span><del>- enqueueEvent(eventNames().webkitpointerlockerrorEvent, target);
</del><ins>+ enqueueEvent(eventNames().pointerlockerrorEvent, target);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_element) {
</span><span class="cx"> if (&m_element->document() != &target->document()) {
</span><del>- enqueueEvent(eventNames().webkitpointerlockerrorEvent, target);
</del><ins>+ enqueueEvent(eventNames().pointerlockerrorEvent, target);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- enqueueEvent(eventNames().webkitpointerlockchangeEvent, target);
</del><ins>+ enqueueEvent(eventNames().pointerlockchangeEvent, target);
</ins><span class="cx"> m_element = target;
</span><span class="cx"> } else if (m_page.chrome().client().requestPointerLock()) {
</span><span class="cx"> m_lockPending = true;
</span><span class="cx"> m_element = target;
</span><del>- } else {
- enqueueEvent(eventNames().webkitpointerlockerrorEvent, target);
- }
</del><ins>+ } else
+ enqueueEvent(eventNames().pointerlockerrorEvent, target);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PointerLockController::requestPointerUnlock()
</span><span class="lines">@@ -107,19 +107,19 @@
</span><span class="cx">
</span><span class="cx"> void PointerLockController::didAcquirePointerLock()
</span><span class="cx"> {
</span><del>- enqueueEvent(eventNames().webkitpointerlockchangeEvent, m_element.get());
</del><ins>+ enqueueEvent(eventNames().pointerlockchangeEvent, m_element.get());
</ins><span class="cx"> m_lockPending = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PointerLockController::didNotAcquirePointerLock()
</span><span class="cx"> {
</span><del>- enqueueEvent(eventNames().webkitpointerlockerrorEvent, m_element.get());
</del><ins>+ enqueueEvent(eventNames().pointerlockerrorEvent, m_element.get());
</ins><span class="cx"> clearElement();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PointerLockController::didLosePointerLock()
</span><span class="cx"> {
</span><del>- enqueueEvent(eventNames().webkitpointerlockchangeEvent, m_element ? &m_element->document() : m_documentOfRemovedElementWhileWaitingForUnlock.get());
</del><ins>+ enqueueEvent(eventNames().pointerlockchangeEvent, m_element ? &m_element->document() : m_documentOfRemovedElementWhileWaitingForUnlock.get());
</ins><span class="cx"> clearElement();
</span><span class="cx"> m_documentOfRemovedElementWhileWaitingForUnlock = 0;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>