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

Side by Side Diff: Source/core/rendering/RenderLayerModelObject.cpp

Issue 19614004: Compositor hit test performance improvement (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Merge with trunk Created 7 years, 4 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/rendering/RenderLayerModelObject.h ('k') | Source/core/rendering/RenderObject.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) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010, 2012 Google Inc. All rights reserved. 7 * Copyright (C) 2010, 2012 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 bool oldStyleIsViewportConstrained = oldStyle && oldStyle->hasViewportCo nstrainedPosition(); 175 bool oldStyleIsViewportConstrained = oldStyle && oldStyle->hasViewportCo nstrainedPosition();
176 if (newStyleIsViewportConstained != oldStyleIsViewportConstrained) { 176 if (newStyleIsViewportConstained != oldStyleIsViewportConstrained) {
177 if (newStyleIsViewportConstained && layer()) 177 if (newStyleIsViewportConstained && layer())
178 frameView->addViewportConstrainedObject(this); 178 frameView->addViewportConstrainedObject(this);
179 else 179 else
180 frameView->removeViewportConstrainedObject(this); 180 frameView->removeViewportConstrainedObject(this);
181 } 181 }
182 } 182 }
183 } 183 }
184 184
185 void RenderLayerModelObject::addLayerHitTestRects(LayerHitTestRects& rects, cons t RenderLayer* currentLayer, const LayoutPoint& layerOffset) const 185 void RenderLayerModelObject::addLayerHitTestRects(LayerHitTestRects& rects, cons t RenderLayer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& c ontainerRect) const
186 { 186 {
187 // If we have a new layer then our current layer/offset is irrelevant. 187 // If we have a new layer then our current layer/offset is irrelevant.
188 LayoutPoint adjustedLayerOffset = layerOffset; 188 LayoutPoint adjustedLayerOffset = layerOffset;
189 LayoutRect adjustedContainerRect = containerRect;
189 if (hasLayer()) { 190 if (hasLayer()) {
190 currentLayer = layer(); 191 currentLayer = layer();
191 adjustedLayerOffset = LayoutPoint(); 192 adjustedLayerOffset = LayoutPoint();
193 adjustedContainerRect = LayoutRect();
192 } 194 }
193 195
194 RenderObject::addLayerHitTestRects(rects, currentLayer, adjustedLayerOffset) ; 196 RenderObject::addLayerHitTestRects(rects, currentLayer, adjustedLayerOffset, adjustedContainerRect);
195 } 197 }
196 198
197 } // namespace WebCore 199 } // namespace WebCore
198 200
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayerModelObject.h ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698