Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(426)

Side by Side Diff: WebCore/dom/Node.cpp

Issue 4065007: Merge 70473 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/events/keyboardevent-mousedown-crash-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 2974 matching lines...) Expand 10 before | Expand all | Expand 10 after
2985 } else if (eventType == eventNames().contextmenuEvent) { 2985 } else if (eventType == eventNames().contextmenuEvent) {
2986 if (Frame* frame = document()->frame()) 2986 if (Frame* frame = document()->frame())
2987 if (Page* page = frame->page()) 2987 if (Page* page = frame->page())
2988 page->contextMenuController()->handleContextMenuEvent(event); 2988 page->contextMenuController()->handleContextMenuEvent(event);
2989 #endif 2989 #endif
2990 } else if (eventType == eventNames().textInputEvent) { 2990 } else if (eventType == eventNames().textInputEvent) {
2991 if (event->isTextEvent()) 2991 if (event->isTextEvent())
2992 if (Frame* frame = document()->frame()) 2992 if (Frame* frame = document()->frame())
2993 frame->eventHandler()->defaultTextInputEventHandler(static_cast< TextEvent*>(event)); 2993 frame->eventHandler()->defaultTextInputEventHandler(static_cast< TextEvent*>(event));
2994 #if ENABLE(PAN_SCROLLING) 2994 #if ENABLE(PAN_SCROLLING)
2995 } else if (eventType == eventNames().mousedownEvent) { 2995 } else if (eventType == eventNames().mousedownEvent && event->isMouseEvent() ) {
2996 MouseEvent* mouseEvent = static_cast<MouseEvent*>(event); 2996 MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
2997 if (mouseEvent->button() == MiddleButton) { 2997 if (mouseEvent->button() == MiddleButton) {
2998 if (enclosingLinkEventParentOrSelf()) 2998 if (enclosingLinkEventParentOrSelf())
2999 return; 2999 return;
3000 3000
3001 RenderObject* renderer = this->renderer(); 3001 RenderObject* renderer = this->renderer();
3002 while (renderer && (!renderer->isBox() || !toRenderBox(renderer)->ca nBeScrolledAndHasScrollableArea())) 3002 while (renderer && (!renderer->isBox() || !toRenderBox(renderer)->ca nBeScrolledAndHasScrollableArea()))
3003 renderer = renderer->parent(); 3003 renderer = renderer->parent();
3004 3004
3005 if (renderer) { 3005 if (renderer) {
(...skipping 23 matching lines...) Expand all
3029 3029
3030 #ifndef NDEBUG 3030 #ifndef NDEBUG
3031 3031
3032 void showTree(const WebCore::Node* node) 3032 void showTree(const WebCore::Node* node)
3033 { 3033 {
3034 if (node) 3034 if (node)
3035 node->showTreeForThis(); 3035 node->showTreeForThis();
3036 } 3036 }
3037 3037
3038 #endif 3038 #endif
OLDNEW
« no previous file with comments | « LayoutTests/fast/events/keyboardevent-mousedown-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698