Diff
Modified: trunk/Source/WebKit2/ChangeLog (142918 => 142919)
--- trunk/Source/WebKit2/ChangeLog 2013-02-14 22:26:53 UTC (rev 142918)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-14 22:27:52 UTC (rev 142919)
@@ -1,3 +1,18 @@
+2013-02-14 Anders Carlsson <[email protected]>
+
+ Add WKContextIsPlugInUpdateAvailable
+ https://bugs.webkit.org/show_bug.cgi?id=109862
+ <rdar://problem/13173140>
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/C/mac/WKContextPrivateMac.h:
+ * UIProcess/API/C/mac/WKContextPrivateMac.mm: Renamed from Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.cpp.
+ (WKContextGetProcessSuppressionEnabled):
+ (WKContextSetProcessSuppressionEnabled):
+ (WKContextIsPlugInUpdateAvailable):
+ * WebKit2.xcodeproj/project.pbxproj:
+
2013-02-14 Zan Dobersek <[email protected]>
[GTK] Errors when building WebKit2 with Clang
Deleted: trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.cpp (142918 => 142919)
--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.cpp 2013-02-14 22:26:53 UTC (rev 142918)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.cpp 2013-02-14 22:27:52 UTC (rev 142919)
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-
-#include "config.h"
-#include "WKContextPrivateMac.h"
-
-#include "WKAPICast.h"
-#include "WebContext.h"
-
-using namespace WebKit;
-
-bool WKContextGetProcessSuppressionEnabled(WKContextRef contextRef)
-{
- return toImpl(contextRef)->processSuppressionEnabled();
-}
-
-void WKContextSetProcessSuppressionEnabled(WKContextRef contextRef, bool enabled)
-{
- toImpl(contextRef)->setProcessSuppressionEnabled(enabled);
-}
Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h (142918 => 142919)
--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2013-02-14 22:26:53 UTC (rev 142918)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2013-02-14 22:27:52 UTC (rev 142919)
@@ -35,6 +35,8 @@
WK_EXPORT bool WKContextGetProcessSuppressionEnabled(WKContextRef context);
WK_EXPORT void WKContextSetProcessSuppressionEnabled(WKContextRef context, bool enabled);
+WK_EXPORT bool WKContextIsPlugInUpdateAvailable(WKContextRef context, WKStringRef plugInBundleIdentifier);
+
#ifdef __cplusplus
}
#endif
Copied: trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (from rev 142917, trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.cpp) (0 => 142919)
--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2013-02-14 22:27:52 UTC (rev 142919)
@@ -0,0 +1,50 @@
+/*
+ * 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 "config.h"
+#import "WKContextPrivateMac.h"
+
+#import "WKAPICast.h"
+#import "WKStringCF.h"
+#import "WebContext.h"
+#import <WebKitSystemInterface.h>
+#import <wtf/RetainPtr.h>
+
+using namespace WebKit;
+
+bool WKContextGetProcessSuppressionEnabled(WKContextRef contextRef)
+{
+ return toImpl(contextRef)->processSuppressionEnabled();
+}
+
+void WKContextSetProcessSuppressionEnabled(WKContextRef contextRef, bool enabled)
+{
+ toImpl(contextRef)->setProcessSuppressionEnabled(enabled);
+}
+
+bool WKContextIsPlugInUpdateAvailable(WKContextRef context, WKStringRef plugInBundleIdentifier)
+{
+ return WKIsPluginUpdateAvailable((NSString *)adoptCF(WKStringCopyCFString(kCFAllocatorDefault, plugInBundleIdentifier)).get());
+}
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (142918 => 142919)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-02-14 22:26:53 UTC (rev 142918)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-02-14 22:27:52 UTC (rev 142919)
@@ -582,7 +582,7 @@
9F4F59441648B67F00493B7E /* SharedWorkerProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F4F59431648B67F00493B7E /* SharedWorkerProcessProxyMac.mm */; };
9F54F88F16488E87007DF81A /* ChildProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F54F88E16488E87007DF81A /* ChildProcessMac.mm */; };
9F54F8951648AE0F007DF81A /* PluginProcessManagerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F54F8941648AE0E007DF81A /* PluginProcessManagerMac.mm */; };
- 9FB5F394169E6A80002C25BF /* WKContextPrivateMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FB5F392169E6A80002C25BF /* WKContextPrivateMac.cpp */; };
+ 9FB5F394169E6A80002C25BF /* WKContextPrivateMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9FB5F392169E6A80002C25BF /* WKContextPrivateMac.mm */; };
9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FB5F393169E6A80002C25BF /* WKContextPrivateMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
A5EFD38C16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
B62E7310143047A60069EC35 /* WKHitTestResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B62E730F143047A60069EC35 /* WKHitTestResult.cpp */; };
@@ -1977,7 +1977,7 @@
9F4F59431648B67F00493B7E /* SharedWorkerProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SharedWorkerProcessProxyMac.mm; sourceTree = "<group>"; };
9F54F88E16488E87007DF81A /* ChildProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ChildProcessMac.mm; sourceTree = "<group>"; };
9F54F8941648AE0E007DF81A /* PluginProcessManagerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginProcessManagerMac.mm; sourceTree = "<group>"; };
- 9FB5F392169E6A80002C25BF /* WKContextPrivateMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WKContextPrivateMac.cpp; path = mac/WKContextPrivateMac.cpp; sourceTree = "<group>"; };
+ 9FB5F392169E6A80002C25BF /* WKContextPrivateMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKContextPrivateMac.mm; path = mac/WKContextPrivateMac.mm; sourceTree = "<group>"; };
9FB5F393169E6A80002C25BF /* WKContextPrivateMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKContextPrivateMac.h; path = mac/WKContextPrivateMac.h; sourceTree = "<group>"; };
A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageVisibilityTypes.h; sourceTree = "<group>"; };
A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSerializedScriptValue.h; sourceTree = "<group>"; };
@@ -3628,8 +3628,8 @@
6EE849C41368D9040038D481 /* mac */ = {
isa = PBXGroup;
children = (
- 9FB5F392169E6A80002C25BF /* WKContextPrivateMac.cpp */,
9FB5F393169E6A80002C25BF /* WKContextPrivateMac.h */,
+ 9FB5F392169E6A80002C25BF /* WKContextPrivateMac.mm */,
6EE849C61368D92D0038D481 /* WKInspectorPrivateMac.h */,
BCE17B7B1381F1170012A641 /* WKPagePrivateMac.cpp */,
BCE17B7C1381F1170012A641 /* WKPagePrivateMac.h */,
@@ -6693,7 +6693,7 @@
BC4A6296147313A0006C681A /* WKConnectionRef.cpp in Sources */,
BCB9E24C1120E15C00A137E0 /* WKContext.cpp in Sources */,
51A555F5128C6C47009ABCEC /* WKContextMenuItem.cpp in Sources */,
- 9FB5F394169E6A80002C25BF /* WKContextPrivateMac.cpp in Sources */,
+ 9FB5F394169E6A80002C25BF /* WKContextPrivateMac.mm in Sources */,
3309345A1315B9980097A7BC /* WKCookieManager.cpp in Sources */,
512F58F912A88A5400629530 /* WKCredential.cpp in Sources */,
BC4075F7124FF0270068F20A /* WKData.cpp in Sources */,
Modified: trunk/WebKitLibraries/ChangeLog (142918 => 142919)
--- trunk/WebKitLibraries/ChangeLog 2013-02-14 22:26:53 UTC (rev 142918)
+++ trunk/WebKitLibraries/ChangeLog 2013-02-14 22:27:52 UTC (rev 142919)
@@ -1,3 +1,17 @@
+2013-02-14 Anders Carlsson <[email protected]>
+
+ Add WKContextIsPlugInUpdateAvailable
+ https://bugs.webkit.org/show_bug.cgi?id=109862
+ <rdar://problem/13173140>
+
+ Reviewed by Sam Weinig.
+
+ Roll WebKitSystemInterface DEPS.
+
+ * WebKitSystemInterface.h:
+ * libWebKitSystemInterfaceLion.a:
+ * libWebKitSystemInterfaceMountainLion.a:
+
2013-02-13 Roger Fong <[email protected]>
Move all .props files from WebKitLibraries folder to WebKit Source folder.
Modified: trunk/WebKitLibraries/WebKitSystemInterface.h (142918 => 142919)
--- trunk/WebKitLibraries/WebKitSystemInterface.h 2013-02-14 22:26:53 UTC (rev 142918)
+++ trunk/WebKitLibraries/WebKitSystemInterface.h 2013-02-14 22:27:52 UTC (rev 142919)
@@ -90,6 +90,7 @@
void WKUnregisterUniqueIdForElement(id element);
BOOL WKShouldBlockPlugin(NSString *bundleIdentifier, NSString *bundleVersionString);
+BOOL WKIsPluginUpdateAvailable(NSString *bundleIdentifier);
// Remote Accessibility API.
void WKAXRegisterRemoteApp(void);
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceLion.a
(Binary files differ)
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
(Binary files differ)
