diff options
author | Ben Murdoch <benm@google.com> | 2012-05-30 16:07:49 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2012-06-01 10:23:38 +0100 |
commit | 678de4acf72e6fd4c6fb9426d2c69445acc18135 (patch) | |
tree | 0b7232fd98dd338ec08ddc1825fecb399c7b75ea /Source/WebCore/dom | |
parent | b5d3edac71ca2c54cbf9ce5bf42cc7727216ac09 (diff) | |
download | external_webkit-678de4acf72e6fd4c6fb9426d2c69445acc18135.zip external_webkit-678de4acf72e6fd4c6fb9426d2c69445acc18135.tar.gz external_webkit-678de4acf72e6fd4c6fb9426d2c69445acc18135.tar.bz2 |
Fix document.createTouchList crash.
Cherry pick of WebKit r119158.
Note the layout test is tweaked slighly from upstream to make it
happy in our older webkit snapshot.
See: http://trac.webkit.org/changeset/119158
Bug: 6578213
Change-Id: Id6cc23938b5139cf0416e3d4c6e7ba227b1b6a0c
Diffstat (limited to 'Source/WebCore/dom')
-rw-r--r-- | Source/WebCore/dom/Document.cpp | 6 | ||||
-rw-r--r-- | Source/WebCore/dom/Document.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index ff50390..b6a1393 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -5064,15 +5064,9 @@ PassRefPtr<Touch> Document::createTouch(DOMWindow* window, EventTarget* target, // http://developer.apple.com/library/safari/#documentation/UserExperience/Reference/DocumentAdditionsReference/DocumentAdditions/DocumentAdditions.html // when this method should throw and nor is it by inspection of iOS behavior. It would be nice to verify any cases where it throws under iOS // and implement them here. See https://bugs.webkit.org/show_bug.cgi?id=47819 - // Ditto for the createTouchList method below. Frame* frame = window ? window->frame() : this->frame(); return Touch::create(frame, target, identifier, screenX, screenY, pageX, pageY); } - -PassRefPtr<TouchList> Document::createTouchList(ExceptionCode&) const -{ - return TouchList::create(); -} #endif DocumentLoader* Document::loader() const diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h index a4fc266..ce82b2e 100644 --- a/Source/WebCore/dom/Document.h +++ b/Source/WebCore/dom/Document.h @@ -1085,7 +1085,6 @@ public: #if ENABLE(TOUCH_EVENTS) PassRefPtr<Touch> createTouch(DOMWindow*, EventTarget*, int identifier, int pageX, int pageY, int screenX, int screenY, ExceptionCode&) const; - PassRefPtr<TouchList> createTouchList(ExceptionCode&) const; #endif const DocumentTiming* timing() const { return &m_documentTiming; } |