Title: [95575] trunk/Source/WebKit/chromium
Revision
95575
Author
[email protected]
Date
2011-09-20 15:37:58 -0700 (Tue, 20 Sep 2011)

Log Message

[chromium] remove obsolete WebPermissionClient::allowImages method
https://bugs.webkit.org/show_bug.cgi?id=68380

Reviewed by Darin Fisher.

* DEPS:
* public/WebPermissionClient.h:
(WebKit::WebPermissionClient::allowImage):

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (95574 => 95575)


--- trunk/Source/WebKit/chromium/ChangeLog	2011-09-20 22:33:48 UTC (rev 95574)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-09-20 22:37:58 UTC (rev 95575)
@@ -1,3 +1,14 @@
+2011-09-20  Jochen Eisinger  <[email protected]>
+
+        [chromium] remove obsolete WebPermissionClient::allowImages method
+        https://bugs.webkit.org/show_bug.cgi?id=68380
+
+        Reviewed by Darin Fisher.
+
+        * DEPS:
+        * public/WebPermissionClient.h:
+        (WebKit::WebPermissionClient::allowImage):
+
 2011-09-20  Aaron Boodman  <[email protected]>
 
         Rework script context creation/release notifications

Modified: trunk/Source/WebKit/chromium/DEPS (95574 => 95575)


--- trunk/Source/WebKit/chromium/DEPS	2011-09-20 22:33:48 UTC (rev 95574)
+++ trunk/Source/WebKit/chromium/DEPS	2011-09-20 22:37:58 UTC (rev 95575)
@@ -32,7 +32,7 @@
 
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '101494'
+  'chromium_rev': '101722'
 }
 
 deps = {

Modified: trunk/Source/WebKit/chromium/public/WebPermissionClient.h (95574 => 95575)


--- trunk/Source/WebKit/chromium/public/WebPermissionClient.h	2011-09-20 22:33:48 UTC (rev 95574)
+++ trunk/Source/WebKit/chromium/public/WebPermissionClient.h	2011-09-20 22:37:58 UTC (rev 95575)
@@ -47,9 +47,7 @@
     virtual bool allowFileSystem(WebFrame*) { return true; }
 
     // Controls whether images are allowed for this frame.
-    virtual bool allowImage(WebFrame* frame, bool enabledPerSettings, const WebURL& imageURL) { return allowImages(frame, enabledPerSettings); }
-    // FIXME: remove once chromium side has landed.
-    virtual bool allowImages(WebFrame*, bool enabledPerSettings) { return enabledPerSettings; }
+    virtual bool allowImage(WebFrame* frame, bool enabledPerSettings, const WebURL& imageURL) { return enabledPerSettings; }
 
     // Controls whether access to Indexed DB are allowed for this frame.
     virtual bool allowIndexedDB(WebFrame*, const WebString& name, const WebSecurityOrigin&) { return true; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to