| 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 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 m_innerViewportScrollLayer->removeAllChildren(); | 426 m_innerViewportScrollLayer->removeAllChildren(); |
| 427 m_innerViewportScrollLayer->addChild(currentLayerTreeRoot); | 427 m_innerViewportScrollLayer->addChild(currentLayerTreeRoot); |
| 428 } | 428 } |
| 429 | 429 |
| 430 void VisualViewport::initializeScrollbars() | 430 void VisualViewport::initializeScrollbars() |
| 431 { | 431 { |
| 432 // Do nothing if not attached to layer tree yet - will initialize upon attac
h. | 432 // Do nothing if not attached to layer tree yet - will initialize upon attac
h. |
| 433 if (!m_innerViewportContainerLayer) | 433 if (!m_innerViewportContainerLayer) |
| 434 return; | 434 return; |
| 435 | 435 |
| 436 if (visualViewportSuppliesScrollbars()) { | 436 if (visualViewportSuppliesScrollbars() && !frameHost().settings().hideScroll
bars()) { |
| 437 if (!m_overlayScrollbarHorizontal->parent()) | 437 if (!m_overlayScrollbarHorizontal->parent()) |
| 438 m_innerViewportContainerLayer->addChild(m_overlayScrollbarHorizontal
.get()); | 438 m_innerViewportContainerLayer->addChild(m_overlayScrollbarHorizontal
.get()); |
| 439 if (!m_overlayScrollbarVertical->parent()) | 439 if (!m_overlayScrollbarVertical->parent()) |
| 440 m_innerViewportContainerLayer->addChild(m_overlayScrollbarVertical.g
et()); | 440 m_innerViewportContainerLayer->addChild(m_overlayScrollbarVertical.g
et()); |
| 441 } else { | 441 } else { |
| 442 m_overlayScrollbarHorizontal->removeFromParent(); | 442 m_overlayScrollbarHorizontal->removeFromParent(); |
| 443 m_overlayScrollbarVertical->removeFromParent(); | 443 m_overlayScrollbarVertical->removeFromParent(); |
| 444 } | 444 } |
| 445 | 445 |
| 446 setupScrollbar(WebScrollbar::Horizontal); | 446 setupScrollbar(WebScrollbar::Horizontal); |
| (...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 832 } else if (graphicsLayer == m_rootTransformLayer.get()) { | 832 } else if (graphicsLayer == m_rootTransformLayer.get()) { |
| 833 name = "Root Transform Layer"; | 833 name = "Root Transform Layer"; |
| 834 } else { | 834 } else { |
| 835 ASSERT_NOT_REACHED(); | 835 ASSERT_NOT_REACHED(); |
| 836 } | 836 } |
| 837 | 837 |
| 838 return name; | 838 return name; |
| 839 } | 839 } |
| 840 | 840 |
| 841 } // namespace blink | 841 } // namespace blink |
| OLD | NEW |