<!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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { 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>[20663] branches/Safari-522</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20663">20663</a></dd>
<dt>Author</dt> <dd>bdash</dd>
<dt>Date</dt> <dd>2007-04-02 12:23:57 -0700 (Mon, 02 Apr 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge r20555 and r20560.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesSafari522WebCoreChangeLog">branches/Safari-522/WebCore/ChangeLog</a></li>
<li><a href="#branchesSafari522WebCorepagemacWebCoreFrameBridgemm">branches/Safari-522/WebCore/page/mac/WebCoreFrameBridge.mm</a></li>
<li><a href="#branchesSafari522WebKitChangeLog">branches/Safari-522/WebKit/ChangeLog</a></li>
<li><a href="#branchesSafari522WebKitMiscWebKitVersionChecksh">branches/Safari-522/WebKit/Misc/WebKitVersionChecks.h</a></li>
<li><a href="#branchesSafari522WebKitWebViewWebViewmm">branches/Safari-522/WebKit/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesSafari522WebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/Safari-522/WebCore/ChangeLog (20662 => 20663)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-522/WebCore/ChangeLog 2007-04-02 18:37:31 UTC (rev 20662)
+++ branches/Safari-522/WebCore/ChangeLog 2007-04-02 19:23:57 UTC (rev 20663)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2007-03-28 Adele Peterson <adele@apple.com>
+
+ Reviewed by Kevin M.
+
+ WebCore part of fix for <rdar://problem/5095515> VitalSource Bookshelf should not pass return statements into stringByEvaluatingJavaScriptFromString
+
+ * page/mac/WebCoreFrameBridge.mm: (-[WebCoreFrameBridge stringByEvaluatingJavaScriptFromString:forceUserGesture:]):
+ Convert return value to a string. This matches the behavior in Safari 2.0.
+
</ins><span class="cx"> 2007-03-29 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix for <rdar://problem/4545060>, technorati and arstechnica fail because of getComputedStyle not
</span></span></pre></div>
<a id="branchesSafari522WebCorepagemacWebCoreFrameBridgemm"></a>
<div class="modfile"><h4>Modified: branches/Safari-522/WebCore/page/mac/WebCoreFrameBridge.mm (20662 => 20663)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-522/WebCore/page/mac/WebCoreFrameBridge.mm 2007-04-02 18:37:31 UTC (rev 20662)
+++ branches/Safari-522/WebCore/page/mac/WebCoreFrameBridge.mm 2007-04-02 19:23:57 UTC (rev 20663)
</span><span class="lines">@@ -687,10 +687,10 @@
</span><span class="cx"> {
</span><span class="cx"> m_frame->loader()->createEmptyDocument();
</span><span class="cx"> JSValue* result = m_frame->loader()->executeScript(0, string, forceUserGesture);
</span><del>- if (!result || !result->isString())
</del><ins>+ if (!result)
</ins><span class="cx"> return 0;
</span><span class="cx"> JSLock lock;
</span><del>- return String(result->getString());
</del><ins>+ return String(result->isString() ? result->getString() : result->toString(m_frame->scriptProxy()->interpreter()->globalExec()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSAppleEventDescriptor *)aeDescByEvaluatingJavaScriptFromString:(NSString *)string
</span></span></pre></div>
<a id="branchesSafari522WebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/Safari-522/WebKit/ChangeLog (20662 => 20663)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-522/WebKit/ChangeLog 2007-04-02 18:37:31 UTC (rev 20662)
+++ branches/Safari-522/WebKit/ChangeLog 2007-04-02 19:23:57 UTC (rev 20663)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2007-03-28 Adele Peterson <adele@apple.com>
+
+ Reviewed by Brady.
+
+ Update to last fix.
+
+ * Misc/WebKitVersionChecks.h: Added WEBKIT_FIRST_VERSION_WITHOUT_VITALSOURCE_QUIRK.
+ * WebView/WebView.mm: (-[WebView stringByEvaluatingJavaScriptFromString:]):
+ Added check to only use the VitalSource workaround if the app is not linked on or after
+ the defined WEBKIT_FIRST_VERSION_WITHOUT_VITALSOURCE_QUIRK version number.
+
+2007-03-28 Adele Peterson <adele@apple.com>
+
+ Reviewed by Kevin M.
+
+ WebKit part of fix for <rdar://problem/5095515> VitalSource Bookshelf should not pass return statements into stringByEvaluatingJavaScriptFromString
+
+ Added an app specific workaround for VitalSource Bookshelf that strips "return" from the beginning of their script strings. We used to allow this
+ but now we throw a JavaScript exception for return statements that aren't in functions.
+
+ Filed this evangelism bug so we can notify VitalSource of the problem:
+ <rdar://problem/5095515> VitalSource Bookshelf should not pass return statements into stringByEvaluatingJavaScriptFromString
+
+ * WebView/WebView.mm: (-[WebView stringByEvaluatingJavaScriptFromString:]):
+
</ins><span class="cx"> 2007-03-27 John Sullivan <sullivan@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Tim
</span></span></pre></div>
<a id="branchesSafari522WebKitMiscWebKitVersionChecksh"></a>
<div class="modfile"><h4>Modified: branches/Safari-522/WebKit/Misc/WebKitVersionChecks.h (20662 => 20663)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-522/WebKit/Misc/WebKitVersionChecks.h 2007-04-02 18:37:31 UTC (rev 20662)
+++ branches/Safari-522/WebKit/Misc/WebKitVersionChecks.h 2007-04-02 19:23:57 UTC (rev 20663)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #define WEBKIT_FIRST_VERSION_WITHOUT_ACROBAT_QUIRK 0x020A0000 // 522.0.0
</span><span class="cx"> #define WEBKIT_FIRST_VERSION_WITH_LOCAL_RESOURCE_SECURITY_RESTRICTION 0x020A0000 // 522.0.0
</span><span class="cx"> #define WEBKIT_FIRST_VERSION_WITHOUT_APERTURE_QUIRK 0x020A0000 // 522.0.0
</span><ins>+#define WEBKIT_FIRST_VERSION_WITHOUT_VITALSOURCE_QUIRK 0x020A0000 // 522.0.0
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchesSafari522WebKitWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/Safari-522/WebKit/WebView/WebView.mm (20662 => 20663)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-522/WebKit/WebView/WebView.mm 2007-04-02 18:37:31 UTC (rev 20662)
+++ branches/Safari-522/WebKit/WebView/WebView.mm 2007-04-02 19:23:57 UTC (rev 20663)
</span><span class="lines">@@ -2099,6 +2099,14 @@
</span><span class="cx">
</span><span class="cx"> - (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script
</span><span class="cx"> {
</span><ins>+ // FIXME: We can remove this workaround for VitalSource Bookshelf when they update
+ // their code so that it no longer calls stringByEvaluatingJavaScriptFromString with a return statement.
+ // Return statements are only valid in a function. See <rdar://problem/5095515> for the evangelism bug.
+ if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITHOUT_VITALSOURCE_QUIRK) && [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.vitalsource.bookshelf"]) {
+ NSRange returnStringRange = [script rangeOfString:@"return "];
+ if (returnStringRange.length != 0 && returnStringRange.location == 0)
+ script = [script substringFromIndex: returnStringRange.location + returnStringRange.length];
+ }
</ins><span class="cx"> return [[[self mainFrame] _bridge] stringByEvaluatingJavaScriptFromString:script];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>