<!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>[149865] 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/149865">149865</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-05-10 04:18:10 -0700 (Fri, 10 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove ScriptController::updateSecurityOrigin
https://bugs.webkit.org/show_bug.cgi?id=115895

Reviewed by Antti Koivisto.

ScriptController::updateSecurityOrigin is just dead code now that the V8 bindings are gone.

* bindings/js/ScriptController.cpp:
* bindings/js/ScriptController.h:
* dom/Document.cpp:
(WebCore::Document::setIsViewSource):
(WebCore::Document::setDomain):
* dom/Document.h:
(Document):
* dom/SecurityContext.cpp:
(WebCore::SecurityContext::enforceSandboxFlags):
* dom/SecurityContext.h:
(SecurityContext):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllerh">trunk/Source/WebCore/bindings/js/ScriptController.h</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="#trunkSourceWebCoredomSecurityContextcpp">trunk/Source/WebCore/dom/SecurityContext.cpp</a></li>
<li><a href="#trunkSourceWebCoredomSecurityContexth">trunk/Source/WebCore/dom/SecurityContext.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149864 => 149865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-10 11:12:41 UTC (rev 149864)
+++ trunk/Source/WebCore/ChangeLog        2013-05-10 11:18:10 UTC (rev 149865)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2013-05-10  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Remove ScriptController::updateSecurityOrigin
+        https://bugs.webkit.org/show_bug.cgi?id=115895
+
+        Reviewed by Antti Koivisto.
+
+        ScriptController::updateSecurityOrigin is just dead code now that the V8 bindings are gone.
+
+        * bindings/js/ScriptController.cpp:
+        * bindings/js/ScriptController.h:
+        * dom/Document.cpp:
+        (WebCore::Document::setIsViewSource):
+        (WebCore::Document::setDomain):
+        * dom/Document.h:
+        (Document):
+        * dom/SecurityContext.cpp:
+        (WebCore::SecurityContext::enforceSandboxFlags):
+        * dom/SecurityContext.h:
+        (SecurityContext):
+
+2013-05-10  Anders Carlsson  &lt;andersca@apple.com&gt;
+
</ins><span class="cx">         Stop including SecurityOrigin.h where unnecessary
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=115897
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (149864 => 149865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp        2013-05-10 11:12:41 UTC (rev 149864)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp        2013-05-10 11:18:10 UTC (rev 149865)
</span><span class="lines">@@ -291,11 +291,6 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ScriptController::updateSecurityOrigin()
-{
-    // Our bindings do not do anything in this case.
-}
-
</del><span class="cx"> Bindings::RootObject* ScriptController::cacheableBindingRootObject()
</span><span class="cx"> {
</span><span class="cx">     if (!canExecuteScripts(NotAboutToExecuteScript))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.h (149864 => 149865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.h        2013-05-10 11:12:41 UTC (rev 149864)
+++ trunk/Source/WebCore/bindings/js/ScriptController.h        2013-05-10 11:18:10 UTC (rev 149865)
</span><span class="lines">@@ -129,12 +129,6 @@
</span><span class="cx">     void namedItemAdded(HTMLDocument*, const AtomicString&amp;) { }
</span><span class="cx">     void namedItemRemoved(HTMLDocument*, const AtomicString&amp;) { }
</span><span class="cx"> 
</span><del>-    // Notifies the ScriptController that the securityOrigin of the current
-    // document was modified.  For example, this method is called when
-    // document.domain is set.  This method is *not* called when a new document
-    // is attached to a frame because updateDocument() is called instead.
-    void updateSecurityOrigin();
-
</del><span class="cx">     void clearScriptObjects();
</span><span class="cx">     void cleanupScriptObjectsForPlugin(void*);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (149864 => 149865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp        2013-05-10 11:12:41 UTC (rev 149864)
+++ trunk/Source/WebCore/dom/Document.cpp        2013-05-10 11:18:10 UTC (rev 149865)
</span><span class="lines">@@ -2000,7 +2000,6 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     setSecurityOrigin(SecurityOrigin::createUnique());
</span><del>-    didUpdateSecurityOrigin();
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void Document::createStyleResolver()
</span><span class="lines">@@ -3812,8 +3811,6 @@
</span><span class="cx">     // have also assigned to access this page.
</span><span class="cx">     if (equalIgnoringCase(domain(), newDomain)) {
</span><span class="cx">         securityOrigin()-&gt;setDomainFromDOM(newDomain);
</span><del>-        if (m_frame)
-            m_frame-&gt;script()-&gt;updateSecurityOrigin();
</del><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -3841,8 +3838,6 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     securityOrigin()-&gt;setDomainFromDOM(newDomain);
</span><del>-    if (m_frame)
-        m_frame-&gt;script()-&gt;updateSecurityOrigin();
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // http://www.whatwg.org/specs/web-apps/current-work/#dom-document-lastmodified
</span><span class="lines">@@ -4666,13 +4661,6 @@
</span><span class="cx">     contentSecurityPolicy()-&gt;copyStateFrom(m_frame-&gt;tree()-&gt;parent()-&gt;document()-&gt;contentSecurityPolicy());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Document::didUpdateSecurityOrigin()
-{
-    if (!m_frame)
-        return;
-    m_frame-&gt;script()-&gt;updateSecurityOrigin();
-}
-
</del><span class="cx"> bool Document::isContextThread() const
</span><span class="cx"> {
</span><span class="cx">     return isMainThread();
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (149864 => 149865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h        2013-05-10 11:12:41 UTC (rev 149864)
+++ trunk/Source/WebCore/dom/Document.h        2013-05-10 11:18:10 UTC (rev 149865)
</span><span class="lines">@@ -1220,8 +1220,6 @@
</span><span class="cx"> protected:
</span><span class="cx">     Document(Frame*, const KURL&amp;, unsigned = DefaultDocumentClass);
</span><span class="cx"> 
</span><del>-    virtual void didUpdateSecurityOrigin() OVERRIDE;
-
</del><span class="cx">     void clearXMLVersion() { m_xmlVersion = String(); }
</span><span class="cx"> 
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoredomSecurityContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SecurityContext.cpp (149864 => 149865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SecurityContext.cpp        2013-05-10 11:12:41 UTC (rev 149864)
+++ trunk/Source/WebCore/dom/SecurityContext.cpp        2013-05-10 11:18:10 UTC (rev 149865)
</span><span class="lines">@@ -73,17 +73,10 @@
</span><span class="cx">     m_sandboxFlags |= mask;
</span><span class="cx"> 
</span><span class="cx">     // The SandboxOrigin is stored redundantly in the security origin.
</span><del>-    if (isSandboxed(SandboxOrigin) &amp;&amp; securityOrigin() &amp;&amp; !securityOrigin()-&gt;isUnique()) {
</del><ins>+    if (isSandboxed(SandboxOrigin) &amp;&amp; securityOrigin() &amp;&amp; !securityOrigin()-&gt;isUnique())
</ins><span class="cx">         setSecurityOrigin(SecurityOrigin::createUnique());
</span><del>-        didUpdateSecurityOrigin();
-    }
</del><span class="cx"> }
</span><span class="cx"> 
</span><del>-void SecurityContext::didUpdateSecurityOrigin()
-{
-    // Subclasses can override this function if the need to do extra work when the security origin changes.
-}
-
</del><span class="cx"> SandboxFlags SecurityContext::parseSandboxPolicy(const String&amp; policy, String&amp; invalidTokensErrorMessage)
</span><span class="cx"> {
</span><span class="cx">     // http://www.w3.org/TR/html5/the-iframe-element.html#attr-iframe-sandbox
</span></span></pre></div>
<a id="trunkSourceWebCoredomSecurityContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SecurityContext.h (149864 => 149865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SecurityContext.h        2013-05-10 11:12:41 UTC (rev 149864)
+++ trunk/Source/WebCore/dom/SecurityContext.h        2013-05-10 11:18:10 UTC (rev 149865)
</span><span class="lines">@@ -77,8 +77,6 @@
</span><span class="cx">     SecurityContext();
</span><span class="cx">     virtual ~SecurityContext();
</span><span class="cx"> 
</span><del>-    virtual void didUpdateSecurityOrigin();
-
</del><span class="cx">     void setContentSecurityPolicy(PassOwnPtr&lt;ContentSecurityPolicy&gt;);
</span><span class="cx"> 
</span><span class="cx">     void didFailToInitializeSecurityOrigin() { m_haveInitializedSecurityOrigin = false; }
</span></span></pre>
</div>
</div>

</body>
</html>