Changeset 54268 in webkit


Ignore:
Timestamp:
Feb 2, 2010 7:42:43 PM (14 years ago)
Author:
mrowe@apple.com
Message:

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.

Location:
trunk/WebKit/mac
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/mac/ChangeLog

    r54252 r54268  
    1 2010-02-02  Alexey Proskuryakov  <ap@apple.com>
    2 
    3         Reviewed by Darin Adler.
    4 
    5         https://bugs.webkit.org/show_bug.cgi?id=34502
    6         Unused method pluginLayer in Netscape plug-in views
    7 
    8         * Plugins/Hosted/WebHostedNetscapePluginView.h:
    9         * Plugins/Hosted/WebHostedNetscapePluginView.mm:
    10         * Plugins/WebNetscapePluginView.h:
    11         * Plugins/WebNetscapePluginView.mm:
    12         Removed the method.
    13 
    1412010-02-01  Shinichiro Hamaji  <hamaji@chromium.org>
    152
  • trunk/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.h

    r54252 r54268  
    6060
    6161- (void)pluginHostDied;
     62- (CALayer *)pluginLayer;
    6263- (void)webFrame:(WebFrame *)webFrame didFinishLoadWithReason:(NPReason)reason;
    6364
  • trunk/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm

    r54252 r54268  
    130130}
    131131
     132// FIXME: This method is an ideal candidate to move up to the base class
     133- (CALayer *)pluginLayer
     134{
     135    return _pluginLayer.get();
     136}
     137
    132138- (void)setLayer:(CALayer *)newLayer
    133139{
  • trunk/WebKit/mac/Plugins/WebNetscapePluginView.h

    r54252 r54268  
    152152- (BOOL)sendEvent:(void*)event isDrawRect:(BOOL)eventIsDrawRect;
    153153- (NPEventModel)eventModel;
     154#ifndef BUILDING_ON_TIGER
     155- (CALayer *)pluginLayer;
     156#endif
    154157- (NPError)loadRequest:(NSURLRequest *)request inTarget:(NSString *)target withNotifyData:(void *)notifyData sendNotification:(BOOL)sendNotification;
    155158- (NPError)getURLNotify:(const char *)URL target:(const char *)target notifyData:(void *)notifyData;
  • trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm

    r54252 r54268  
    11171117
    11181118#ifndef BUILDING_ON_TIGER
     1119// FIXME: This method is an ideal candidate to move up to the base class
     1120- (CALayer *)pluginLayer
     1121{
     1122    return _pluginLayer.get();
     1123}
     1124
    11191125- (void)setLayer:(CALayer *)newLayer
    11201126{
Note: See TracChangeset for help on using the changeset viewer.