Update Java related WKSI function names
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Nov 2012 01:58:54 +0000 (01:58 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Nov 2012 01:58:54 +0000 (01:58 +0000)
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:

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

Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
WebKitLibraries/ChangeLog
WebKitLibraries/libWebKitSystemInterfaceLion.a
WebKitLibraries/libWebKitSystemInterfaceMountainLion.a

index 101d634..344d485 100644 (file)
@@ -1,3 +1,15 @@
+2012-11-06  Anders Carlsson  <andersca@apple.com>
+
+        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  <ap@apple.com>
 
         Clean up which storage cookie jar functions use
index 6378964..f0bcda5 100644 (file)
@@ -625,7 +625,7 @@ void WebChromeClient::unavailablePluginButtonClicked(Element* element, RenderEmb
 
         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];
         }
 
index a81bf91..62d565f 100644 (file)
@@ -1603,7 +1603,7 @@ static bool isOracleJavaPlugIn(NSString *bundleIdentifier)
 
 static bool isPlugInInactive(NSString *bundleIdentifier)
 {
-    if (isOracleJavaPlugIn(bundleIdentifier) && !WKJLIsRuntimeAndWebComponentsInstalled())
+    if (isOracleJavaPlugIn(bundleIdentifier) && !WKIsJavaPlugInActive())
         return true;
 
     return false;
index 4b5f9bc..5c10a4e 100644 (file)
@@ -1,3 +1,15 @@
+2012-11-06  Anders Carlsson  <andersca@apple.com>
+
+        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  <cmuppala@apple.com>
 
         Add application occlusion criterion to enable/disable process suppression on Mac
index bc272a9..6ebde64 100644 (file)
@@ -133,7 +133,7 @@ bool PluginInfoStore::shouldUsePlugin(Vector<PluginModuleInfo>& alreadyLoadedPlu
         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 @@ PluginModuleLoadPolicy PluginInfoStore::policyForPlugin(const PluginModuleInfo&
     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 @@ bool PluginInfoStore::reactivateInactivePlugin(const PluginModuleInfo& plugin)
 {
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
     if (plugin.bundleIdentifier == oracleJavaAppletPluginBundleIdentifier) {
-        WKJLReportWebComponentsUsed();
+        WKActivateJavaPlugIn();
         return true;
     }
 #endif
index c171a2a..de8cd4a 100644 (file)
@@ -1,3 +1,16 @@
+2012-11-06  Anders Carlsson  <andersca@apple.com>
+
+        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  <ap@apple.com>
 
         Clean up which storage cookie jar functions use
index b34f117..c21d745 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceLion.a and b/WebKitLibraries/libWebKitSystemInterfaceLion.a differ
index 01aac27..9b0f837 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a and b/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a differ