Add a PluginInactive plug-in unavailability reason
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Nov 2012 20:43:27 +0000 (20:43 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Nov 2012 20:43:27 +0000 (20:43 +0000)
https://bugs.webkit.org/show_bug.cgi?id=101089

Reviewed by Sam Weinig.

Source/WebCore:

This is to be used by Mac WebKit and WebKit2 shortly.

* English.lproj/Localizable.strings:
* platform/LocalizedStrings.cpp:
(WebCore::inactivePluginText):
(WebCore):
* platform/LocalizedStrings.h:
(WebCore):
* platform/blackberry/LocalizedStringsBlackBerry.cpp:
(WebCore::inactivePluginText):
(WebCore):
* platform/efl/LocalizedStringsEfl.cpp:
(WebCore::inactivePluginText):
(WebCore):
* platform/gtk/LocalizedStringsGtk.cpp:
(WebCore::inactivePluginText):
(WebCore):
* platform/qt/LocalizedStringsQt.cpp:
(WebCore::inactivePluginText):
(WebCore):
* rendering/RenderEmbeddedObject.cpp:
(WebCore::unavailablePluginReplacementText):
* rendering/RenderEmbeddedObject.h:

Source/WebKit/chromium:

* src/LocalizedStrings.cpp:
(WebCore::inactivePluginText):
(WebCore):

Source/WebKit2:

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::unavailablePluginButtonClicked):

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

14 files changed:
Source/WebCore/ChangeLog
Source/WebCore/English.lproj/Localizable.strings
Source/WebCore/platform/LocalizedStrings.cpp
Source/WebCore/platform/LocalizedStrings.h
Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp
Source/WebCore/platform/efl/LocalizedStringsEfl.cpp
Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
Source/WebCore/platform/qt/LocalizedStringsQt.cpp
Source/WebCore/rendering/RenderEmbeddedObject.cpp
Source/WebCore/rendering/RenderEmbeddedObject.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/src/LocalizedStrings.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/WebPageProxy.cpp

index 91070cb..172a3cb 100644 (file)
@@ -1,3 +1,34 @@
+2012-11-02  Anders Carlsson  <andersca@apple.com>
+
+        Add a PluginInactive plug-in unavailability reason
+        https://bugs.webkit.org/show_bug.cgi?id=101089
+
+        Reviewed by Sam Weinig.
+
+        This is to be used by Mac WebKit and WebKit2 shortly.
+
+        * English.lproj/Localizable.strings:
+        * platform/LocalizedStrings.cpp:
+        (WebCore::inactivePluginText):
+        (WebCore):
+        * platform/LocalizedStrings.h:
+        (WebCore):
+        * platform/blackberry/LocalizedStringsBlackBerry.cpp:
+        (WebCore::inactivePluginText):
+        (WebCore):
+        * platform/efl/LocalizedStringsEfl.cpp:
+        (WebCore::inactivePluginText):
+        (WebCore):
+        * platform/gtk/LocalizedStringsGtk.cpp:
+        (WebCore::inactivePluginText):
+        (WebCore):
+        * platform/qt/LocalizedStringsQt.cpp:
+        (WebCore::inactivePluginText):
+        (WebCore):
+        * rendering/RenderEmbeddedObject.cpp:
+        (WebCore::unavailablePluginReplacementText):
+        * rendering/RenderEmbeddedObject.h:
+
 2012-11-02  Rob Buis  <rbuis@rim.com>
 
         [CMAKE] Remove QNX specific section
index 4c43150..56c65b0 100644 (file)
Binary files a/Source/WebCore/English.lproj/Localizable.strings and b/Source/WebCore/English.lproj/Localizable.strings differ
index 690843b..8f7866f 100644 (file)
@@ -683,6 +683,11 @@ String insecurePluginVersionText()
     return WEB_UI_STRING_KEY("Blocked Plug-in", "Blocked Plug-In (Insecure plug-in)", "Label text to be used when an insecure plug-in version was blocked from loading");
 }
 
