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

Side by Side Diff: Source/core/dom/StyleEngine.cpp

Issue 1159833003: New SELECT Popup: Recalc style when a web font is loaded (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebased Created 5 years, 6 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/css/CSSFontSelector.h ('k') | Source/web/PopupMenuImpl.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 if (!document().isActive()) 602 if (!document().isActive())
603 return; 603 return;
604 604
605 if (m_resolver) 605 if (m_resolver)
606 m_resolver->invalidateMatchedPropertiesCache(); 606 m_resolver->invalidateMatchedPropertiesCache();
607 document().setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTraci ng::create(StyleChangeReason::Fonts)); 607 document().setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTraci ng::create(StyleChangeReason::Fonts));
608 } 608 }
609 609
610 void StyleEngine::setFontSelector(PassRefPtrWillBeRawPtr<CSSFontSelector> fontSe lector) 610 void StyleEngine::setFontSelector(PassRefPtrWillBeRawPtr<CSSFontSelector> fontSe lector)
611 { 611 {
612 #if !ENABLE(OILPAN)
613 if (m_fontSelector)
614 m_fontSelector->unregisterForInvalidationCallbacks(this);
615 #endif
612 m_fontSelector = fontSelector; 616 m_fontSelector = fontSelector;
617 if (m_fontSelector)
618 m_fontSelector->registerForInvalidationCallbacks(this);
613 } 619 }
614 620
615 void StyleEngine::platformColorsChanged() 621 void StyleEngine::platformColorsChanged()
616 { 622 {
617 if (m_resolver) 623 if (m_resolver)
618 m_resolver->invalidateMatchedPropertiesCache(); 624 m_resolver->invalidateMatchedPropertiesCache();
619 document().setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTraci ng::create(StyleChangeReason::PlatformColorChange)); 625 document().setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTraci ng::create(StyleChangeReason::PlatformColorChange));
620 } 626 }
621 627
622 void StyleEngine::classChangedForElement(const SpaceSplitString& changedClasses, Element& element) 628 void StyleEngine::classChangedForElement(const SpaceSplitString& changedClasses, Element& element)
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 visitor->trace(m_dirtyTreeScopes); 723 visitor->trace(m_dirtyTreeScopes);
718 visitor->trace(m_activeTreeScopes); 724 visitor->trace(m_activeTreeScopes);
719 visitor->trace(m_fontSelector); 725 visitor->trace(m_fontSelector);
720 visitor->trace(m_textToSheetCache); 726 visitor->trace(m_textToSheetCache);
721 visitor->trace(m_sheetToTextCache); 727 visitor->trace(m_sheetToTextCache);
722 #endif 728 #endif
723 CSSFontSelectorClient::trace(visitor); 729 CSSFontSelectorClient::trace(visitor);
724 } 730 }
725 731
726 } 732 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSFontSelector.h ('k') | Source/web/PopupMenuImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698