diff options
| author | Steve Block <steveblock@google.com> | 2009-11-05 18:34:51 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:13 +0000 |
| commit | 3f60c26c3fa9dc89d57ef4db083a4f13ef86c103 (patch) | |
| tree | 81c16accd4c9b2b2e4e29ec18b9e5fa7eb37ed93 /WebCore/dom/Document.cpp | |
| parent | cac0f67c402d107cdb10971b95719e2ff9c7c76b (diff) | |
| download | external_webkit-3f60c26c3fa9dc89d57ef4db083a4f13ef86c103.zip external_webkit-3f60c26c3fa9dc89d57ef4db083a4f13ef86c103.tar.gz external_webkit-3f60c26c3fa9dc89d57ef4db083a4f13ef86c103.tar.bz2 | |
Merge webkit.org at r50258 : Fix conflicts.
Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor.
See http://trac.webkit.org/changeset/49608
Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77
Diffstat (limited to 'WebCore/dom/Document.cpp')
| -rw-r--r-- | WebCore/dom/Document.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp index 9ac1092..174e58d 100644 --- a/WebCore/dom/Document.cpp +++ b/WebCore/dom/Document.cpp @@ -3058,17 +3058,14 @@ PassRefPtr<Event> Document::createEvent(const String& eventType, ExceptionCode& else if (eventType == "SVGZoomEvents") event = SVGZoomEvent::create(); #endif -<<<<<<< HEAD:WebCore/dom/Document.cpp #if ENABLE(TOUCH_EVENTS) // Android - if (eventType == "TouchEvent") - return TouchEvent::create(); + else if (eventType == "TouchEvent") + event = TouchEvent::create(); #endif -======= if (event) { event->setCreatedByDOM(true); return event.release(); } ->>>>>>> webkit.org at r50258.:WebCore/dom/Document.cpp ec = NOT_SUPPORTED_ERR; return 0; } |