Changeset 95033 in webkit

Timestamp:

Sep 13, 2011 10:54:15 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Do not always return the cached frame name.
​https://bugs.webkit.org/show_bug.cgi?id=66856

Patch by Raphael Kubo da Costa <​kubo@profusion.mobi> on 2011-09-13
Reviewed by Antonio Gomes.

When a frame has its parent changed (via adoptNode and appendChild,
for example), the frame name will change, so we need to account for
that case and change the cached name when needed.

This should make fast/frames/iframe-reparenting-unique-name.html pass.

• ewk/ewk_frame.cpp:

(ewk_frame_name_get):

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_frame.cpp (modified) (2 diffs)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2011-09-13  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [EFL] Do not always return the cached frame name.
+        https://bugs.webkit.org/show_bug.cgi?id=66856
+
+        Reviewed by Antonio Gomes.
+
+        When a frame has its parent changed (via adoptNode and appendChild,
+        for example), the frame name will change, so we need to account for
+        that case and change the cached name when needed.
+
+        This should make fast/frames/iframe-reparenting-unique-name.html pass.
+
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_name_get):
+
 2011-09-12  Flavio Ceolin  <flavio.ceolin@profusion.mobi>
 

trunk/Source/WebKit/efl/ewk/ewk_frame.cpp

@@ -350 +350 @@
     EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
 
-    if (sd->name)
-        return sd->name;
-
     if (!sd->frame) {
         ERR("could not get name of uninitialized frame.");
@@ -358 +355 @@
     }
 
-    WTF::String s = sd->frame->tree()->uniqueName();
-    WTF::CString cs = s.utf8();
-    sd->name = eina_stringshare_add_length(cs.data(), cs.length());
+    const WTF::String frameName = sd->frame->tree()->uniqueName();
+
+    if ((sd->name) && (sd->name == frameName))
+        return sd->name;
+
+    eina_stringshare_replace_length(&(sd->name), frameName.utf8().data(), frameName.length());
+
     return sd->name;
 }