<!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>[20665] branches/Safari-522/WebKit</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20665">20665</a></dd>
<dt>Author</dt> <dd>bdash</dd>
<dt>Date</dt> <dd>2007-04-02 12:37:26 -0700 (Mon, 02 Apr 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge r20593 and r20596.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesSafari522WebKitChangeLog">branches/Safari-522/WebKit/ChangeLog</a></li>
<li><a href="#branchesSafari522WebKitEnglishlprojStringsNotToBeLocalizedtxt">branches/Safari-522/WebKit/English.lproj/StringsNotToBeLocalized.txt</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>
<li><a href="#branchesSafari522WebKitLibrariesChangeLog">branches/Safari-522/WebKitLibraries/ChangeLog</a></li>
<li><a href="#branchesSafari522WebKitLibrariesWebKitSystemInterfaceh">branches/Safari-522/WebKitLibraries/WebKitSystemInterface.h</a></li>
<li><a href="#branchesSafari522WebKitLibrarieslibWebKitSystemInterfacea">branches/Safari-522/WebKitLibraries/libWebKitSystemInterface.a</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesSafari522WebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/Safari-522/WebKit/ChangeLog (20664 => 20665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-522/WebKit/ChangeLog 2007-04-02 19:33:50 UTC (rev 20664)
+++ branches/Safari-522/WebKit/ChangeLog 2007-04-02 19:37:26 UTC (rev 20665)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2007-03-29 Beth Dakin <bdakin@apple.com>
+
+ Reviewed by Brady.
+
+ Fix for <rdar://problem/4674537> REGRESSION: Adobe Acrobat 8 - Text
+ blinks when mouse is moved, and is invisible otherwise
+
+ -and-
+
+ <rdar://problem/4992521> Please adjust WebKit's Acrobat-workaround
+ methodology
+
+ The fix for the first bug is to compare against the bundle
+ identifiers for Adobe Reader and the non-Pro Adobe Acrobat in
+ addition to Adobe Acrobat Pro. The fix for the second bug is to
+ check the version number of Acrobat/Reader through
+ WebKitSystemInterface instead of checking which version of WebKit
+ it has been linked against.
+
+ * English.lproj/StringsNotToBeLocalized.txt: Two new bundle
+ identifiers.
+ * Misc/WebKitVersionChecks.h: Remove Acrobat quirk constant.
+ * WebView/WebView.mm:
+ (-[WebView _updateWebCoreSettingsFromPreferences:]):
</ins><span class="cx"> 2007-03-28 Adele Peterson <adele@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Brady.
</span></span></pre></div>
<a id="branchesSafari522WebKitEnglishlprojStringsNotToBeLocalizedtxt"></a>
<div class="modfile"><h4>Modified: branches/Safari-522/WebKit/English.lproj/StringsNotToBeLocalized.txt (20664 => 20665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-522/WebKit/English.lproj/StringsNotToBeLocalized.txt 2007-04-02 19:33:50 UTC (rev 20664)
+++ branches/Safari-522/WebKit/English.lproj/StringsNotToBeLocalized.txt 2007-04-02 19:37:26 UTC (rev 20665)
</span><span class="lines">@@ -306,7 +306,9 @@
</span><span class="cx"> "canGoBack"
</span><span class="cx"> "canGoForward"
</span><span class="cx"> "com.RealNetworks.RealOne Player"
</span><ins>+"com.adobe.Acrobat"
</ins><span class="cx"> "com.adobe.Acrobat.Pro"
</span><ins>+"com.adobe.Reader"
</ins><span class="cx"> "com.apple.Aperture"
</span><span class="cx"> "com.apple.AppKit"
</span><span class="cx"> "com.apple.HIWebView"
</span></span></pre></div>
<a id="branchesSafari522WebKitMiscWebKitVersionChecksh"></a>
<div class="modfile"><h4>Modified: branches/Safari-522/WebKit/Misc/WebKitVersionChecks.h (20664 => 20665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-522/WebKit/Misc/WebKitVersionChecks.h 2007-04-02 19:33:50 UTC (rev 20664)
+++ branches/Safari-522/WebKit/Misc/WebKitVersionChecks.h 2007-04-02 19:37:26 UTC (rev 20665)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> A version of -1 is returned if the main executable did not link against WebKit (should never happen). */
</span><span class="cx">
</span><span class="cx"> #define WEBKIT_FIRST_VERSION_WITH_3_0_CONTEXT_MENU_TAGS 0x020A0000 // 522.0.0
</span><del>-#define WEBKIT_FIRST_VERSION_WITHOUT_ACROBAT_QUIRK 0x020A0000 // 522.0.0
</del><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><span class="cx"> #define WEBKIT_FIRST_VERSION_WITHOUT_VITALSOURCE_QUIRK 0x020A0000 // 522.0.0
</span></span></pre></div>
<a id="branchesSafari522WebKitWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/Safari-522/WebKit/WebView/WebView.mm (20664 => 20665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-522/WebKit/WebView/WebView.mm 2007-04-02 19:33:50 UTC (rev 20664)
+++ branches/Safari-522/WebKit/WebView/WebView.mm 2007-04-02 19:37:26 UTC (rev 20665)
</span><span class="lines">@@ -860,8 +860,9 @@
</span><span class="cx"> settings->setUserStyleSheetLocation([NSURL URLWithString:(location ? location : @"")]);
</span><span class="cx"> } else
</span><span class="cx"> settings->setUserStyleSheetLocation([NSURL URLWithString:@""]);
</span><del>- settings->setNeedsAcrobatFrameReloadingQuirk(!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITHOUT_ACROBAT_QUIRK)
- && [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.adobe.Acrobat.Pro"]);
</del><ins>+ settings->setNeedsAcrobatFrameReloadingQuirk(WKAppVersionCheckLessThan(@"com.adobe.Acrobat", -1, 9)
+ || WKAppVersionCheckLessThan(@"com.adobe.Acrobat.Pro", -1, 9)
+ || WKAppVersionCheckLessThan(@"com.adobe.Reader", -1, 9));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_preferencesChangedNotification: (NSNotification *)notification
</span></span></pre></div>
<a id="branchesSafari522WebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: branches/Safari-522/WebKitLibraries/ChangeLog (20664 => 20665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-522/WebKitLibraries/ChangeLog 2007-04-02 19:33:50 UTC (rev 20664)
+++ branches/Safari-522/WebKitLibraries/ChangeLog 2007-04-02 19:37:26 UTC (rev 20665)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2007-03-29 Beth Dakin <bdakin@apple.com>
+
+ Rubber-stamped by Adam.
+
+ Keep OpenSource building.
+
+ * WebKitSystemInterface.h:
+ * libWebKitSystemInterface.a:
+
</ins><span class="cx"> 2007-03-07 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix. Rebuild against 10.4 SDK.
</span></span></pre></div>
<a id="branchesSafari522WebKitLibrariesWebKitSystemInterfaceh"></a>
<div class="modfile"><h4>Modified: branches/Safari-522/WebKitLibraries/WebKitSystemInterface.h (20664 => 20665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-522/WebKitLibraries/WebKitSystemInterface.h 2007-04-02 19:33:50 UTC (rev 20664)
+++ branches/Safari-522/WebKitLibraries/WebKitSystemInterface.h 2007-04-02 19:37:26 UTC (rev 20665)
</span><span class="lines">@@ -145,6 +145,8 @@
</span><span class="cx">
</span><span class="cx"> BOOL WKCGContextIsBitmapContext(CGContextRef context);
</span><span class="cx">
</span><ins>+BOOL WKAppVersionCheckLessThan(NSString *, int, double);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchesSafari522WebKitLibrarieslibWebKitSystemInterfacea"></a>
<div class="binary"><h4>Modified: branches/Safari-522/WebKitLibraries/libWebKitSystemInterface.a</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
</div>
</body>
</html>