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

Side by Side Diff: Source/core/loader/NavigationAction.cpp

Issue 26558004: Revert 158219 "Move dom/*Event* to events to match the DOM vs. E..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1651/
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/NavigationAction.h ('k') | Source/core/loader/NavigationScheduler.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 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 11 matching lines...) Expand all
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "config.h" 29 #include "config.h"
30 #include "core/loader/NavigationAction.h" 30 #include "core/loader/NavigationAction.h"
31 31
32 #include "core/events/MouseEvent.h" 32 #include "core/dom/MouseEvent.h"
33 #include "core/loader/FrameLoader.h" 33 #include "core/loader/FrameLoader.h"
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 static NavigationType navigationType(FrameLoadType frameLoadType, bool isFormSub mission, bool haveEvent) 37 static NavigationType navigationType(FrameLoadType frameLoadType, bool isFormSub mission, bool haveEvent)
38 { 38 {
39 bool isReload = frameLoadType == FrameLoadTypeReload || frameLoadType == Fra meLoadTypeReloadFromOrigin; 39 bool isReload = frameLoadType == FrameLoadTypeReload || frameLoadType == Fra meLoadTypeReloadFromOrigin;
40 bool isBackForward = isBackForwardLoadType(frameLoadType); 40 bool isBackForward = isBackForwardLoadType(frameLoadType);
41 if (isFormSubmission) 41 if (isFormSubmission)
42 return (isReload || isBackForward) ? NavigationTypeFormResubmitted : Nav igationTypeFormSubmitted; 42 return (isReload || isBackForward) ? NavigationTypeFormResubmitted : Nav igationTypeFormSubmitted;
(...skipping 26 matching lines...) Expand all
69 event = toMouseEvent(m_event.get()); 69 event = toMouseEvent(m_event.get());
70 else if (m_type == NavigationTypeFormSubmitted && m_event && m_event->underl yingEvent() && m_event->underlyingEvent()->isMouseEvent()) 70 else if (m_type == NavigationTypeFormSubmitted && m_event && m_event->underl yingEvent() && m_event->underlyingEvent()->isMouseEvent())
71 event = toMouseEvent(m_event->underlyingEvent()); 71 event = toMouseEvent(m_event->underlyingEvent());
72 72
73 if (!event) 73 if (!event)
74 return false; 74 return false;
75 return navigationPolicyFromMouseEvent(event->button(), event->ctrlKey(), eve nt->shiftKey(), event->altKey(), event->metaKey(), policy); 75 return navigationPolicyFromMouseEvent(event->button(), event->ctrlKey(), eve nt->shiftKey(), event->altKey(), event->metaKey(), policy);
76 } 76 }
77 77
78 } 78 }
OLDNEW
« no previous file with comments | « Source/core/loader/NavigationAction.h ('k') | Source/core/loader/NavigationScheduler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698