Changeset 136876 in webkit

Timestamp:

Dec 6, 2012, 1:13:24 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Add some null-checks for the touch-lists in TouchEvent
​https://bugs.webkit.org/show_bug.cgi?id=104098

Patch by Sadrul Habib Chowdhury <​sadrul@chromium.org> on 2012-12-06
Reviewed by Adam Barth.

It is possible for the touch-lists to be NULL in a TouchEvent. V8TouchEvent checks for NULL
touches(), targetTouches() and changedTouches(). So do the same for WebMouseEventBuilder.

• src/WebInputEventConversion.cpp:

(WebKit::WebMouseEventBuilder::WebMouseEventBuilder):

• tests/WebInputEventConversionTest.cpp:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebInputEventConversion.cpp (modified) (1 diff)
• tests/WebInputEventConversionTest.cpp (modified) (3 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-12-06  Sadrul Habib Chowdhury  <sadrul@chromium.org>
+
+        [chromium] Add some null-checks for the touch-lists in TouchEvent
+        https://bugs.webkit.org/show_bug.cgi?id=104098
+
+        Reviewed by Adam Barth.
+
+        It is possible for the touch-lists to be NULL in a TouchEvent. V8TouchEvent checks for NULL
+        touches(), targetTouches() and changedTouches(). So do the same for WebMouseEventBuilder.
+
+        * src/WebInputEventConversion.cpp:
+        (WebKit::WebMouseEventBuilder::WebMouseEventBuilder):
+        * tests/WebInputEventConversionTest.cpp:
+
 2012-12-06  Xianzhu Wang  <wangxianzhu@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebInputEventConversion.cpp

@@ -476 +476 @@
 WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const WebCore::RenderObject* renderObject, const TouchEvent& event)
 {
+    if (!event.touches())
+        return;
     if (event.touches()->length() != 1) {
-        if (event.touches()->length() || event.type() != eventNames().touchendEvent || event.changedTouches()->length() != 1)
+        if (event.touches()->length() || event.type() != eventNames().touchendEvent || !event.changedTouches() || event.changedTouches()->length() != 1)
             return;
     }

trunk/Source/WebKit/chromium/tests/WebInputEventConversionTest.cpp

@@ -34 +34 @@
 
 #include "KeyboardEvent.h"
+#include "TouchEvent.h"
 #include <gtest/gtest.h>
 
@@ -39 +40 @@
 using WebKit::WebKeyboardEvent;
 using WebKit::WebKeyboardEventBuilder;
+using WebKit::WebMouseEventBuilder;
 
 namespace {
@@ -73 +75 @@
 }
 
+TEST(WebInputEventConversionTest, WebTouchEventBuilder)
+{
+    RefPtr<WebCore::TouchEvent> event = WebCore::TouchEvent::create();
+    WebMouseEventBuilder mouse(0, 0, *event);
+    EXPECT_EQ(WebInputEvent::Undefined, mouse.type);
+}
+
 } // anonymous namespace