| 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 2446 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2457     if (graphicsLayerPaintingPhase & GraphicsLayerPaintMask) |  2457     if (graphicsLayerPaintingPhase & GraphicsLayerPaintMask) | 
|  2458         paintLayerFlags |= PaintLayerPaintingCompositingMaskPhase; |  2458         paintLayerFlags |= PaintLayerPaintingCompositingMaskPhase; | 
|  2459     if (graphicsLayerPaintingPhase & GraphicsLayerPaintChildClippingMask) |  2459     if (graphicsLayerPaintingPhase & GraphicsLayerPaintChildClippingMask) | 
|  2460         paintLayerFlags |= PaintLayerPaintingChildClippingMaskPhase; |  2460         paintLayerFlags |= PaintLayerPaintingChildClippingMaskPhase; | 
|  2461     if (graphicsLayerPaintingPhase & GraphicsLayerPaintOverflowContents) |  2461     if (graphicsLayerPaintingPhase & GraphicsLayerPaintOverflowContents) | 
|  2462         paintLayerFlags |= PaintLayerPaintingOverflowContents; |  2462         paintLayerFlags |= PaintLayerPaintingOverflowContents; | 
|  2463     if (graphicsLayerPaintingPhase & GraphicsLayerPaintCompositedScroll) |  2463     if (graphicsLayerPaintingPhase & GraphicsLayerPaintCompositedScroll) | 
|  2464         paintLayerFlags |= PaintLayerPaintingCompositingScrollingPhase; |  2464         paintLayerFlags |= PaintLayerPaintingCompositingScrollingPhase; | 
|  2465  |  2465  | 
|  2466     if (graphicsLayer == m_backgroundLayer.get()) |  2466     if (graphicsLayer == m_backgroundLayer.get()) | 
|  2467         paintLayerFlags |= (PaintLayerPaintingRootBackgroundOnly | PaintLayerPai
      ntingCompositingForegroundPhase); // Need PaintLayerPaintingCompositingForegroun
      dPhase to walk child layers. |  2467         paintLayerFlags |= PaintLayerPaintingRootBackgroundOnly; | 
|  2468     else if (compositor()->fixedRootBackgroundLayer() && m_owningLayer.isRootLay
      er()) |  2468     else if (compositor()->fixedRootBackgroundLayer() && m_owningLayer.isRootLay
      er()) | 
|  2469         paintLayerFlags |= PaintLayerPaintingSkipRootBackground; |  2469         paintLayerFlags |= PaintLayerPaintingSkipRootBackground; | 
|  2470  |  2470  | 
|  2471     if (graphicsLayer == m_graphicsLayer.get() |  2471     if (graphicsLayer == m_graphicsLayer.get() | 
|  2472         || graphicsLayer == m_foregroundLayer.get() |  2472         || graphicsLayer == m_foregroundLayer.get() | 
|  2473         || graphicsLayer == m_backgroundLayer.get() |  2473         || graphicsLayer == m_backgroundLayer.get() | 
|  2474         || graphicsLayer == m_maskLayer.get() |  2474         || graphicsLayer == m_maskLayer.get() | 
|  2475         || graphicsLayer == m_childClippingMaskLayer.get() |  2475         || graphicsLayer == m_childClippingMaskLayer.get() | 
|  2476         || graphicsLayer == m_scrollingContentsLayer.get()) { |  2476         || graphicsLayer == m_scrollingContentsLayer.get()) { | 
|  2477  |  2477  | 
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2703     } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |  2703     } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 
|  2704         name = "Scrolling Contents Layer"; |  2704         name = "Scrolling Contents Layer"; | 
|  2705     } else { |  2705     } else { | 
|  2706         ASSERT_NOT_REACHED(); |  2706         ASSERT_NOT_REACHED(); | 
|  2707     } |  2707     } | 
|  2708  |  2708  | 
|  2709     return name; |  2709     return name; | 
|  2710 } |  2710 } | 
|  2711  |  2711  | 
|  2712 } // namespace blink |  2712 } // namespace blink | 
| OLD | NEW |