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

Side by Side Diff: Source/core/rendering/compositing/CompositedLayerMapping.cpp

Issue 542963002: Revert 181400 "Partial revert of r178392" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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
« no previous file with comments | « LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt ('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 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after
1161 updateScrollingBlockSelection(); 1161 updateScrollingBlockSelection();
1162 } 1162 }
1163 1163
1164 if (hasPaintedContent && isAcceleratedCanvas(renderer())) { 1164 if (hasPaintedContent && isAcceleratedCanvas(renderer())) {
1165 CanvasRenderingContext* context = toHTMLCanvasElement(renderer()->node() )->renderingContext(); 1165 CanvasRenderingContext* context = toHTMLCanvasElement(renderer()->node() )->renderingContext();
1166 // Content layer may be null if context is lost. 1166 // Content layer may be null if context is lost.
1167 if (WebLayer* contentLayer = context->platformLayer()) { 1167 if (WebLayer* contentLayer = context->platformLayer()) {
1168 Color bgColor(Color::transparent); 1168 Color bgColor(Color::transparent);
1169 if (contentLayerSupportsDirectBackgroundComposition(renderer())) { 1169 if (contentLayerSupportsDirectBackgroundComposition(renderer())) {
1170 bgColor = rendererBackgroundColor(); 1170 bgColor = rendererBackgroundColor();
1171 hasPaintedContent = false;
1172 } 1171 }
1173 contentLayer->setBackgroundColor(bgColor.rgb()); 1172 contentLayer->setBackgroundColor(bgColor.rgb());
1174 } 1173 }
1175 } 1174 }
1176 1175
1177 // FIXME: we could refine this to only allocate backings for one of these la yers if possible. 1176 // FIXME: we could refine this to only allocate backings for one of these la yers if possible.
1178 if (m_foregroundLayer) 1177 if (m_foregroundLayer)
1179 m_foregroundLayer->setDrawsContent(hasPaintedContent); 1178 m_foregroundLayer->setDrawsContent(hasPaintedContent);
1180 1179
1181 if (m_backgroundLayer) 1180 if (m_backgroundLayer)
(...skipping 1167 matching lines...) Expand 10 before | Expand all | Expand 10 after
2349 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { 2348 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) {
2350 name = "Scrolling Block Selection Layer"; 2349 name = "Scrolling Block Selection Layer";
2351 } else { 2350 } else {
2352 ASSERT_NOT_REACHED(); 2351 ASSERT_NOT_REACHED();
2353 } 2352 }
2354 2353
2355 return name; 2354 return name;
2356 } 2355 }
2357 2356
2358 } // namespace blink 2357 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698