OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 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 876 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
887 | 887 |
888 m_backgroundColor = color; | 888 m_backgroundColor = color; |
889 m_layer->layer()->setBackgroundColor(m_backgroundColor.rgb()); | 889 m_layer->layer()->setBackgroundColor(m_backgroundColor.rgb()); |
890 } | 890 } |
891 | 891 |
892 void GraphicsLayer::setContentsOpaque(bool opaque) | 892 void GraphicsLayer::setContentsOpaque(bool opaque) |
893 { | 893 { |
894 m_contentsOpaque = opaque; | 894 m_contentsOpaque = opaque; |
895 m_layer->layer()->setOpaque(m_contentsOpaque); | 895 m_layer->layer()->setOpaque(m_contentsOpaque); |
896 m_opaqueRectTrackingContentLayerDelegate->setOpaque(m_contentsOpaque); | 896 m_opaqueRectTrackingContentLayerDelegate->setOpaque(m_contentsOpaque); |
| 897 if (m_contentsLayer) |
| 898 m_contentsLayer->setOpaque(opaque); |
897 } | 899 } |
898 | 900 |
899 void GraphicsLayer::setMaskLayer(GraphicsLayer* maskLayer) | 901 void GraphicsLayer::setMaskLayer(GraphicsLayer* maskLayer) |
900 { | 902 { |
901 if (maskLayer == m_maskLayer) | 903 if (maskLayer == m_maskLayer) |
902 return; | 904 return; |
903 | 905 |
904 m_maskLayer = maskLayer; | 906 m_maskLayer = maskLayer; |
905 WebLayer* maskWebLayer = m_maskLayer ? m_maskLayer->platformLayer() : 0; | 907 WebLayer* maskWebLayer = m_maskLayer ? m_maskLayer->platformLayer() : 0; |
906 m_layer->layer()->setMaskLayer(maskWebLayer); | 908 m_layer->layer()->setMaskLayer(maskWebLayer); |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1127 #ifndef NDEBUG | 1129 #ifndef NDEBUG |
1128 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer) | 1130 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer) |
1129 { | 1131 { |
1130 if (!layer) | 1132 if (!layer) |
1131 return; | 1133 return; |
1132 | 1134 |
1133 String output = layer->layerTreeAsText(WebCore::LayerTreeIncludesDebugInfo); | 1135 String output = layer->layerTreeAsText(WebCore::LayerTreeIncludesDebugInfo); |
1134 fprintf(stderr, "%s\n", output.utf8().data()); | 1136 fprintf(stderr, "%s\n", output.utf8().data()); |
1135 } | 1137 } |
1136 #endif | 1138 #endif |
OLD | NEW |