<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[187640] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187640">187640</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-07-31 01:06:37 -0700 (Fri, 31 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Have DataObjectGtk::unknownTypes() return a reference to the HashMap object
https://bugs.webkit.org/show_bug.cgi?id=147401
Reviewed by Carlos Garcia Campos.
Don't copy the DataObjectGtk::m_unknownTypes HashMap on every retrieval through
DataObjectGtk::unknownTypes(). The range-based for-loops that iterate over the
map in PasteboardGtk.cpp and PasteboardHelper.cpp are also cleaned up.
* platform/gtk/DataObjectGtk.cpp:
(WebCore::DataObjectGtk::unknownTypes):
* platform/gtk/DataObjectGtk.h:
* platform/gtk/PasteboardGtk.cpp:
(WebCore::Pasteboard::writePasteboard):
(WebCore::Pasteboard::types):
* platform/gtk/PasteboardHelper.cpp:
(WebCore::PasteboardHelper::fillSelectionData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkDataObjectGtkcpp">trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkDataObjectGtkh">trunk/Source/WebCore/platform/gtk/DataObjectGtk.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkPasteboardGtkcpp">trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkPasteboardHelpercpp">trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187639 => 187640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-31 06:02:40 UTC (rev 187639)
+++ trunk/Source/WebCore/ChangeLog 2015-07-31 08:06:37 UTC (rev 187640)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-07-31 Zan Dobersek <zdobersek@igalia.com>
+
+ [GTK] Have DataObjectGtk::unknownTypes() return a reference to the HashMap object
+ https://bugs.webkit.org/show_bug.cgi?id=147401
+
+ Reviewed by Carlos Garcia Campos.
+
+ Don't copy the DataObjectGtk::m_unknownTypes HashMap on every retrieval through
+ DataObjectGtk::unknownTypes(). The range-based for-loops that iterate over the
+ map in PasteboardGtk.cpp and PasteboardHelper.cpp are also cleaned up.
+
+ * platform/gtk/DataObjectGtk.cpp:
+ (WebCore::DataObjectGtk::unknownTypes):
+ * platform/gtk/DataObjectGtk.h:
+ * platform/gtk/PasteboardGtk.cpp:
+ (WebCore::Pasteboard::writePasteboard):
+ (WebCore::Pasteboard::types):
+ * platform/gtk/PasteboardHelper.cpp:
+ (WebCore::PasteboardHelper::fillSelectionData):
+
</ins><span class="cx"> 2015-07-30 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> RenderTheme::paintBorderOnly and paintDecorations should take RenderBox instead of RenderObject.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkDataObjectGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp (187639 => 187640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp 2015-07-31 06:02:40 UTC (rev 187639)
+++ trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp 2015-07-31 08:06:37 UTC (rev 187640)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> str.replace(NonBreakingSpaceCharacter, SpaceCharacter);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HashMap<String, String> DataObjectGtk::unknownTypes() const
</del><ins>+const HashMap<String, String>& DataObjectGtk::unknownTypes() const
</ins><span class="cx"> {
</span><span class="cx"> return m_unknownTypeData;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkDataObjectGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/DataObjectGtk.h (187639 => 187640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/DataObjectGtk.h 2015-07-31 06:02:40 UTC (rev 187639)
+++ trunk/Source/WebCore/platform/gtk/DataObjectGtk.h 2015-07-31 08:06:37 UTC (rev 187640)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> String text() const { return m_text; }
</span><span class="cx"> String markup() const { return m_markup; }
</span><span class="cx"> String unknownTypeData(const String& type) const { return m_unknownTypeData.get(type); }
</span><del>- HashMap<String, String> unknownTypes() const;
</del><ins>+ const HashMap<String, String>& unknownTypes() const;
</ins><span class="cx"> void setText(const String&);
</span><span class="cx"> void setMarkup(const String&);
</span><span class="cx"> void setUnknownTypeData(const String& type, const String& data) { m_unknownTypeData.set(type, data); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp (187639 => 187640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2015-07-31 06:02:40 UTC (rev 187639)
+++ trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2015-07-31 08:06:37 UTC (rev 187640)
</span><span class="lines">@@ -204,10 +204,8 @@
</span><span class="cx"> if (sourceDataObject->hasImage())
</span><span class="cx"> m_dataObject->setImage(sourceDataObject->image());
</span><span class="cx"> if (sourceDataObject->hasUnknownTypeData()) {
</span><del>- auto types = m_dataObject->unknownTypes();
- auto end = types.end();
- for (auto it = types.begin(); it != end; ++it)
- m_dataObject->setUnknownTypeData(it->key, it->value);
</del><ins>+ for (auto& it : m_dataObject->unknownTypes())
+ m_dataObject->setUnknownTypeData(it.key, it.value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span><span class="lines">@@ -300,10 +298,8 @@
</span><span class="cx"> if (m_dataObject->hasFilenames())
</span><span class="cx"> types.append(ASCIILiteral("Files"));
</span><span class="cx">
</span><del>- auto unknownTypes = m_dataObject->unknownTypes();
- auto end = unknownTypes.end();
- for (auto it = unknownTypes.begin(); it != end; ++it)
- types.append(it->key);
</del><ins>+ for (auto& key : m_dataObject->unknownTypes().keys())
+ types.append(key);
</ins><span class="cx">
</span><span class="cx"> return types;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardHelpercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp (187639 => 187640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2015-07-31 06:02:40 UTC (rev 187639)
+++ trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2015-07-31 08:06:37 UTC (rev 187640)
</span><span class="lines">@@ -162,10 +162,8 @@
</span><span class="cx"> GVariantBuilder builder;
</span><span class="cx"> g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
</span><span class="cx">
</span><del>- auto types = dataObject->unknownTypes();
- auto end = types.end();
- for (auto it = types.begin(); it != end; ++it) {
- GUniquePtr<gchar> dictItem(g_strdup_printf("{'%s', '%s'}", it->key.utf8().data(), it->value.utf8().data()));
</del><ins>+ for (auto& it : dataObject->unknownTypes()) {
+ GUniquePtr<gchar> dictItem(g_strdup_printf("{'%s', '%s'}", it.key.utf8().data(), it.value.utf8().data()));
</ins><span class="cx"> g_variant_builder_add_parsed(&builder, dictItem.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>