Changeset 116794 in webkit

Timestamp:

May 11, 2012 12:40:30 PM (12 years ago)

Author:

andersca@apple.com

Message:

REGRESSION(r116687): [Chromium] plugins/embed-attributes-style.html shows a garbled string
​https://bugs.webkit.org/show_bug.cgi?id=86170

Reviewed by Andreas Kling.

The string we are passing to the TextRun constructor needs to stay alive for longer so revert back to the old
behavior where we store it as a member variable.

• rendering/RenderEmbeddedObject.cpp:

(WebCore::unavailablePluginReplacementText):
(WebCore):
(WebCore::RenderEmbeddedObject::setPluginUnavailabilityReason):
(WebCore::RenderEmbeddedObject::getReplacementTextGeometry):

• rendering/RenderEmbeddedObject.h:

(RenderEmbeddedObject):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-11  Anders Carlsson  <andersca@apple.com>
+
+        REGRESSION(r116687): [Chromium] plugins/embed-attributes-style.html shows a garbled string
+        https://bugs.webkit.org/show_bug.cgi?id=86170
+
+        Reviewed by Andreas Kling.
+
+        The string we are passing to the TextRun constructor needs to stay alive for longer so revert back to the old
+        behavior where we store it as a member variable.
+
+        * rendering/RenderEmbeddedObject.cpp:
+        (WebCore::unavailablePluginReplacementText):
+        (WebCore):
+        (WebCore::RenderEmbeddedObject::setPluginUnavailabilityReason):
+        (WebCore::RenderEmbeddedObject::getReplacementTextGeometry):
+        * rendering/RenderEmbeddedObject.h:
+        (RenderEmbeddedObject):
+
 2012-05-11  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp

@@ -103 +103 @@
 #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)
 {
@@ -108 +123 @@
     m_showsUnavailablePluginIndicator = true;
     m_pluginUnavailabilityReason = pluginUnavailabilityReason;
+
+    m_unavailablePluginReplacementText = unavailablePluginReplacementText(pluginUnavailabilityReason);
 }
 
@@ -194 +211 @@
     font = Font(fontDescription, 0, 0);
     font.update(0);
-    
-    run = TextRun(unavailablePluginReplacementText());
+
+    run = TextRun(m_unavailablePluginReplacementText);
     textWidth = font.width(run);
     
@@ -206 +223 @@
 
     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();
 }
 

trunk/Source/WebCore/rendering/RenderEmbeddedObject.h

@@ -79 +79 @@
     bool isInUnavailablePluginIndicator(const LayoutPoint&) const;
     bool getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatRect& contentRect, Path&, FloatRect& replacementTextRect, Font&, TextRun&, float& textWidth) const;
-    String unavailablePluginReplacementText() const;
 
     bool m_hasFallbackContent; // FIXME: This belongs on HTMLObjectElement.
@@ -85 +84 @@
     bool m_showsUnavailablePluginIndicator;
     PluginUnavailabilityReason m_pluginUnavailabilityReason;
+    String m_unavailablePluginReplacementText;
     bool m_unavailablePluginIndicatorIsPressed;
     bool m_mouseDownWasInUnavailablePluginIndicator;