Diff
Modified: branches/safari-536.29-branch/Source/WebKit2/ChangeLog (144481 => 144482)
--- branches/safari-536.29-branch/Source/WebKit2/ChangeLog 2013-03-01 20:40:05 UTC (rev 144481)
+++ branches/safari-536.29-branch/Source/WebKit2/ChangeLog 2013-03-01 20:42:07 UTC (rev 144482)
@@ -1,5 +1,24 @@
2013-03-01 Brady Eidson <[email protected]>
+ Merge r142919
+
+ 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-03-01 Brady Eidson <[email protected]>
+
Merge r142017
2013-02-06 Anders Carlsson <[email protected]>
Added: branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h (0 => 144482)
--- branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h (rev 0)
+++ branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2013-03-01 20:42:07 UTC (rev 144482)
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+#ifndef WKContextPrivateMac_h
+#define WKContextPrivateMac_h
+
+#include <WebKit2/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT bool WKContextIsPlugInUpdateAvailable(WKContextRef context, WKStringRef plugInBundleIdentifier);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKContextPrivateMac_h */
Added: branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (0 => 144482)
--- branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (rev 0)
+++ branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2013-03-01 20:42:07 UTC (rev 144482)
@@ -0,0 +1,40 @@
+/*
+ * 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 WKContextIsPlugInUpdateAvailable(WKContextRef context, WKStringRef plugInBundleIdentifier)
+{
+ return WKIsPluginUpdateAvailable((NSString *)adoptCF(WKStringCopyCFString(kCFAllocatorDefault, plugInBundleIdentifier)).get());
+}
Modified: branches/safari-536.29-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (144481 => 144482)
--- branches/safari-536.29-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-03-01 20:40:05 UTC (rev 144481)
+++ branches/safari-536.29-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-03-01 20:42:07 UTC (rev 144482)
@@ -423,6 +423,8 @@
51B15A8513843A3900321AD8 /* EnvironmentUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 51B15A8313843A3900321AD8 /* EnvironmentUtilities.h */; };
51B3005012529D0E000B5CA0 /* WebBackForwardListCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51B3004E12529D0E000B5CA0 /* WebBackForwardListCF.cpp */; };
51B3005112529D0E000B5CA0 /* WebPageProxyCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51B3004F12529D0E000B5CA0 /* WebPageProxyCF.cpp */; };
+ 51C2966516E144D800757D21 /* WKContextPrivateMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C2966316E144D800757D21 /* WKContextPrivateMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 51C2966616E144D800757D21 /* WKContextPrivateMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51C2966416E144D800757D21 /* WKContextPrivateMac.mm */; };
51C4032C136749D800DC972D /* AuthenticationManager.mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51C4032B136749D800DC972D /* AuthenticationManager.mac.mm */; };
51D02F64132EC5B900BEAA96 /* WebIconDatabaseMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D02F63132EC5B900BEAA96 /* WebIconDatabaseMessageReceiver.cpp */; };
51D02F6A132EC73700BEAA96 /* WebIconDatabaseMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D02F67132EC73700BEAA96 /* WebIconDatabaseMessages.h */; };
@@ -1453,6 +1455,8 @@
51B15A8313843A3900321AD8 /* EnvironmentUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EnvironmentUtilities.h; path = unix/EnvironmentUtilities.h; sourceTree = "<group>"; };
51B3004E12529D0E000B5CA0 /* WebBackForwardListCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebBackForwardListCF.cpp; path = cf/WebBackForwardListCF.cpp; sourceTree = "<group>"; };
51B3004F12529D0E000B5CA0 /* WebPageProxyCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebPageProxyCF.cpp; path = cf/WebPageProxyCF.cpp; sourceTree = "<group>"; };
+ 51C2966316E144D800757D21 /* WKContextPrivateMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKContextPrivateMac.h; path = mac/WKContextPrivateMac.h; sourceTree = "<group>"; };
+ 51C2966416E144D800757D21 /* WKContextPrivateMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKContextPrivateMac.mm; path = mac/WKContextPrivateMac.mm; sourceTree = "<group>"; };
51C4032B136749D800DC972D /* AuthenticationManager.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AuthenticationManager.mac.mm; path = mac/AuthenticationManager.mac.mm; sourceTree = "<group>"; };
51D02F63132EC5B900BEAA96 /* WebIconDatabaseMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIconDatabaseMessageReceiver.cpp; sourceTree = "<group>"; };
51D02F65132EC6D300BEAA96 /* WebIconDatabaseProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebIconDatabaseProxy.messages.in; path = IconDatabase/WebIconDatabaseProxy.messages.in; sourceTree = "<group>"; };
@@ -2744,6 +2748,8 @@
6EE849C41368D9040038D481 /* mac */ = {
isa = PBXGroup;
children = (
+ 51C2966316E144D800757D21 /* WKContextPrivateMac.h */,
+ 51C2966416E144D800757D21 /* WKContextPrivateMac.mm */,
6EE849C61368D92D0038D481 /* WKInspectorPrivateMac.h */,
BCE17B7B1381F1170012A641 /* WKPagePrivateMac.cpp */,
BCE17B7C1381F1170012A641 /* WKPagePrivateMac.h */,
@@ -4209,6 +4215,7 @@
CEDA12E3152CD1B300D9E08D /* WebAlternativeTextClient.h in Headers */,
E19582D3153CBFD700B60875 /* PDFKitImports.h in Headers */,
51EFC1CF1524E62500C9A938 /* WKBundleDOMWindowExtension.h in Headers */,
+ 51C2966516E144D800757D21 /* WKContextPrivateMac.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4957,6 +4964,7 @@
51FA2D7415212DF100C1BA0B /* InjectedBundleDOMWindowExtension.cpp in Sources */,
51FA2D7715212E2600C1BA0B /* WKBundleDOMWindowExtension.cpp in Sources */,
CD67D30E15C08F9A00843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp in Sources */,
+ 51C2966616E144D800757D21 /* WKContextPrivateMac.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: branches/safari-536.29-branch/WebKitLibraries/ChangeLog (144481 => 144482)
--- branches/safari-536.29-branch/WebKitLibraries/ChangeLog 2013-03-01 20:40:05 UTC (rev 144481)
+++ branches/safari-536.29-branch/WebKitLibraries/ChangeLog 2013-03-01 20:42:07 UTC (rev 144482)
@@ -1,3 +1,21 @@
+2013-03-01 Brady Eidson <[email protected]>
+
+ Merge r142919
+
+ 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-01-30 Lucas Forschler <[email protected]>
Merge r138606
Modified: branches/safari-536.29-branch/WebKitLibraries/WebKitSystemInterface.h (144481 => 144482)
--- branches/safari-536.29-branch/WebKitLibraries/WebKitSystemInterface.h 2013-03-01 20:40:05 UTC (rev 144481)
+++ branches/safari-536.29-branch/WebKitLibraries/WebKitSystemInterface.h 2013-03-01 20:42:07 UTC (rev 144482)
@@ -93,6 +93,7 @@
void WKUnregisterUniqueIdForElement(id element);
BOOL WKShouldBlockPlugin(NSString *bundleIdentifier, NSString *bundleVersionString);
+BOOL WKIsPluginUpdateAvailable(NSString *bundleIdentifier);
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
// Remote Accessibility API.
