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

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

Issue 1216543005: Revert of Add a FrameView lifecycle method that just updates layout, style and compositing. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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/input/EventHandlerTest.cpp ('k') | Source/core/layout/LayoutTestHelper.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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 172
173 // The frame's layout and style must be up-to-date if we reach here. 173 // The frame's layout and style must be up-to-date if we reach here.
174 bool isInsideChildFrame = childRoot->hitTestNoLifecycleUpdate(childFrame Result); 174 bool isInsideChildFrame = childRoot->hitTestNoLayoutAndStyleUpdate(child FrameResult);
175 175
176 if (result.hitTestRequest().listBased()) { 176 if (result.hitTestRequest().listBased()) {
177 result.append(childFrameResult); 177 result.append(childFrameResult);
178 } else if (isInsideChildFrame) { 178 } else if (isInsideChildFrame) {
179 // Force the result not to be cacheable because the parent 179 // Force the result not to be cacheable because the parent
180 // frame should not cache this result; as it won't be notified of 180 // frame should not cache this result; as it won't be notified of
181 // changes in the child. 181 // changes in the child.
182 childFrameResult.setCacheable(false); 182 childFrameResult.setCacheable(false);
183 result = childFrameResult; 183 result = childFrameResult;
184 } 184 }
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 if (widget->frameRect() == newFrame) 325 if (widget->frameRect() == newFrame)
326 return false; 326 return false;
327 327
328 RefPtr<LayoutPart> protector(this); 328 RefPtr<LayoutPart> protector(this);
329 RefPtrWillBeRawPtr<Node> protectedNode(node()); 329 RefPtrWillBeRawPtr<Node> protectedNode(node());
330 widget->setFrameRect(newFrame); 330 widget->setFrameRect(newFrame);
331 return widget->frameRect().size() != newFrame.size(); 331 return widget->frameRect().size() != newFrame.size();
332 } 332 }
333 333
334 } 334 }
OLDNEW
« no previous file with comments | « Source/core/input/EventHandlerTest.cpp ('k') | Source/core/layout/LayoutTestHelper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698