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

Side by Side Diff: Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp

Issue 1284203004: Generate scroll/clip display item hierarchy for SPv2 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix failing test. Update test expectation. Created 5 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 2090 matching lines...) Expand 10 before | Expand all | Expand 10 after
2101 2101
2102 IntSize offset = paintInfo.offsetFromLayoutObject; 2102 IntSize offset = paintInfo.offsetFromLayoutObject;
2103 AffineTransform translation; 2103 AffineTransform translation;
2104 translation.translate(-offset.width(), -offset.height()); 2104 translation.translate(-offset.width(), -offset.height());
2105 TransformRecorder transformRecorder(*context, *this, translation); 2105 TransformRecorder transformRecorder(*context, *this, translation);
2106 2106
2107 // The dirtyRect is in the coords of the painting root. 2107 // The dirtyRect is in the coords of the painting root.
2108 IntRect dirtyRect(clip); 2108 IntRect dirtyRect(clip);
2109 dirtyRect.move(offset); 2109 dirtyRect.move(offset);
2110 2110
2111 if (!(paintLayerFlags & PaintLayerPaintingOverflowContents)) { 2111 if (!(paintLayerFlags & PaintLayerPaintingOverflowContents) && !RuntimeEnabl edFeatures::slimmingPaintV2Enabled()) {
2112 LayoutRect bounds = paintInfo.compositedBounds; 2112 LayoutRect bounds = paintInfo.compositedBounds;
2113 bounds.move(paintInfo.paintLayer->subpixelAccumulation()); 2113 bounds.move(paintInfo.paintLayer->subpixelAccumulation());
2114 dirtyRect.intersect(pixelSnappedIntRect(bounds)); 2114 dirtyRect.intersect(pixelSnappedIntRect(bounds));
2115 } else { 2115 } else {
2116 dirtyRect.move(roundedIntSize(paintInfo.paintLayer->subpixelAccumulation ())); 2116 dirtyRect.move(roundedIntSize(paintInfo.paintLayer->subpixelAccumulation ()));
2117 } 2117 }
2118 2118
2119 #if ENABLE(ASSERT) 2119 #if ENABLE(ASSERT)
2120 paintInfo.paintLayer->layoutObject()->assertSubtreeIsLaidOut(); 2120 paintInfo.paintLayer->layoutObject()->assertSubtreeIsLaidOut();
2121 #endif 2121 #endif
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
2397 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { 2397 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) {
2398 name = "Scrolling Block Selection Layer"; 2398 name = "Scrolling Block Selection Layer";
2399 } else { 2399 } else {
2400 ASSERT_NOT_REACHED(); 2400 ASSERT_NOT_REACHED();
2401 } 2401 }
2402 2402
2403 return name; 2403 return name;
2404 } 2404 }
2405 2405
2406 } // namespace blink 2406 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698