OLD | NEW |
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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 } | 153 } |
154 | 154 |
155 // Adjust layerLocation to be relative to the layer. | 155 // Adjust layerLocation to be relative to the layer. |
156 // FIXME: event.layerX and event.layerY are poorly defined, | 156 // FIXME: event.layerX and event.layerY are poorly defined, |
157 // and probably don't always correspond to RenderLayer offsets. | 157 // and probably don't always correspond to RenderLayer offsets. |
158 // https://bugs.webkit.org/show_bug.cgi?id=21868 | 158 // https://bugs.webkit.org/show_bug.cgi?id=21868 |
159 Node* n = targetNode; | 159 Node* n = targetNode; |
160 while (n && !n->renderer()) | 160 while (n && !n->renderer()) |
161 n = n->parentNode(); | 161 n = n->parentNode(); |
162 | 162 |
163 RenderLayer* layer; | 163 if (n) { |
164 if (n && (layer = n->renderer()->enclosingLayer())) { | 164 for (RenderLayer* layer = n->renderer()->enclosingLayer(); layer; layer
= layer->parent()) |
165 for (; layer; layer = layer->parent()) { | |
166 m_layerLocation -= toLayoutSize(layer->location()); | 165 m_layerLocation -= toLayoutSize(layer->location()); |
167 } | |
168 } | 166 } |
169 | 167 |
170 m_hasCachedRelativePosition = true; | 168 m_hasCachedRelativePosition = true; |
171 } | 169 } |
172 | 170 |
173 int MouseRelatedEvent::layerX() | 171 int MouseRelatedEvent::layerX() |
174 { | 172 { |
175 if (!m_hasCachedRelativePosition) | 173 if (!m_hasCachedRelativePosition) |
176 computeRelativePosition(); | 174 computeRelativePosition(); |
177 return m_layerLocation.x(); | 175 return m_layerLocation.x(); |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 // See Microsoft documentation and <http://www.quirksmode.org/dom/w3c_events
.html>. | 219 // See Microsoft documentation and <http://www.quirksmode.org/dom/w3c_events
.html>. |
222 return m_clientLocation.y(); | 220 return m_clientLocation.y(); |
223 } | 221 } |
224 | 222 |
225 void MouseRelatedEvent::trace(Visitor* visitor) | 223 void MouseRelatedEvent::trace(Visitor* visitor) |
226 { | 224 { |
227 UIEventWithKeyState::trace(visitor); | 225 UIEventWithKeyState::trace(visitor); |
228 } | 226 } |
229 | 227 |
230 } // namespace WebCore | 228 } // namespace WebCore |
OLD | NEW |