[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[mrowe at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 600e756a52ac435d48c0fabd6acb9d00ca452aa3
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 3 03:42:43 2010 +0000

    Roll out r54252.
    
    The method it deleted is in fact used, and its deletion resulted in plug-ins that use accelerated compositing not being drawn.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54268 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 7e572a7..8bbd4de 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,16 +1,3 @@
-2010-02-02  Alexey Proskuryakov  <ap at apple.com>
-
-        Reviewed by Darin Adler.
-
-        https://bugs.webkit.org/show_bug.cgi?id=34502
-        Unused method pluginLayer in Netscape plug-in views
-
-        * Plugins/Hosted/WebHostedNetscapePluginView.h:
-        * Plugins/Hosted/WebHostedNetscapePluginView.mm:
-        * Plugins/WebNetscapePluginView.h:
-        * Plugins/WebNetscapePluginView.mm:
-        Removed the method.
-
 2010-02-01  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.h b/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.h
index ec3edfc..5313ff2 100644
--- a/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.h
+++ b/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.h
@@ -59,6 +59,7 @@ namespace WebKit {
             element:(PassRefPtr<WebCore::HTMLPlugInElement>)element;
 
 - (void)pluginHostDied;
+- (CALayer *)pluginLayer;
 - (void)webFrame:(WebFrame *)webFrame didFinishLoadWithReason:(NPReason)reason;
 
 @end
diff --git a/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm b/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
index a5e5749..9baa328 100644
--- a/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
@@ -129,6 +129,12 @@ extern "C" {
     return YES;
 }
 
+// FIXME: This method is an ideal candidate to move up to the base class
+- (CALayer *)pluginLayer
+{
+    return _pluginLayer.get();
+}
+
 - (void)setLayer:(CALayer *)newLayer
 {
     // FIXME: This should use the same implementation as WebNetscapePluginView (and move to the base class).
diff --git a/WebKit/mac/Plugins/WebNetscapePluginView.h b/WebKit/mac/Plugins/WebNetscapePluginView.h
index 29e2552..2ee566e 100644
--- a/WebKit/mac/Plugins/WebNetscapePluginView.h
+++ b/WebKit/mac/Plugins/WebNetscapePluginView.h
@@ -151,6 +151,9 @@ typedef union PluginPort {
 @interface WebNetscapePluginView (WebInternal)
 - (BOOL)sendEvent:(void*)event isDrawRect:(BOOL)eventIsDrawRect;
 - (NPEventModel)eventModel;
+#ifndef BUILDING_ON_TIGER
+- (CALayer *)pluginLayer;
+#endif
 - (NPError)loadRequest:(NSURLRequest *)request inTarget:(NSString *)target withNotifyData:(void *)notifyData sendNotification:(BOOL)sendNotification;
 - (NPError)getURLNotify:(const char *)URL target:(const char *)target notifyData:(void *)notifyData;
 - (NPError)getURL:(const char *)URL target:(const char *)target;
diff --git a/WebKit/mac/Plugins/WebNetscapePluginView.mm b/WebKit/mac/Plugins/WebNetscapePluginView.mm
index ee3030c..4a4a435 100644
--- a/WebKit/mac/Plugins/WebNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebNetscapePluginView.mm
@@ -1116,6 +1116,12 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
 }
 
 #ifndef BUILDING_ON_TIGER
+// FIXME: This method is an ideal candidate to move up to the base class
+- (CALayer *)pluginLayer
+{
+    return _pluginLayer.get();
+}
+
 - (void)setLayer:(CALayer *)newLayer
 {
     [super setLayer:newLayer];

-- 
WebKit Debian packaging