OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 2000 Simon Hausmann <hausmann@kde.org> | 3 * (C) 2000 Simon Hausmann <hausmann@kde.org> |
4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) | 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) |
5 * Copyright (C) 2004, 2005, 2006, 2009 Apple Inc. All rights reserved. | 5 * Copyright (C) 2004, 2005, 2006, 2009 Apple Inc. All rights reserved. |
6 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2011. All rights reserved. |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 | 170 |
171 if (action == HitTestForeground) { | 171 if (action == HitTestForeground) { |
172 FrameView* childFrameView = toFrameView(widget()); | 172 FrameView* childFrameView = toFrameView(widget()); |
173 LayoutViewItem childRootItem = childFrameView->layoutViewItem(); | 173 LayoutViewItem childRootItem = childFrameView->layoutViewItem(); |
174 | 174 |
175 if (visibleToHitTestRequest(result.hitTestRequest()) && | 175 if (visibleToHitTestRequest(result.hitTestRequest()) && |
176 !childRootItem.isNull()) { | 176 !childRootItem.isNull()) { |
177 LayoutPoint adjustedLocation = accumulatedOffset + location(); | 177 LayoutPoint adjustedLocation = accumulatedOffset + location(); |
178 LayoutPoint contentOffset = LayoutPoint(borderLeft() + paddingLeft(), | 178 LayoutPoint contentOffset = LayoutPoint(borderLeft() + paddingLeft(), |
179 borderTop() + paddingTop()) - | 179 borderTop() + paddingTop()) - |
180 LayoutSize(childFrameView->scrollOffset()); | 180 LayoutSize(childFrameView->scrollOffsetInt()); |
181 HitTestLocation newHitTestLocation(locationInContainer, | 181 HitTestLocation newHitTestLocation(locationInContainer, |
182 -adjustedLocation - contentOffset); | 182 -adjustedLocation - contentOffset); |
183 HitTestRequest newHitTestRequest(result.hitTestRequest().type() | | 183 HitTestRequest newHitTestRequest(result.hitTestRequest().type() | |
184 HitTestRequest::ChildFrameHitTest); | 184 HitTestRequest::ChildFrameHitTest); |
185 HitTestResult childFrameResult(newHitTestRequest, newHitTestLocation); | 185 HitTestResult childFrameResult(newHitTestRequest, newHitTestLocation); |
186 | 186 |
187 // The frame's layout and style must be up to date if we reach here. | 187 // The frame's layout and style must be up to date if we reach here. |
188 bool isInsideChildFrame = | 188 bool isInsideChildFrame = |
189 childRootItem.hitTestNoLifecycleUpdate(childFrameResult); | 189 childRootItem.hitTestNoLifecycleUpdate(childFrameResult); |
190 | 190 |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
382 } | 382 } |
383 | 383 |
384 bool LayoutPart::isThrottledFrameView() const { | 384 bool LayoutPart::isThrottledFrameView() const { |
385 if (!widget() || !widget()->isFrameView()) | 385 if (!widget() || !widget()->isFrameView()) |
386 return false; | 386 return false; |
387 const FrameView* frameView = toFrameView(widget()); | 387 const FrameView* frameView = toFrameView(widget()); |
388 return frameView->shouldThrottleRendering(); | 388 return frameView->shouldThrottleRendering(); |
389 } | 389 } |
390 | 390 |
391 } // namespace blink | 391 } // namespace blink |
OLD | NEW |