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

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

Issue 131403008: Revert of Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/SettingsDelegate.h ('k') | Source/core/testing/InternalSettings.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 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 break; 511 break;
512 case SettingsDelegate::TextAutosizingChange: 512 case SettingsDelegate::TextAutosizingChange:
513 // FIXME: I wonder if this needs to traverse frames like in WebViewImpl: :resize, or whether there is only one document per Settings instance? 513 // FIXME: I wonder if this needs to traverse frames like in WebViewImpl: :resize, or whether there is only one document per Settings instance?
514 for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNe xt()) { 514 for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNe xt()) {
515 TextAutosizer* textAutosizer = frame->document()->textAutosizer(); 515 TextAutosizer* textAutosizer = frame->document()->textAutosizer();
516 if (textAutosizer) 516 if (textAutosizer)
517 textAutosizer->recalculateMultipliers(); 517 textAutosizer->recalculateMultipliers();
518 } 518 }
519 setNeedsRecalcStyleInAllFrames(); 519 setNeedsRecalcStyleInAllFrames();
520 break; 520 break;
521 case SettingsDelegate::FontFamilyChange:
522 for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNe xt())
523 frame->document()->styleEngine()->resetFontSelector();
524 break;
525 } 521 }
526 } 522 }
527 523
528 void Page::didCommitLoad(Frame* frame) 524 void Page::didCommitLoad(Frame* frame)
529 { 525 {
530 lifecycleNotifier().notifyDidCommitLoad(frame); 526 lifecycleNotifier().notifyDidCommitLoad(frame);
531 if (m_mainFrame == frame) 527 if (m_mainFrame == frame)
532 useCounter().didCommitLoad(); 528 useCounter().didCommitLoad();
533 } 529 }
534 530
(...skipping 16 matching lines...) Expand all
551 , backForwardClient(0) 547 , backForwardClient(0)
552 , spellCheckerClient(0) 548 , spellCheckerClient(0)
553 { 549 {
554 } 550 }
555 551
556 Page::PageClients::~PageClients() 552 Page::PageClients::~PageClients()
557 { 553 {
558 } 554 }
559 555
560 } // namespace WebCore 556 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/SettingsDelegate.h ('k') | Source/core/testing/InternalSettings.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698