commit 63f95120ca90887045131d7ecf183e171d5dbe5d
author Ben Murdoch <benm@google.com> Mon Feb 15 17:00:16 2010 +0000
committer Ben Murdoch <benm@google.com> Mon Feb 15 17:08:22 2010 +0000
tree fe37288f71edbb771265ff93b6cd398e6e510c03
parent 37ee8a08023fb2e5af82a4164797459e256c18e1

Don't add something to a hash map and then get it out again immediately if we don't need to.

Change-Id: Ic6718a7c23e8896f5bbbb5cadcc22aa9a3108530

WebCore/page/EventHandler.cpp

diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp
index ad29dc1..39fe724 100644
--- a/WebCore/page/EventHandler.cpp
+++ b/WebCore/page/EventHandler.cpp
@@ -2600,10 +2600,13 @@
         // The touch event should act on the originating touch target, not the current target
         // TODO: Upstream this fix to webkit.org (see webkit bug 34585)
         int touchPointId = point.id();
-        if (point.state() == PlatformTouchPoint::TouchPressed)
+        EventTarget* touchTarget = 0;
+        if (point.state() == PlatformTouchPoint::TouchPressed) {
             m_originatingTouchPointTargets.set(touchPointId, target);
+            touchTarget = target;
+        } else
+            touchTarget = m_originatingTouchPointTargets.get(touchPointId).get();
 
-        EventTarget* touchTarget = m_originatingTouchPointTargets.get(touchPointId).get();
         ASSERT(touchTarget);
 
         RefPtr<Touch> touch = Touch::create(doc->frame(), touchTarget, touchPointId,