| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 #include "RenderGeometryMap.h" | 48 #include "RenderGeometryMap.h" |
| 49 #include "RenderIFrame.h" | 49 #include "RenderIFrame.h" |
| 50 #include "RenderLayerBacking.h" | 50 #include "RenderLayerBacking.h" |
| 51 #include "RenderReplica.h" | 51 #include "RenderReplica.h" |
| 52 #include "RenderVideo.h" | 52 #include "RenderVideo.h" |
| 53 #include "RenderView.h" | 53 #include "RenderView.h" |
| 54 #include "ScrollbarTheme.h" | 54 #include "ScrollbarTheme.h" |
| 55 #include "ScrollingConstraints.h" | 55 #include "ScrollingConstraints.h" |
| 56 #include "ScrollingCoordinator.h" | 56 #include "ScrollingCoordinator.h" |
| 57 #include "Settings.h" | 57 #include "Settings.h" |
| 58 #include "TraceEvent.h" | |
| 59 #include "WebCoreMemoryInstrumentation.h" | 58 #include "WebCoreMemoryInstrumentation.h" |
| 59 #include "core/platform/chromium/TraceEvent.h" |
| 60 #include "core/platform/graphics/GraphicsLayer.h" | 60 #include "core/platform/graphics/GraphicsLayer.h" |
| 61 #include "core/platform/graphics/transforms/TransformState.h" | 61 #include "core/platform/graphics/transforms/TransformState.h" |
| 62 #include <wtf/MemoryInstrumentationHashMap.h> | 62 #include <wtf/MemoryInstrumentationHashMap.h> |
| 63 #include <wtf/TemporaryChange.h> | 63 #include <wtf/TemporaryChange.h> |
| 64 | 64 |
| 65 #if !LOG_DISABLED | 65 #if !LOG_DISABLED |
| 66 #include <wtf/CurrentTime.h> | 66 #include <wtf/CurrentTime.h> |
| 67 #endif | 67 #endif |
| 68 | 68 |
| 69 #ifndef NDEBUG | 69 #ifndef NDEBUG |
| (...skipping 2666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2736 info.addMember(m_layerForScrollCorner, "layerForScrollCorner"); | 2736 info.addMember(m_layerForScrollCorner, "layerForScrollCorner"); |
| 2737 #if ENABLE(RUBBER_BANDING) | 2737 #if ENABLE(RUBBER_BANDING) |
| 2738 info.addMember(m_layerForOverhangAreas, "layerForOverhangAreas"); | 2738 info.addMember(m_layerForOverhangAreas, "layerForOverhangAreas"); |
| 2739 info.addMember(m_contentShadowLayer, "contentShadowLayer"); | 2739 info.addMember(m_contentShadowLayer, "contentShadowLayer"); |
| 2740 info.addMember(m_layerForTopOverhangArea, "layerForTopOverhangArea"); | 2740 info.addMember(m_layerForTopOverhangArea, "layerForTopOverhangArea"); |
| 2741 info.addMember(m_layerForBottomOverhangArea, "layerForBottomOverhangArea"); | 2741 info.addMember(m_layerForBottomOverhangArea, "layerForBottomOverhangArea"); |
| 2742 #endif | 2742 #endif |
| 2743 } | 2743 } |
| 2744 | 2744 |
| 2745 } // namespace WebCore | 2745 } // namespace WebCore |
| OLD | NEW |