| 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 ASSERT(m_owner); | 66 ASSERT(m_owner); |
| 67 WebCore::ScrollingCoordinator* coordinator = m_owner->page()->scrollingCoord
inator(); | 67 WebCore::ScrollingCoordinator* coordinator = m_owner->page()->scrollingCoord
inator(); |
| 68 ASSERT(coordinator); | 68 ASSERT(coordinator); |
| 69 coordinator->setLayerIsContainerForFixedPositionLayers(m_innerViewportScroll
Layer.get(), true); | 69 coordinator->setLayerIsContainerForFixedPositionLayers(m_innerViewportScroll
Layer.get(), true); |
| 70 | 70 |
| 71 // No need for the inner viewport to clip, since the compositing | 71 // No need for the inner viewport to clip, since the compositing |
| 72 // surface takes care of it -- and clipping here would interfere with | 72 // surface takes care of it -- and clipping here would interfere with |
| 73 // dynamically-sized viewports on Android. | 73 // dynamically-sized viewports on Android. |
| 74 m_innerViewportContainerLayer->setMasksToBounds(false); | 74 m_innerViewportContainerLayer->setMasksToBounds(false); |
| 75 | 75 |
| 76 // TODO(wjmaclean) Remove next line once https://codereview.chromium.org/239
83047 lands. | |
| 77 m_innerViewportScrollLayer->platformLayer()->setScrollable(true); | |
| 78 m_innerViewportScrollLayer->platformLayer()->setScrollClipLayer( | 76 m_innerViewportScrollLayer->platformLayer()->setScrollClipLayer( |
| 79 m_innerViewportContainerLayer->platformLayer()); | 77 m_innerViewportContainerLayer->platformLayer()); |
| 80 m_innerViewportScrollLayer->platformLayer()->setUserScrollable(true, true); | 78 m_innerViewportScrollLayer->platformLayer()->setUserScrollable(true, true); |
| 81 | 79 |
| 82 m_innerViewportContainerLayer->addChild(m_pageScaleLayer.get()); | 80 m_innerViewportContainerLayer->addChild(m_pageScaleLayer.get()); |
| 83 m_pageScaleLayer->addChild(m_innerViewportScrollLayer.get()); | 81 m_pageScaleLayer->addChild(m_innerViewportScrollLayer.get()); |
| 84 m_innerViewportContainerLayer->addChild(m_overlayScrollbarHorizontal.get()); | 82 m_innerViewportContainerLayer->addChild(m_overlayScrollbarHorizontal.get()); |
| 85 m_innerViewportContainerLayer->addChild(m_overlayScrollbarVertical.get()); | 83 m_innerViewportContainerLayer->addChild(m_overlayScrollbarVertical.get()); |
| 86 | 84 |
| 87 // Setup the inner viewport overlay scrollbars. | 85 // Setup the inner viewport overlay scrollbars. |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 } else if (graphicsLayer == m_overlayScrollbarVertical.get()) { | 222 } else if (graphicsLayer == m_overlayScrollbarVertical.get()) { |
| 225 name = "Overlay Scrollbar Vertical Layer"; | 223 name = "Overlay Scrollbar Vertical Layer"; |
| 226 } else { | 224 } else { |
| 227 ASSERT_NOT_REACHED(); | 225 ASSERT_NOT_REACHED(); |
| 228 } | 226 } |
| 229 | 227 |
| 230 return name; | 228 return name; |
| 231 } | 229 } |
| 232 | 230 |
| 233 } // namespace blink | 231 } // namespace blink |
| OLD | NEW |