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

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

Issue 138443013: Remove iframe@seamless (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Include remove tests 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
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 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 treeScopesRemoved.add(treeScope); 384 treeScopesRemoved.add(treeScope);
385 } 385 }
386 if (!treeScopesRemoved.isEmpty()) 386 if (!treeScopesRemoved.isEmpty())
387 for (HashSet<TreeScope*>::iterator it = treeScopesRemoved.begin(); i t != treeScopesRemoved.end(); ++it) 387 for (HashSet<TreeScope*>::iterator it = treeScopesRemoved.begin(); i t != treeScopesRemoved.end(); ++it)
388 m_activeTreeScopes.remove(*it); 388 m_activeTreeScopes.remove(*it);
389 } 389 }
390 390
391 InspectorInstrumentation::activeStyleSheetsUpdated(&m_document); 391 InspectorInstrumentation::activeStyleSheetsUpdated(&m_document);
392 m_usesRemUnits = m_documentStyleSheetCollection.usesRemUnits(); 392 m_usesRemUnits = m_documentStyleSheetCollection.usesRemUnits();
393 393
394 if (m_documentScopeDirty || updateMode == FullStyleUpdate)
395 m_document.notifySeamlessChildDocumentsOfStylesheetUpdate();
396
397 m_dirtyTreeScopes.clear(); 394 m_dirtyTreeScopes.clear();
398 m_documentScopeDirty = false; 395 m_documentScopeDirty = false;
399 396
400 return requiresFullStyleRecalc; 397 return requiresFullStyleRecalc;
401 } 398 }
402 399
403 const Vector<RefPtr<StyleSheet> > StyleEngine::activeStyleSheetsForInspector() c onst 400 const Vector<RefPtr<StyleSheet> > StyleEngine::activeStyleSheetsForInspector() c onst
404 { 401 {
405 if (m_activeTreeScopes.isEmpty()) 402 if (m_activeTreeScopes.isEmpty())
406 return m_documentStyleSheetCollection.styleSheetsForStyleSheetList(); 403 return m_documentStyleSheetCollection.styleSheetsForStyleSheetList();
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 { 610 {
614 HashMap<StyleSheetContents*, AtomicString>::iterator it = sheetToTextCache() .find(contents); 611 HashMap<StyleSheetContents*, AtomicString>::iterator it = sheetToTextCache() .find(contents);
615 if (it == sheetToTextCache().end()) 612 if (it == sheetToTextCache().end())
616 return; 613 return;
617 614
618 textToSheetCache().remove(it->value); 615 textToSheetCache().remove(it->value);
619 sheetToTextCache().remove(contents); 616 sheetToTextCache().remove(contents);
620 } 617 }
621 618
622 } 619 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698