Title: [152686] branches/safari-537-branch/Source
Revision
152686
Author
[email protected]
Date
2013-07-15 18:14:12 -0700 (Mon, 15 Jul 2013)

Log Message

Merged r152382.  <rdar://problem/14252733>

Modified Paths

Diff

Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152685 => 152686)


--- branches/safari-537-branch/Source/WebCore/ChangeLog	2013-07-16 00:37:02 UTC (rev 152685)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog	2013-07-16 01:14:12 UTC (rev 152686)
@@ -1,5 +1,28 @@
 2013-07-15  Lucas Forschler  <[email protected]>
 
+        Merge r152382
+
+    2013-07-03  Gordon Sheridan  <[email protected]>
+
+            Implement mechanism to detect (partially) hidden blocked plugins.
+            https://bugs.webkit.org/show_bug.cgi?id=117998
+
+            Reviewed by Dean Jackson.
+
+            * rendering/RenderEmbeddedObject.cpp:
+            (WebCore::RenderEmbeddedObject::replacementTextRect):
+            Added private method for calculating the size of the replacement text for blocked plugins.
+
+            (WebCore::RenderEmbeddedObject::isReplacementObscured):
+            Added public method to determine if the EMBED element used for a blocked plugin is inaccessible to the user.
+            * rendering/RenderEmbeddedObject.h:
+            Declare the two new methods mentioned above.
+
+            * WebCore.exp.in:
+            Export RenderEmbeddedObject::isReplacementObscured().
+
+2013-07-15  Lucas Forschler  <[email protected]>
+
         Merge r152623
 
     2013-07-14  Jon Lee  <[email protected]>

Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (152685 => 152686)


--- branches/safari-537-branch/Source/WebKit2/ChangeLog	2013-07-16 00:37:02 UTC (rev 152685)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog	2013-07-16 01:14:12 UTC (rev 152686)
@@ -1,5 +1,41 @@
 2013-07-15  Lucas Forschler  <[email protected]>
 
+        Merge r152382
+
+    2013-07-03  Gordon Sheridan  <[email protected]>
+
+            Implement mechanism to detect (partially) hidden blocked plugins.
+            https://bugs.webkit.org/show_bug.cgi?id=117998
+
+            Reviewed by Dean Jackson.
+
+            * Shared/Plugins/Netscape/PluginInformation.h:
+            * Shared/Plugins/Netscape/PluginInformation.cpp:
+            (WebKit::plugInInformationReplacementObscuredKey):
+            Add key for plugInInformation dictionaries.
+
+            (WebKit::createPluginInformationDictionary):
+            Add boolean parameter identifying whether the replacement for a blocked plugin is obscured, and add it to the dictionary.
+
+            * Shared/API/c/WKPluginInformation.h:
+            * Shared/API/c/WKPluginInformation.cpp:
+            (WKPluginInformationReplacementObscuredKey):
+            Provide the C API for the plugInInformationReplacementObscuredKey().
+
+            * UIProcess/WebPageProxy.h:
+            * UIProcess/WebPageProxy.cpp:
+            (WebKit::WebPageProxy::didBlockInsecurePluginVersion):
+            Add bool replacementObscured parameter to pass on argument to createPluginInformationDictionary().
+
+            * UIProcess/WebPageProxy.messages.in:
+            Add bool replacementObscured parameter to DidBlockInsecurePluginVersion() message.
+
+            * WebProcess/WebPage/WebPage.cpp:
+            (WebKit::WebPage::createPlugin):
+            Invoke isReplacementObscured() method for blocked plugins.
+
+2013-07-15  Lucas Forschler  <[email protected]>
+
         Merge r152642
 
     2013-07-14  Jon Lee  <[email protected]>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to