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

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

Issue 2553653003: Make ifdefs consistent in WebKit/Source/core/layout/ . (Closed)
Patch Set: Update after review. Created 4 years 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
« no previous file with comments | « third_party/WebKit/Source/core/layout/SubtreeLayoutScope.cpp ('k') | no next file » | 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) 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 2778 matching lines...) Expand 10 before | Expand all | Expand 10 after
2789 2789
2790 if (!(paintLayerFlags & PaintLayerPaintingOverflowContents)) { 2790 if (!(paintLayerFlags & PaintLayerPaintingOverflowContents)) {
2791 LayoutRect bounds = paintInfo.compositedBounds; 2791 LayoutRect bounds = paintInfo.compositedBounds;
2792 bounds.move(paintInfo.paintLayer->subpixelAccumulation()); 2792 bounds.move(paintInfo.paintLayer->subpixelAccumulation());
2793 dirtyRect.intersect(pixelSnappedIntRect(bounds)); 2793 dirtyRect.intersect(pixelSnappedIntRect(bounds));
2794 } else { 2794 } else {
2795 dirtyRect.move( 2795 dirtyRect.move(
2796 roundedIntSize(paintInfo.paintLayer->subpixelAccumulation())); 2796 roundedIntSize(paintInfo.paintLayer->subpixelAccumulation()));
2797 } 2797 }
2798 2798
2799 #if ENABLE(ASSERT) 2799 #if DCHECK_IS_ON()
2800 if (!layoutObject()->view()->frame() || 2800 if (!layoutObject()->view()->frame() ||
2801 !layoutObject()->view()->frame()->shouldThrottleRendering()) 2801 !layoutObject()->view()->frame()->shouldThrottleRendering())
2802 paintInfo.paintLayer->layoutObject()->assertSubtreeIsLaidOut(); 2802 paintInfo.paintLayer->layoutObject()->assertSubtreeIsLaidOut();
2803 #endif 2803 #endif
2804 2804
2805 float deviceScaleFactor = 2805 float deviceScaleFactor =
2806 blink::deviceScaleFactor(paintInfo.paintLayer->layoutObject()->frame()); 2806 blink::deviceScaleFactor(paintInfo.paintLayer->layoutObject()->frame());
2807 context.setDeviceScaleFactor(deviceScaleFactor); 2807 context.setDeviceScaleFactor(deviceScaleFactor);
2808 2808
2809 if (paintInfo.paintLayer->compositingState() != PaintsIntoGroupedBacking) { 2809 if (paintInfo.paintLayer->compositingState() != PaintsIntoGroupedBacking) {
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
3370 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { 3370 } else if (graphicsLayer == m_decorationOutlineLayer.get()) {
3371 name = "Decoration Layer"; 3371 name = "Decoration Layer";
3372 } else { 3372 } else {
3373 ASSERT_NOT_REACHED(); 3373 ASSERT_NOT_REACHED();
3374 } 3374 }
3375 3375
3376 return name; 3376 return name;
3377 } 3377 }
3378 3378
3379 } // namespace blink 3379 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/SubtreeLayoutScope.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698