Title: [166581] releases/WebKitGTK/webkit-2.4/Source/WebKit2
Revision
166581
Author
carlo...@webkit.org
Date
2014-04-01 06:45:58 -0700 (Tue, 01 Apr 2014)

Log Message

Merge r166575 - Don't copy the children map in webkitWebViewBaseContainerForall
https://bugs.webkit.org/show_bug.cgi?id=131016

Reviewed by Carlos Garcia Campos.

* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseContainerForall): Avoid copying the GtkWidget-to-IntRect HashMap object
by transforming the iteration to a range-based for-loop over that HashMap's keys.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (166580 => 166581)


--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog	2014-04-01 13:35:39 UTC (rev 166580)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog	2014-04-01 13:45:58 UTC (rev 166581)
@@ -1,5 +1,16 @@
 2014-04-01  Zan Dobersek  <zdober...@igalia.com>
 
+        Don't copy the children map in webkitWebViewBaseContainerForall
+        https://bugs.webkit.org/show_bug.cgi?id=131016
+
+        Reviewed by Carlos Garcia Campos.
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseContainerForall): Avoid copying the GtkWidget-to-IntRect HashMap object
+        by transforming the iteration to a range-based for-loop over that HashMap's keys.
+
+2014-04-01  Zan Dobersek  <zdober...@igalia.com>
+
         [GTK] Don't copy the ResourceResponse object in webkitWebViewDecidePolicy
         https://bugs.webkit.org/show_bug.cgi?id=131015
 

Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (166580 => 166581)


--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp	2014-04-01 13:35:39 UTC (rev 166580)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp	2014-04-01 13:45:58 UTC (rev 166581)
@@ -362,10 +362,8 @@
     WebKitWebViewBase* webView = WEBKIT_WEB_VIEW_BASE(container);
     WebKitWebViewBasePrivate* priv = webView->priv;
 
-    WebKitWebViewChildrenMap children = priv->children;
-    WebKitWebViewChildrenMap::const_iterator end = children.end();
-    for (WebKitWebViewChildrenMap::const_iterator current = children.begin(); current != end; ++current)
-        (*callback)(current->key, callbackData);
+    for (const auto& widget : priv->children.keys())
+        (*callback)(widget, callbackData);
 
     if (includeInternals && priv->inspectorView)
         (*callback)(priv->inspectorView, callbackData);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to