+String inactivePluginText()
+{
+    return WEB_UI_STRING("Inactive Plug-in", "Label text to be used when a plugin has not been loaded for some time");
+}
+
 String multipleFileUploadText(unsigned numberOfFiles)
 {
     return formatLocalizedString(WEB_UI_STRING("%d files", "Label to describe the number of files selected in a file upload control that allows multiple files"), numberOfFiles);
index fcba156..9602e1f 100644 (file)
@@ -202,6 +202,8 @@ namespace WebCore {
     String crashedPluginText();
     String blockedPluginByContentSecurityPolicyText();
     String insecurePluginVersionText();
+    String inactivePluginText();
+
     String multipleFileUploadText(unsigned numberOfFiles);
     String unknownFileSizeText();
 
index 4ac7862..7bd71a5 100644 (file)
@@ -584,6 +584,12 @@ String insecurePluginVersionText()
     return String();
 }
 
+String inactivePluginText()
+{
+    notImplemented();
+    return String();
+}
+
 String multipleFileUploadText(unsigned)
 {
     return String(", ...");
index cb5d7ba..5fdd3b2 100644 (file)
@@ -572,6 +572,12 @@ String insecurePluginVersionText()
     return String();
 }
 
+String inactivePluginText()
+{
+    notImplemented();
+    return String();
+}
+
 String unacceptableTLSCertificate()
 {
     return String::fromUTF8("Unacceptable TLS certificate");
index 91b35d0..aae0440 100644 (file)
@@ -485,6 +485,12 @@ String insecurePluginVersionText()
     return String();
 }
 
+String inactivePluginText()
+{
+    notImplemented();
+    return String();
+}
+
 String multipleFileUploadText(unsigned numberOfFiles)
 {
     // FIXME: If this file gets localized, this should really be localized as one string with a wildcard for the number.
index a410f43..0cdce3a 100644 (file)
@@ -457,6 +457,12 @@ String insecurePluginVersionText()
     return String();
 }
 
+String inactivePluginText()
+{
+    notImplemented();
+    return String();
+}
+
 String multipleFileUploadText(unsigned)
 {
     notImplemented();
index c826eaa..e964855 100644 (file)
@@ -117,6 +117,8 @@ static String unavailablePluginReplacementText(RenderEmbeddedObject::PluginUnava
         return blockedPluginByContentSecurityPolicyText();
     case RenderEmbeddedObject::InsecurePluginVersion:
         return insecurePluginVersionText();
+    case RenderEmbeddedObject::PluginInactive:
+        return inactivePluginText();
     }
 
     ASSERT_NOT_REACHED();
index 5317b4c..133f34d 100644 (file)
@@ -41,7 +41,8 @@ public:
         PluginMissing,
         PluginCrashed,
         PluginBlockedByContentSecurityPolicy,
-        InsecurePluginVersion
+        InsecurePluginVersion,
+        PluginInactive,
     };
     void setPluginUnavailabilityReason(PluginUnavailabilityReason);
     bool showsUnavailablePluginIndicator() const;
index dc44b2c..377db2b 100644 (file)
@@ -1,3 +1,14 @@
+2012-11-02  Anders Carlsson  <andersca@apple.com>
+
+        Add a PluginInactive plug-in unavailability reason
+        https://bugs.webkit.org/show_bug.cgi?id=101089
+
+        Reviewed by Sam Weinig.
+
+        * src/LocalizedStrings.cpp:
+        (WebCore::inactivePluginText):
+        (WebCore):
+
 2012-11-02  Ian Vollick  <vollick@chromium.org>
 
         Support invalidation tracking for composited layers
index e5baded..a5c2024 100644 (file)
@@ -317,6 +317,12 @@ String insecurePluginVersionText()
     return String();
 }
 
+String inactivePluginText()
+{
+    notImplemented();
+    return String();
+}
+
 String multipleFileUploadText(unsigned numberOfFiles)
 {
     return query(WebLocalizedString::MultipleFileUploadText, String::number(numberOfFiles));
index 440c50a..d9e1036 100644 (file)
@@ -1,3 +1,13 @@
+2012-11-02  Anders Carlsson  <andersca@apple.com>
+
+        Add a PluginInactive plug-in unavailability reason
+        https://bugs.webkit.org/show_bug.cgi?id=101089
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::unavailablePluginButtonClicked):
+
 2012-11-02  Adam Barth  <abarth@webkit.org>
 
         ENABLE(UNDO_MANAGER) is disabled everywhere and is not under active development
index 1456611..b345a30 100644 (file)
@@ -2593,6 +2593,7 @@ void WebPageProxy::unavailablePluginButtonClicked(uint32_t opaquePluginUnavailab
         break;
 
     case RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy:
+    case RenderEmbeddedObject::PluginInactive:
         ASSERT_NOT_REACHED();
     }