Diff
Modified: trunk/Source/WebCore/ChangeLog (96204 => 96205)
--- trunk/Source/WebCore/ChangeLog 2011-09-28 08:21:05 UTC (rev 96204)
+++ trunk/Source/WebCore/ChangeLog 2011-09-28 08:28:35 UTC (rev 96205)
@@ -1,3 +1,20 @@
+2011-09-27 Andy Estes <[email protected]>
+
+ WebKitLinkedOnOrAfter() check is ineffective for Solar Walk app-specific hack.
+ https://bugs.webkit.org/show_bug.cgi?id=68863
+
+ Reviewed by Darin Adler.
+
+ The SolarWalk binary does not link against WebKit.framework directly,
+ so calling NSVersionOfLinkTimeLibrary() will not return the version of
+ WebKit against which SolarWalk was linked. Since Solar Walk has
+ released an update that addresses the issue for which this app-specific
+ hack was originally added, we should just remove the hack.
+
+ * WebCore.exp.in: Remove applicationIsSolarWalkMac().
+ * platform/RuntimeApplicationChecks.cpp: Ditto.
+ * platform/RuntimeApplicationChecks.h: Ditto.
+
2011-09-28 Tim Horton <[email protected]>
Fix potential SVG performance regression (over-invalidation of caches) from 96052
Modified: trunk/Source/WebCore/WebCore.exp.in (96204 => 96205)
--- trunk/Source/WebCore/WebCore.exp.in 2011-09-28 08:21:05 UTC (rev 96204)
+++ trunk/Source/WebCore/WebCore.exp.in 2011-09-28 08:28:35 UTC (rev 96205)
@@ -621,7 +621,6 @@
__ZN7WebCore25PluginMainThreadScheduler16unregisterPluginEP4_NPP
__ZN7WebCore25PluginMainThreadScheduler9schedulerEv
__ZN7WebCore25addLanguageChangeObserverEPvPFvS0_E
-__ZN7WebCore25applicationIsSolarWalkMacEv
__ZN7WebCore25contextMenuItemTagOutlineEv
__ZN7WebCore26CSSMutableStyleDeclarationC1Ev
__ZN7WebCore26UserTypingGestureIndicator27processingUserTypingGestureEv
Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp (96204 => 96205)
--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp 2011-09-28 08:21:05 UTC (rev 96204)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp 2011-09-28 08:28:35 UTC (rev 96205)
@@ -102,10 +102,4 @@
return isAperture;
}
-bool applicationIsSolarWalkMac()
-{
- static bool isSolarWalk = mainBundleIsEqualTo("com.vitotechnology.SolarWalkMac");
- return isSolarWalk;
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.h (96204 => 96205)
--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.h 2011-09-28 08:21:05 UTC (rev 96204)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.h 2011-09-28 08:28:35 UTC (rev 96205)
@@ -36,7 +36,6 @@
bool applicationIsMicrosoftMyDay();
bool applicationIsMicrosoftOutlook();
bool applicationIsSafari();
-bool applicationIsSolarWalkMac();
} // namespace WebCore
Modified: trunk/Source/WebKit/ChangeLog (96204 => 96205)
--- trunk/Source/WebKit/ChangeLog 2011-09-28 08:21:05 UTC (rev 96204)
+++ trunk/Source/WebKit/ChangeLog 2011-09-28 08:28:35 UTC (rev 96205)
@@ -1,3 +1,18 @@
+2011-09-27 Andy Estes <[email protected]>
+
+ WebKitLinkedOnOrAfter() check is ineffective for Solar Walk app-specific hack.
+ https://bugs.webkit.org/show_bug.cgi?id=68863
+
+ Reviewed by Darin Adler.
+
+ The SolarWalk binary does not link against WebKit.framework directly,
+ so calling NSVersionOfLinkTimeLibrary() will not return the version of
+ WebKit against which SolarWalk was linked. Since Solar Walk has
+ released an update that addresses the issue for which this app-specific
+ hack was originally added, we should just remove the hack.
+
+ * WebKit.xcodeproj/project.pbxproj: Remove SolarWalkQuirksUserScript.js.
+
2011-09-25 Adam Barth <[email protected]>
Remove PLATFORM(HAIKU) and associated code
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (96204 => 96205)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2011-09-28 08:21:05 UTC (rev 96204)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2011-09-28 08:28:35 UTC (rev 96205)
@@ -332,7 +332,6 @@
A864B3F6123ED9FA00C2A612 /* MailQuirksUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = A864B3E5123ED83D00C2A612 /* MailQuirksUserScript.js */; };
AB9FBBBB0F8582B0006ADC43 /* WebDOMOperationsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = AB9FBBBA0F8582B0006ADC43 /* WebDOMOperationsInternal.h */; };
ABDDF20D08EB0DDC001E1241 /* WebDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDDF20C08EB0DDC001E1241 /* WebDownloadInternal.h */; };
- B5974457137C7342002A18FF /* SolarWalkQuirksUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = B5DB1F17137C62F500A28E7E /* SolarWalkQuirksUserScript.js */; };
B6CE5C24100BC5CE00219936 /* WebApplicationCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = B68049720FFBCEC1009F7F62 /* WebApplicationCache.mm */; };
B6CE5C25100BC5F500219936 /* WebApplicationCache.h in Headers */ = {isa = PBXBuildFile; fileRef = B68049710FFBCEC1009F7F62 /* WebApplicationCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
B804176F1217A83100466BAE /* WebInspectorFrontend.h in Headers */ = {isa = PBXBuildFile; fileRef = B804176D1217A83100466BAE /* WebInspectorFrontend.h */; };
@@ -642,7 +641,6 @@
A864B3E5123ED83D00C2A612 /* MailQuirksUserScript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = MailQuirksUserScript.js; sourceTree = "<group>"; };
AB9FBBBA0F8582B0006ADC43 /* WebDOMOperationsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDOMOperationsInternal.h; sourceTree = "<group>"; };
ABDDF20C08EB0DDC001E1241 /* WebDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDownloadInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- B5DB1F17137C62F500A28E7E /* SolarWalkQuirksUserScript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = SolarWalkQuirksUserScript.js; sourceTree = "<group>"; };
B68049710FFBCEC1009F7F62 /* WebApplicationCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebApplicationCache.h; sourceTree = "<group>"; };
B68049720FFBCEC1009F7F62 /* WebApplicationCache.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebApplicationCache.mm; sourceTree = "<group>"; };
B804176D1217A83100466BAE /* WebInspectorFrontend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebInspectorFrontend.h; sourceTree = "<group>"; };
@@ -926,7 +924,6 @@
isa = PBXGroup;
children = (
29AEF95D134C755400FE5096 /* OutlookQuirksUserScript.js */,
- B5DB1F17137C62F500A28E7E /* SolarWalkQuirksUserScript.js */,
A864B3E5123ED83D00C2A612 /* MailQuirksUserScript.js */,
1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */,
5DE92FEE0BD7017E0059A5FD /* WebAssertions.h */,
@@ -1685,7 +1682,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- B5974457137C7342002A18FF /* SolarWalkQuirksUserScript.js in Resources */,
29AEF960134C76FB00FE5096 /* OutlookQuirksUserScript.js in Resources */,
A864B3F6123ED9FA00C2A612 /* MailQuirksUserScript.js in Resources */,
939810BA0824BF01008DF038 /* IDNScriptWhiteList.txt in Resources */,
Modified: trunk/Source/WebKit/mac/ChangeLog (96204 => 96205)
--- trunk/Source/WebKit/mac/ChangeLog 2011-09-28 08:21:05 UTC (rev 96204)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-09-28 08:28:35 UTC (rev 96205)
@@ -1,3 +1,23 @@
+2011-09-27 Andy Estes <[email protected]>
+
+ WebKitLinkedOnOrAfter() check is ineffective for Solar Walk app-specific hack.
+ https://bugs.webkit.org/show_bug.cgi?id=68863
+
+ Reviewed by Darin Adler.
+
+ The SolarWalk binary does not link against WebKit.framework directly,
+ so calling NSVersionOfLinkTimeLibrary() will not return the version of
+ WebKit against which SolarWalk was linked. Since Solar Walk has
+ released an update that addresses the issue for which this app-specific
+ hack was originally added, we should just remove the hack.
+
+ * Misc/SolarWalkQuirksUserScript.js: Removed.
+ * WebView/WebView.mm: Removed needsSolarWalkQuirksScript(),
+ leakSolarWalkQuirksUserScriptContents(), and
+ -[WebView _injectSolarWalkQuirksScript].
+ (-[WebView _commonInitializationWithFrameName:groupName:]): Do not
+ inject the Solar Walk quirks script.
+
2011-09-27 Mark Hahnenberg <[email protected]>
Add static version of JSCell::getCallData
Deleted: trunk/Source/WebKit/mac/Misc/SolarWalkQuirksUserScript.js (96204 => 96205)
--- trunk/Source/WebKit/mac/Misc/SolarWalkQuirksUserScript.js 2011-09-28 08:21:05 UTC (rev 96204)
+++ trunk/Source/WebKit/mac/Misc/SolarWalkQuirksUserScript.js 2011-09-28 08:28:35 UTC (rev 96205)
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2011 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * 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 APPLE INC. OR ITS 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.
- */
-(function() {
-
- function reparseTitle()
- {
- // Solar Walk uses a self closing title tag, so to match the behavior of the old parser,
- // we write the contents of the title element to the end of the document so it can be re-parsed.
- document.write(document.documentElement.outerHTML + document.title);
-
- // Remove <title> since SolarWalk intended it to be empty.
- document.head.removeChild(document.title);
- }
-
- addEventListener("load", reparseTitle, false);
-
-})();
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (96204 => 96205)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2011-09-28 08:21:05 UTC (rev 96204)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2011-09-28 08:28:35 UTC (rev 96205)
@@ -665,27 +665,6 @@
outlookQuirksScriptContents, KURL(), nullptr, nullptr, InjectAtDocumentEnd, InjectInAllFrames);
}
-static bool needsSolarWalkQuirksScript()
-{
- static bool isSolarWalkNeedingQuirksScript = !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_HTML5_PARSER)
- && applicationIsSolarWalkMac();
- return isSolarWalkNeedingQuirksScript;
-}
-
-static NSString *leakSolarWalkQuirksUserScriptContents()
-{
- NSString *scriptPath = [[NSBundle bundleForClass:[WebView class]] pathForResource:@"SolarWalkQuirksUserScript" ofType:@"js"];
- NSStringEncoding encoding;
- return [[NSString alloc] initWithContentsOfFile:scriptPath usedEncoding:&encoding error:0];
-}
-
--(void)_injectSolarWalkQuirksScript
-{
- static NSString *solarWalkQuirksScriptContents = leakSolarWalkQuirksUserScriptContents();
- core(self)->group().addUserScriptToWorld(core([WebScriptWorld world]),
- solarWalkQuirksScriptContents, KURL(), nullptr, nullptr, InjectAtDocumentEnd, InjectInAllFrames);
-}
-
- (void)_commonInitializationWithFrameName:(NSString *)frameName groupName:(NSString *)groupName
{
WebCoreThreadViolationCheckRoundTwo();
@@ -754,11 +733,6 @@
[self _injectOutlookQuirksScript];
}
- if (needsSolarWalkQuirksScript()) {
- _private->page->settings()->setShouldInjectUserScriptsInInitialEmptyDocument(true);
- [self _injectSolarWalkQuirksScript];
- }
-
[WebFrame _createMainFrameWithPage:_private->page frameName:frameName frameView:frameView];
NSRunLoop *runLoop = [NSRunLoop mainRunLoop];
