<!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>[190015] 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/190015">190015</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-09-19 11:15:23 -0700 (Sat, 19 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of custom bindings for Document.location getter
https://bugs.webkit.org/show_bug.cgi?id=149369
Reviewed by Andreas Kling.
Get rid of custom bindings for Document.location getter by defining
a location getter on Document that calls the one on the document's
DOMWindow. The DOMWindow location getter already has an
isCurrentlyDisplayedInFrame() check so the document does not need
to do a null check on the frame.
No new tests, no web-exposed behavior change intended.
* bindings/js/JSDocumentCustom.cpp:
(WebCore::JSDocument::location): Deleted.
* dom/Document.cpp:
(WebCore::Document::location):
* dom/Document.h:
* dom/Document.idl:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::location):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDocumentCustomcpp">trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp</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="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190014 => 190015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-19 15:36:46 UTC (rev 190014)
+++ trunk/Source/WebCore/ChangeLog 2015-09-19 18:15:23 UTC (rev 190015)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-09-19 Chris Dumez <cdumez@apple.com>
+
+ Get rid of custom bindings for Document.location getter
+ https://bugs.webkit.org/show_bug.cgi?id=149369
+
+ Reviewed by Andreas Kling.
+
+ Get rid of custom bindings for Document.location getter by defining
+ a location getter on Document that calls the one on the document's
+ DOMWindow. The DOMWindow location getter already has an
+ isCurrentlyDisplayedInFrame() check so the document does not need
+ to do a null check on the frame.
+
+ No new tests, no web-exposed behavior change intended.
+
+ * bindings/js/JSDocumentCustom.cpp:
+ (WebCore::JSDocument::location): Deleted.
+ * dom/Document.cpp:
+ (WebCore::Document::location):
+ * dom/Document.h:
+ * dom/Document.idl:
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::location):
+
</ins><span class="cx"> 2015-09-18 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Null dereference loading Blink layout test svg/filters/feImage-failed-load-crash.html
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDocumentCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp (190014 => 190015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2015-09-19 15:36:46 UTC (rev 190014)
+++ trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2015-09-19 18:15:23 UTC (rev 190015)
</span><span class="lines">@@ -50,21 +50,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-JSValue JSDocument::location(ExecState* exec) const
-{
- RefPtr<Frame> frame = impl().frame();
- if (!frame)
- return jsNull();
-
- RefPtr<Location> location = frame->document()->domWindow()->location();
- if (JSObject* wrapper = getCachedWrapper(globalObject()->world(), location.get()))
- return wrapper;
-
- JSLocation* jsLocation = JSLocation::create(getDOMStructure<JSLocation>(exec->vm(), globalObject()), globalObject(), *location);
- cacheWrapper(globalObject()->world(), location.get(), jsLocation);
- return jsLocation;
-}
-
</del><span class="cx"> void JSDocument::setLocation(ExecState* exec, JSValue value)
</span><span class="cx"> {
</span><span class="cx"> String locationString = value.toString(exec)->value(exec);
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (190014 => 190015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-09-19 15:36:46 UTC (rev 190014)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-09-19 18:15:23 UTC (rev 190015)
</span><span class="lines">@@ -2567,6 +2567,15 @@
</span><span class="cx"> documentElement()->appendChild(newBody.releaseNonNull(), ec);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Location* Document::location() const
+{
+ auto* window = domWindow();
+ if (!window)
+ return nullptr;
+
+ return window->location();
+}
+
</ins><span class="cx"> HTMLHeadElement* Document::head()
</span><span class="cx"> {
</span><span class="cx"> if (auto element = documentElement())
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (190014 => 190015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-09-19 15:36:46 UTC (rev 190014)
+++ trunk/Source/WebCore/dom/Document.h 2015-09-19 18:15:23 UTC (rev 190015)
</span><span class="lines">@@ -123,6 +123,7 @@
</span><span class="cx"> class LiveNodeList;
</span><span class="cx"> class JSNode;
</span><span class="cx"> class Locale;
</span><ins>+class Location;
</ins><span class="cx"> class MediaCanStartListener;
</span><span class="cx"> class MediaPlaybackTarget;
</span><span class="cx"> class MediaPlaybackTargetClient;
</span><span class="lines">@@ -901,6 +902,8 @@
</span><span class="cx"> WEBCORE_EXPORT HTMLElement* bodyOrFrameset() const;
</span><span class="cx"> void setBodyOrFrameset(PassRefPtr<HTMLElement>, ExceptionCode&);
</span><span class="cx">
</span><ins>+ Location* location() const;
+
</ins><span class="cx"> WEBCORE_EXPORT HTMLHeadElement* head();
</span><span class="cx">
</span><span class="cx"> DocumentMarkerController& markers() const { return *m_markers; }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.idl (190014 => 190015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.idl 2015-09-19 15:36:46 UTC (rev 190014)
+++ trunk/Source/WebCore/dom/Document.idl 2015-09-19 18:15:23 UTC (rev 190015)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> NodeList getElementsByName([Default=Undefined,AtomicString] optional DOMString elementName);
</span><span class="cx">
</span><span class="cx"> #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
</span><del>- [Custom, Unforgeable] attribute Location location;
</del><ins>+ [CustomSetter, Unforgeable] attribute Location location;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // IE extensions
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (190014 => 190015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2015-09-19 15:36:46 UTC (rev 190014)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2015-09-19 18:15:23 UTC (rev 190015)
</span><span class="lines">@@ -744,7 +744,7 @@
</span><span class="cx"> Location* DOMWindow::location() const
</span><span class="cx"> {
</span><span class="cx"> if (!isCurrentlyDisplayedInFrame())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> if (!m_location)
</span><span class="cx"> m_location = Location::create(m_frame);
</span><span class="cx"> return m_location.get();
</span></span></pre>
</div>
</div>
</body>
</html>