Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(515)

Side by Side Diff: third_party/WebKit/Source/core/page/Page.cpp

Issue 2811793005: Rename LocalFrame::Script() to GetScriptController() (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 break; 539 break;
540 for (Frame* frame = MainFrame(); frame; 540 for (Frame* frame = MainFrame(); frame;
541 frame = frame->Tree().TraverseNext()) { 541 frame = frame->Tree().TraverseNext()) {
542 if (!frame->IsLocalFrame()) 542 if (!frame->IsLocalFrame())
543 continue; 543 continue;
544 LocalFrame* local_frame = ToLocalFrame(frame); 544 LocalFrame* local_frame = ToLocalFrame(frame);
545 if (local_frame->Loader() 545 if (local_frame->Loader()
546 .StateMachine() 546 .StateMachine()
547 ->CommittedFirstRealDocumentLoad()) { 547 ->CommittedFirstRealDocumentLoad()) {
548 // Forcibly instantiate WindowProxy. 548 // Forcibly instantiate WindowProxy.
549 local_frame->Script().WindowProxy(DOMWrapperWorld::MainWorld()); 549 local_frame->GetScriptController().WindowProxy(
550 DOMWrapperWorld::MainWorld());
550 } 551 }
551 } 552 }
552 } break; 553 } break;
553 case SettingsDelegate::kMediaControlsChange: 554 case SettingsDelegate::kMediaControlsChange:
554 for (Frame* frame = MainFrame(); frame; 555 for (Frame* frame = MainFrame(); frame;
555 frame = frame->Tree().TraverseNext()) { 556 frame = frame->Tree().TraverseNext()) {
556 if (!frame->IsLocalFrame()) 557 if (!frame->IsLocalFrame())
557 continue; 558 continue;
558 Document* doc = ToLocalFrame(frame)->GetDocument(); 559 Document* doc = ToLocalFrame(frame)->GetDocument();
559 if (doc) 560 if (doc)
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 : chrome_client(nullptr), 673 : chrome_client(nullptr),
673 context_menu_client(nullptr), 674 context_menu_client(nullptr),
674 editor_client(nullptr), 675 editor_client(nullptr),
675 spell_checker_client(nullptr) {} 676 spell_checker_client(nullptr) {}
676 677
677 Page::PageClients::~PageClients() {} 678 Page::PageClients::~PageClients() {}
678 679
679 template class CORE_TEMPLATE_EXPORT Supplement<Page>; 680 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
680 681
681 } // namespace blink 682 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/ImageLoader.cpp ('k') | third_party/WebKit/Source/core/xml/DocumentXMLTreeViewer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698