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

Side by Side Diff: Source/core/page/EventHandler.cpp

Issue 197873022: Drop Element::isHTMLFrameElementBase() virtual function (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Take tkent's feedback into consideration Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLFrameElementBase.h ('k') | Source/web/TextFinder.cpp » ('j') | 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) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 1727 matching lines...) Expand 10 before | Expand all | Expand 10 after
1738 event.movementDelta().x(), event.movementDelta().y(), 1738 event.movementDelta().x(), event.movementDelta().y(),
1739 event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(), 1739 event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(),
1740 0, nullptr, clipboard); 1740 0, nullptr, clipboard);
1741 1741
1742 dragTarget->dispatchEvent(me.get(), IGNORE_EXCEPTION); 1742 dragTarget->dispatchEvent(me.get(), IGNORE_EXCEPTION);
1743 return me->defaultPrevented(); 1743 return me->defaultPrevented();
1744 } 1744 }
1745 1745
1746 static bool targetIsFrame(Node* target, LocalFrame*& frame) 1746 static bool targetIsFrame(Node* target, LocalFrame*& frame)
1747 { 1747 {
1748 if (!target) 1748 if (!isHTMLFrameElementBase(target))
1749 return false;
1750
1751 if (!isHTMLFrameElement(*target) && !isHTMLIFrameElement(*target))
1752 return false; 1749 return false;
1753 1750
1754 frame = toHTMLFrameElementBase(target)->contentFrame(); 1751 frame = toHTMLFrameElementBase(target)->contentFrame();
1755 return true; 1752 return true;
1756 } 1753 }
1757 1754
1758 static bool findDropZone(Node* target, Clipboard* clipboard) 1755 static bool findDropZone(Node* target, Clipboard* clipboard)
1759 { 1756 {
1760 Element* element = target->isElementNode() ? toElement(target) : target->par entElement(); 1757 Element* element = target->isElementNode() ? toElement(target) : target->par entElement();
1761 for (; element; element = element->parentElement()) { 1758 for (; element; element = element->parentElement()) {
(...skipping 2265 matching lines...) Expand 10 before | Expand all | Expand 10 after
4027 unsigned EventHandler::accessKeyModifiers() 4024 unsigned EventHandler::accessKeyModifiers()
4028 { 4025 {
4029 #if OS(MACOSX) 4026 #if OS(MACOSX)
4030 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; 4027 return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
4031 #else 4028 #else
4032 return PlatformEvent::AltKey; 4029 return PlatformEvent::AltKey;
4033 #endif 4030 #endif
4034 } 4031 }
4035 4032
4036 } // namespace WebCore 4033 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFrameElementBase.h ('k') | Source/web/TextFinder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698