| 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 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 438 frame = frame->tree().traverseNext()) { | 438 frame = frame->tree().traverseNext()) { |
| 439 if (!frame->isLocalFrame()) | 439 if (!frame->isLocalFrame()) |
| 440 continue; | 440 continue; |
| 441 if (FrameView* view = toLocalFrame(frame)->view()) | 441 if (FrameView* view = toLocalFrame(frame)->view()) |
| 442 view->updateAcceleratedCompositingSettings(); | 442 view->updateAcceleratedCompositingSettings(); |
| 443 } | 443 } |
| 444 } | 444 } |
| 445 | 445 |
| 446 void Page::didCommitLoad(LocalFrame* frame) { | 446 void Page::didCommitLoad(LocalFrame* frame) { |
| 447 if (m_mainFrame == frame) { | 447 if (m_mainFrame == frame) { |
| 448 KURL url; |
| 449 if (frame->document()) |
| 450 url = frame->document()->url(); |
| 451 |
| 448 // TODO(rbyers): Most of this doesn't appear to take into account that each | 452 // TODO(rbyers): Most of this doesn't appear to take into account that each |
| 449 // SVGImage gets it's own Page instance. | 453 // SVGImage gets it's own Page instance. |
| 450 frameHost().consoleMessageStorage().clear(); | 454 frameHost().consoleMessageStorage().clear(); |
| 451 useCounter().didCommitLoad(); | 455 useCounter().didCommitLoad(url); |
| 452 deprecation().clearSuppression(); | 456 deprecation().clearSuppression(); |
| 453 frameHost().visualViewport().sendUMAMetrics(); | 457 frameHost().visualViewport().sendUMAMetrics(); |
| 454 | 458 |
| 455 // Need to reset visual viewport position here since before commit load we | 459 // Need to reset visual viewport position here since before commit load we |
| 456 // would update the previous history item, Page::didCommitLoad is called | 460 // would update the previous history item, Page::didCommitLoad is called |
| 457 // after a new history item is created in FrameLoader. | 461 // after a new history item is created in FrameLoader. |
| 458 // See crbug.com/642279 | 462 // See crbug.com/642279 |
| 459 frameHost().visualViewport().setScrollOffset(ScrollOffset(), | 463 frameHost().visualViewport().setScrollOffset(ScrollOffset(), |
| 460 ProgrammaticScroll); | 464 ProgrammaticScroll); |
| 461 m_hostsUsingFeatures.updateMeasurementsAndClear(); | 465 m_hostsUsingFeatures.updateMeasurementsAndClear(); |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 : chromeClient(nullptr), | 536 : chromeClient(nullptr), |
| 533 contextMenuClient(nullptr), | 537 contextMenuClient(nullptr), |
| 534 editorClient(nullptr), | 538 editorClient(nullptr), |
| 535 spellCheckerClient(nullptr) {} | 539 spellCheckerClient(nullptr) {} |
| 536 | 540 |
| 537 Page::PageClients::~PageClients() {} | 541 Page::PageClients::~PageClients() {} |
| 538 | 542 |
| 539 template class CORE_TEMPLATE_EXPORT Supplement<Page>; | 543 template class CORE_TEMPLATE_EXPORT Supplement<Page>; |
| 540 | 544 |
| 541 } // namespace blink | 545 } // namespace blink |
| OLD | NEW |