| OLD | NEW |
| 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 1295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1306 m_graphicsLayer->setBackgroundColor(Color()); | 1306 m_graphicsLayer->setBackgroundColor(Color()); |
| 1307 } else { | 1307 } else { |
| 1308 // An unset (invalid) color will remove the solid color. | 1308 // An unset (invalid) color will remove the solid color. |
| 1309 m_graphicsLayer->setContentsToSolidColor(Color()); | 1309 m_graphicsLayer->setContentsToSolidColor(Color()); |
| 1310 m_graphicsLayer->setBackgroundColor(backgroundColor); | 1310 m_graphicsLayer->setBackgroundColor(backgroundColor); |
| 1311 } | 1311 } |
| 1312 } | 1312 } |
| 1313 | 1313 |
| 1314 static bool supportsDirectBoxDecorationsComposition(const RenderObject* renderer
) | 1314 static bool supportsDirectBoxDecorationsComposition(const RenderObject* renderer
) |
| 1315 { | 1315 { |
| 1316 if (!GraphicsLayer::supportsBackgroundColorContent()) | |
| 1317 return false; | |
| 1318 | |
| 1319 if (renderer->hasClip()) | 1316 if (renderer->hasClip()) |
| 1320 return false; | 1317 return false; |
| 1321 | 1318 |
| 1322 if (hasBoxDecorationsOrBackgroundImage(renderer->style())) | 1319 if (hasBoxDecorationsOrBackgroundImage(renderer->style())) |
| 1323 return false; | 1320 return false; |
| 1324 | 1321 |
| 1325 // FIXME: we should be able to allow backgroundComposite; However since this
is not a common use case it has been deferred for now. | 1322 // FIXME: we should be able to allow backgroundComposite; However since this
is not a common use case it has been deferred for now. |
| 1326 if (renderer->style()->backgroundComposite() != CompositeSourceOver) | 1323 if (renderer->style()->backgroundComposite() != CompositeSourceOver) |
| 1327 return false; | 1324 return false; |
| 1328 | 1325 |
| (...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2002 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 1999 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 2003 name = "Scrolling Contents Layer"; | 2000 name = "Scrolling Contents Layer"; |
| 2004 } else { | 2001 } else { |
| 2005 ASSERT_NOT_REACHED(); | 2002 ASSERT_NOT_REACHED(); |
| 2006 } | 2003 } |
| 2007 | 2004 |
| 2008 return name; | 2005 return name; |
| 2009 } | 2006 } |
| 2010 | 2007 |
| 2011 } // namespace WebCore | 2008 } // namespace WebCore |
| OLD | NEW |