| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All |
| 3 * Rights Reserved. | 3 * Rights Reserved. |
| 4 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. | 4 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. |
| 5 * (http://www.torchmobile.com/) | 5 * (http://www.torchmobile.com/) |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 503 visitor->trace(m_contextMenuController); | 503 visitor->trace(m_contextMenuController); |
| 504 visitor->trace(m_pointerLockController); | 504 visitor->trace(m_pointerLockController); |
| 505 visitor->trace(m_scrollingCoordinator); | 505 visitor->trace(m_scrollingCoordinator); |
| 506 visitor->trace(m_mainFrame); | 506 visitor->trace(m_mainFrame); |
| 507 visitor->trace(m_validationMessageClient); | 507 visitor->trace(m_validationMessageClient); |
| 508 visitor->trace(m_frameHost); | 508 visitor->trace(m_frameHost); |
| 509 Supplementable<Page>::trace(visitor); | 509 Supplementable<Page>::trace(visitor); |
| 510 PageVisibilityNotifier::trace(visitor); | 510 PageVisibilityNotifier::trace(visitor); |
| 511 } | 511 } |
| 512 | 512 |
| 513 void Page::layerTreeViewInitialized(WebLayerTreeView& layerTreeView) { | 513 void Page::layerTreeViewInitialized(WebLayerTreeView& layerTreeView, |
| 514 FrameView* view) { |
| 514 if (scrollingCoordinator()) | 515 if (scrollingCoordinator()) |
| 515 scrollingCoordinator()->layerTreeViewInitialized(layerTreeView); | 516 scrollingCoordinator()->layerTreeViewInitialized(layerTreeView, view); |
| 516 } | 517 } |
| 517 | 518 |
| 518 void Page::willCloseLayerTreeView(WebLayerTreeView& layerTreeView) { | 519 void Page::willCloseLayerTreeView(WebLayerTreeView& layerTreeView, |
| 520 FrameView* view) { |
| 519 if (m_scrollingCoordinator) | 521 if (m_scrollingCoordinator) |
| 520 m_scrollingCoordinator->willCloseLayerTreeView(layerTreeView); | 522 m_scrollingCoordinator->willCloseLayerTreeView(layerTreeView, view); |
| 521 } | 523 } |
| 522 | 524 |
| 523 void Page::willBeDestroyed() { | 525 void Page::willBeDestroyed() { |
| 524 Frame* mainFrame = m_mainFrame; | 526 Frame* mainFrame = m_mainFrame; |
| 525 | 527 |
| 526 mainFrame->detach(FrameDetachType::Remove); | 528 mainFrame->detach(FrameDetachType::Remove); |
| 527 | 529 |
| 528 ASSERT(allPages().contains(this)); | 530 ASSERT(allPages().contains(this)); |
| 529 allPages().remove(this); | 531 allPages().remove(this); |
| 530 ordinaryPages().remove(this); | 532 ordinaryPages().remove(this); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 544 : chromeClient(nullptr), | 546 : chromeClient(nullptr), |
| 545 contextMenuClient(nullptr), | 547 contextMenuClient(nullptr), |
| 546 editorClient(nullptr), | 548 editorClient(nullptr), |
| 547 spellCheckerClient(nullptr) {} | 549 spellCheckerClient(nullptr) {} |
| 548 | 550 |
| 549 Page::PageClients::~PageClients() {} | 551 Page::PageClients::~PageClients() {} |
| 550 | 552 |
| 551 template class CORE_TEMPLATE_EXPORT Supplement<Page>; | 553 template class CORE_TEMPLATE_EXPORT Supplement<Page>; |
| 552 | 554 |
| 553 } // namespace blink | 555 } // namespace blink |
| OLD | NEW |