OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 #include "core/rendering/RenderLayerStackingNode.h" | 43 #include "core/rendering/RenderLayerStackingNode.h" |
44 #include "core/rendering/RenderLayerStackingNodeIterator.h" | 44 #include "core/rendering/RenderLayerStackingNodeIterator.h" |
45 #include "core/rendering/RenderVideo.h" | 45 #include "core/rendering/RenderVideo.h" |
46 #include "core/rendering/RenderView.h" | 46 #include "core/rendering/RenderView.h" |
47 #include "core/rendering/compositing/CompositedLayerMapping.h" | 47 #include "core/rendering/compositing/CompositedLayerMapping.h" |
48 #include "core/rendering/compositing/CompositingLayerAssigner.h" | 48 #include "core/rendering/compositing/CompositingLayerAssigner.h" |
49 #include "core/rendering/compositing/CompositingRequirementsUpdater.h" | 49 #include "core/rendering/compositing/CompositingRequirementsUpdater.h" |
50 #include "core/rendering/compositing/GraphicsLayerTreeBuilder.h" | 50 #include "core/rendering/compositing/GraphicsLayerTreeBuilder.h" |
51 #include "core/rendering/compositing/GraphicsLayerUpdater.h" | 51 #include "core/rendering/compositing/GraphicsLayerUpdater.h" |
52 #include "platform/OverscrollTheme.h" | 52 #include "platform/OverscrollTheme.h" |
| 53 #include "platform/TraceEvent.h" |
53 #include "platform/graphics/GraphicsLayer.h" | 54 #include "platform/graphics/GraphicsLayer.h" |
54 #include "public/platform/Platform.h" | 55 #include "public/platform/Platform.h" |
55 | 56 |
56 namespace WebCore { | 57 namespace WebCore { |
57 | 58 |
58 class DeprecatedDirtyCompositingDuringCompositingUpdate { | 59 class DeprecatedDirtyCompositingDuringCompositingUpdate { |
59 WTF_MAKE_NONCOPYABLE(DeprecatedDirtyCompositingDuringCompositingUpdate); | 60 WTF_MAKE_NONCOPYABLE(DeprecatedDirtyCompositingDuringCompositingUpdate); |
60 public: | 61 public: |
61 DeprecatedDirtyCompositingDuringCompositingUpdate(DocumentLifecycle& lifecyc
le) | 62 DeprecatedDirtyCompositingDuringCompositingUpdate(DocumentLifecycle& lifecyc
le) |
62 : m_lifecycle(lifecycle) | 63 : m_lifecycle(lifecycle) |
(...skipping 1246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1309 } else if (graphicsLayer == m_scrollLayer.get()) { | 1310 } else if (graphicsLayer == m_scrollLayer.get()) { |
1310 name = "LocalFrame Scrolling Layer"; | 1311 name = "LocalFrame Scrolling Layer"; |
1311 } else { | 1312 } else { |
1312 ASSERT_NOT_REACHED(); | 1313 ASSERT_NOT_REACHED(); |
1313 } | 1314 } |
1314 | 1315 |
1315 return name; | 1316 return name; |
1316 } | 1317 } |
1317 | 1318 |
1318 } // namespace WebCore | 1319 } // namespace WebCore |
OLD | NEW |