Changeset 96205 in webkit

Timestamp:

Sep 28, 2011 1:28:35 AM (13 years ago)

Author:

aestes@apple.com

Message:

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.

Source/WebCore:

• WebCore.exp.in: Remove applicationIsSolarWalkMac().
• platform/RuntimeApplicationChecks.cpp: Ditto.
• platform/RuntimeApplicationChecks.h: Ditto.

Source/WebKit:

• WebKit.xcodeproj/project.pbxproj: Remove SolarWalkQuirksUserScript.js.

Source/WebKit/mac:

• Misc/SolarWalkQuirksUserScript.js: Removed.
• WebView/WebView.mm: Removed needsSolarWalkQuirksScript(),

leakSolarWalkQuirksUserScriptContents(), and
-[WebView _injectSolarWalkQuirksScript].
(-[WebView _commonInitializationWithFrameName:groupName:]): Do not
inject the Solar Walk quirks script.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/platform/RuntimeApplicationChecks.cpp (modified) (1 diff)
• WebCore/platform/RuntimeApplicationChecks.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebKit.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/Misc/SolarWalkQuirksUserScript.js (deleted)
• WebKit/mac/WebView/WebView.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-27  Andy Estes  <aestes@apple.com>
+
+        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  <timothy_horton@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -622 +622 @@
 __ZN7WebCore25PluginMainThreadScheduler9schedulerEv
 __ZN7WebCore25addLanguageChangeObserverEPvPFvS0_E
-__ZN7WebCore25applicationIsSolarWalkMacEv
 __ZN7WebCore25contextMenuItemTagOutlineEv
 __ZN7WebCore26CSSMutableStyleDeclarationC1Ev

trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp

@@ -103 +103 @@
 }
 
-bool applicationIsSolarWalkMac()
-{
-    static bool isSolarWalk = mainBundleIsEqualTo("com.vitotechnology.SolarWalkMac");
-    return isSolarWalk;
-}
-
 } // namespace WebCore

trunk/Source/WebCore/platform/RuntimeApplicationChecks.h

@@ -37 +37 @@
 bool applicationIsMicrosoftOutlook();
 bool applicationIsSafari();
-bool applicationIsSolarWalkMac();
 
 } // namespace WebCore

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2011-09-27  Andy Estes  <aestes@apple.com>
+
+        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  <abarth@webkit.org>
 

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -333 +333 @@
                 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, ); }; };
@@ -643 +642 @@
                 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>"; };
@@ -927 +925 @@
                         children = (
                                 29AEF95D134C755400FE5096 /* OutlookQuirksUserScript.js */,
-                                B5DB1F17137C62F500A28E7E /* SolarWalkQuirksUserScript.js */,
                                 A864B3E5123ED83D00C2A612 /* MailQuirksUserScript.js */,
                                 1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */,
@@ -1686 +1683 @@
                         buildActionMask = 2147483647;
                         files = (
-                                B5974457137C7342002A18FF /* SolarWalkQuirksUserScript.js in Resources */,
                                 29AEF960134C76FB00FE5096 /* OutlookQuirksUserScript.js in Resources */,
                                 A864B3F6123ED9FA00C2A612 /* MailQuirksUserScript.js in Resources */,

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-09-27  Andy Estes  <aestes@apple.com>
+
+        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  <mhahnenberg@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -666 +666 @@
 }
 
-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
 {
@@ -753 +732 @@
         _private->page->settings()->setShouldInjectUserScriptsInInitialEmptyDocument(true);
         [self _injectOutlookQuirksScript];
-    }
-
-    if (needsSolarWalkQuirksScript()) {
-        _private->page->settings()->setShouldInjectUserScriptsInInitialEmptyDocument(true);
-        [self _injectSolarWalkQuirksScript];
     }