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

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

Issue 2724543002: Renamed deviceScaleFactor() to deviceScaleFactorDeprecated() in Page (Closed)
Patch Set: Rebase Created 3 years, 9 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) 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 2896 matching lines...) Expand 10 before | Expand all | Expand 10 after
2907 bounds.move(paintInfo.paintLayer->subpixelAccumulation()); 2907 bounds.move(paintInfo.paintLayer->subpixelAccumulation());
2908 dirtyRect.intersect(pixelSnappedIntRect(bounds)); 2908 dirtyRect.intersect(pixelSnappedIntRect(bounds));
2909 } 2909 }
2910 2910
2911 #if DCHECK_IS_ON() 2911 #if DCHECK_IS_ON()
2912 if (!layoutObject().view()->frame() || 2912 if (!layoutObject().view()->frame() ||
2913 !layoutObject().view()->frame()->shouldThrottleRendering()) 2913 !layoutObject().view()->frame()->shouldThrottleRendering())
2914 paintInfo.paintLayer->layoutObject().assertSubtreeIsLaidOut(); 2914 paintInfo.paintLayer->layoutObject().assertSubtreeIsLaidOut();
2915 #endif 2915 #endif
2916 2916
2917 float deviceScaleFactor = 2917 float deviceScaleFactor = blink::deviceScaleFactorDeprecated(
2918 blink::deviceScaleFactor(paintInfo.paintLayer->layoutObject().frame()); 2918 paintInfo.paintLayer->layoutObject().frame());
2919 context.setDeviceScaleFactor(deviceScaleFactor); 2919 context.setDeviceScaleFactor(deviceScaleFactor);
2920 2920
2921 if (paintInfo.paintLayer->compositingState() != PaintsIntoGroupedBacking) { 2921 if (paintInfo.paintLayer->compositingState() != PaintsIntoGroupedBacking) {
2922 // FIXME: GraphicsLayers need a way to split for multicol. 2922 // FIXME: GraphicsLayers need a way to split for multicol.
2923 PaintLayerPaintingInfo paintingInfo( 2923 PaintLayerPaintingInfo paintingInfo(
2924 paintInfo.paintLayer, LayoutRect(dirtyRect), GlobalPaintNormalPhase, 2924 paintInfo.paintLayer, LayoutRect(dirtyRect), GlobalPaintNormalPhase,
2925 paintInfo.paintLayer->subpixelAccumulation()); 2925 paintInfo.paintLayer->subpixelAccumulation());
2926 PaintLayerPainter(*paintInfo.paintLayer) 2926 PaintLayerPainter(*paintInfo.paintLayer)
2927 .paintLayerContents(context, paintingInfo, paintLayerFlags); 2927 .paintLayerContents(context, paintingInfo, paintLayerFlags);
2928 2928
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
3481 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { 3481 } else if (graphicsLayer == m_decorationOutlineLayer.get()) {
3482 name = "Decoration Layer"; 3482 name = "Decoration Layer";
3483 } else { 3483 } else {
3484 ASSERT_NOT_REACHED(); 3484 ASSERT_NOT_REACHED();
3485 } 3485 }
3486 3486
3487 return name; 3487 return name;
3488 } 3488 }
3489 3489
3490 } // namespace blink 3490 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698