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

Side by Side Diff: Source/core/layout/LayoutPart.cpp

Issue 1177123003: Revert "Implement a Hit Test Cache for same point hits." (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « Source/core/layout/LayoutImage.cpp ('k') | Source/core/layout/LayoutView.h » ('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) 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 162
163 FrameView* childFrameView = toFrameView(widget()); 163 FrameView* childFrameView = toFrameView(widget());
164 LayoutView* childRoot = childFrameView->layoutView(); 164 LayoutView* childRoot = childFrameView->layoutView();
165 165
166 if (visibleToHitTestRequest(result.hitTestRequest()) && childRoot) { 166 if (visibleToHitTestRequest(result.hitTestRequest()) && childRoot) {
167 LayoutPoint adjustedLocation = accumulatedOffset + location(); 167 LayoutPoint adjustedLocation = accumulatedOffset + location();
168 LayoutPoint contentOffset = LayoutPoint(borderLeft() + paddingLeft(), bo rderTop() + paddingTop()) - LayoutSize(childFrameView->scrollOffset()); 168 LayoutPoint contentOffset = LayoutPoint(borderLeft() + paddingLeft(), bo rderTop() + paddingTop()) - LayoutSize(childFrameView->scrollOffset());
169 HitTestLocation newHitTestLocation(locationInContainer, -adjustedLocatio n - contentOffset); 169 HitTestLocation newHitTestLocation(locationInContainer, -adjustedLocatio n - contentOffset);
170 HitTestRequest newHitTestRequest(result.hitTestRequest().type() | HitTes tRequest::ChildFrameHitTest); 170 HitTestRequest newHitTestRequest(result.hitTestRequest().type() | HitTes tRequest::ChildFrameHitTest);
171 HitTestResult childFrameResult(newHitTestRequest, newHitTestLocation); 171 HitTestResult childFrameResult(newHitTestRequest, newHitTestLocation);
172 childFrameResult.setValidityRect(result.validityRect());
173 172
174 bool isInsideChildFrame = childRoot->hitTest(childFrameResult); 173 bool isInsideChildFrame = childRoot->hitTest(newHitTestRequest, newHitTe stLocation, childFrameResult);
175 174
176 if (result.hitTestRequest().listBased()) 175 if (result.hitTestRequest().listBased())
177 result.append(childFrameResult); 176 result.append(childFrameResult);
178 else if (isInsideChildFrame) 177 else if (isInsideChildFrame)
179 result = childFrameResult; 178 result = childFrameResult;
180 179
181 if (isInsideChildFrame) 180 if (isInsideChildFrame)
182 return true; 181 return true;
183 } 182 }
184 183
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 if (widget->frameRect() == newFrame) 319 if (widget->frameRect() == newFrame)
321 return false; 320 return false;
322 321
323 RefPtr<LayoutPart> protector(this); 322 RefPtr<LayoutPart> protector(this);
324 RefPtrWillBeRawPtr<Node> protectedNode(node()); 323 RefPtrWillBeRawPtr<Node> protectedNode(node());
325 widget->setFrameRect(newFrame); 324 widget->setFrameRect(newFrame);
326 return widget->frameRect().size() != newFrame.size(); 325 return widget->frameRect().size() != newFrame.size();
327 } 326 }
328 327
329 } 328 }
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutImage.cpp ('k') | Source/core/layout/LayoutView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698