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

Side by Side Diff: Source/core/events/MouseRelatedEvent.cpp

Issue 898783003: Move rendering/RenderLayer* to layout/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/editing/RenderedPosition.cpp ('k') | Source/core/frame/Frame.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) 2001 Peter Kelly (pmk@post.com) 2 * Copyright (C) 2001 Peter Kelly (pmk@post.com)
3 * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de) 3 * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de)
4 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
5 * Copyright (C) 2003, 2005, 2006, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2008 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
11 * 11 *
12 * This library is distributed in the hope that it will be useful, 12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Library General Public License for more details. 15 * Library General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Library General Public License 17 * You should have received a copy of the GNU Library General Public License
18 * along with this library; see the file COPYING.LIB. If not, write to 18 * along with this library; see the file COPYING.LIB. If not, write to
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20 * Boston, MA 02110-1301, USA.
21 */ 21 */
22 22
23 #include "config.h" 23 #include "config.h"
24 #include "core/events/MouseRelatedEvent.h" 24 #include "core/events/MouseRelatedEvent.h"
25 25
26 #include "core/dom/Document.h" 26 #include "core/dom/Document.h"
27 #include "core/frame/LocalDOMWindow.h" 27 #include "core/frame/LocalDOMWindow.h"
28 #include "core/frame/FrameView.h" 28 #include "core/frame/FrameView.h"
29 #include "core/frame/LocalFrame.h" 29 #include "core/frame/LocalFrame.h"
30 #include "core/rendering/RenderLayer.h" 30 #include "core/layout/Layer.h"
31 #include "core/rendering/RenderObject.h" 31 #include "core/rendering/RenderObject.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 MouseRelatedEvent::MouseRelatedEvent() 35 MouseRelatedEvent::MouseRelatedEvent()
36 : m_isSimulated(false) 36 : m_isSimulated(false)
37 , m_hasCachedRelativePosition(false) 37 , m_hasCachedRelativePosition(false)
38 { 38 {
39 } 39 }
40 40
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 if (RenderObject* r = targetNode->renderer()) { 146 if (RenderObject* r = targetNode->renderer()) {
147 FloatPoint localPos = r->absoluteToLocal(FloatPoint(absoluteLocation()), UseTransforms); 147 FloatPoint localPos = r->absoluteToLocal(FloatPoint(absoluteLocation()), UseTransforms);
148 m_offsetLocation = roundedLayoutPoint(localPos); 148 m_offsetLocation = roundedLayoutPoint(localPos);
149 float scaleFactor = 1 / pageZoomFactor(this); 149 float scaleFactor = 1 / pageZoomFactor(this);
150 if (scaleFactor != 1.0f) 150 if (scaleFactor != 1.0f)
151 m_offsetLocation.scale(scaleFactor, scaleFactor); 151 m_offsetLocation.scale(scaleFactor, scaleFactor);
152 } 152 }
153 153
154 // Adjust layerLocation to be relative to the layer. 154 // Adjust layerLocation to be relative to the layer.
155 // FIXME: event.layerX and event.layerY are poorly defined, 155 // FIXME: event.layerX and event.layerY are poorly defined,
156 // and probably don't always correspond to RenderLayer offsets. 156 // and probably don't always correspond to Layer offsets.
157 // https://bugs.webkit.org/show_bug.cgi?id=21868 157 // https://bugs.webkit.org/show_bug.cgi?id=21868
158 Node* n = targetNode; 158 Node* n = targetNode;
159 while (n && !n->renderer()) 159 while (n && !n->renderer())
160 n = n->parentNode(); 160 n = n->parentNode();
161 161
162 if (n) { 162 if (n) {
163 // FIXME: This logic is a wrong implementation of convertToLayerCoords. 163 // FIXME: This logic is a wrong implementation of convertToLayerCoords.
164 for (RenderLayer* layer = n->renderer()->enclosingLayer(); layer; layer = layer->parent()) 164 for (Layer* layer = n->renderer()->enclosingLayer(); layer; layer = laye r->parent())
165 m_layerLocation -= toLayoutSize(layer->location()); 165 m_layerLocation -= toLayoutSize(layer->location());
166 } 166 }
167 167
168 m_hasCachedRelativePosition = true; 168 m_hasCachedRelativePosition = true;
169 } 169 }
170 170
171 int MouseRelatedEvent::layerX() 171 int MouseRelatedEvent::layerX()
172 { 172 {
173 if (!m_hasCachedRelativePosition) 173 if (!m_hasCachedRelativePosition)
174 computeRelativePosition(); 174 computeRelativePosition();
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 // See Microsoft documentation and <http://www.quirksmode.org/dom/w3c_events .html>. 223 // See Microsoft documentation and <http://www.quirksmode.org/dom/w3c_events .html>.
224 return m_clientLocation.y(); 224 return m_clientLocation.y();
225 } 225 }
226 226
227 void MouseRelatedEvent::trace(Visitor* visitor) 227 void MouseRelatedEvent::trace(Visitor* visitor)
228 { 228 {
229 UIEventWithKeyState::trace(visitor); 229 UIEventWithKeyState::trace(visitor);
230 } 230 }
231 231
232 } // namespace blink 232 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/editing/RenderedPosition.cpp ('k') | Source/core/frame/Frame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698