Remove code bracketed by REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM as we are no longer intere...

Reviewed by Dan Bernstein.

* WebKit.xcodeproj/project.pbxproj: Don't define REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM as it is no longer used.
* mac/WebView/WebView.mm:
(+[WebView initialize]):

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 88c1a7df1cbac56ec01e7d32d7fde03a832e77c0..b29cb32d9f835306045fa889f37bd0f8f31b73a4 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-20  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Remove code bracketed by REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM as we are no longer
+        interested in supporting Safari 2 with TOT WebKit.
+
+        * WebKit.xcodeproj/project.pbxproj: Don't define REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM
+        as it is no longer used. 
+
 2008-01-03  Darin Adler  <darin@apple.com>
 
         - fix Safari build

diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj
index 3476ba17f40c1de0aac4b78807078fba5007e0e3..22af9bbf77ee7b48ac8d0ae5fb7b968668de297e 100644 (file)
--- a/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -1664,7 +1664,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
                        buildSettings = {
-                               DEBUG_DEFINES = "DISABLE_THREAD_CHECK ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM";
+                               DEBUG_DEFINES = "DISABLE_THREAD_CHECK ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH";
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders";
                                OTHER_LDFLAGS = (
@@ -1679,7 +1679,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
                        buildSettings = {
-                               DEBUG_DEFINES = "NDEBUG ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM";
+                               DEBUG_DEFINES = "NDEBUG ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH";
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders";
                                OTHER_LDFLAGS = (

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 37ec0e62a38c5b84f73a954dc62ce0ad461ddd3e..c5948d72cd812c0eadb5c5dc83129d3b80be24c0 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-20  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Remove code bracketed by REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM as we are no longer
+        interested in supporting Safari 2 with TOT WebKit.
+
+        * WebView/WebView.mm:
+        (+[WebView initialize]):
+
 2008-01-17  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Adam Roben.

diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index aa85059ad92b6fff96197ea69c008d9c996ca81d..dd204299123986888e2bf8942152c58d5a475998 100644 (file)
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -1678,13 +1678,6 @@ WebFrameLoadDelegateImplementationCache* WebViewGetFrameLoadDelegateImplementati
         return;
     initialized = YES;
 
-#ifdef REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM
-    // This prevents open source users from crashing when using the Show DOM Tree menu item in Safari 2.
-    // FIXME: remove this when we no longer need to support Safari 2.
-    if ([[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.Safari"] && [[NSUserDefaults standardUserDefaults] boolForKey:@"IncludeDebugMenu"])
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_finishedLaunching) name:NSApplicationDidFinishLaunchingNotification object:NSApp];
-#endif
-
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationWillTerminate) name:NSApplicationWillTerminateNotification object:NSApp];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_preferencesChangedNotification:) name:WebPreferencesChangedNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_preferencesRemovedNotification:) name:WebPreferencesRemovedNotification object:nil];
@@ -1697,24 +1690,6 @@ WebFrameLoadDelegateImplementationCache* WebViewGetFrameLoadDelegateImplementati
         [WebPluginDatabase closeSharedDatabase];
 }
 
-#ifdef REMOVE_SAFARI_DOM_TREE_DEBUG_ITEM
-// FIXME: remove this when it is no longer needed to prevent Safari from crashing
-+ (void)_finishedLaunching
-{
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_removeDOMTreeMenuItem:) name:NSMenuDidAddItemNotification object:[NSApp mainMenu]];
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSApplicationDidFinishLaunchingNotification object:NSApp];
-}
-
-+(void)_removeDOMTreeMenuItem:(NSNotification *)notification
-{
-    NSMenu *debugMenu = [[[[NSApp mainMenu] itemArray] lastObject] submenu];
-    NSMenuItem *domTree = [debugMenu itemWithTitle:@"Show DOM Tree"];
-    if (domTree)
-        [debugMenu removeItem:domTree];
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSMenuDidAddItemNotification object:[NSApp mainMenu]];
-}
-#endif
-
 + (BOOL)canShowMIMEType:(NSString *)MIMEType
 {
     return [self _viewClass:nil andRepresentationClass:nil forMIMEType:MIMEType];