[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

jochen at chromium.org jochen at chromium.org
Sun Feb 20 23:02:25 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit e8ce9c954b15cb3385d85743275955f91a011343
Author: jochen at chromium.org <jochen at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 15 09:33:09 2011 +0000

    2011-01-15  Jochen Eisinger  <jochen at chromium.org>
    
            Reviewed by David Levin.
    
            [chromium] remove obsolete createView method
            https://bugs.webkit.org/show_bug.cgi?id=52437
    
            * DumpRenderTree/chromium/WebViewHost.cpp:
            (WebViewHost::createView):
            * DumpRenderTree/chromium/WebViewHost.h:
    2011-01-15  Jochen Eisinger  <jochen at chromium.org>
    
            Reviewed by David Levin.
    
            [chromium] remove obsolete createView method
            https://bugs.webkit.org/show_bug.cgi?id=52437
    
            * public/WebViewClient.h:
            (WebKit::WebViewClient::createView):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75875 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 0ee5208..f6a6d2d 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-15  Jochen Eisinger  <jochen at chromium.org>
+
+        Reviewed by David Levin.
+
+        [chromium] remove obsolete createView method
+        https://bugs.webkit.org/show_bug.cgi?id=52437
+
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::createView):
+        * DumpRenderTree/chromium/WebViewHost.h:
+
 2011-01-14  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by Geoff Garen.
diff --git a/Tools/DumpRenderTree/chromium/WebViewHost.cpp b/Tools/DumpRenderTree/chromium/WebViewHost.cpp
index f5dd7fd..62df390 100644
--- a/Tools/DumpRenderTree/chromium/WebViewHost.cpp
+++ b/Tools/DumpRenderTree/chromium/WebViewHost.cpp
@@ -227,7 +227,7 @@ static string textAffinityDescription(WebTextAffinity affinity)
 
 // WebViewClient -------------------------------------------------------------
 
-WebView* WebViewHost::createView(WebFrame*, const WebWindowFeatures&, const WebString&)
+WebView* WebViewHost::createView(WebFrame*, const WebURLRequest&, const WebWindowFeatures&, const WebString&)
 {
     if (!layoutTestController()->canOpenWindows())
         return 0;
diff --git a/Tools/DumpRenderTree/chromium/WebViewHost.h b/Tools/DumpRenderTree/chromium/WebViewHost.h
index 86c23a5..0a36aec 100644
--- a/Tools/DumpRenderTree/chromium/WebViewHost.h
+++ b/Tools/DumpRenderTree/chromium/WebViewHost.h
@@ -104,7 +104,7 @@ class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient,
     virtual bool navigate(const TestNavigationEntry&, bool reload);
 
     // WebKit::WebViewClient
-    virtual WebKit::WebView* createView(WebKit::WebFrame*, const WebKit::WebWindowFeatures&, const WebKit::WebString&);
+    virtual WebKit::WebView* createView(WebKit::WebFrame*, const WebKit::WebURLRequest&, const WebKit::WebWindowFeatures&, const WebKit::WebString&);
     virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType);
     virtual WebKit::WebWidget* createPopupMenu(const WebKit::WebPopupMenuInfo&);
     virtual WebKit::WebStorageNamespace* createSessionStorageNamespace(unsigned quota);
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index c0cd169..efd15a9 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-15  Jochen Eisinger  <jochen at chromium.org>
+
+        Reviewed by David Levin.
+
+        [chromium] remove obsolete createView method
+        https://bugs.webkit.org/show_bug.cgi?id=52437
+
+        * public/WebViewClient.h:
+        (WebKit::WebViewClient::createView):
+
 2011-01-14  Xiyuan Xia  <xiyuan at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebViewClient.h b/WebKit/chromium/public/WebViewClient.h
index a3ad9b4..08fb942 100644
--- a/WebKit/chromium/public/WebViewClient.h
+++ b/WebKit/chromium/public/WebViewClient.h
@@ -83,25 +83,13 @@ public:
     // Create a new related WebView.  This method must clone its session storage
     // so any subsequent calls to createSessionStorageNamespace conform to the
     // WebStorage specification.
-    // FIXME: This method is DEPRECATED and should be removed once the new
-    // createView() (the next method) is implemented at Chromium side.
-    virtual WebView* createView(WebFrame* creator,
-                                const WebWindowFeatures& features,
-                                const WebString& name) { return 0; }
-
-    // Create a new related WebView.  This method must clone its session storage
-    // so any subsequent calls to createSessionStorageNamespace conform to the
-    // WebStorage specification.
     // The request parameter is only for the client to check if the request
     // could be fulfilled.  The client should not load the request.
     virtual WebView* createView(WebFrame* creator,
                                 const WebURLRequest& request,
                                 const WebWindowFeatures& features,
                                 const WebString& name) {
-        // FIXME: This is a temporary default implementation which calls the old
-        // version of createView(). Should change to 'return 0' when the old one
-        // is removed.
-        return createView(creator, features, name); 
+        return 0;
     }
 
     // Create a new WebPopupMenu.  In the second form, the client is

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list