Source/WebCore: Removed an unused setting.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 18 Aug 2011 00:17:19 +0000 (00:17 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 18 Aug 2011 00:17:19 +0000 (00:17 +0000)
Reviewed by Anders Carlsson.

* WebCore.exp.in:
* page/Settings.cpp:
(WebCore::Settings::Settings): Removed initializer for m_needsTigerMailQuirks.
* page/Settings.h: Removed accessors.

Source/WebKit/mac: Removed some code that is not needed when building for Leopard or later.

Reviewed by Anders Carlsson.

* WebCoreSupport/WebContextMenuClient.mm:
(fixMenusToSendToOldClients): Removed check for Tiger Mail.
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::objectContentType):
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]):
(-[WebView _preferencesChanged:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@93268 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/page/Settings.cpp
Source/WebCore/page/Settings.h
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm
Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
Source/WebKit/mac/WebView/WebView.mm

index c9ac98f02e3ecba5330172393659f52e34683e00..ded6d62ec6ffd21a989446f631e08f4fa6cdaa79 100644 (file)
@@ -1,3 +1,14 @@
+2011-08-17  Dan Bernstein  <mitz@apple.com>
+
+        Removed an unused setting.
+
+        Reviewed by Anders Carlsson.
+
+        * WebCore.exp.in:
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings): Removed initializer for m_needsTigerMailQuirks.
+        * page/Settings.h: Removed accessors.
+
 2011-08-17  Oliver Hunt  <oliver@apple.com>
 
         Move towards supporting user controlled prototypes on CanvasPixelArray
index 20d01db71ff5012d03268598500e4a211de234b0..6b2f09901f0caf4eb3283132a391492d4b865318 100644 (file)
@@ -895,7 +895,6 @@ __ZN7WebCore8Settings22setShowsURLsInToolTipsEb
 __ZN7WebCore8Settings23setDefaultFixedFontSizeEi
 __ZN7WebCore8Settings23setEditableLinkBehaviorENS_20EditableLinkBehaviorE
 __ZN7WebCore8Settings23setLoadDeferringEnabledEb
-__ZN7WebCore8Settings23setNeedsTigerMailQuirksEb
 __ZN7WebCore8Settings23setPictographFontFamilyERKN3WTF12AtomicStringE11UScriptCode
 __ZN7WebCore8Settings23setUsesEncodingDetectorEb
 __ZN7WebCore8Settings24setApplicationChromeModeEb
index e8e66513a68870307d6006cf83d14128ecb339b1..e3e02a41f5d6caf653028007584d058911481aa2 100644 (file)
@@ -149,7 +149,6 @@ Settings::Settings(Page* page)
     , m_needsKeyboardEventDisambiguationQuirks(false)
     , m_treatsAnyTextCSSLinkAsStylesheet(false)
     , m_needsLeopardMailQuirks(false)
-    , m_needsTigerMailQuirks(false)
     , m_isDOMPasteAllowed(false)
     , m_shrinksStandaloneImagesToFit(true)
     , m_usesPageCache(false)
@@ -505,11 +504,6 @@ void Settings::setNeedsLeopardMailQuirks(bool needsQuirks)
     m_needsLeopardMailQuirks = needsQuirks;
 }
 
