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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

Issue 2019583002: Don't include scroll offset in offsetFromLayoutObject for scrolling contents layers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 Google Inc. All rights reserved. 7 * Copyright (C) 2010 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 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 // so assert but check that the layer is composited. 421 // so assert but check that the layer is composited.
422 ASSERT(compositingState() != NotComposited); 422 ASSERT(compositingState() != NotComposited);
423 423
424 // FIXME: generalize accessors to backing GraphicsLayers so that this code i s squashing-agnostic. 424 // FIXME: generalize accessors to backing GraphicsLayers so that this code i s squashing-agnostic.
425 if (layer()->groupedMapping()) { 425 if (layer()->groupedMapping()) {
426 LayoutRect paintInvalidationRect = r; 426 LayoutRect paintInvalidationRect = r;
427 if (GraphicsLayer* squashingLayer = layer()->groupedMapping()->squashing Layer()) { 427 if (GraphicsLayer* squashingLayer = layer()->groupedMapping()->squashing Layer()) {
428 // Note: the subpixel accumulation of layer() does not need to be ad ded here. It is already taken into account. 428 // Note: the subpixel accumulation of layer() does not need to be ad ded here. It is already taken into account.
429 squashingLayer->setNeedsDisplayInRect(enclosingIntRect(paintInvalida tionRect), invalidationReason, object); 429 squashingLayer->setNeedsDisplayInRect(enclosingIntRect(paintInvalida tionRect), invalidationReason, object);
430 } 430 }
431 } else if (paintInvalidationContainer.usesCompositedScrolling() && &paintInv alidationContainer != this) {
432 layer()->compositedLayerMapping()->setScrollingContentsNeedDisplayInRect (r, invalidationReason, object);
431 } else { 433 } else {
434 // TODO(chrishtr): we should be able to skip scrolling content layers in this case.
432 layer()->compositedLayerMapping()->setContentsNeedDisplayInRect(r, inval idationReason, object); 435 layer()->compositedLayerMapping()->setContentsNeedDisplayInRect(r, inval idationReason, object);
433 } 436 }
434 }
Xianzhu 2016/05/31 16:46:27 ?
chrishtr 2016/05/31 16:58:39 Done.
435 437
436 void LayoutBoxModelObject::invalidateDisplayItemClientOnBacking(const DisplayIte mClient& displayItemClient, PaintInvalidationReason invalidationReason) const 438 void LayoutBoxModelObject::invalidateDisplayItemClientOnBacking(const DisplayIte mClient& displayItemClient, PaintInvalidationReason invalidationReason) const
437 { 439 {
438 displayItemClient.setDisplayItemsUncached(); 440 displayItemClient.setDisplayItemsUncached();
439 441
440 // We need to inform the GraphicsLayer about this paint invalidation only wh en we are tracking 442 // We need to inform the GraphicsLayer about this paint invalidation only wh en we are tracking
441 // paint invalidation or ENABLE(ASSERT). 443 // paint invalidation or ENABLE(ASSERT).
442 #if !ENABLE(ASSERT) 444 #if !ENABLE(ASSERT)
443 if (!frameView()->isTrackingPaintInvalidations()) 445 if (!frameView()->isTrackingPaintInvalidations())
444 return; 446 return;
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 if (rootElementStyle->hasBackground()) 1120 if (rootElementStyle->hasBackground())
1119 return false; 1121 return false;
1120 1122
1121 if (node() != document().firstBodyElement()) 1123 if (node() != document().firstBodyElement())
1122 return false; 1124 return false;
1123 1125
1124 return true; 1126 return true;
1125 } 1127 }
1126 1128
1127 } // namespace blink 1129 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698