Expose -[WebPluginPackage bundle] as SPI
authoraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Oct 2013 20:28:49 +0000 (20:28 +0000)
committeraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Oct 2013 20:28:49 +0000 (20:28 +0000)
https://bugs.webkit.org/show_bug.cgi?id=122814

Reviewed by Anders Carlsson.

Source/WebKit:

* WebKit.xcodeproj/project.pbxproj: Added WebPluginPackagePrivate.h.

Source/WebKit/mac:

* Plugins/WebPluginPackage.mm:
(-[WebPluginPackage bundle]): Defined.
* Plugins/WebPluginPackagePrivate.h: Declared bundle as a method in a
category on NSObject.

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

Source/WebKit/ChangeLog
Source/WebKit/WebKit.xcodeproj/project.pbxproj
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Plugins/WebPluginPackage.mm
Source/WebKit/mac/Plugins/WebPluginPackagePrivate.h [new file with mode: 0644]

index 35efc66..b634fbe 100644 (file)
@@ -1,3 +1,12 @@
+2013-10-15  Andy Estes  <aestes@apple.com>
+
+        Expose -[WebPluginPackage bundle] as SPI
+        https://bugs.webkit.org/show_bug.cgi?id=122814
+
+        Reviewed by Anders Carlsson.
+
+        * WebKit.xcodeproj/project.pbxproj: Added WebPluginPackagePrivate.h.
+
 2013-10-10  Ryosuke Niwa  <rniwa@webkit.org>
 
         Windows build fix attempt.
index 23e2540..104bc54 100644 (file)
                93EB178D09F88D460091F8FF /* WebSystemInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93EB178C09F88D460091F8FF /* WebSystemInterface.mm */; };
                93EB178F09F88D510091F8FF /* WebSystemInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 93EB178E09F88D510091F8FF /* WebSystemInterface.h */; };
                93FDE9330D79CAF30074F029 /* WebHistoryInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93FDE9320D79CAF30074F029 /* WebHistoryInternal.h */; };
+               A17A11B1180DC84800E5498C /* WebPluginPackagePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = A17A11B0180DC84800E5498C /* WebPluginPackagePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A5687BDA135B791A0074CBCB /* WebNodeHighlighter.h in Headers */ = {isa = PBXBuildFile; fileRef = A5687BD8135B791A0074CBCB /* WebNodeHighlighter.h */; };
                A5687BDB135B791A0074CBCB /* WebNodeHighlighter.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5687BD9135B791A0074CBCB /* WebNodeHighlighter.mm */; };
                A57E2F24120749E600048DF3 /* WebQuotaManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A57E2F22120749E600048DF3 /* WebQuotaManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93FDE9320D79CAF30074F029 /* WebHistoryInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryInternal.h; sourceTree = "<group>"; };
                9CAE9D070252A4130ECA16EA /* WebPreferencesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPreferencesPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                9CF0E249021361B00ECA16EA /* WebFramePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFramePrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               A17A11B0180DC84800E5498C /* WebPluginPackagePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginPackagePrivate.h; sourceTree = "<group>"; };
                A5687BD8135B791A0074CBCB /* WebNodeHighlighter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNodeHighlighter.h; sourceTree = "<group>"; };
                A5687BD9135B791A0074CBCB /* WebNodeHighlighter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNodeHighlighter.mm; sourceTree = "<group>"; };
                A57E2F22120749E600048DF3 /* WebQuotaManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebQuotaManager.h; sourceTree = "<group>"; };
                                8467275D0367158500CA2ACA /* WebPluginController.mm */,
                                83E4AF4B036659440000E506 /* WebPluginPackage.h */,
                                83E4AF4C036659440000E506 /* WebPluginPackage.mm */,
+                               A17A11B0180DC84800E5498C /* WebPluginPackagePrivate.h */,
                                225F881409F97E8A00423A40 /* WebPluginPrivate.h */,
                                848DFF860365FE6A00CA2ACA /* WebPluginViewFactory.h */,
                                83E679780726D7CF006C7A36 /* WebPluginViewFactoryPrivate.h */,
                                598AD9201201CF0700ABAE4E /* WebDeviceOrientation.h in Headers */,
                                598AD91A1201CEC900ABAE4E /* WebDeviceOrientationClient.h in Headers */,
                                598AD9241201CF1900ABAE4E /* WebDeviceOrientationInternal.h in Headers */,
+                               A17A11B1180DC84800E5498C /* WebPluginPackagePrivate.h in Headers */,
                                598ADA461202275000ABAE4E /* WebDeviceOrientationProvider.h in Headers */,
                                598AD9261201CF2500ABAE4E /* WebDeviceOrientationProviderMock.h in Headers */,
                                598AD92A1201CF3B00ABAE4E /* WebDeviceOrientationProviderMockInternal.h in Headers */,
index 5e2911c..5638121 100644 (file)
@@ -1,3 +1,15 @@
+2013-10-15  Andy Estes  <aestes@apple.com>
+
+        Expose -[WebPluginPackage bundle] as SPI
+        https://bugs.webkit.org/show_bug.cgi?id=122814
+
+        Reviewed by Anders Carlsson.
+
+        * Plugins/WebPluginPackage.mm:
+        (-[WebPluginPackage bundle]): Defined.
+        * Plugins/WebPluginPackagePrivate.h: Declared bundle as a method in a
+        category on NSObject.
+
 2013-10-12  Darin Adler  <darin@apple.com>
 
         Get rid of the toHTMLElement helper for casting FormAssociatedElement to HTMLElement
index a608068..6072128 100644 (file)
@@ -108,6 +108,11 @@ NSString *WebPlugInContainingElementKey =       @"WebPlugInContainingElementKey"
     return [super load];
 }
 
+- (NSBundle *)bundle
+{
+    return nsBundle;
+}
+
 @end
 
 @implementation NSObject (WebScripting)
diff --git a/Source/WebKit/mac/Plugins/WebPluginPackagePrivate.h b/Source/WebKit/mac/Plugins/WebPluginPackagePrivate.h
new file mode 100644 (file)
index 0000000..b433d1c
--- /dev/null
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface NSObject (WebPluginPackagePrivate)
+
+- (NSBundle *)bundle;
+
+@end