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

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

Issue 146683003: Settings should not call into inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: incorporated review comments Created 6 years, 10 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
« no previous file with comments | « Source/core/page/Page.h ('k') | Source/core/rendering/FastTextAutosizer.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 break; 500 break;
501 case SettingsDelegate::TextAutosizingChange: 501 case SettingsDelegate::TextAutosizingChange:
502 // FIXME: I wonder if this needs to traverse frames like in WebViewImpl: :resize, or whether there is only one document per Settings instance? 502 // FIXME: I wonder if this needs to traverse frames like in WebViewImpl: :resize, or whether there is only one document per Settings instance?
503 for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNe xt()) { 503 for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNe xt()) {
504 TextAutosizer* textAutosizer = frame->document()->textAutosizer(); 504 TextAutosizer* textAutosizer = frame->document()->textAutosizer();
505 if (textAutosizer) 505 if (textAutosizer)
506 textAutosizer->recalculateMultipliers(); 506 textAutosizer->recalculateMultipliers();
507 } 507 }
508 setNeedsRecalcStyleInAllFrames(); 508 setNeedsRecalcStyleInAllFrames();
509 break; 509 break;
510 case SettingsDelegate::ScriptEnableChange:
511 m_inspectorController->scriptsEnabled(settings().scriptEnabled());
512 break;
510 } 513 }
511 } 514 }
512 515
513 void Page::didCommitLoad(Frame* frame) 516 void Page::didCommitLoad(Frame* frame)
514 { 517 {
515 lifecycleNotifier().notifyDidCommitLoad(frame); 518 lifecycleNotifier().notifyDidCommitLoad(frame);
516 if (m_mainFrame == frame) 519 if (m_mainFrame == frame)
517 useCounter().didCommitLoad(); 520 useCounter().didCommitLoad();
518 } 521 }
519 522
(...skipping 16 matching lines...) Expand all
536 , backForwardClient(0) 539 , backForwardClient(0)
537 , spellCheckerClient(0) 540 , spellCheckerClient(0)
538 { 541 {
539 } 542 }
540 543
541 Page::PageClients::~PageClients() 544 Page::PageClients::~PageClients()
542 { 545 {
543 } 546 }
544 547
545 } // namespace WebCore 548 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/Page.h ('k') | Source/core/rendering/FastTextAutosizer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698