WebCore:

        Reviewed by Darin.

        removed recently-added PreferredType concept; we found a better way to do what
        ths was accomplishing

        * bridge/WindowFeatures.h:
        (WebCore::WindowFeatures::WindowFeatures):
        removed definition of PreferredType

        * page/ContextMenuController.cpp:
        (WebCore::openNewWindow):
        removed use of PreferredType

WebKit/mac:

        Reviewed by Darin.

        removed recently-added PreferredType concept; we found a better way to do what
        ths was accomplishing

        * WebCoreSupport/WebChromeClient.mm:
        (WebChromeClient::createWindow):
        removed use of PreferredType

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e0ab48739a737a02f9ad904824a59fb2b54d6d58..f5b4f53e033634d9855efa3cde735dbfec560611 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2007-11-13  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Darin.
+
+        removed recently-added PreferredType concept; we found a better way to do what
+        ths was accomplishing
+
+        * bridge/WindowFeatures.h:
+        (WebCore::WindowFeatures::WindowFeatures):
+        removed definition of PreferredType
+                        
+        * page/ContextMenuController.cpp:
+        (WebCore::openNewWindow):
+        removed use of PreferredType
+
 2007-11-12  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Darin.

diff --git a/WebCore/bridge/WindowFeatures.h b/WebCore/bridge/WindowFeatures.h
index 39ab178a3481d8818395933266e65c8510a589f2..ee4d8ee6d48bbebaf109e15aff8912b1c970b95f 100644 (file)
--- a/WebCore/bridge/WindowFeatures.h
+++ b/WebCore/bridge/WindowFeatures.h
@@ -29,17 +29,11 @@
 namespace WebCore {
 
 struct WindowFeatures {
-    typedef enum {
-        PreferUnspecified,
-        PreferNewWindow,
-        PreferNewTab
-    } PreferredType;
-    
     WindowFeatures()
         : xSet(false), ySet(false), widthSet(false), heightSet(false),
           menuBarVisible(true), statusBarVisible(true), toolBarVisible(true),
           locationBarVisible(true), scrollbarsVisible(true), resizable(true),
-          fullscreen(false), dialog(false), preferredType(PreferUnspecified)
+          fullscreen(false), dialog(false)
     {}
 
     float x;
@@ -60,7 +54,6 @@ struct WindowFeatures {
 
     bool fullscreen;
     bool dialog;
-    PreferredType preferredType;
 };
 
 } // namespace WebCore

diff --git a/WebCore/page/ContextMenuController.cpp b/WebCore/page/ContextMenuController.cpp
index 228c2a3911714a09f8d7843e485868e5f1a66ca9..19216ae5cbb00edbb1629f48e2735470998084f8 100644 (file)
--- a/WebCore/page/ContextMenuController.cpp
+++ b/WebCore/page/ContextMenuController.cpp
@@ -110,7 +110,6 @@ static void openNewWindow(const KURL& urlToLoad, Frame* frame)
 {
     if (Page* oldPage = frame->page()) {
         WindowFeatures features;
-        features.preferredType = WindowFeatures::PreferNewWindow;
         if (Page* newPage = oldPage->chrome()->createWindow(frame,
                 FrameLoadRequest(ResourceRequest(urlToLoad, frame->loader()->outgoingReferrer())), features))
             newPage->chrome()->show();

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index f2b97fe5190334783e3a0662e9dbe9a93bf61039..89442d577e13ecd3a47c5e901d6af251871dcd14 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-13  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Darin.
+
+        removed recently-added PreferredType concept; we found a better way to do what
+        ths was accomplishing
+
+        * WebCoreSupport/WebChromeClient.mm:
+        (WebChromeClient::createWindow):
+        removed use of PreferredType
+
 2007-11-13  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Dan Bernstein.

diff --git a/WebKit/mac/WebCoreSupport/WebChromeClient.mm b/WebKit/mac/WebCoreSupport/WebChromeClient.mm
index 983207edf079b1d48cd3790e74cbc5a489ae0704..cc09eaab382bf5c4ce056655e1198a1134c9d410 100644 (file)
--- a/WebKit/mac/WebCoreSupport/WebChromeClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebChromeClient.mm
@@ -173,19 +173,6 @@ Page* WebChromeClient::createWindow(Frame* frame, const FrameLoadRequest& reques
         if (height)
             [dictFeatures setObject:height forKey:@"height"];
         
-        switch (features.preferredType) {
-            case WindowFeatures::PreferNewWindow:
-                [dictFeatures setObject:@"window" forKey:@"preferredType"];
-                break;
-            case WindowFeatures::PreferNewTab:
-                [dictFeatures setObject:@"tab" forKey:@"preferredType"];
-                break;
-            case WindowFeatures::PreferUnspecified:
-                break;
-            default:
-                ASSERT_NOT_REACHED();
-        }
-                    
         newWebView = CallUIDelegate(m_webView, @selector(webView:createWebViewWithRequest:windowFeatures:), URLRequest, dictFeatures);
         
         [dictFeatures release];