| 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 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 409 ASSERT(compositor); | 409 ASSERT(compositor); |
| 410 layerTreeView->registerViewportLayers( | 410 layerTreeView->registerViewportLayers( |
| 411 m_overscrollElasticityLayer->platformLayer(), | 411 m_overscrollElasticityLayer->platformLayer(), |
| 412 m_pageScaleLayer->platformLayer(), | 412 m_pageScaleLayer->platformLayer(), |
| 413 m_innerViewportScrollLayer->platformLayer(), | 413 m_innerViewportScrollLayer->platformLayer(), |
| 414 scrollLayer); | 414 scrollLayer); |
| 415 } | 415 } |
| 416 | 416 |
| 417 bool VisualViewport::visualViewportSuppliesScrollbars() const | 417 bool VisualViewport::visualViewportSuppliesScrollbars() const |
| 418 { | 418 { |
| 419 return frameHost().settings().viewportMetaEnabled(); | 419 return frameHost().settings().viewportEnabled(); |
| 420 } | 420 } |
| 421 | 421 |
| 422 bool VisualViewport::scrollAnimatorEnabled() const | 422 bool VisualViewport::scrollAnimatorEnabled() const |
| 423 { | 423 { |
| 424 return frameHost().settings().scrollAnimatorEnabled(); | 424 return frameHost().settings().scrollAnimatorEnabled(); |
| 425 } | 425 } |
| 426 | 426 |
| 427 void VisualViewport::clearLayersForTreeView(WebLayerTreeView* layerTreeView) con
st | 427 void VisualViewport::clearLayersForTreeView(WebLayerTreeView* layerTreeView) con
st |
| 428 { | 428 { |
| 429 ASSERT(layerTreeView); | 429 ASSERT(layerTreeView); |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 739 } else if (graphicsLayer == m_rootTransformLayer) { | 739 } else if (graphicsLayer == m_rootTransformLayer) { |
| 740 name = "Root Transform Layer"; | 740 name = "Root Transform Layer"; |
| 741 } else { | 741 } else { |
| 742 ASSERT_NOT_REACHED(); | 742 ASSERT_NOT_REACHED(); |
| 743 } | 743 } |
| 744 | 744 |
| 745 return name; | 745 return name; |
| 746 } | 746 } |
| 747 | 747 |
| 748 } // namespace blink | 748 } // namespace blink |
| OLD | NEW |