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: Source/core/rendering/CompositedLayerMapping.cpp

Issue 63943006: Re-enable solid background color optimization for composited layers. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add window.internals.forceCompositingUpdate(document) to webgl test to avoid flaky Created 7 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
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 1257 matching lines...) Expand 10 before | Expand all | Expand 10 after
1268 m_graphicsLayer->setBackgroundColor(Color()); 1268 m_graphicsLayer->setBackgroundColor(Color());
1269 } else { 1269 } else {
1270 // An unset (invalid) color will remove the solid color. 1270 // An unset (invalid) color will remove the solid color.
1271 m_graphicsLayer->setContentsToSolidColor(Color()); 1271 m_graphicsLayer->setContentsToSolidColor(Color());
1272 m_graphicsLayer->setBackgroundColor(backgroundColor); 1272 m_graphicsLayer->setBackgroundColor(backgroundColor);
1273 } 1273 }
1274 } 1274 }
1275 1275
1276 static bool supportsDirectBoxDecorationsComposition(const RenderObject* renderer ) 1276 static bool supportsDirectBoxDecorationsComposition(const RenderObject* renderer )
1277 { 1277 {
1278 if (!GraphicsLayer::supportsBackgroundColorContent())
1279 return false;
1280
1281 if (renderer->hasClip()) 1278 if (renderer->hasClip())
1282 return false; 1279 return false;
1283 1280
1284 if (hasBoxDecorationsOrBackgroundImage(renderer->style())) 1281 if (hasBoxDecorationsOrBackgroundImage(renderer->style()))
1285 return false; 1282 return false;
1286 1283
1287 // FIXME: we should be able to allow backgroundComposite; However since this is not a common use case it has been deferred for now. 1284 // FIXME: we should be able to allow backgroundComposite; However since this is not a common use case it has been deferred for now.
1288 if (renderer->style()->backgroundComposite() != CompositeSourceOver) 1285 if (renderer->style()->backgroundComposite() != CompositeSourceOver)
1289 return false; 1286 return false;
1290 1287
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after
2034 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { 2031 } else if (graphicsLayer == m_scrollingContentsLayer.get()) {
2035 name = "Scrolling Contents Layer"; 2032 name = "Scrolling Contents Layer";
2036 } else { 2033 } else {
2037 ASSERT_NOT_REACHED(); 2034 ASSERT_NOT_REACHED();
2038 } 2035 }
2039 2036
2040 return name; 2037 return name;
2041 } 2038 }
2042 2039
2043 } // namespace WebCore 2040 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698