| 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 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 inner_viewport_container_layer_ = GraphicsLayer::Create(this); | 343 inner_viewport_container_layer_ = GraphicsLayer::Create(this); |
| 344 overscroll_elasticity_layer_ = GraphicsLayer::Create(this); | 344 overscroll_elasticity_layer_ = GraphicsLayer::Create(this); |
| 345 page_scale_layer_ = GraphicsLayer::Create(this); | 345 page_scale_layer_ = GraphicsLayer::Create(this); |
| 346 inner_viewport_scroll_layer_ = GraphicsLayer::Create(this); | 346 inner_viewport_scroll_layer_ = GraphicsLayer::Create(this); |
| 347 overlay_scrollbar_horizontal_ = GraphicsLayer::Create(this); | 347 overlay_scrollbar_horizontal_ = GraphicsLayer::Create(this); |
| 348 overlay_scrollbar_vertical_ = GraphicsLayer::Create(this); | 348 overlay_scrollbar_vertical_ = GraphicsLayer::Create(this); |
| 349 | 349 |
| 350 ScrollingCoordinator* coordinator = GetPage().GetScrollingCoordinator(); | 350 ScrollingCoordinator* coordinator = GetPage().GetScrollingCoordinator(); |
| 351 DCHECK(coordinator); | 351 DCHECK(coordinator); |
| 352 coordinator->SetLayerIsContainerForFixedPositionLayers( | 352 coordinator->SetLayerIsContainerForFixedPositionLayers( |
| 353 inner_viewport_scroll_layer_.get(), true); | 353 inner_viewport_container_layer_.get(), true); |
| 354 | 354 |
| 355 // Set masks to bounds so the compositor doesn't clobber a manually | 355 // Set masks to bounds so the compositor doesn't clobber a manually |
| 356 // set inner viewport container layer size. | 356 // set inner viewport container layer size. |
| 357 inner_viewport_container_layer_->SetMasksToBounds( | 357 inner_viewport_container_layer_->SetMasksToBounds( |
| 358 GetPage().GetSettings().GetMainFrameClipsContent()); | 358 GetPage().GetSettings().GetMainFrameClipsContent()); |
| 359 inner_viewport_container_layer_->SetSize(FloatSize(size_)); | 359 inner_viewport_container_layer_->SetSize(FloatSize(size_)); |
| 360 | 360 |
| 361 inner_viewport_scroll_layer_->PlatformLayer()->SetScrollClipLayer( | 361 inner_viewport_scroll_layer_->PlatformLayer()->SetScrollClipLayer( |
| 362 inner_viewport_container_layer_->PlatformLayer()); | 362 inner_viewport_container_layer_->PlatformLayer()); |
| 363 inner_viewport_scroll_layer_->PlatformLayer()->SetUserScrollable(true, true); | 363 inner_viewport_scroll_layer_->PlatformLayer()->SetUserScrollable(true, true); |
| (...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 856 } else if (graphics_layer == root_transform_layer_.get()) { | 856 } else if (graphics_layer == root_transform_layer_.get()) { |
| 857 name = "Root Transform Layer"; | 857 name = "Root Transform Layer"; |
| 858 } else { | 858 } else { |
| 859 NOTREACHED(); | 859 NOTREACHED(); |
| 860 } | 860 } |
| 861 | 861 |
| 862 return name; | 862 return name; |
| 863 } | 863 } |
| 864 | 864 |
| 865 } // namespace blink | 865 } // namespace blink |
| OLD | NEW |