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

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

Issue 701873002: Revert "Don't invalidate scrolling container layer when scrolling contents need invalidation" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 // short-circuit on full-paint invalidation. 329 // short-circuit on full-paint invalidation.
330 LayoutRect dirtyRect = viewRect(); 330 LayoutRect dirtyRect = viewRect();
331 if (doingFullPaintInvalidation() && !dirtyRect.isEmpty()) { 331 if (doingFullPaintInvalidation() && !dirtyRect.isEmpty()) {
332 const RenderLayerModelObject* paintInvalidationContainer = &paintInvalid ationState.paintInvalidationContainer(); 332 const RenderLayerModelObject* paintInvalidationContainer = &paintInvalid ationState.paintInvalidationContainer();
333 mapRectToPaintInvalidationBacking(paintInvalidationContainer, dirtyRect, &paintInvalidationState); 333 mapRectToPaintInvalidationBacking(paintInvalidationContainer, dirtyRect, &paintInvalidationState);
334 invalidatePaintUsingContainer(paintInvalidationContainer, dirtyRect, Pai ntInvalidationFull); 334 invalidatePaintUsingContainer(paintInvalidationContainer, dirtyRect, Pai ntInvalidationFull);
335 } 335 }
336 RenderBlock::invalidateTreeIfNeeded(paintInvalidationState); 336 RenderBlock::invalidateTreeIfNeeded(paintInvalidationState);
337 } 337 }
338 338
339 void RenderView::invalidatePaintForRectangle(const LayoutRect& paintInvalidation Rect, PaintInvalidationReason invalidationReason, const RenderObject& forRendere r) const 339 void RenderView::invalidatePaintForRectangle(const LayoutRect& paintInvalidation Rect, PaintInvalidationReason invalidationReason) const
340 { 340 {
341 ASSERT(!paintInvalidationRect.isEmpty()); 341 ASSERT(!paintInvalidationRect.isEmpty());
342 342
343 if (document().printing() || !m_frameView) 343 if (document().printing() || !m_frameView)
344 return; 344 return;
345 345
346 ASSERT(layer()->compositingState() == PaintsIntoOwnBacking || !frame()->owne rRenderer()); 346 ASSERT(layer()->compositingState() == PaintsIntoOwnBacking || !frame()->owne rRenderer());
347 347
348 if (layer()->compositingState() == PaintsIntoOwnBacking) { 348 if (layer()->compositingState() == PaintsIntoOwnBacking) {
349 setBackingNeedsPaintInvalidationInRect(paintInvalidationRect, invalidati onReason, forRenderer); 349 setBackingNeedsPaintInvalidationInRect(paintInvalidationRect, invalidati onReason);
350 } else { 350 } else {
351 m_frameView->contentRectangleForPaintInvalidation(pixelSnappedIntRect(pa intInvalidationRect)); 351 m_frameView->contentRectangleForPaintInvalidation(pixelSnappedIntRect(pa intInvalidationRect));
352 } 352 }
353 } 353 }
354 354
355 void RenderView::invalidatePaintForViewAndCompositedLayers() 355 void RenderView::invalidatePaintForViewAndCompositedLayers()
356 { 356 {
357 setShouldDoFullPaintInvalidation(); 357 setShouldDoFullPaintInvalidation();
358 358
359 // The only way we know how to hit these ASSERTS below this point is via the Chromium OS login screen. 359 // The only way we know how to hit these ASSERTS below this point is via the Chromium OS login screen.
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
868 return viewWidth(IncludeScrollbars) / scale; 868 return viewWidth(IncludeScrollbars) / scale;
869 } 869 }
870 870
871 double RenderView::layoutViewportHeight() const 871 double RenderView::layoutViewportHeight() const
872 { 872 {
873 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1; 873 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1;
874 return viewHeight(IncludeScrollbars) / scale; 874 return viewHeight(IncludeScrollbars) / scale;
875 } 875 }
876 876
877 } // namespace blink 877 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderView.h ('k') | Source/core/rendering/compositing/CompositedLayerMapping.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698