| 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 FrameView* childFrameView = toFrameView(widget()); | 154 FrameView* childFrameView = toFrameView(widget()); |
| 155 LayoutView* childRoot = childFrameView->layoutView(); | 155 LayoutView* childRoot = childFrameView->layoutView(); |
| 156 | 156 |
| 157 if (visibleToHitTestRequest(result.hitTestRequest()) && childRoot) { | 157 if (visibleToHitTestRequest(result.hitTestRequest()) && childRoot) { |
| 158 LayoutPoint adjustedLocation = accumulatedOffset + location(); | 158 LayoutPoint adjustedLocation = accumulatedOffset + location(); |
| 159 LayoutPoint contentOffset = LayoutPoint(borderLeft() + paddingLeft(), bo
rderTop() + paddingTop()) - LayoutSize(childFrameView->scrollOffset()); | 159 LayoutPoint contentOffset = LayoutPoint(borderLeft() + paddingLeft(), bo
rderTop() + paddingTop()) - LayoutSize(childFrameView->scrollOffset()); |
| 160 HitTestLocation newHitTestLocation(locationInContainer, -adjustedLocatio
n - contentOffset); | 160 HitTestLocation newHitTestLocation(locationInContainer, -adjustedLocatio
n - contentOffset); |
| 161 HitTestRequest newHitTestRequest(result.hitTestRequest().type() | HitTes
tRequest::ChildFrameHitTest); | 161 HitTestRequest newHitTestRequest(result.hitTestRequest().type() | HitTes
tRequest::ChildFrameHitTest); |
| 162 HitTestResult childFrameResult(newHitTestRequest, newHitTestLocation); | 162 HitTestResult childFrameResult(newHitTestRequest, newHitTestLocation); |
| 163 | 163 |
| 164 bool isInsideChildFrame = childRoot->hitTest(newHitTestRequest, newHitTe
stLocation, childFrameResult); | 164 bool isInsideChildFrame = childRoot->hitTest(childFrameResult); |
| 165 | 165 |
| 166 if (result.hitTestRequest().listBased()) | 166 if (result.hitTestRequest().listBased()) |
| 167 result.append(childFrameResult); | 167 result.append(childFrameResult); |
| 168 else if (isInsideChildFrame) | 168 else if (isInsideChildFrame) |
| 169 result = childFrameResult; | 169 result = childFrameResult; |
| 170 | 170 |
| 171 if (isInsideChildFrame) | 171 if (isInsideChildFrame) |
| 172 return true; | 172 return true; |
| 173 } | 173 } |
| 174 | 174 |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 if (widget->frameRect() == newFrame) | 310 if (widget->frameRect() == newFrame) |
| 311 return false; | 311 return false; |
| 312 | 312 |
| 313 RefPtr<LayoutPart> protector(this); | 313 RefPtr<LayoutPart> protector(this); |
| 314 RefPtrWillBeRawPtr<Node> protectedNode(node()); | 314 RefPtrWillBeRawPtr<Node> protectedNode(node()); |
| 315 widget->setFrameRect(newFrame); | 315 widget->setFrameRect(newFrame); |
| 316 return widget->frameRect().size() != newFrame.size(); | 316 return widget->frameRect().size() != newFrame.size(); |
| 317 } | 317 } |
| 318 | 318 |
| 319 } | 319 } |
| OLD | NEW |