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

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

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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/editing/markup.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.
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 return; 136 return;
137 137
138 // Compute coordinates that are based on the target. 138 // Compute coordinates that are based on the target.
139 m_layerLocation = m_pageLocation; 139 m_layerLocation = m_pageLocation;
140 m_offsetLocation = m_pageLocation; 140 m_offsetLocation = m_pageLocation;
141 141
142 // Must have an updated render tree for this math to work correctly. 142 // Must have an updated render tree for this math to work correctly.
143 targetNode->document().updateLayoutIgnorePendingStylesheets(); 143 targetNode->document().updateLayoutIgnorePendingStylesheets();
144 144
145 // Adjust offsetLocation to be relative to the target's position. 145 // Adjust offsetLocation to be relative to the target's position.
146 if (LayoutObject* r = targetNode->renderer()) { 146 if (LayoutObject* r = targetNode->layoutObject()) {
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 Layer 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->layoutObject())
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 (Layer* layer = n->renderer()->enclosingLayer(); layer; layer = laye r->parent()) 164 for (Layer* layer = n->layoutObject()->enclosingLayer(); layer; layer = layer->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 DEFINE_TRACE(MouseRelatedEvent) 227 DEFINE_TRACE(MouseRelatedEvent)
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/markup.cpp ('k') | Source/core/frame/Frame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698