<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[28488] trunk/WebKit/win</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/28488">28488</a></dd>
<dt>Author</dt> <dd>adachan@apple.com</dd>
<dt>Date</dt> <dd>2007-12-06 11:33:04 -0800 (Thu, 06 Dec 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Build fix.

        Reviewed by Geoff.

        * WebScriptCallFrame.cpp:
        (WebScriptCallFrame::valueByEvaluatingJavaScriptFromString):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitwinChangeLog">trunk/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkWebKitwinWebScriptCallFramecpp">trunk/WebKit/win/WebScriptCallFrame.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/ChangeLog (28487 => 28488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/ChangeLog        2007-12-06 18:46:23 UTC (rev 28487)
+++ trunk/WebKit/win/ChangeLog        2007-12-06 19:33:04 UTC (rev 28488)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2007-12-06  Ada Chan  &lt;adachan@apple.com&gt;
+
+        Build fix.
+
+        Reviewed by Geoff.
+
+        * WebScriptCallFrame.cpp:
+        (WebScriptCallFrame::valueByEvaluatingJavaScriptFromString):
+
</ins><span class="cx"> 2007-12-04  Geoffrey Garen  &lt;ggaren@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkWebKitwinWebScriptCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebScriptCallFrame.cpp (28487 => 28488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebScriptCallFrame.cpp        2007-12-06 18:46:23 UTC (rev 28487)
+++ trunk/WebKit/win/WebScriptCallFrame.cpp        2007-12-06 19:33:04 UTC (rev 28488)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include &quot;COMEnumVariant.h&quot;
</span><span class="cx"> #include &quot;Function.h&quot;
</span><span class="cx"> 
</span><ins>+#include &lt;JavaScriptCore/Interpreter.h&gt;
</ins><span class="cx"> #include &lt;JavaScriptCore/JSGlobalObject.h&gt;
</span><span class="cx"> #include &lt;JavaScriptCore/JSStringRefBSTR.h&gt;
</span><span class="cx"> #include &lt;JavaScriptCore/JSValueRef.h&gt;
</span><span class="lines">@@ -222,8 +223,7 @@
</span><span class="cx"> JSValue* WebScriptCallFrame::valueByEvaluatingJavaScriptFromString(BSTR script)
</span><span class="cx"> {
</span><span class="cx">     ExecState* state = m_state;
</span><del>-    Interpreter* interp  = state-&gt;dynamicInterpreter();
-    JSGlobalObject* globObj = interp-&gt;globalObject();
</del><ins>+    JSGlobalObject* globObj = state-&gt;dynamicGlobalObject();
</ins><span class="cx"> 
</span><span class="cx">     // find &quot;eval&quot;
</span><span class="cx">     JSObject* eval = 0;
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx">         scriptExecutionResult = eval-&gt;call(state, 0, args);
</span><span class="cx">     } else
</span><span class="cx">         // no &quot;eval&quot;, or no context (i.e. global scope) - use global fallback
</span><del>-        scriptExecutionResult = interp-&gt;evaluate(UString(), 0, code.data(), code.size(), globObj).value();
</del><ins>+        scriptExecutionResult = Interpreter::evaluate(state, UString(), 0, code.data(), code.size(), globObj).value();
</ins><span class="cx"> 
</span><span class="cx">     if (state-&gt;hadException())
</span><span class="cx">         scriptExecutionResult = state-&gt;exception();    // (may be redundant depending on which eval path was used)
</span></span></pre>
</div>
</div>

</body>
</html>