diff options
Diffstat (limited to 'Source/WebCore/rendering/RenderEmbeddedObject.cpp')
-rw-r--r-- | Source/WebCore/rendering/RenderEmbeddedObject.cpp | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/Source/WebCore/rendering/RenderEmbeddedObject.cpp b/Source/WebCore/rendering/RenderEmbeddedObject.cpp index 55cfcfd4d..315c16f8a 100644 --- a/Source/WebCore/rendering/RenderEmbeddedObject.cpp +++ b/Source/WebCore/rendering/RenderEmbeddedObject.cpp @@ -102,11 +102,28 @@ bool RenderEmbeddedObject::allowsAcceleratedCompositing() const } #endif +static String unavailablePluginReplacementText(RenderEmbeddedObject::PluginUnavailabilityReason pluginUnavailabilityReason) +{ + switch (pluginUnavailabilityReason) { + case RenderEmbeddedObject::PluginMissing: + return missingPluginText(); + case RenderEmbeddedObject::PluginCrashed: + return crashedPluginText(); + case RenderEmbeddedObject::InsecurePluginVersion: + return insecurePluginVersionText(); + } + + ASSERT_NOT_REACHED(); + return String(); +} + void RenderEmbeddedObject::setPluginUnavailabilityReason(PluginUnavailabilityReason pluginUnavailabilityReason) { ASSERT(!m_showsUnavailablePluginIndicator); m_showsUnavailablePluginIndicator = true; m_pluginUnavailabilityReason = pluginUnavailabilityReason; + + m_unavailablePluginReplacementText = unavailablePluginReplacementText(pluginUnavailabilityReason); } bool RenderEmbeddedObject::showsUnavailablePluginIndicator() const @@ -193,8 +210,8 @@ bool RenderEmbeddedObject::getReplacementTextGeometry(const LayoutPoint& accumul fontDescription.setComputedSize(fontDescription.specifiedSize()); font = Font(fontDescription, 0, 0); font.update(0); - - run = TextRun(unavailablePluginReplacementText()); + + run = TextRun(m_unavailablePluginReplacementText); textWidth = font.width(run); replacementTextRect.setSize(FloatSize(textWidth + replacementTextRoundedRectLeftRightTextMargin * 2, replacementTextRoundedRectHeight)); @@ -207,21 +224,6 @@ bool RenderEmbeddedObject::getReplacementTextGeometry(const LayoutPoint& accumul return true; } -String RenderEmbeddedObject::unavailablePluginReplacementText() const -{ - switch (m_pluginUnavailabilityReason) { - case PluginMissing: - return missingPluginText(); - case PluginCrashed: - return crashedPluginText(); - case InsecurePluginVersion: - return insecurePluginVersionText(); - } - - ASSERT_NOT_REACHED(); - return String(); -} - void RenderEmbeddedObject::layout() { ASSERT(needsLayout()); |