Title: [133702] trunk
- Revision
- 133702
- Author
- [email protected]
- Date
- 2012-11-06 17:58:54 -0800 (Tue, 06 Nov 2012)
Log Message
Update Java related WKSI function names
https://bugs.webkit.org/show_bug.cgi?id=101414
Reviewed by Sam Weinig.
Source/WebKit/mac:
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::unavailablePluginButtonClicked):
* WebCoreSupport/WebFrameLoaderClient.mm:
(isPlugInInactive):
Source/WebKit2:
* UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
(WebKit::PluginInfoStore::shouldUsePlugin):
(WebKit::PluginInfoStore::policyForPlugin):
(WebKit::PluginInfoStore::reactivateInactivePlugin):
WebKitLibraries:
Roll WebKitSystemInterface DEPS.
* WebKitSystemInterface.h:
* libWebKitSystemInterfaceLion.a:
* libWebKitSystemInterfaceMountainLion.a:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (133701 => 133702)
--- trunk/Source/WebKit/mac/ChangeLog 2012-11-07 01:56:29 UTC (rev 133701)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-11-07 01:58:54 UTC (rev 133702)
@@ -1,3 +1,15 @@
+2012-11-06 Anders Carlsson <[email protected]>
+
+ Update Java related WKSI function names
+ https://bugs.webkit.org/show_bug.cgi?id=101414
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/WebChromeClient.mm:
+ (WebChromeClient::unavailablePluginButtonClicked):
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (isPlugInInactive):
+
2012-11-06 Alexey Proskuryakov <[email protected]>
Clean up which storage cookie jar functions use
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (133701 => 133702)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2012-11-07 01:56:29 UTC (rev 133701)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2012-11-07 01:58:54 UTC (rev 133702)
@@ -625,7 +625,7 @@
if (pluginPackage && [pluginPackage bundleIdentifier] == "com.oracle.java.JavaAppletPlugin") {
// Reactivate the plug-in and reload the page so the plug-in will be instantiated correctly.
- WKJLReportWebComponentsUsed();
+ WKActivateJavaPlugIn();
[m_webView reload:nil];
}
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (133701 => 133702)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2012-11-07 01:56:29 UTC (rev 133701)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2012-11-07 01:58:54 UTC (rev 133702)
@@ -1603,7 +1603,7 @@
static bool isPlugInInactive(NSString *bundleIdentifier)
{
- if (isOracleJavaPlugIn(bundleIdentifier) && !WKJLIsRuntimeAndWebComponentsInstalled())
+ if (isOracleJavaPlugIn(bundleIdentifier) && !WKIsJavaPlugInActive())
return true;
return false;
Modified: trunk/Source/WebKit2/ChangeLog (133701 => 133702)
--- trunk/Source/WebKit2/ChangeLog 2012-11-07 01:56:29 UTC (rev 133701)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-07 01:58:54 UTC (rev 133702)
@@ -1,3 +1,15 @@
+2012-11-06 Anders Carlsson <[email protected]>
+
+ Update Java related WKSI function names
+ https://bugs.webkit.org/show_bug.cgi?id=101414
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+ (WebKit::PluginInfoStore::shouldUsePlugin):
+ (WebKit::PluginInfoStore::policyForPlugin):
+ (WebKit::PluginInfoStore::reactivateInactivePlugin):
+
2012-11-06 Kiran Muppala <[email protected]>
Add application occlusion criterion to enable/disable process suppression on Mac
Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm (133701 => 133702)
--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2012-11-07 01:56:29 UTC (rev 133701)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2012-11-07 01:58:54 UTC (rev 133702)
@@ -133,7 +133,7 @@
return false;
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- if (plugin.bundleIdentifier == "com.apple.java.JavaAppletPlugin" && shouldBlockPlugin(plugin) && !WKJLIsRuntimeAndWebComponentsInstalled()) {
+ if (plugin.bundleIdentifier == "com.apple.java.JavaAppletPlugin" && shouldBlockPlugin(plugin) && !WKIsJavaPlugInActive()) {
// If the Apple Java plug-in is blocked and there's no Java runtime installed, just pretend that the plug-in doesn't exist.
return false;
}
@@ -147,7 +147,7 @@
if (WKShouldBlockPlugin(plugin.bundleIdentifier, plugin.versionString))
return PluginModuleBlocked;
- if (plugin.bundleIdentifier == oracleJavaAppletPluginBundleIdentifier && !WKJLIsRuntimeAndWebComponentsInstalled())
+ if (plugin.bundleIdentifier == oracleJavaAppletPluginBundleIdentifier && !WKIsJavaPlugInActive())
return PluginModuleInactive;
return PluginModuleLoadNormally;
@@ -157,7 +157,7 @@
{
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
if (plugin.bundleIdentifier == oracleJavaAppletPluginBundleIdentifier) {
- WKJLReportWebComponentsUsed();
+ WKActivateJavaPlugIn();
return true;
}
#endif
Modified: trunk/WebKitLibraries/ChangeLog (133701 => 133702)
--- trunk/WebKitLibraries/ChangeLog 2012-11-07 01:56:29 UTC (rev 133701)
+++ trunk/WebKitLibraries/ChangeLog 2012-11-07 01:58:54 UTC (rev 133702)
@@ -1,3 +1,16 @@
+2012-11-06 Anders Carlsson <[email protected]>
+
+ Update Java related WKSI function names
+ https://bugs.webkit.org/show_bug.cgi?id=101414
+
+ Reviewed by Sam Weinig.
+
+ Roll WebKitSystemInterface DEPS.
+
+ * WebKitSystemInterface.h:
+ * libWebKitSystemInterfaceLion.a:
+ * libWebKitSystemInterfaceMountainLion.a:
+
2012-11-06 Alexey Proskuryakov <[email protected]>
Clean up which storage cookie jar functions use
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceLion.a
(Binary files differ)
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
(Binary files differ)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
