[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 054b5e3a12631e1fc689ed4d29a1645a4dfbd405
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 18 04:53:26 2010 +0000

    2010-01-17  Kent Tamura  <tkent at chromium.org>
    
            Reviewed by Shinichiro Hamaji.
    
            [Chromium] Remove an old runFileChooser() method.
            https://bugs.webkit.org/show_bug.cgi?id=33778
    
            Chromium code switched to new runFileChooser() introduced by
            r53269. The old one is not needed anymore.
    
            * public/WebViewClient.h:
            * src/ChromeClientImpl.cpp:
            (WebKit::ChromeClientImpl::runOpenPanel):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53389 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 7d77941..61a6456 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-17  Kent Tamura  <tkent at chromium.org>
+
+        Reviewed by Shinichiro Hamaji.
+
+        [Chromium] Remove an old runFileChooser() method.
+        https://bugs.webkit.org/show_bug.cgi?id=33778
+        
+        Chromium code switched to new runFileChooser() introduced by
+        r53269. The old one is not needed anymore.
+
+        * public/WebViewClient.h:
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::runOpenPanel):
+
 2010-01-15  Eric Seidel  <eric at webkit.org>
 
         No review, rolling out r53344.
diff --git a/WebKit/chromium/public/WebViewClient.h b/WebKit/chromium/public/WebViewClient.h
index 16a2fca..98db4b2 100644
--- a/WebKit/chromium/public/WebViewClient.h
+++ b/WebKit/chromium/public/WebViewClient.h
@@ -161,11 +161,6 @@ public:
 
     // Dialogs -------------------------------------------------------------
 
-    // Deprecated. Use another runFileChooser() below instead.
-    virtual bool runFileChooser(
-        bool multiSelect, const WebString& title,
-        const WebString& initialValue, WebFileChooserCompletion*) { return false; }
-
     // This method returns immediately after showing the dialog. When the
     // dialog is closed, it should call the WebFileChooserCompletion to
     // pass the results of the dialog. Returns false if
diff --git a/WebKit/chromium/src/ChromeClientImpl.cpp b/WebKit/chromium/src/ChromeClientImpl.cpp
index 7552997..9079094 100644
--- a/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -572,14 +572,7 @@ void ChromeClientImpl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileCh
     if (client->runFileChooser(params, chooserCompletion))
         return;
 
-    // Choosing with new function failed, so fallback to old function.
-    if (client->runFileChooser(params.multiSelect,
-                               params.title,
-                               params.initialValue,
-                               chooserCompletion))
-        return;
-
-    // Choosing with the old function failed, so do callback with an empty list.
+    // Choosing failed, so do callback with an empty list.
     chooserCompletion->didChooseFile(WebVector<WebString>());
 }
 

-- 
WebKit Debian packaging