| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "PinchViewports.h" | 32 #include "PinchViewports.h" |
| 33 | 33 |
| 34 #include "WebSettingsImpl.h" | 34 #include "WebSettingsImpl.h" |
| 35 #include "WebViewImpl.h" | 35 #include "WebViewImpl.h" |
| 36 #include "core/frame/Frame.h" | 36 #include "core/frame/Frame.h" |
| 37 #include "core/frame/FrameView.h" | 37 #include "core/frame/FrameView.h" |
| 38 #include "core/page/scrolling/ScrollingCoordinator.h" | 38 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 39 #include "core/platform/Scrollbar.h" | |
| 40 #include "core/platform/graphics/GraphicsLayer.h" | |
| 41 #include "core/rendering/RenderLayerCompositor.h" | 39 #include "core/rendering/RenderLayerCompositor.h" |
| 42 #include "platform/geometry/FloatSize.h" | 40 #include "platform/geometry/FloatSize.h" |
| 41 #include "platform/graphics/GraphicsLayer.h" |
| 42 #include "platform/scroll/Scrollbar.h" |
| 43 #include "public/platform/Platform.h" | 43 #include "public/platform/Platform.h" |
| 44 #include "public/platform/WebCompositorSupport.h" | 44 #include "public/platform/WebCompositorSupport.h" |
| 45 #include "public/platform/WebLayer.h" | 45 #include "public/platform/WebLayer.h" |
| 46 #include "public/platform/WebLayerTreeView.h" | 46 #include "public/platform/WebLayerTreeView.h" |
| 47 #include "public/platform/WebScrollbarLayer.h" | 47 #include "public/platform/WebScrollbarLayer.h" |
| 48 | 48 |
| 49 using WebCore::GraphicsLayer; | 49 using WebCore::GraphicsLayer; |
| 50 | 50 |
| 51 namespace blink { | 51 namespace blink { |
| 52 | 52 |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 } else if (graphicsLayer == m_overlayScrollbarVertical.get()) { | 207 } else if (graphicsLayer == m_overlayScrollbarVertical.get()) { |
| 208 name = "Overlay Scrollbar Vertical Layer"; | 208 name = "Overlay Scrollbar Vertical Layer"; |
| 209 } else { | 209 } else { |
| 210 ASSERT_NOT_REACHED(); | 210 ASSERT_NOT_REACHED(); |
| 211 } | 211 } |
| 212 | 212 |
| 213 return name; | 213 return name; |
| 214 } | 214 } |
| 215 | 215 |
| 216 } // namespace blink | 216 } // namespace blink |
| OLD | NEW |