Merge changes I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6bfe5d24,Ia9f39b83,I5bcecd5a,I1de96683,I543c6810,I8a5b0878,I0ae670bf,Ide4d58dc,I28ebaf3d,I499d6631,Ie5090e0d,I6d3e5f1f

* changes:
  Merge WebKit at r78450: Update ThirdPartyProject.prop
  Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()
  Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
  Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed
  Merge WebKit at r78450: HTMLAreaElement::getRect() renamed
  Merge WebKit at r78450: FrameLoader::url() removed
  Merge WebKit at r78450: HTMLParserQuirks removed
  Merge WebKit at r78450: TextRun::padding() renamed
  Merge WebKit at r78450: Use new FontMetrics
  Merge WebKit at r78450: GraphicsContext current path removed
  Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed
  Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed
  Merge WebKit at r78450: IntRect::bottom()/right() renamed
  Merge WebKit at r78450: Fix remaining conflicts
  Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
  Merge WebKit at r78450: Fix conflicts in media controls
  Merge WebKit at r78450: Fix Makefiles
  Merge WebKit at r78450: Initial merge by git.

1 files changed, 11 insertions, 10 deletions

diff --git a/Source/WebKit/gtk/webkit/webkitwebframe.cpp b/Source/WebKit/gtk/webkit/webkitwebframe.cpp
index d0ea875..fd90a6c 100644
--- 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;
 }
 
@@ -768,7 +769,7 @@ static void draw_page_callback(GtkPrintOperation* op, GtkPrintContext* context,
 {
     PrintContext* printContext = reinterpret_cast<PrintContext*>(user_data);
 
-    if (page_nr >= printContext->pageCount())
+    if (page_nr >= static_cast<gint>(printContext->pageCount()))
         return;
 
     cairo_t* cr = gtk_print_context_get_cairo_context(context);