<!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>[182682] releases/WebKitGTK/webkit-2.8/Source/WebKit2</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/182682">182682</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-13 00:59:08 -0700 (Mon, 13 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/182005">r182005</a> - Avoid the Vector<> copy in WebTouchEvent constructor
https://bugs.webkit.org/show_bug.cgi?id=143043
Reviewed by Carlos Garcia Campos.
Have the WebTouchEvent accept a Vector<> rvalue.
The relevant code is updated so the Vector<> object is moved
through the call chain and finally into the WebTouchEvent constructor.
* Shared/NativeWebTouchEvent.h:
* Shared/WebEvent.h:
* Shared/WebTouchEvent.cpp:
(WebKit::WebTouchEvent::WebTouchEvent):
* Shared/efl/WebEventFactory.cpp:
(WebKit::WebEventFactory::createWebTouchEvent):
* Shared/gtk/NativeWebTouchEventGtk.cpp:
(WebKit::NativeWebTouchEvent::NativeWebTouchEvent):
* Shared/gtk/WebEventFactory.cpp:
(WebKit::WebEventFactory::createWebTouchEvent):
* Shared/gtk/WebEventFactory.h:
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseTouchEvent):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2SharedNativeWebTouchEventh">releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/NativeWebTouchEvent.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2SharedWebEventh">releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/WebEvent.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2SharedWebTouchEventcpp">releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/WebTouchEvent.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2SharedeflWebEventFactorycpp">releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/efl/WebEventFactory.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2SharedgtkNativeWebTouchEventGtkcpp">releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/NativeWebTouchEventGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2SharedgtkWebEventFactorycpp">releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/WebEventFactory.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2SharedgtkWebEventFactoryh">releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/WebEventFactory.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (182681 => 182682)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-04-13 07:54:15 UTC (rev 182681)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-04-13 07:59:08 UTC (rev 182682)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-03-26 Zan Dobersek <zdobersek@igalia.com>
+
+ Avoid the Vector<> copy in WebTouchEvent constructor
+ https://bugs.webkit.org/show_bug.cgi?id=143043
+
+ Reviewed by Carlos Garcia Campos.
+
+ Have the WebTouchEvent accept a Vector<> rvalue.
+ The relevant code is updated so the Vector<> object is moved
+ through the call chain and finally into the WebTouchEvent constructor.
+
+ * Shared/NativeWebTouchEvent.h:
+ * Shared/WebEvent.h:
+ * Shared/WebTouchEvent.cpp:
+ (WebKit::WebTouchEvent::WebTouchEvent):
+ * Shared/efl/WebEventFactory.cpp:
+ (WebKit::WebEventFactory::createWebTouchEvent):
+ * Shared/gtk/NativeWebTouchEventGtk.cpp:
+ (WebKit::NativeWebTouchEvent::NativeWebTouchEvent):
+ * Shared/gtk/WebEventFactory.cpp:
+ (WebKit::WebEventFactory::createWebTouchEvent):
+ * Shared/gtk/WebEventFactory.h:
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseTouchEvent):
+
</ins><span class="cx"> 2015-03-25 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] WebFrameLoaderClient::dispatchDecidePolicyForResponse() should always call the FramePolicyFunction
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2SharedNativeWebTouchEventh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/NativeWebTouchEvent.h (182681 => 182682)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/NativeWebTouchEvent.h 2015-04-13 07:54:15 UTC (rev 182681)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/NativeWebTouchEvent.h 2015-04-13 07:59:08 UTC (rev 182682)
</span><span class="lines">@@ -47,8 +47,8 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> explicit NativeWebTouchEvent(const _UIWebTouchEvent*);
</span><span class="cx"> #elif PLATFORM(GTK)
</span><ins>+ NativeWebTouchEvent(GdkEvent*, Vector<WebPlatformTouchPoint>&&);
</ins><span class="cx"> NativeWebTouchEvent(const NativeWebTouchEvent&);
</span><del>- NativeWebTouchEvent(GdkEvent*, const Vector<WebPlatformTouchPoint>&);
</del><span class="cx"> const GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> NativeWebTouchEvent(EwkTouchEvent*, const WebCore::AffineTransform&);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2SharedWebEventh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/WebEvent.h (182681 => 182682)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/WebEvent.h 2015-04-13 07:54:15 UTC (rev 182681)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/WebEvent.h 2015-04-13 07:59:08 UTC (rev 182682)
</span><span class="lines">@@ -379,9 +379,7 @@
</span><span class="cx"> class WebTouchEvent : public WebEvent {
</span><span class="cx"> public:
</span><span class="cx"> WebTouchEvent() { }
</span><del>-
- // FIXME: It would be nice not to have to copy the Vector here.
- WebTouchEvent(Type, Vector<WebPlatformTouchPoint>, Modifiers, double timestamp);
</del><ins>+ WebTouchEvent(Type, Vector<WebPlatformTouchPoint>&&, Modifiers, double timestamp);
</ins><span class="cx">
</span><span class="cx"> const Vector<WebPlatformTouchPoint>& touchPoints() const { return m_touchPoints; }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2SharedWebTouchEventcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/WebTouchEvent.cpp (182681 => 182682)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/WebTouchEvent.cpp 2015-04-13 07:54:15 UTC (rev 182681)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/WebTouchEvent.cpp 2015-04-13 07:59:08 UTC (rev 182682)
</span><span class="lines">@@ -33,9 +33,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-WebTouchEvent::WebTouchEvent(WebEvent::Type type, Vector<WebPlatformTouchPoint> touchPoints, Modifiers modifiers, double timestamp)
</del><ins>+WebTouchEvent::WebTouchEvent(WebEvent::Type type, Vector<WebPlatformTouchPoint>&& touchPoints, Modifiers modifiers, double timestamp)
</ins><span class="cx"> : WebEvent(type, modifiers, timestamp)
</span><del>- , m_touchPoints(touchPoints)
</del><ins>+ , m_touchPoints(WTF::move(touchPoints))
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isTouchEventType(type));
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2SharedeflWebEventFactorycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/efl/WebEventFactory.cpp (182681 => 182682)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/efl/WebEventFactory.cpp 2015-04-13 07:54:15 UTC (rev 182681)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/efl/WebEventFactory.cpp 2015-04-13 07:59:08 UTC (rev 182682)
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> touchPoints.uncheckedAppend(WebPlatformTouchPoint(point->id(), toWebPlatformTouchPointState(point->state()), toIntPoint(point->screenPosition()), toWebContent.mapPoint(toIntPoint(point->position())), toIntSize(point->radius()), point->rotationAngle(), point->forceFactor()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WebTouchEvent(toWebEventType(event->eventType()), touchPoints, toWebEventModifiers(event->modifiers()), event->timestamp());
</del><ins>+ return WebTouchEvent(toWebEventType(event->eventType()), WTF::move(touchPoints), toWebEventModifiers(event->modifiers()), event->timestamp());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2SharedgtkNativeWebTouchEventGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/NativeWebTouchEventGtk.cpp (182681 => 182682)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/NativeWebTouchEventGtk.cpp 2015-04-13 07:54:15 UTC (rev 182681)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/NativeWebTouchEventGtk.cpp 2015-04-13 07:59:08 UTC (rev 182682)
</span><span class="lines">@@ -31,14 +31,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-NativeWebTouchEvent::NativeWebTouchEvent(GdkEvent* event, const Vector<WebPlatformTouchPoint>& touchPoints)
- : WebTouchEvent(WebEventFactory::createWebTouchEvent(event, touchPoints))
</del><ins>+NativeWebTouchEvent::NativeWebTouchEvent(GdkEvent* event, Vector<WebPlatformTouchPoint>&& touchPoints)
+ : WebTouchEvent(WebEventFactory::createWebTouchEvent(event, WTF::move(touchPoints)))
</ins><span class="cx"> , m_nativeEvent(gdk_event_copy(event))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NativeWebTouchEvent::NativeWebTouchEvent(const NativeWebTouchEvent& event)
</span><del>- : WebTouchEvent(WebEventFactory::createWebTouchEvent(event.nativeEvent(), event.touchPoints()))
</del><ins>+ : WebTouchEvent(WebEventFactory::createWebTouchEvent(event.nativeEvent(), Vector<WebPlatformTouchPoint>(event.touchPoints())))
</ins><span class="cx"> , m_nativeEvent(gdk_event_copy(event.nativeEvent()))
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2SharedgtkWebEventFactorycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/WebEventFactory.cpp (182681 => 182682)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/WebEventFactory.cpp 2015-04-13 07:54:15 UTC (rev 182681)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/WebEventFactory.cpp 2015-04-13 07:59:08 UTC (rev 182682)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> gdk_event_get_time(event));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebTouchEvent WebEventFactory::createWebTouchEvent(const GdkEvent* event, const Vector<WebPlatformTouchPoint>& touchPoints)
</del><ins>+WebTouchEvent WebEventFactory::createWebTouchEvent(const GdkEvent* event, Vector<WebPlatformTouchPoint>&& touchPoints)
</ins><span class="cx"> {
</span><span class="cx"> #ifndef GTK_API_VERSION_2
</span><span class="cx"> WebEvent::Type type = WebEvent::NoType;
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WebTouchEvent(type, touchPoints, modifiersForEvent(event), gdk_event_get_time(event));
</del><ins>+ return WebTouchEvent(type, WTF::move(touchPoints), modifiersForEvent(event), gdk_event_get_time(event));
</ins><span class="cx"> #else
</span><span class="cx"> return WebTouchEvent();
</span><span class="cx"> #endif // GTK_API_VERSION_2
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2SharedgtkWebEventFactoryh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/WebEventFactory.h (182681 => 182682)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/WebEventFactory.h 2015-04-13 07:54:15 UTC (rev 182681)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/WebEventFactory.h 2015-04-13 07:59:08 UTC (rev 182682)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> static WebMouseEvent createWebMouseEvent(const GdkEvent*, int);
</span><span class="cx"> static WebWheelEvent createWebWheelEvent(const GdkEvent*);
</span><span class="cx"> static WebKeyboardEvent createWebKeyboardEvent(const GdkEvent*, const WebCore::CompositionResults&);
</span><del>- static WebTouchEvent createWebTouchEvent(const GdkEvent*, const Vector<WebPlatformTouchPoint>&);
</del><ins>+ static WebTouchEvent createWebTouchEvent(const GdkEvent*, Vector<WebPlatformTouchPoint>&&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (182681 => 182682)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-04-13 07:54:15 UTC (rev 182681)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-04-13 07:59:08 UTC (rev 182682)
</span><span class="lines">@@ -917,7 +917,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<WebPlatformTouchPoint> touchPoints;
</span><span class="cx"> webkitWebViewBaseGetTouchPointsForEvent(webViewBase, touchEvent, touchPoints);
</span><del>- priv->pageProxy->handleTouchEvent(NativeWebTouchEvent(reinterpret_cast<GdkEvent*>(event), touchPoints));
</del><ins>+ priv->pageProxy->handleTouchEvent(NativeWebTouchEvent(reinterpret_cast<GdkEvent*>(event), WTF::move(touchPoints)));
</ins><span class="cx">
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>