[webkit-changes] [133338] trunk/Source

Fri, 02 Nov 2012 13:42:01 -0700

Title: [133338] trunk/Source
Revision
133338
Author
ander...@apple.com
Date
2012-11-02 13:43:27 -0700 (Fri, 02 Nov 2012)

Log Message

Add a PluginInactive plug-in unavailability reason
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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (133337 => 133338)


--- trunk/Source/WebCore/ChangeLog	2012-11-02 20:41:13 UTC (rev 133337)
+++ trunk/Source/WebCore/ChangeLog	2012-11-02 20:43:27 UTC (rev 133338)
@@ -1,3 +1,34 @@
+2012-11-02  Anders Carlsson  <ander...@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  <rb...@rim.com>
 
         [CMAKE] Remove QNX specific section

Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (133337 => 133338)


--- trunk/Source/WebCore/English.lproj/Localizable.strings	2012-11-02 20:41:13 UTC (rev 133337)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings	2012-11-02 20:43:27 UTC (rev 133338)
@@ -178,6 +178,9 @@
 /* Ignore Spelling context menu item */
 "Ignore Spelling" = "Ignore Spelling";
 
+/* Label text to be used when a plugin has not been loaded for some time */
+"Inactive Plug-in" = "Inactive Plug-in";
+
 /* Undo action name */
 "Indent (Undo action name)" = "Indent";
 
@@ -358,6 +361,9 @@
 /* Undo action name */
 "Set Writing Direction (Undo action name)" = "Set Writing Direction";
 
+/* visible name of the plug-in host process. The argument is the application name. */
+"Shared Web Worker (%@ Internet plug-in)" = "Shared Web Worker (%@ Internet plug-in)";
+
 /* Show colors context menu item */
 "Show Colors" = "Show Colors";

Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (133337 => 133338)


--- trunk/Source/WebCore/platform/LocalizedStrings.cpp	2012-11-02 20:41:13 UTC (rev 133337)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp	2012-11-02 20:43:27 UTC (rev 133338)
@@ -683,6 +683,11 @@
     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);

Modified: trunk/Source/WebCore/platform/LocalizedStrings.h (133337 => 133338)


--- trunk/Source/WebCore/platform/LocalizedStrings.h	2012-11-02 20:41:13 UTC (rev 133337)
+++ trunk/Source/WebCore/platform/LocalizedStrings.h	2012-11-02 20:43:27 UTC (rev 133338)
@@ -202,6 +202,8 @@
     String crashedPluginText();
     String blockedPluginByContentSecurityPolicyText();
     String insecurePluginVersionText();
+    String inactivePluginText();
+
     String multipleFileUploadText(unsigned numberOfFiles);
     String unknownFileSizeText();

Modified: trunk/Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp (133337 => 133338)


--- trunk/Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp	2012-11-02 20:41:13 UTC (rev 133337)
+++ trunk/Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp	2012-11-02 20:43:27 UTC (rev 133338)
@@ -584,6 +584,12 @@
     return String();
 }
 
+String inactivePluginText()
+{
+    notImplemented();
+    return String();
+}
+
 String multipleFileUploadText(unsigned)
 {
     return String(", ...");

Modified: trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp (133337 => 133338)


--- trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp	2012-11-02 20:41:13 UTC (rev 133337)
+++ trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp	2012-11-02 20:43:27 UTC (rev 133338)
@@ -572,6 +572,12 @@
     return String();
 }
 
+String inactivePluginText()
+{
+    notImplemented();
+    return String();
+}
+
 String unacceptableTLSCertificate()
 {
     return String::fromUTF8("Unacceptable TLS certificate");

Modified: trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp (133337 => 133338)


--- trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp	2012-11-02 20:41:13 UTC (rev 133337)
+++ trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp	2012-11-02 20:43:27 UTC (rev 133338)
@@ -485,6 +485,12 @@
     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.

Modified: trunk/Source/WebCore/platform/qt/LocalizedStringsQt.cpp (133337 => 133338)


--- trunk/Source/WebCore/platform/qt/LocalizedStringsQt.cpp	2012-11-02 20:41:13 UTC (rev 133337)
+++ trunk/Source/WebCore/platform/qt/LocalizedStringsQt.cpp	2012-11-02 20:43:27 UTC (rev 133338)
@@ -457,6 +457,12 @@
     return String();
 }
 
+String inactivePluginText()
+{
+    notImplemented();
+    return String();
+}
+
 String multipleFileUploadText(unsigned)
 {
     notImplemented();

Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (133337 => 133338)


--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp	2012-11-02 20:41:13 UTC (rev 133337)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp	2012-11-02 20:43:27 UTC (rev 133338)
@@ -117,6 +117,8 @@
         return blockedPluginByContentSecurityPolicyText();
     case RenderEmbeddedObject::InsecurePluginVersion:
         return insecurePluginVersionText();
+    case RenderEmbeddedObject::PluginInactive:
+        return inactivePluginText();
     }
 
     ASSERT_NOT_REACHED();

Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.h (133337 => 133338)


--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.h	2012-11-02 20:41:13 UTC (rev 133337)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.h	2012-11-02 20:43:27 UTC (rev 133338)
@@ -41,7 +41,8 @@
         PluginMissing,
         PluginCrashed,
         PluginBlockedByContentSecurityPolicy,
-        InsecurePluginVersion
+        InsecurePluginVersion,
+        PluginInactive,
     };
     void setPluginUnavailabilityReason(PluginUnavailabilityReason);
     bool showsUnavailablePluginIndicator() const;

Modified: trunk/Source/WebKit/chromium/ChangeLog (133337 => 133338)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-11-02 20:41:13 UTC (rev 133337)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-11-02 20:43:27 UTC (rev 133338)
@@ -1,3 +1,14 @@
+2012-11-02  Anders Carlsson  <ander...@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  <voll...@chromium.org>
 
         Support invalidation tracking for composited layers

Modified: trunk/Source/WebKit/chromium/src/LocalizedStrings.cpp (133337 => 133338)


--- trunk/Source/WebKit/chromium/src/LocalizedStrings.cpp	2012-11-02 20:41:13 UTC (rev 133337)
+++ trunk/Source/WebKit/chromium/src/LocalizedStrings.cpp	2012-11-02 20:43:27 UTC (rev 133338)
@@ -317,6 +317,12 @@
     return String();
 }
 
+String inactivePluginText()
+{
+    notImplemented();
+    return String();
+}
+
 String multipleFileUploadText(unsigned numberOfFiles)
 {
     return query(WebLocalizedString::MultipleFileUploadText, String::number(numberOfFiles));

Modified: trunk/Source/WebKit2/ChangeLog (133337 => 133338)


--- trunk/Source/WebKit2/ChangeLog	2012-11-02 20:41:13 UTC (rev 133337)
+++ trunk/Source/WebKit2/ChangeLog	2012-11-02 20:43:27 UTC (rev 133338)
@@ -1,3 +1,13 @@
+2012-11-02  Anders Carlsson  <ander...@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  <aba...@webkit.org>
 
         ENABLE(UNDO_MANAGER) is disabled everywhere and is not under active development

Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (133337 => 133338)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2012-11-02 20:41:13 UTC (rev 133337)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2012-11-02 20:43:27 UTC (rev 133338)
@@ -2593,6 +2593,7 @@
         break;
 
     case RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy:
+    case RenderEmbeddedObject::PluginInactive:
         ASSERT_NOT_REACHED();
     }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to