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

<h3>Log Message</h3>
<pre>Remove ScriptInstance.h
https://bugs.webkit.org/show_bug.cgi?id=115900

Reviewed by Andreas Kling.

Remove yet another abstraction now that we don't support V8.

* GNUmakefile.list.am:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/ScriptController.h:
(Bindings):
(ScriptController):
* bindings/js/ScriptControllerMac.mm:
(WebCore::ScriptController::createScriptInstanceForWidget):
* bindings/js/ScriptInstance.h: Removed.
* html/HTMLPlugInElement.cpp:
(WebCore::HTMLPlugInElement::getInstance):
* html/HTMLPlugInElement.h:
(Bindings):
(HTMLPlugInElement):
* platform/graphics/wince/MediaPlayerProxy.h:
(WebMediaPlayerProxy):
* rendering/RenderEmbeddedObject.cpp:
* rendering/RenderSnapshottedPlugIn.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcprojWebCorevcproj">trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllerh">trunk/Source/WebCore/bindings/js/ScriptController.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllerMacmm">trunk/Source/WebCore/bindings/js/ScriptControllerMac.mm</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInElementcpp">trunk/Source/WebCore/html/HTMLPlugInElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInElementh">trunk/Source/WebCore/html/HTMLPlugInElement.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceMediaPlayerProxyh">trunk/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderEmbeddedObjectcpp">trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderSnapshottedPlugIncpp">trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsjsScriptInstanceh">trunk/Source/WebCore/bindings/js/ScriptInstance.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149870 => 149871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-10 12:49:22 UTC (rev 149870)
+++ trunk/Source/WebCore/ChangeLog        2013-05-10 12:51:58 UTC (rev 149871)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2013-05-10  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Remove ScriptInstance.h
+        https://bugs.webkit.org/show_bug.cgi?id=115900
+
+        Reviewed by Andreas Kling.
+
+        Remove yet another abstraction now that we don't support V8.
+
+        * GNUmakefile.list.am:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/ScriptController.h:
+        (Bindings):
+        (ScriptController):
+        * bindings/js/ScriptControllerMac.mm:
+        (WebCore::ScriptController::createScriptInstanceForWidget):
+        * bindings/js/ScriptInstance.h: Removed.
+        * html/HTMLPlugInElement.cpp:
+        (WebCore::HTMLPlugInElement::getInstance):
+        * html/HTMLPlugInElement.h:
+        (Bindings):
+        (HTMLPlugInElement):
+        * platform/graphics/wince/MediaPlayerProxy.h:
+        (WebMediaPlayerProxy):
+        * rendering/RenderEmbeddedObject.cpp:
+        * rendering/RenderSnapshottedPlugIn.cpp:
+
+2013-05-10  Anders Carlsson  &lt;andersca@apple.com&gt;
+
</ins><span class="cx">         Unreviewed, rolling out r149866.
</span><span class="cx">         http://trac.webkit.org/changeset/149866
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=115898
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (149870 => 149871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am        2013-05-10 12:49:22 UTC (rev 149870)
+++ trunk/Source/WebCore/GNUmakefile.list.am        2013-05-10 12:51:58 UTC (rev 149871)
</span><span class="lines">@@ -2543,7 +2543,6 @@
</span><span class="cx">         Source/WebCore/bindings/js/ScriptGCEvent.cpp \
</span><span class="cx">         Source/WebCore/bindings/js/ScriptGCEvent.h \
</span><span class="cx">         Source/WebCore/bindings/js/ScriptHeapSnapshot.h \
</span><del>-        Source/WebCore/bindings/js/ScriptInstance.h \
</del><span class="cx">         Source/WebCore/bindings/js/ScriptObject.cpp \
</span><span class="cx">         Source/WebCore/bindings/js/ScriptObject.h \
</span><span class="cx">         Source/WebCore/bindings/js/ScriptProfile.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcprojWebCorevcproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (149870 => 149871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj        2013-05-10 12:49:22 UTC (rev 149870)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj        2013-05-10 12:51:58 UTC (rev 149871)
</span><span class="lines">@@ -73070,10 +73070,6 @@
</span><span class="cx">                                         &gt;
</span><span class="cx">                                 &lt;/File&gt;
</span><span class="cx">                                 &lt;File
</span><del>-                                        RelativePath=&quot;..\bindings\js\ScriptInstance.h&quot;
-                                        &gt;
-                                &lt;/File&gt;
-                                &lt;File
</del><span class="cx">                                         RelativePath=&quot;..\bindings\js\ScriptObject.cpp&quot;
</span><span class="cx">                                         &gt;
</span><span class="cx">                                 &lt;/File&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (149870 => 149871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj        2013-05-10 12:49:22 UTC (rev 149870)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj        2013-05-10 12:51:58 UTC (rev 149871)
</span><span class="lines">@@ -12943,7 +12943,6 @@
</span><span class="cx">     &lt;ClInclude Include=&quot;..\bindings\js\ScriptFunctionCall.h&quot; /&gt;
</span><span class="cx">     &lt;ClInclude Include=&quot;..\bindings\js\ScriptGCEvent.h&quot; /&gt;
</span><span class="cx">     &lt;ClInclude Include=&quot;..\bindings\js\ScriptHeapSnapshot.h&quot; /&gt;
</span><del>-    &lt;ClInclude Include=&quot;..\bindings\js\ScriptInstance.h&quot; /&gt;
</del><span class="cx">     &lt;ClInclude Include=&quot;..\bindings\js\ScriptObject.h&quot; /&gt;
</span><span class="cx">     &lt;ClInclude Include=&quot;..\bindings\js\ScriptProfile.h&quot; /&gt;
</span><span class="cx">     &lt;ClInclude Include=&quot;..\bindings\js\ScriptProfileNode.h&quot; /&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (149870 => 149871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters        2013-05-10 12:49:22 UTC (rev 149870)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters        2013-05-10 12:51:58 UTC (rev 149871)
</span><span class="lines">@@ -11493,9 +11493,6 @@
</span><span class="cx">     &lt;ClInclude Include=&quot;..\bindings\js\ScriptHeapSnapshot.h&quot;&gt;
</span><span class="cx">       &lt;Filter&gt;bindings\js&lt;/Filter&gt;
</span><span class="cx">     &lt;/ClInclude&gt;
</span><del>-    &lt;ClInclude Include=&quot;..\bindings\js\ScriptInstance.h&quot;&gt;
-      &lt;Filter&gt;bindings\js&lt;/Filter&gt;
-    &lt;/ClInclude&gt;
</del><span class="cx">     &lt;ClInclude Include=&quot;..\bindings\js\ScriptObject.h&quot;&gt;
</span><span class="cx">       &lt;Filter&gt;bindings\js&lt;/Filter&gt;
</span><span class="cx">     &lt;/ClInclude&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (149870 => 149871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2013-05-10 12:49:22 UTC (rev 149870)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2013-05-10 12:51:58 UTC (rev 149871)
</span><span class="lines">@@ -2824,7 +2824,6 @@
</span><span class="cx">                 934CC0E10ED39D6F00A658F2 /* ScriptValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 934CC0DF0ED39D6F00A658F2 /* ScriptValue.cpp */; };
</span><span class="cx">                 934CC0E20ED39D6F00A658F2 /* ScriptValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 934CC0E00ED39D6F00A658F2 /* ScriptValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 934CC10A0EDB223900A658F2 /* ScriptSourceCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 934CC1090EDB223900A658F2 /* ScriptSourceCode.h */; };
</span><del>-                934CC1170EDCAC7300A658F2 /* ScriptInstance.h in Headers */ = {isa = PBXBuildFile; fileRef = 934CC1160EDCAC7300A658F2 /* ScriptInstance.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx">                 934D9BA50B8C116B007B42A9 /* WebCoreNSStringExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 934D9BA40B8C116B007B42A9 /* WebCoreNSStringExtras.mm */; };
</span><span class="cx">                 934D9BA70B8C1175007B42A9 /* WebCoreNSStringExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 934D9BA60B8C1175007B42A9 /* WebCoreNSStringExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 934F71380D5A6EFF00018D69 /* AuthenticationChallengeBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 934F71370D5A6EFF00018D69 /* AuthenticationChallengeBase.cpp */; };
</span><span class="lines">@@ -9253,7 +9252,6 @@
</span><span class="cx">                 934CC0DF0ED39D6F00A658F2 /* ScriptValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptValue.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 934CC0E00ED39D6F00A658F2 /* ScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptValue.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 934CC1090EDB223900A658F2 /* ScriptSourceCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptSourceCode.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                934CC1160EDCAC7300A658F2 /* ScriptInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptInstance.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx">                 934D9BA40B8C116B007B42A9 /* WebCoreNSStringExtras.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreNSStringExtras.mm; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 934D9BA60B8C1175007B42A9 /* WebCoreNSStringExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreNSStringExtras.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 934F71370D5A6EFF00018D69 /* AuthenticationChallengeBase.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationChallengeBase.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -18769,7 +18767,6 @@
</span><span class="cx">                                 4FD8D0F0119C718B002FA825 /* ScriptGCEvent.cpp */,
</span><span class="cx">                                 4FD8D0F1119C718B002FA825 /* ScriptGCEvent.h */,
</span><span class="cx">                                 9F3B947D12241758005304E7 /* ScriptHeapSnapshot.h */,
</span><del>-                                934CC1160EDCAC7300A658F2 /* ScriptInstance.h */,
</del><span class="cx">                                 41F066E30F64BCF600A07EAC /* ScriptObject.cpp */,
</span><span class="cx">                                 41F066E20F64BCF600A07EAC /* ScriptObject.h */,
</span><span class="cx">                                 F33F0281120947F200E5743A /* ScriptProfile.cpp */,
</span><span class="lines">@@ -23339,7 +23336,6 @@
</span><span class="cx">                                 41002CCD0F66EDEF009E660D /* ScriptFunctionCall.h in Headers */,
</span><span class="cx">                                 4FD8D0F3119C718B002FA825 /* ScriptGCEvent.h in Headers */,
</span><span class="cx">                                 9F3B947E12241758005304E7 /* ScriptHeapSnapshot.h in Headers */,
</span><del>-                                934CC1170EDCAC7300A658F2 /* ScriptInstance.h in Headers */,
</del><span class="cx">                                 41F066E40F64BCF600A07EAC /* ScriptObject.h in Headers */,
</span><span class="cx">                                 FD31603612B0267600C1A359 /* ScriptProcessorNode.h in Headers */,
</span><span class="cx">                                 9F72304F11184B4100AD0126 /* ScriptProfile.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.h (149870 => 149871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.h        2013-05-10 12:49:22 UTC (rev 149870)
+++ trunk/Source/WebCore/bindings/js/ScriptController.h        2013-05-10 12:51:58 UTC (rev 149871)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> #include &quot;FrameLoaderTypes.h&quot;
</span><span class="cx"> #include &quot;JSDOMWindowShell.h&quot;
</span><span class="cx"> #include &quot;ScriptControllerBase.h&quot;
</span><del>-#include &quot;ScriptInstance.h&quot;
</del><span class="cx"> #include &lt;JavaScriptCore/JSBase.h&gt;
</span><span class="cx"> #include &lt;heap/Strong.h&gt;
</span><span class="cx"> #include &lt;wtf/Forward.h&gt;
</span><span class="lines">@@ -45,6 +44,7 @@
</span><span class="cx">     class ExecState;
</span><span class="cx"> 
</span><span class="cx">     namespace Bindings {
</span><ins>+        class Instance;
</ins><span class="cx">         class RootObject;
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> 
</span><span class="cx">     void updatePlatformScriptObjects();
</span><span class="cx"> 
</span><del>-    PassScriptInstance createScriptInstanceForWidget(Widget*);
</del><ins>+    PassRefPtr&lt;JSC::Bindings::Instance&gt;  createScriptInstanceForWidget(Widget*);
</ins><span class="cx">     JSC::Bindings::RootObject* bindingRootObject();
</span><span class="cx">     JSC::Bindings::RootObject* cacheableBindingRootObject();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptControllerMac.mm (149870 => 149871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptControllerMac.mm        2013-05-10 12:49:22 UTC (rev 149870)
+++ trunk/Source/WebCore/bindings/js/ScriptControllerMac.mm        2013-05-10 12:51:58 UTC (rev 149871)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-PassScriptInstance ScriptController::createScriptInstanceForWidget(Widget* widget)
</del><ins>+PassRefPtr&lt;JSC::Bindings::Instance&gt; ScriptController::createScriptInstanceForWidget(Widget* widget)
</ins><span class="cx"> {
</span><span class="cx">     NSView* widgetView = widget-&gt;platformWidget();
</span><span class="cx">     if (!widgetView)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptInstanceh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/ScriptInstance.h (149870 => 149871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptInstance.h        2013-05-10 12:49:22 UTC (rev 149870)
+++ trunk/Source/WebCore/bindings/js/ScriptInstance.h        2013-05-10 12:51:58 UTC (rev 149871)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-/*
- * Copyright (c) 2008, Google 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:
- * 
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * &quot;AS IS&quot; 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 THE COPYRIGHT
- * OWNER OR 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.
- */
-
-#ifndef ScriptInstance_h
-#define ScriptInstance_h
-
-#include &quot;BridgeJSC.h&quot;
-#include &lt;wtf/RefPtr.h&gt;
-
-namespace WebCore {
-
-typedef RefPtr&lt;JSC::Bindings::Instance&gt; ScriptInstance;
-typedef PassRefPtr&lt;JSC::Bindings::Instance&gt; PassScriptInstance;
-
-} // namespace WebCore
-
-#endif // ScriptInstance_h
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInElement.cpp (149870 => 149871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInElement.cpp        2013-05-10 12:49:22 UTC (rev 149870)
+++ trunk/Source/WebCore/html/HTMLPlugInElement.cpp        2013-05-10 12:51:58 UTC (rev 149871)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include &quot;HTMLPlugInElement.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;Attribute.h&quot;
</span><ins>+#include &quot;BridgeJSC.h&quot;
</ins><span class="cx"> #include &quot;Chrome.h&quot;
</span><span class="cx"> #include &quot;ChromeClient.h&quot;
</span><span class="cx"> #include &quot;CSSPropertyNames.h&quot;
</span><span class="lines">@@ -118,7 +119,7 @@
</span><span class="cx">     m_instance.clear();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-PassScriptInstance HTMLPlugInElement::getInstance()
</del><ins>+PassRefPtr&lt;JSC::Bindings::Instance&gt; HTMLPlugInElement::getInstance()
</ins><span class="cx"> {
</span><span class="cx">     Frame* frame = document()-&gt;frame();
</span><span class="cx">     if (!frame)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInElement.h (149870 => 149871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInElement.h        2013-05-10 12:49:22 UTC (rev 149870)
+++ trunk/Source/WebCore/html/HTMLPlugInElement.h        2013-05-10 12:51:58 UTC (rev 149871)
</span><span class="lines">@@ -26,12 +26,16 @@
</span><span class="cx"> #include &quot;HTMLFrameOwnerElement.h&quot;
</span><span class="cx"> #include &quot;Image.h&quot;
</span><span class="cx"> 
</span><del>-#include &quot;ScriptInstance.h&quot;
-
</del><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> struct NPObject;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+namespace JSC {
+namespace Bindings {
+class Instance;
+}
+}
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> class RenderEmbeddedObject;
</span><span class="lines">@@ -44,7 +48,7 @@
</span><span class="cx"> 
</span><span class="cx">     void resetInstance();
</span><span class="cx"> 
</span><del>-    PassScriptInstance getInstance();
</del><ins>+    PassRefPtr&lt;JSC::Bindings::Instance&gt; getInstance();
</ins><span class="cx"> 
</span><span class="cx">     Widget* pluginWidget() const;
</span><span class="cx"> 
</span><span class="lines">@@ -104,7 +108,7 @@
</span><span class="cx">     virtual bool isKeyboardFocusable(KeyboardEvent*) const;
</span><span class="cx">     virtual bool isPluginElement() const;
</span><span class="cx"> 
</span><del>-    mutable ScriptInstance m_instance;
</del><ins>+    RefPtr&lt;JSC::Bindings::Instance&gt; m_instance;
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">     NPObject* m_NPObject;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceMediaPlayerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.h (149870 => 149871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.h        2013-05-10 12:49:22 UTC (rev 149870)
+++ trunk/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.h        2013-05-10 12:51:58 UTC (rev 149871)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> 
</span><span class="cx"> #include &lt;wtf/Forward.h&gt;
</span><del>-#include &quot;ScriptInstance.h&quot;
</del><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="lines">@@ -54,7 +53,7 @@
</span><span class="cx">         void load(const String&amp; url);
</span><span class="cx">         HTMLMediaElement* element();
</span><span class="cx">         void invokeMethod(const String&amp; methodName);
</span><del>-        ScriptInstance pluginInstance();
</del><ins>+        RefPtr&lt;JSC::Bindings::Instance&gt; pluginInstance();
</ins><span class="cx"> 
</span><span class="cx">     private:
</span><span class="cx">         MediaPlayer* m_mediaPlayer;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderEmbeddedObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (149870 => 149871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp        2013-05-10 12:49:22 UTC (rev 149870)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp        2013-05-10 12:51:58 UTC (rev 149871)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> #include &quot;Settings.h&quot;
</span><span class="cx"> #include &quot;Text.h&quot;
</span><span class="cx"> #include &quot;TextRun.h&quot;
</span><ins>+#include &lt;wtf/StackStats.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
</span><span class="cx"> #include &quot;HTMLMediaElement.h&quot;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderSnapshottedPlugIncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp (149870 => 149871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp        2013-05-10 12:49:22 UTC (rev 149870)
+++ trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp        2013-05-10 12:51:58 UTC (rev 149871)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #include &quot;Path.h&quot;
</span><span class="cx"> #include &quot;PlatformMouseEvent.h&quot;
</span><span class="cx"> #include &quot;RenderView.h&quot;
</span><ins>+#include &lt;wtf/StackStats.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>