| 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 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 414 Document* doc = toLocalFrame(frame)->document(); | 414 Document* doc = toLocalFrame(frame)->document(); |
| 415 if (doc) | 415 if (doc) |
| 416 HTMLMediaElement::setTextTrackKindUserPreferenceForAllMediaElements( | 416 HTMLMediaElement::setTextTrackKindUserPreferenceForAllMediaElements( |
| 417 doc); | 417 doc); |
| 418 } | 418 } |
| 419 } | 419 } |
| 420 break; | 420 break; |
| 421 case SettingsDelegate::DOMWorldsChange: { | 421 case SettingsDelegate::DOMWorldsChange: { |
| 422 if (!settings().forceMainWorldInitialization()) | 422 if (!settings().forceMainWorldInitialization()) |
| 423 break; | 423 break; |
| 424 if (!mainFrame() || !mainFrame()->isLocalFrame()) | |
| 425 break; | |
| 426 if (!toLocalFrame(mainFrame()) | |
| 427 ->loader() | |
| 428 .stateMachine() | |
| 429 ->committedFirstRealDocumentLoad()) | |
| 430 break; | |
| 431 for (Frame* frame = mainFrame(); frame; | 424 for (Frame* frame = mainFrame(); frame; |
| 432 frame = frame->tree().traverseNext()) { | 425 frame = frame->tree().traverseNext()) { |
| 433 if (frame->isLocalFrame()) | 426 if (!frame->isLocalFrame()) |
| 434 toLocalFrame(frame)->script().initializeMainWorld(); | 427 continue; |
| 428 LocalFrame* localFrame = toLocalFrame(frame); |
| 429 if (localFrame->loader() |
| 430 .stateMachine() |
| 431 ->committedFirstRealDocumentLoad()) { |
| 432 localFrame->script().initializeMainWorld(); |
| 433 } |
| 435 } | 434 } |
| 436 } break; | 435 } break; |
| 437 } | 436 } |
| 438 } | 437 } |
| 439 | 438 |
| 440 void Page::updateAcceleratedCompositingSettings() { | 439 void Page::updateAcceleratedCompositingSettings() { |
| 441 for (Frame* frame = mainFrame(); frame; | 440 for (Frame* frame = mainFrame(); frame; |
| 442 frame = frame->tree().traverseNext()) { | 441 frame = frame->tree().traverseNext()) { |
| 443 if (!frame->isLocalFrame()) | 442 if (!frame->isLocalFrame()) |
| 444 continue; | 443 continue; |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 : chromeClient(nullptr), | 535 : chromeClient(nullptr), |
| 537 contextMenuClient(nullptr), | 536 contextMenuClient(nullptr), |
| 538 editorClient(nullptr), | 537 editorClient(nullptr), |
| 539 spellCheckerClient(nullptr) {} | 538 spellCheckerClient(nullptr) {} |
| 540 | 539 |
| 541 Page::PageClients::~PageClients() {} | 540 Page::PageClients::~PageClients() {} |
| 542 | 541 |
| 543 template class CORE_TEMPLATE_EXPORT Supplement<Page>; | 542 template class CORE_TEMPLATE_EXPORT Supplement<Page>; |
| 544 | 543 |
| 545 } // namespace blink | 544 } // namespace blink |
| OLD | NEW |