Reviewed by Tim Hatcher.

        Second part of the fix for <rdar://problem/6352982>

        * Plugins/WebBaseNetscapePluginView.h: Make this class conform to WebPluginContainerCheckController
        * Plugins/WebBaseNetscapePluginView.mm: Likewise.
        (-[WebBaseNetscapePluginView _webPluginContainerCancelCheckIfAllowedToLoadRequest:]): Added skeleton method.
        * Plugins/WebPluginContainerCheck.h: Added protocol for <WebPluginContainerCheckController>
        * Plugins/WebPluginContainerCheck.mm:
        (-[WebPluginContainerCheck initWithRequest:target:resultObject:selector:controller:]):
        * Plugins/WebPluginController.h: Make this class conform to WebPluginContainerCheckController



git-svn-id: svn://svn.chromium.org/blink/trunk@42786 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebKit/mac/ChangeLog

+2009-04-23  Kevin Decker  <kdecker@apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        Second part of the fix for <rdar://problem/6352982>
+
+        * Plugins/WebBaseNetscapePluginView.h: Make this class conform to WebPluginContainerCheckController
+        * Plugins/WebBaseNetscapePluginView.mm: Likewise.
+        (-[WebBaseNetscapePluginView _webPluginContainerCancelCheckIfAllowedToLoadRequest:]): Added skeleton method.
+        * Plugins/WebPluginContainerCheck.h: Added protocol for <WebPluginContainerCheckController>
+        * Plugins/WebPluginContainerCheck.mm:
+        (-[WebPluginContainerCheck initWithRequest:target:resultObject:selector:controller:]):
+        * Plugins/WebPluginController.h: Make this class conform to WebPluginContainerCheckController
+
 2009-04-23  Kevin Decker  <kdecker@apple.com>
 
         Reviewed by Anders Carlsson.

third_party/WebKit/WebKit/mac/Plugins/WebBaseNetscapePluginView.h

@@ -30,7 +30,7 @@
 #import <Cocoa/Cocoa.h>
 
 #import "WebNetscapePluginPackage.h"
-
+#import "WebPluginContainerCheck.h"
 #import <wtf/PassRefPtr.h>
 #import <wtf/RefPtr.h>
 #import <wtf/RetainPtr.h>
@@ -44,7 +44,7 @@ namespace WebCore {
     class HTMLPlugInElement;
 }
 
-@interface WebBaseNetscapePluginView : NSView
+@interface WebBaseNetscapePluginView : NSView <WebPluginContainerCheckController>
 {
     RetainPtr<WebNetscapePluginPackage> _pluginPackage;
     

third_party/WebKit/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm

@@ -733,6 +733,11 @@ using namespace WebCore;
 {
     // Not yet implemented
 }
+   
+- (void)_webPluginContainerCancelCheckIfAllowedToLoadRequest:(id)checkIdentifier
+{
+  // Not yet implemented   
+}
 
 @end
 

third_party/WebKit/WebKit/mac/Plugins/WebPluginContainerCheck.h

@@ -30,23 +30,30 @@
 
 @class NSURLRequest;
 @class NSString;
-@class WebPluginController;
+@class WebFrame;
+@class WebView;
 @class WebPolicyDecisionListener;
 
+@protocol WebPluginContainerCheckController <NSObject>
+- (void)_webPluginContainerCancelCheckIfAllowedToLoadRequest:(id)checkIdentifier;
+- (WebFrame *)webFrame;
+- (WebView *)webView;
+@end
+
 @interface WebPluginContainerCheck : NSObject
 {
     NSURLRequest *_request;
     NSString *_target;
-    WebPluginController *_controller;
+    id <WebPluginContainerCheckController> _controller;
     id _resultObject;
     SEL _resultSelector;
     BOOL _done;
     WebPolicyDecisionListener *_listener;
 }
 
-+ (id)checkWithRequest:(NSURLRequest *)request target:(NSString *)target resultObject:(id)obj selector:(SEL)selector controller:(WebPluginController *)controller;
++ (id)checkWithRequest:(NSURLRequest *)request target:(NSString *)target resultObject:(id <WebPluginContainerCheckController>)obj selector:(SEL)selector controller:(id)controller;
 
-- (id)initWithRequest:(NSURLRequest *)request target:(NSString *)target resultObject:(id)obj selector:(SEL)selector controller:(WebPluginController *)controller;
+- (id)initWithRequest:(NSURLRequest *)request target:(NSString *)target resultObject:(id <WebPluginContainerCheckController>)obj selector:(SEL)selector controller:(id)controller;
 
 - (void)start;
 

third_party/WebKit/WebKit/mac/Plugins/WebPluginContainerCheck.mm

@@ -47,12 +47,12 @@ using namespace WebCore;
 
 @implementation WebPluginContainerCheck
 
-+ (id)checkWithRequest:(NSURLRequest *)request target:(NSString *)target resultObject:(id)obj selector:(SEL)selector controller:(WebPluginController *)controller
++ (id)checkWithRequest:(NSURLRequest *)request target:(NSString *)target resultObject:(id)obj selector:(SEL)selector controller:(id <WebPluginContainerCheckController>)controller
 {
     return [[[self alloc] initWithRequest:request target:target resultObject:obj selector:selector controller:controller] autorelease];
 }
 
-- (id)initWithRequest:(NSURLRequest *)request target:(NSString *)target resultObject:(id)obj selector:(SEL)selector controller:(WebPluginController *)controller
+- (id)initWithRequest:(NSURLRequest *)request target:(NSString *)target resultObject:(id)obj selector:(SEL)selector controller:(id <WebPluginContainerCheckController>)controller
 {
     if (!(self = [super init]))
         return nil;

third_party/WebKit/WebKit/mac/Plugins/WebPluginController.h

@@ -27,6 +27,7 @@
  */
 
 #import <WebKit/WebBasePluginPackage.h>
+#import "WebPluginContainerCheck.h"
 
 @class WebFrame;
 @class WebHTMLView;
@@ -34,7 +35,7 @@
 @class WebView;
 @class WebDataSource;
 
-@interface WebPluginController : NSObject <WebPluginManualLoader>
+@interface WebPluginController : NSObject <WebPluginManualLoader, WebPluginContainerCheckController>
 {
     NSView *_documentView;
     WebDataSource *_dataSource;