2011-02-04 Martin Robinson <mrobinson@igalia.com>

        Reviewed by Xan Lopez.

        [GTK] WebKitWebFrame can return a stale frame name when calling webkit_web_frame_get_name
        https://bugs.webkit.org/show_bug.cgi?id=53797

        * platform/gtk/Skipped: Unskip a test which is now passing.
2011-02-04  Martin Robinson  <mrobinson@igalia.com>

        Reviewed by Xan Lopez.

        [GTK] WebKitWebFrame can return a stale frame name when calling webkit_web_frame_get_name
        https://bugs.webkit.org/show_bug.cgi?id=53797

        When the frame name changes between different calls to webkit_web_frame_get_name
        on the same frame, return the new frame name instead of the one valid during the
        previous call.

        * webkit/webkitwebframe.cpp:
        (webkit_web_frame_init): Initialize the frame name to 0.
        (webkit_web_frame_get_name): Check the current frame name first before
        returning the cached value.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77714 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 979c272e9052e8f0fa43ac373a21e5dc28655119..d4f0001928f7dd7f259d2fecb254aaf32e553736 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-04  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] WebKitWebFrame can return a stale frame name when calling webkit_web_frame_get_name
+        https://bugs.webkit.org/show_bug.cgi?id=53797
+
+        * platform/gtk/Skipped: Unskip a test which is now passing.
+
 2011-02-04  Martin Robinson  <mrobinson@igalia.com>
 
         Rebaseline a few tests after r77665 and add a GTK-specific baseline

diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 05a3a1b7569dedbeaa00d999b87709441f216b21..599b3ce78aed4dfa3009a422d1ed71b7b24fe814 100644 (file)
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -3763,7 +3763,6 @@ fast/css/opacity-float.html
 
 # New events failing; see https://bugs.webkit.org/show_bug.cgi?id=28823
 fast/events/pageshow-pagehide-on-back-cached.html
-fast/events/pageshow-pagehide-on-back-uncached.html
 fast/events/pageshow-pagehide.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=30724

diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
index 3f164a255ee0a506b4fd12bb3748321a8729ca17..a001168420cc5941be215d1b489caa1e3d89a24e 100644 (file)
--- a/Source/WebKit/gtk/ChangeLog
+++ b/Source/WebKit/gtk/ChangeLog
@@ -1,3 +1,19 @@
+2011-02-04  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] WebKitWebFrame can return a stale frame name when calling webkit_web_frame_get_name
+        https://bugs.webkit.org/show_bug.cgi?id=53797
+
+        When the frame name changes between different calls to webkit_web_frame_get_name
+        on the same frame, return the new frame name instead of the one valid during the
+        previous call.
+
+        * webkit/webkitwebframe.cpp:
+        (webkit_web_frame_init): Initialize the frame name to 0.
+        (webkit_web_frame_get_name): Check the current frame name first before
+        returning the cached value.
+
 2011-02-04  Martin Robinson  <mrobinson@igalia.com>
 
         Reviewed by Gustavo Noronha Silva.

diff --git a/Source/WebKit/gtk/webkit/webkitwebframe.cpp b/Source/WebKit/gtk/webkit/webkitwebframe.cpp
index 5ab265412f432d85b976fdfd64d81ad4b39cea44..fd90a6c270947fb46d9d480d2ec9127007b9421b 100644 (file)
--- a/Source/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/Source/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -474,23 +474,24 @@ WebKitWebView* webkit_web_frame_get_web_view(WebKitWebFrame* frame)
  *
  * Returns the @frame's name
  *
- * Return value: the name of @frame
+ * Return value: the name of @frame. This method will return NULL if
+ * the #WebKitWebFrame is invalid or an empty string if it is not backed
+ * by a live WebCore frame.
  */
 G_CONST_RETURN gchar* webkit_web_frame_get_name(WebKitWebFrame* frame)
 {
     g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), 0);
-
-    WebKitWebFramePrivate* priv = frame->priv;
-
-    if (priv->name)
-        return priv->name;
-
     Frame* coreFrame = core(frame);
     if (!coreFrame)
         return "";
 
-    String string = coreFrame->tree()->uniqueName();
-    priv->name = g_strdup(string.utf8().data());
+    WebKitWebFramePrivate* priv = frame->priv;
+    CString frameName = coreFrame->tree()->uniqueName().string().utf8();
+    if (!g_strcmp0(frameName.data(), priv->name))
+        return priv->name;
+
+    g_free(priv->name);
+    priv->name = g_strdup(frameName.data());
     return priv->name;
 }