-void Settings::setNeedsTigerMailQuirks(bool needsQuirks)
-{
-    m_needsTigerMailQuirks = needsQuirks;
-}
-    
 void Settings::setDOMPasteAllowed(bool DOMPasteAllowed)
 {
     m_isDOMPasteAllowed = DOMPasteAllowed;
index b4a8d35b33ce398650910d2dfee2292f48d05a5d..5ce64f0ca5e0b495b8c3ecd303fb7a51152c2048 100644 (file)
@@ -220,9 +220,6 @@ namespace WebCore {
         void setNeedsLeopardMailQuirks(bool);
         bool needsLeopardMailQuirks() const { return m_needsLeopardMailQuirks; }
 
-        void setNeedsTigerMailQuirks(bool);
-        bool needsTigerMailQuirks() const { return m_needsTigerMailQuirks; }
-
         void setDOMPasteAllowed(bool);
         bool isDOMPasteAllowed() const { return m_isDOMPasteAllowed; }
         
@@ -521,7 +518,6 @@ namespace WebCore {
         bool m_needsKeyboardEventDisambiguationQuirks : 1;
         bool m_treatsAnyTextCSSLinkAsStylesheet : 1;
         bool m_needsLeopardMailQuirks : 1;
-        bool m_needsTigerMailQuirks : 1;
         bool m_isDOMPasteAllowed : 1;
         bool m_shrinksStandaloneImagesToFit : 1;
         bool m_usesPageCache: 1;
index 278198365dd74b8ba3accd817eea2d0ebc5b0b93..aee657ee4075721405798350f603438421b9057c 100644 (file)
@@ -1,3 +1,17 @@
+2011-08-17  Dan Bernstein  <mitz@apple.com>
+
+        Removed some code that is not needed when building for Leopard or later.
+
+        Reviewed by Anders Carlsson.
+
+        * WebCoreSupport/WebContextMenuClient.mm:
+        (fixMenusToSendToOldClients): Removed check for Tiger Mail.
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::objectContentType):
+        * WebView/WebView.mm:
+        (-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]):
+        (-[WebView _preferencesChanged:]):
+
 2011-08-17  Dan Bernstein  <mitz@apple.com>
 
         Eliminate the WebCGFloat compatibility definition that was needed for Tiger.
index c5a103562d8f07c5793af864c24fd1fd8d532412..bb547c9b7f16eaddd6720dc945063f83f152497f 100644 (file)
@@ -102,21 +102,11 @@ static NSMutableArray *fixMenusToSendToOldClients(NSMutableArray *defaultMenuIte
     if (!preVersion3Client)
         return savedItems;
         
-    BOOL isMail = applicationIsAppleMail();
     for (unsigned i = 0; i < defaultItemsCount; ++i) {
         NSMenuItem *item = [defaultMenuItems objectAtIndex:i];
         int tag = [item tag];
         int oldStyleTag = tag;
-        
-        if (preVersion3Client && isMail && tag == WebMenuItemTagOpenLink) {
-            // Tiger Mail changes our "Open Link in New Window" item to "Open Link"
-            // and doesn't expect us to include an "Open Link" item at all. (5011905)
-            [defaultMenuItems removeObjectAtIndex:i];
-            i--;
-            defaultItemsCount--;
-            continue;
-        }
-        
+
         if (tag >= WEBMENUITEMTAG_WEBKIT_3_0_SPI_START) {
             // Change all editing-related SPI tags listed in WebUIDelegatePrivate.h to WebMenuItemTagOther
             // to match our old WebKit context menu behavior.
index 727c4e6774ee30fc5c1801b7bd16c22c94607b9a..0948406d53d3f71627603466332bfbc6e68f3261 100644 (file)
@@ -1479,12 +1479,6 @@ ObjectContentType WebFrameLoaderClient::objectContentType(const KURL& url, const
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 
-    // This is a quirk that ensures Tiger Mail's WebKit plug-in will load during layout
-    // and not attach time. (5520541)
-    static BOOL isTigerMail = WKAppVersionCheckLessThan(@"com.apple.mail", -1, 3.0);
-    if (isTigerMail && mimeType == "application/x-apple-msg-attachment")
-        return ObjectContentNetscapePlugin;
-
     String type = mimeType;
 
     if (type.isEmpty()) {
index acc18967fe03421e0243d6a8215fcb3f157e1cae..7377a9a9555801d99935dfa261b656fb87a57bcf 100644 (file)
@@ -591,11 +591,6 @@ static bool runningLeopardMail()
     return NO;
 }
 
-static bool runningTigerMail()
-{
-    return NO;    
-}
-
 static bool coreVideoHas7228836Fix()
 {
 #ifdef BUILDING_ON_LEOPARD
@@ -815,7 +810,7 @@ static NSString *leakSolarWalkQuirksUserScriptContents()
     [self _scheduleGlibContextIterations];
 #endif
 
-    if (runningTigerMail() || runningLeopardMail())
+    if (runningLeopardMail())
         [self _injectMailQuirksScript];
 }
 
@@ -1544,7 +1539,6 @@ static bool needsSelfRetainWhileLoadingQuirk()
     settings->setTreatsAnyTextCSSLinkAsStylesheet([self _needsLinkElementTextCSSQuirk]);
     settings->setNeedsKeyboardEventDisambiguationQuirks([self _needsKeyboardEventDisambiguationQuirks]);
     settings->setNeedsLeopardMailQuirks(runningLeopardMail());
-    settings->setNeedsTigerMailQuirks(runningTigerMail());
     settings->setNeedsSiteSpecificQuirks(_private->useSiteSpecificSpoofing);
     settings->setWebArchiveDebugModeEnabled([preferences webArchiveDebugModeEnabled]);
     settings->setLocalFileContentSniffingEnabled([preferences localFileContentSniffingEnabled]);
@@ -4574,13 +4568,6 @@ static BOOL findString(NSView <WebDocumentSearching> *searchView, NSString *stri
     // this will cause observers to call mainFrameDocument where this flag will be checked
 }
 
-// This method name is used by Mail on Tiger (but not post-Tiger), so we shouldn't delete it 
-// until the day comes when we're no longer supporting Mail on Tiger.
-- (WebFrame *)_frameForCurrentSelection
-{
-    return [self _selectedOrMainFrame];
-}
-
 - (void)setTabKeyCyclesThroughElements:(BOOL)cyclesElements
 {
     _private->tabKeyCyclesThroughElementsChanged = YES;