Make sure to hand back a script object for webkit plugins (the container

        view forwards to its plugin child).

        Reviewed by sullivan

        * Plugins/WebKitPluginContainerView.h:
        * Plugins/WebKitPluginContainerView.mm:
        (-[WebKitPluginContainerView objectForWebScript]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@22033 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index de041dc3cc904c9a3592a4932f00c96189f0edec..d3d9a9ddb25f619d2423aea324ef086b53800c8e 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2007-06-06  David Hyatt  <hyatt@apple.com>
+
+        Make sure to hand back a script object for webkit plugins (the container
+        view forwards to its plugin child).
+
+        Reviewed by sullivan
+
+        * Plugins/WebKitPluginContainerView.h:
+        * Plugins/WebKitPluginContainerView.mm:
+        (-[WebKitPluginContainerView objectForWebScript]):
+
 2007-06-06  David Hyatt  <hyatt@apple.com>
 
         Fix for bug 13972, quicktime doesn't respect CSS clip and overflow properties.

diff --git a/WebKit/Plugins/WebKitPluginContainerView.h b/WebKit/Plugins/WebKitPluginContainerView.h
index 7f062b7320c588677ab92b29db6a3be04a846783..c1b93c7c55aa936cb7479ffc0b90c53a93a6173b 100644 (file)
--- a/WebKit/Plugins/WebKitPluginContainerView.h
+++ b/WebKit/Plugins/WebKitPluginContainerView.h
@@ -38,4 +38,6 @@
 - (id)initWithFrame:(NSRect)r
          DOMElement:(DOMElement *)anElement;
 
+- (id)objectForWebScript;
+
 @end

diff --git a/WebKit/Plugins/WebKitPluginContainerView.mm b/WebKit/Plugins/WebKitPluginContainerView.mm
index 690f898e3f1a171d884ece02dff052d6c0d2df8b..a28821284c555de6412d6fc17464bf52b83f431e 100644 (file)
--- a/WebKit/Plugins/WebKitPluginContainerView.mm
+++ b/WebKit/Plugins/WebKitPluginContainerView.mm
@@ -54,5 +54,10 @@
     return NSIntersectionRect([self convertRect:[_element _windowClipRect] fromView:nil], [super visibleRect]);
 }
 
+- (id)objectForWebScript
+{
+    return [[[self subviews] objectAtIndex: 0] objectForWebScript];
+}
+
 @end
 

diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj
index 1c8021f638e44d645bfe1f01900e3d7e6a3a3590..fb86ae98dd9ab2e12909acfad8191f0c6fe21040 100644 (file)
--- a/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -1324,7 +1324,6 @@
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
-                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,