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

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

Issue 153233002: *** DO NOT LAND *** Remove regions support, keeping a bare minimum to support "region-based"... (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 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
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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 #include "core/inspector/InspectorController.h" 73 #include "core/inspector/InspectorController.h"
74 #include "core/page/MouseEventWithHitTestResults.h" 74 #include "core/page/MouseEventWithHitTestResults.h"
75 #include "core/page/Page.h" 75 #include "core/page/Page.h"
76 #include "core/frame/Settings.h" 76 #include "core/frame/Settings.h"
77 #include "core/page/SpatialNavigation.h" 77 #include "core/page/SpatialNavigation.h"
78 #include "core/page/TouchAdjustment.h" 78 #include "core/page/TouchAdjustment.h"
79 #include "core/rendering/HitTestRequest.h" 79 #include "core/rendering/HitTestRequest.h"
80 #include "core/rendering/HitTestResult.h" 80 #include "core/rendering/HitTestResult.h"
81 #include "core/rendering/RenderFlowThread.h" 81 #include "core/rendering/RenderFlowThread.h"
82 #include "core/rendering/RenderLayer.h" 82 #include "core/rendering/RenderLayer.h"
83 #include "core/rendering/RenderRegion.h"
84 #include "core/rendering/RenderTextControlSingleLine.h" 83 #include "core/rendering/RenderTextControlSingleLine.h"
85 #include "core/rendering/RenderView.h" 84 #include "core/rendering/RenderView.h"
86 #include "core/rendering/RenderWidget.h" 85 #include "core/rendering/RenderWidget.h"
87 #include "core/rendering/style/CursorList.h" 86 #include "core/rendering/style/CursorList.h"
88 #include "core/rendering/style/RenderStyle.h" 87 #include "core/rendering/style/RenderStyle.h"
89 #include "core/svg/SVGDocument.h" 88 #include "core/svg/SVGDocument.h"
90 #include "core/svg/SVGElementInstance.h" 89 #include "core/svg/SVGElementInstance.h"
91 #include "core/svg/SVGUseElement.h" 90 #include "core/svg/SVGUseElement.h"
92 #include "platform/PlatformGestureEvent.h" 91 #include "platform/PlatformGestureEvent.h"
93 #include "platform/PlatformKeyboardEvent.h" 92 #include "platform/PlatformKeyboardEvent.h"
(...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 bool didScroll = curBox->scroll(physicalDirection, granularity, delta); 951 bool didScroll = curBox->scroll(physicalDirection, granularity, delta);
953 952
954 if (didScroll && stopNode) 953 if (didScroll && stopNode)
955 *stopNode = curBox->node(); 954 *stopNode = curBox->node();
956 955
957 if (didScroll || shouldStopBubbling) { 956 if (didScroll || shouldStopBubbling) {
958 setFrameWasScrolledByUser(); 957 setFrameWasScrolledByUser();
959 return true; 958 return true;
960 } 959 }
961 960
962 // FIXME: This should probably move to a virtual method on RenderBox, so mething like
963 // RenderBox::scrollAncestor, and specialized for RenderFlowThread
964 curBox = curBox->containingBlock(); 961 curBox = curBox->containingBlock();
965 if (curBox && curBox->isRenderNamedFlowThread()) {
966 RenderBox* flowedBox = curBox;
967
968 if (RenderBox* startBox = node->renderBox())
969 flowedBox = startBox;
970
971 curBox = toRenderFlowThread(curBox)->regionFromAbsolutePointAndBox(a bsolutePoint, flowedBox);
972 }
973 } 962 }
974 963
975 return false; 964 return false;
976 } 965 }
977 966
978 bool EventHandler::bubblingScroll(ScrollDirection direction, ScrollGranularity g ranularity, Node* startingNode) 967 bool EventHandler::bubblingScroll(ScrollDirection direction, ScrollGranularity g ranularity, Node* startingNode)
979 { 968 {
980 // The layout needs to be up to date to determine if we can scroll. We may b e 969 // The layout needs to be up to date to determine if we can scroll. We may b e
981 // here because of an onLoad event, in which case the final layout hasn't be en performed yet. 970 // here because of an onLoad event, in which case the final layout hasn't be en performed yet.
982 m_frame->document()->updateLayoutIgnorePendingStylesheets(); 971 m_frame->document()->updateLayoutIgnorePendingStylesheets();
(...skipping 3031 matching lines...) Expand 10 before | Expand all | Expand 10 after
4014 unsigned EventHandler::accessKeyModifiers() 4003 unsigned EventHandler::accessKeyModifiers()
4015 { 4004 {
4016 #if OS(MACOSX) 4005 #if OS(MACOSX)
4017 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; 4006 return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
4018 #else 4007 #else
4019 return PlatformEvent::AltKey; 4008 return PlatformEvent::AltKey;
4020 #endif 4009 #endif
4021 } 4010 }
4022 4011
4023 } // namespace WebCore 4012 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorInstrumentation.idl ('k') | Source/core/rendering/CompositedLayerMapping.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698