[webkit-changes] [135894] branches/safari-536.28-branch/Source

Tue, 27 Nov 2012 11:57:56 -0800

Title: [135894] branches/safari-536.28-branch/Source

Diff

Modified: branches/safari-536.28-branch/Source/WebCore/ChangeLog (135893 => 135894)


--- branches/safari-536.28-branch/Source/WebCore/ChangeLog	2012-11-27 19:58:46 UTC (rev 135893)
+++ branches/safari-536.28-branch/Source/WebCore/ChangeLog	2012-11-27 19:59:37 UTC (rev 135894)
@@ -1,5 +1,40 @@
 2012-11-27  Lucas Forschler  <[email protected]>
 
+        Merge r133338
+
+    2012-11-02  Anders Carlsson  <[email protected]>
+
+            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-27  Lucas Forschler  <[email protected]>
+
         <rdar://problem/12704510>
         Merge r134666

Modified: branches/safari-536.28-branch/Source/WebCore/English.lproj/Localizable.strings (135893 => 135894)


--- branches/safari-536.28-branch/Source/WebCore/English.lproj/Localizable.strings	2012-11-27 19:58:46 UTC (rev 135893)
+++ branches/safari-536.28-branch/Source/WebCore/English.lproj/Localizable.strings	2012-11-27 19:59:37 UTC (rev 135894)
@@ -172,6 +172,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";
 
@@ -352,6 +355,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: branches/safari-536.28-branch/Source/WebCore/platform/LocalizedStrings.cpp (135893 => 135894)


--- branches/safari-536.28-branch/Source/WebCore/platform/LocalizedStrings.cpp	2012-11-27 19:58:46 UTC (rev 135893)
+++ branches/safari-536.28-branch/Source/WebCore/platform/LocalizedStrings.cpp	2012-11-27 19:59:37 UTC (rev 135894)
@@ -678,6 +678,11 @@
     return WEB_UI_STRING("Blocked 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: branches/safari-536.28-branch/Source/WebCore/platform/LocalizedStrings.h (135893 => 135894)


--- branches/safari-536.28-branch/Source/WebCore/platform/LocalizedStrings.h	2012-11-27 19:58:46 UTC (rev 135893)
+++ branches/safari-536.28-branch/Source/WebCore/platform/LocalizedStrings.h	2012-11-27 19:59:37 UTC (rev 135894)
@@ -168,6 +168,8 @@
     String missingPluginText();
     String crashedPluginText();
     String insecurePluginVersionText();
+    String inactivePluginText();
+
     String multipleFileUploadText(unsigned numberOfFiles);
     String unknownFileSizeText();

Modified: branches/safari-536.28-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp (135893 => 135894)


--- branches/safari-536.28-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp	2012-11-27 19:58:46 UTC (rev 135893)
+++ branches/safari-536.28-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp	2012-11-27 19:59:37 UTC (rev 135894)
@@ -111,6 +111,8 @@
         return crashedPluginText();
     case RenderEmbeddedObject::InsecurePluginVersion:
         return insecurePluginVersionText();
+    case RenderEmbeddedObject::PluginInactive:
+        return inactivePluginText();
     }
 
     ASSERT_NOT_REACHED();

Modified: branches/safari-536.28-branch/Source/WebCore/rendering/RenderEmbeddedObject.h (135893 => 135894)


--- branches/safari-536.28-branch/Source/WebCore/rendering/RenderEmbeddedObject.h	2012-11-27 19:58:46 UTC (rev 135893)
+++ branches/safari-536.28-branch/Source/WebCore/rendering/RenderEmbeddedObject.h	2012-11-27 19:59:37 UTC (rev 135894)
@@ -39,7 +39,8 @@
     enum PluginUnavailabilityReason {
         PluginMissing,
         PluginCrashed,
-        InsecurePluginVersion
+        InsecurePluginVersion,
+        PluginInactive,
     };
     void setPluginUnavailabilityReason(PluginUnavailabilityReason);
     bool showsUnavailablePluginIndicator() const;

Modified: branches/safari-536.28-branch/Source/WebKit2/ChangeLog (135893 => 135894)


--- branches/safari-536.28-branch/Source/WebKit2/ChangeLog	2012-11-27 19:58:46 UTC (rev 135893)
+++ branches/safari-536.28-branch/Source/WebKit2/ChangeLog	2012-11-27 19:59:37 UTC (rev 135894)
@@ -1,3 +1,17 @@
+2012-11-27  Lucas Forschler  <[email protected]>
+
+        Merge r133338
+
+    2012-11-02  Anders Carlsson  <[email protected]>
+
+            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-26  Lucas Forschler  <[email protected]>
 
         Merge r131975

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to