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 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
478 ASSERT(compositor); | 478 ASSERT(compositor); |
479 layerTreeView->registerViewportLayers( | 479 layerTreeView->registerViewportLayers( |
480 m_overscrollElasticityLayer->platformLayer(), | 480 m_overscrollElasticityLayer->platformLayer(), |
481 m_pageScaleLayer->platformLayer(), | 481 m_pageScaleLayer->platformLayer(), |
482 m_innerViewportScrollLayer->platformLayer(), | 482 m_innerViewportScrollLayer->platformLayer(), |
483 scrollLayer); | 483 scrollLayer); |
484 } | 484 } |
485 | 485 |
486 bool VisualViewport::visualViewportSuppliesScrollbars() const | 486 bool VisualViewport::visualViewportSuppliesScrollbars() const |
487 { | 487 { |
488 return frameHost().settings().viewportMetaEnabled(); | 488 return frameHost().settings().viewportEnabled(); |
489 } | 489 } |
490 | 490 |
491 bool VisualViewport::scrollAnimatorEnabled() const | 491 bool VisualViewport::scrollAnimatorEnabled() const |
492 { | 492 { |
493 return frameHost().settings().scrollAnimatorEnabled(); | 493 return frameHost().settings().scrollAnimatorEnabled(); |
494 } | 494 } |
495 | 495 |
496 void VisualViewport::clearLayersForTreeView(WebLayerTreeView* layerTreeView) con
st | 496 void VisualViewport::clearLayersForTreeView(WebLayerTreeView* layerTreeView) con
st |
497 { | 497 { |
498 ASSERT(layerTreeView); | 498 ASSERT(layerTreeView); |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
814 } else if (graphicsLayer == m_rootTransformLayer) { | 814 } else if (graphicsLayer == m_rootTransformLayer) { |
815 name = "Root Transform Layer"; | 815 name = "Root Transform Layer"; |
816 } else { | 816 } else { |
817 ASSERT_NOT_REACHED(); | 817 ASSERT_NOT_REACHED(); |
818 } | 818 } |
819 | 819 |
820 return name; | 820 return name; |
821 } | 821 } |
822 | 822 |
823 } // namespace blink | 823 } // namespace blink |
OLD | NEW |