Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153030 => 153031)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-23 02:16:02 UTC (rev 153030)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-23 02:30:26 UTC (rev 153031)
@@ -1,5 +1,55 @@
2013-07-22 Lucas Forschler <[email protected]>
+ Merge r153017
+
+ 2013-07-22 Tim Horton <[email protected]>
+
+ Plug-in unavailability indicator should not be displayed if a blocked plugin's indicator is clipped
+ https://bugs.webkit.org/show_bug.cgi?id=118998
+ <rdar://problem/14511268>
+
+ Reviewed by Anders Carlsson.
+
+ * html/HTMLEmbedElement.cpp:
+ (WebCore::HTMLEmbedElement::updateWidget):
+ * html/HTMLObjectElement.cpp:
+ (WebCore::HTMLObjectElement::updateWidget):
+ * html/HTMLPlugInElement.cpp:
+ (WebCore::HTMLPlugInElement::defaultEventHandler):
+ (WebCore::HTMLPlugInElement::supportsFocus):
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::updateWidgetIfNecessary):
+ * loader/SubframeLoader.cpp:
+ (WebCore::SubframeLoader::createJavaAppletWidget):
+ (WebCore::SubframeLoader::loadPlugin):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::updateWidget):
+ Rename showsUnavailablePluginIndicator to isPluginUnavailable, since being unavailable
+ and actually showing the indicator are two totally different things.
+
+ * WebCore.exp.in: Expose setUnavailablePluginIndicatorIsHidden.
+
+ * rendering/RenderEmbeddedObject.cpp:
+ (WebCore::RenderEmbeddedObject::RenderEmbeddedObject):
+ Rename m_showsUnavailablePluginIndicator to m_isPluginUnavailable.
+ Add m_isUnavailablePluginIndicatorHidden, defaulting to false.
+
+ (WebCore::RenderEmbeddedObject::setPluginUnavailabilityReasonWithDescription):
+ Set m_isPluginUnavailable when we get an unavailability reason.
+
+ (WebCore::RenderEmbeddedObject::paint):
+ (WebCore::RenderEmbeddedObject::setUnavailablePluginIndicatorIsHidden): Added.
+
+ * rendering/RenderEmbeddedObject.h:
+ (WebCore::RenderEmbeddedObject::isPluginUnavailable): Added.
+
+ (WebCore::RenderEmbeddedObject::showsUnavailablePluginIndicator):
+ Repurpose "showsUnavailablePluginIndicator" to actually represent whether
+ the indicator is displayed (i.e. the plugin is unavailable, and the
+ indicator is not hidden).
+
+2013-07-22 Lucas Forschler <[email protected]>
+
Merge r153014
2013-07-22 Tim Horton <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/WebCore.exp.in (153030 => 153031)
--- branches/safari-537-branch/Source/WebCore/WebCore.exp.in 2013-07-23 02:16:02 UTC (rev 153030)
+++ branches/safari-537-branch/Source/WebCore/WebCore.exp.in 2013-07-23 02:30:26 UTC (rev 153031)
@@ -668,6 +668,7 @@
__ZN7WebCore20NodeRenderingContextC1EPNS_4NodeE
__ZN7WebCore20NodeRenderingContextD1Ev
__ZN7WebCore20RenderEmbeddedObject29setPluginUnavailabilityReasonENS0_26PluginUnavailabilityReasonE
+__ZN7WebCore20RenderEmbeddedObject37setUnavailablePluginIndicatorIsHiddenEb
__ZN7WebCore20RenderEmbeddedObject44setPluginUnavailabilityReasonWithDescriptionENS0_26PluginUnavailabilityReasonERKN3WTF6StringE
__ZNK7WebCore20RenderEmbeddedObject21isReplacementObscuredEv
__ZN7WebCore20ResourceHandleClient16didReceiveBufferEPNS_14ResourceHandleEN3WTF10PassRefPtrINS_12SharedBufferEEEi
Modified: branches/safari-537-branch/Source/WebCore/html/HTMLEmbedElement.cpp (153030 => 153031)
--- branches/safari-537-branch/Source/WebCore/html/HTMLEmbedElement.cpp 2013-07-23 02:16:02 UTC (rev 153030)
+++ branches/safari-537-branch/Source/WebCore/html/HTMLEmbedElement.cpp 2013-07-23 02:30:26 UTC (rev 153031)
@@ -128,7 +128,7 @@
// moved down into HTMLPluginImageElement.cpp
void HTMLEmbedElement::updateWidget(PluginCreationOption pluginCreationOption)
{
- ASSERT(!renderEmbeddedObject()->showsUnavailablePluginIndicator());
+ ASSERT(!renderEmbeddedObject()->isPluginUnavailable());
ASSERT(needsWidgetUpdate());
setNeedsWidgetUpdate(false);
Modified: branches/safari-537-branch/Source/WebCore/html/HTMLObjectElement.cpp (153030 => 153031)
--- branches/safari-537-branch/Source/WebCore/html/HTMLObjectElement.cpp 2013-07-23 02:16:02 UTC (rev 153030)
+++ branches/safari-537-branch/Source/WebCore/html/HTMLObjectElement.cpp 2013-07-23 02:30:26 UTC (rev 153031)
@@ -276,7 +276,7 @@
// moved down into HTMLPluginImageElement.cpp
void HTMLObjectElement::updateWidget(PluginCreationOption pluginCreationOption)
{
- ASSERT(!renderEmbeddedObject()->showsUnavailablePluginIndicator());
+ ASSERT(!renderEmbeddedObject()->isPluginUnavailable());
ASSERT(needsWidgetUpdate());
setNeedsWidgetUpdate(false);
// FIXME: This should ASSERT isFinishedParsingChildren() instead.
Modified: branches/safari-537-branch/Source/WebCore/html/HTMLPlugInElement.cpp (153030 => 153031)
--- branches/safari-537-branch/Source/WebCore/html/HTMLPlugInElement.cpp 2013-07-23 02:16:02 UTC (rev 153030)
+++ branches/safari-537-branch/Source/WebCore/html/HTMLPlugInElement.cpp 2013-07-23 02:30:26 UTC (rev 153031)
@@ -200,7 +200,7 @@
RenderObject* r = renderer();
if (r && r->isEmbeddedObject()) {
- if (toRenderEmbeddedObject(r)->showsUnavailablePluginIndicator()) {
+ if (toRenderEmbeddedObject(r)->isPluginUnavailable()) {
toRenderEmbeddedObject(r)->handleUnavailablePluginIndicatorEvent(event);
return;
}
@@ -251,7 +251,7 @@
if (useFallbackContent() || !renderer() || !renderer()->isEmbeddedObject())
return false;
- return !toRenderEmbeddedObject(renderer())->showsUnavailablePluginIndicator();
+ return !toRenderEmbeddedObject(renderer())->isPluginUnavailable();
}
#if ENABLE(NETSCAPE_PLUGIN_API)
Modified: branches/safari-537-branch/Source/WebCore/html/HTMLPlugInImageElement.cpp (153030 => 153031)
--- branches/safari-537-branch/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-07-23 02:16:02 UTC (rev 153030)
+++ branches/safari-537-branch/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-07-23 02:30:26 UTC (rev 153031)
@@ -273,7 +273,7 @@
if (!needsWidgetUpdate() || useFallbackContent() || isImageType())
return;
- if (!renderEmbeddedObject() || renderEmbeddedObject()->showsUnavailablePluginIndicator())
+ if (!renderEmbeddedObject() || renderEmbeddedObject()->isPluginUnavailable())
return;
updateWidget(CreateOnlyNonNetscapePlugins);
Modified: branches/safari-537-branch/Source/WebCore/loader/SubframeLoader.cpp (153030 => 153031)
--- branches/safari-537-branch/Source/WebCore/loader/SubframeLoader.cpp 2013-07-23 02:16:02 UTC (rev 153030)
+++ branches/safari-537-branch/Source/WebCore/loader/SubframeLoader.cpp 2013-07-23 02:30:26 UTC (rev 153031)
@@ -324,7 +324,7 @@
if (!widget) {
RenderEmbeddedObject* renderer = element->renderEmbeddedObject();
- if (!renderer->showsUnavailablePluginIndicator())
+ if (!renderer->isPluginUnavailable())
renderer->setPluginUnavailabilityReason(RenderEmbeddedObject::PluginMissing);
return 0;
}
@@ -456,7 +456,7 @@
pluginElement, url, paramNames, paramValues, mimeType, loadManually);
if (!widget) {
- if (!renderer->showsUnavailablePluginIndicator())
+ if (!renderer->isPluginUnavailable())
renderer->setPluginUnavailabilityReason(RenderEmbeddedObject::PluginMissing);
return false;
}
Modified: branches/safari-537-branch/Source/WebCore/page/FrameView.cpp (153030 => 153031)
--- branches/safari-537-branch/Source/WebCore/page/FrameView.cpp 2013-07-23 02:16:02 UTC (rev 153030)
+++ branches/safari-537-branch/Source/WebCore/page/FrameView.cpp 2013-07-23 02:30:26 UTC (rev 153031)
@@ -2662,7 +2662,7 @@
if (object->isEmbeddedObject()) {
RenderEmbeddedObject* embeddedObject = static_cast<RenderEmbeddedObject*>(object);
// No need to update if it's already crashed or known to be missing.
- if (embeddedObject->showsUnavailablePluginIndicator())
+ if (embeddedObject->isPluginUnavailable())
return;
if (object->isSnapshottedPlugIn()) {
Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp (153030 => 153031)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2013-07-23 02:16:02 UTC (rev 153030)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2013-07-23 02:30:26 UTC (rev 153031)
@@ -95,7 +95,8 @@
RenderEmbeddedObject::RenderEmbeddedObject(Element* element)
: RenderPart(element)
, m_hasFallbackContent(false)
- , m_showsUnavailablePluginIndicator(false)
+ , m_isPluginUnavailable(false)
+ , m_isUnavailablePluginIndicatorHidden(false)
, m_unavailablePluginIndicatorIsPressed(false)
, m_mouseDownWasInUnavailablePluginIndicator(false)
{
@@ -153,8 +154,8 @@
void RenderEmbeddedObject::setPluginUnavailabilityReasonWithDescription(PluginUnavailabilityReason pluginUnavailabilityReason, const String& description)
{
- ASSERT(!m_showsUnavailablePluginIndicator);
- m_showsUnavailablePluginIndicator = true;
+ ASSERT(!m_isPluginUnavailable);
+ m_isPluginUnavailable = true;
m_pluginUnavailabilityReason = pluginUnavailabilityReason;
if (description.isEmpty())
@@ -163,11 +164,6 @@
m_unavailablePluginReplacementText = description;
}
-bool RenderEmbeddedObject::showsUnavailablePluginIndicator() const
-{
- return m_showsUnavailablePluginIndicator;
-}
-
void RenderEmbeddedObject::setUnavailablePluginIndicatorIsPressed(bool pressed)
{
if (m_unavailablePluginIndicatorIsPressed == pressed)
@@ -226,7 +222,7 @@
if (Frame* frame = this->frame())
page = frame->page();
- if (showsUnavailablePluginIndicator()) {
+ if (isPluginUnavailable()) {
if (page && paintInfo.phase == PaintPhaseForeground)
page->addRelevantUnpaintedObject(this, visualOverflowRect());
RenderReplaced::paint(paintInfo, paintOffset);
@@ -274,6 +270,13 @@
context->drawBidiText(font, run, FloatPoint(labelX, labelY));
}
+void RenderEmbeddedObject::setUnavailablePluginIndicatorIsHidden(bool hidden)
+{
+ m_isUnavailablePluginIndicatorHidden = hidden;
+
+ repaint();
+}
+
static void addReplacementArrowPath(Path& path, const FloatRect& insideRect)
{
FloatRect insideRectWithMargin(insideRect);
Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderEmbeddedObject.h (153030 => 153031)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderEmbeddedObject.h 2013-07-23 02:16:02 UTC (rev 153030)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderEmbeddedObject.h 2013-07-23 02:30:26 UTC (rev 153031)
@@ -45,8 +45,12 @@
};
void setPluginUnavailabilityReason(PluginUnavailabilityReason);
void setPluginUnavailabilityReasonWithDescription(PluginUnavailabilityReason, const String& description);
- bool showsUnavailablePluginIndicator() const;
+ bool isPluginUnavailable() const { return m_isPluginUnavailable; }
+ bool showsUnavailablePluginIndicator() const { return isPluginUnavailable() && !m_isUnavailablePluginIndicatorHidden; }
+
+ void setUnavailablePluginIndicatorIsHidden(bool);
+
// FIXME: This belongs on HTMLObjectElement.
bool hasFallbackContent() const { return m_hasFallbackContent; }
void setHasFallbackContent(bool hasFallbackContent) { m_hasFallbackContent = hasFallbackContent; }
@@ -103,7 +107,8 @@
bool m_hasFallbackContent; // FIXME: This belongs on HTMLObjectElement.
- bool m_showsUnavailablePluginIndicator;
+ bool m_isPluginUnavailable;
+ bool m_isUnavailablePluginIndicatorHidden;
PluginUnavailabilityReason m_pluginUnavailabilityReason;
String m_unavailablePluginReplacementText;
bool m_unavailablePluginIndicatorIsPressed;
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (153030 => 153031)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-07-23 02:16:02 UTC (rev 153030)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-07-23 02:30:26 UTC (rev 153031)
@@ -558,6 +558,7 @@
RenderEmbeddedObject* renderObject = toRenderEmbeddedObject(pluginElement->renderer());
renderObject->setPluginUnavailabilityReasonWithDescription(RenderEmbeddedObject::InsecurePluginVersion, unavailabilityDescription);
replacementObscured = renderObject->isReplacementObscured();
+ renderObject->setUnavailablePluginIndicatorIsHidden(replacementObscured);
}
send(Messages::WebPageProxy::DidBlockInsecurePluginVersion(parameters.mimeType, parameters.url.string(), frameURLString, pageURLString, replacementObscured));