Changeset 197065 in webkit

Timestamp:

Feb 25, 2016, 12:37:49 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r196813 - Blocked plug-in placeholder is sometimes not shown.
​https://bugs.webkit.org/show_bug.cgi?id=154434
<rdar://problem/22584973>

Reviewed by Brent Fulgham.

m_isUnavailablePluginIndicatorHidden was set to false incorrectly as initial value.
It prevented RenderEmbeddedObject from issuing repaint when the plugin indicator
was set to visible (m_isUnavailablePluginIndicatorHidden <- false) the first time.
(The reason why the indicator showed up most of the time was because some renderer
triggered repaint on the view.)

Unable to test.

• rendering/RenderEmbeddedObject.cpp:

(WebCore::RenderEmbeddedObject::setUnavailablePluginIndicatorIsHidden):
(WebCore::RenderEmbeddedObject::RenderEmbeddedObject): Deleted.
(WebCore::RenderEmbeddedObject::setUnavailablePluginIndicatorIsPressed): Deleted.

• rendering/RenderEmbeddedObject.h:

(WebCore::RenderEmbeddedObject::showsUnavailablePluginIndicator):

Location:

releases/WebKitGTK/webkit-2.12/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderEmbeddedObject.cpp (modified) (3 diffs)
• rendering/RenderEmbeddedObject.h (modified) (2 diffs)

releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-19  Zalan Bujtas  <zalan@apple.com>
+
+        Blocked plug-in placeholder is sometimes not shown.
+        https://bugs.webkit.org/show_bug.cgi?id=154434
+        <rdar://problem/22584973>
+
+        Reviewed by Brent Fulgham.
+
+        m_isUnavailablePluginIndicatorHidden was set to false incorrectly as initial value.
+        It prevented RenderEmbeddedObject from issuing repaint when the plugin indicator
+        was set to visible (m_isUnavailablePluginIndicatorHidden <- false) the first time.
+        (The reason why the indicator showed up most of the time was because some renderer
+        triggered repaint on the view.)
+
+        Unable to test.
+
+        * rendering/RenderEmbeddedObject.cpp:
+        (WebCore::RenderEmbeddedObject::setUnavailablePluginIndicatorIsHidden):
+        (WebCore::RenderEmbeddedObject::RenderEmbeddedObject): Deleted.
+        (WebCore::RenderEmbeddedObject::setUnavailablePluginIndicatorIsPressed): Deleted.
+        * rendering/RenderEmbeddedObject.h:
+        (WebCore::RenderEmbeddedObject::showsUnavailablePluginIndicator):
+
 2016-02-19  Philippe Normand  <pnormand@igalia.com>
 

releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderEmbeddedObject.cpp

@@ -100 +100 @@
     : RenderWidget(element, WTFMove(style))
     , m_isPluginUnavailable(false)
-    , m_isUnavailablePluginIndicatorHidden(false)
     , m_unavailablePluginIndicatorIsPressed(false)
     , m_mouseDownWasInUnavailablePluginIndicator(false)
@@ -193 +192 @@
     if (m_unavailablePluginIndicatorIsPressed == pressed)
         return;
-
     m_unavailablePluginIndicatorIsPressed = pressed;
     repaint();
@@ -343 +341 @@
 void RenderEmbeddedObject::setUnavailablePluginIndicatorIsHidden(bool hidden)
 {
-    if (m_isUnavailablePluginIndicatorHidden == hidden)
-        return;
-
-    m_isUnavailablePluginIndicatorHidden = hidden;
+    auto newState = hidden ? UnavailablePluginIndicatorState::Hidden : UnavailablePluginIndicatorState::Visible;
+    if (m_isUnavailablePluginIndicatorState == newState)
+        return;
+    m_isUnavailablePluginIndicatorState = newState;
     repaint();
 }

releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderEmbeddedObject.h

@@ -51 +51 @@
 
     bool isPluginUnavailable() const { return m_isPluginUnavailable; }
-    bool showsUnavailablePluginIndicator() const { return isPluginUnavailable() && !m_isUnavailablePluginIndicatorHidden; }
+    bool showsUnavailablePluginIndicator() const { return isPluginUnavailable() && m_isUnavailablePluginIndicatorState == UnavailablePluginIndicatorState::Visible; }
 
     WEBCORE_EXPORT void setUnavailablePluginIndicatorIsHidden(bool);
@@ -94 +94 @@
 
     bool m_isPluginUnavailable;
-    bool m_isUnavailablePluginIndicatorHidden;
+    enum class UnavailablePluginIndicatorState { Uninitialized, Hidden, Visible };
+    UnavailablePluginIndicatorState m_isUnavailablePluginIndicatorState { UnavailablePluginIndicatorState::Uninitialized };
     PluginUnavailabilityReason m_pluginUnavailabilityReason;
     String m_unavailablePluginReplacementText;