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

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

Issue 82583005: Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Added 2 layout tests Created 7 years 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
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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 break; 515 break;
516 case SettingsDelegate::TextAutosizingChange: 516 case SettingsDelegate::TextAutosizingChange:
517 // FIXME: I wonder if this needs to traverse frames like in WebViewImpl: :resize, or whether there is only one document per Settings instance? 517 // FIXME: I wonder if this needs to traverse frames like in WebViewImpl: :resize, or whether there is only one document per Settings instance?
518 for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNe xt()) { 518 for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNe xt()) {
519 TextAutosizer* textAutosizer = frame->document()->textAutosizer(); 519 TextAutosizer* textAutosizer = frame->document()->textAutosizer();
520 if (textAutosizer) 520 if (textAutosizer)
521 textAutosizer->recalculateMultipliers(); 521 textAutosizer->recalculateMultipliers();
522 } 522 }
523 setNeedsRecalcStyleInAllFrames(); 523 setNeedsRecalcStyleInAllFrames();
524 break; 524 break;
525 case SettingsDelegate::FontFamilyChange:
526 for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNe xt())
527 frame->document()->styleEngine()->resetFontSelector();
528 break;
525 } 529 }
526 } 530 }
527 531
528 void Page::didCommitLoad(Frame* frame) 532 void Page::didCommitLoad(Frame* frame)
529 { 533 {
530 lifecycleNotifier().notifyDidCommitLoad(frame); 534 lifecycleNotifier().notifyDidCommitLoad(frame);
531 if (m_mainFrame == frame) 535 if (m_mainFrame == frame)
532 useCounter().didCommitLoad(); 536 useCounter().didCommitLoad();
533 } 537 }
534 538
(...skipping 16 matching lines...) Expand all
551 , backForwardClient(0) 555 , backForwardClient(0)
552 , spellCheckerClient(0) 556 , spellCheckerClient(0)
553 { 557 {
554 } 558 }
555 559
556 Page::PageClients::~PageClients() 560 Page::PageClients::~PageClients()
557 { 561 {
558 } 562 }
559 563
560 } // namespace WebCore 564 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698