Commit d97317cc authored by mrowe@apple.com's avatar mrowe@apple.com

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: svn://svn.chromium.org/blink/trunk@54268 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent e0a40164
2010-02-02 Alexey Proskuryakov <ap@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@chromium.org> 2010-02-01 Shinichiro Hamaji <hamaji@chromium.org>
Reviewed by Eric Seidel. Reviewed by Eric Seidel.
......
...@@ -59,6 +59,7 @@ namespace WebKit { ...@@ -59,6 +59,7 @@ namespace WebKit {
element:(PassRefPtr<WebCore::HTMLPlugInElement>)element; element:(PassRefPtr<WebCore::HTMLPlugInElement>)element;
- (void)pluginHostDied; - (void)pluginHostDied;
- (CALayer *)pluginLayer;
- (void)webFrame:(WebFrame *)webFrame didFinishLoadWithReason:(NPReason)reason; - (void)webFrame:(WebFrame *)webFrame didFinishLoadWithReason:(NPReason)reason;
@end @end
......
...@@ -129,6 +129,12 @@ extern "C" { ...@@ -129,6 +129,12 @@ extern "C" {
return YES; 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 - (void)setLayer:(CALayer *)newLayer
{ {
// FIXME: This should use the same implementation as WebNetscapePluginView (and move to the base class). // FIXME: This should use the same implementation as WebNetscapePluginView (and move to the base class).
......
...@@ -151,6 +151,9 @@ typedef union PluginPort { ...@@ -151,6 +151,9 @@ typedef union PluginPort {
@interface WebNetscapePluginView (WebInternal) @interface WebNetscapePluginView (WebInternal)
- (BOOL)sendEvent:(void*)event isDrawRect:(BOOL)eventIsDrawRect; - (BOOL)sendEvent:(void*)event isDrawRect:(BOOL)eventIsDrawRect;
- (NPEventModel)eventModel; - (NPEventModel)eventModel;
#ifndef BUILDING_ON_TIGER
- (CALayer *)pluginLayer;
#endif
- (NPError)loadRequest:(NSURLRequest *)request inTarget:(NSString *)target withNotifyData:(void *)notifyData sendNotification:(BOOL)sendNotification; - (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)getURLNotify:(const char *)URL target:(const char *)target notifyData:(void *)notifyData;
- (NPError)getURL:(const char *)URL target:(const char *)target; - (NPError)getURL:(const char *)URL target:(const char *)target;
......
...@@ -1116,6 +1116,12 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr) ...@@ -1116,6 +1116,12 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
} }
#ifndef BUILDING_ON_TIGER #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 - (void)setLayer:(CALayer *)newLayer
{ {
[super setLayer:newLayer]; [super setLayer:newLayer];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment