Title: [199462] releases/WebKitGTK/webkit-2.12
- Revision
- 199462
- Author
- [email protected]
- Date
- 2016-04-13 04:41:33 -0700 (Wed, 13 Apr 2016)
Log Message
Merge r198785 - REGRESSION (r196813): Missing plug-in placeholder is missing
https://bugs.webkit.org/show_bug.cgi?id=155973
<rdar://problem/25068392>
Reviewed by Andy Estes.
Show unavailable plugin indicator when UnavailablePluginIndicatorState (uninitialized, hidden, visible) is not set to hidden explicitly.
It matches pre-196813 behaviour.
Unable to test.
* rendering/RenderEmbeddedObject.h:
(WebCore::RenderEmbeddedObject::showsUnavailablePluginIndicator):
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (199461 => 199462)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-13 11:38:23 UTC (rev 199461)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-13 11:41:33 UTC (rev 199462)
@@ -1,3 +1,13 @@
+2016-03-31 Zalan Bujtas <[email protected]>
+
+ Add a -mismatch test case for r198785.
+ see webkit.org/b/155973
+
+ Unreviewed.
+
+ * plugins/missing-plugin-placeholder-expected-mismatch.html: Added.
+ * plugins/missing-plugin-placeholder.html: Added.
+
2016-03-29 Eric Carlson <[email protected]>
media/track/track-remove-track.html is flaky, crashing and failing
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/plugins/missing-plugin-placeholder-expected-mismatch.html (0 => 199462)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/plugins/missing-plugin-placeholder-expected-mismatch.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/plugins/missing-plugin-placeholder-expected-mismatch.html 2016-04-13 11:41:33 UTC (rev 199462)
@@ -0,0 +1,15 @@
+<html>
+<head>
+<title>This tests that missing-plugin placeholder shows up.</title>
+<style>
+ div {
+ width: 500px;
+ height: 500px;
+ background: green;
+ }
+</style>
+</head>
+<body>
+<div></div>
+</body>
+</html>
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/plugins/missing-plugin-placeholder.html (0 => 199462)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/plugins/missing-plugin-placeholder.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/plugins/missing-plugin-placeholder.html 2016-04-13 11:41:33 UTC (rev 199462)
@@ -0,0 +1,15 @@
+<html>
+<head>
+<title>This tests that missing-plugin placeholder shows up.</title>
+<style>
+ embed {
+ width: 500px;
+ height: 500px;
+ background: green;
+ }
+</style>
+</head>
+<body>
+<embed type="application/x-non-existent"></embed>
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199461 => 199462)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 11:38:23 UTC (rev 199461)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 11:41:33 UTC (rev 199462)
@@ -1,3 +1,19 @@
+2016-03-29 Zalan Bujtas <[email protected]>
+
+ REGRESSION (r196813): Missing plug-in placeholder is missing
+ https://bugs.webkit.org/show_bug.cgi?id=155973
+ <rdar://problem/25068392>
+
+ Reviewed by Andy Estes.
+
+ Show unavailable plugin indicator when UnavailablePluginIndicatorState (uninitialized, hidden, visible) is not set to hidden explicitly.
+ It matches pre-196813 behaviour.
+
+ Unable to test.
+
+ * rendering/RenderEmbeddedObject.h:
+ (WebCore::RenderEmbeddedObject::showsUnavailablePluginIndicator):
+
2016-03-29 Eric Carlson <[email protected]>
media/track/track-remove-track.html is flaky, crashing and failing
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderEmbeddedObject.h (199461 => 199462)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderEmbeddedObject.h 2016-04-13 11:38:23 UTC (rev 199461)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderEmbeddedObject.h 2016-04-13 11:41:33 UTC (rev 199462)
@@ -50,7 +50,6 @@
WEBCORE_EXPORT void setPluginUnavailabilityReasonWithDescription(PluginUnavailabilityReason, const String& description);
bool isPluginUnavailable() const { return m_isPluginUnavailable; }
- bool showsUnavailablePluginIndicator() const { return isPluginUnavailable() && m_isUnavailablePluginIndicatorState == UnavailablePluginIndicatorState::Visible; }
WEBCORE_EXPORT void setUnavailablePluginIndicatorIsHidden(bool);
@@ -73,6 +72,7 @@
virtual const char* renderName() const override { return "RenderEmbeddedObject"; }
virtual bool isEmbeddedObject() const override final { return true; }
+ bool showsUnavailablePluginIndicator() const { return isPluginUnavailable() && m_isUnavailablePluginIndicatorState != UnavailablePluginIndicatorState::Hidden; }
void paintSnapshotImage(PaintInfo&, const LayoutPoint&, Image&);
virtual void paintContents(PaintInfo&, const LayoutPoint&) override final;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
