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

Side by Side Diff: sky/engine/core/dom/Document.cpp

Issue 778743003: Merge StyleSheet into CSSStyleSheet. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: sort headers. Created 6 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
« no previous file with comments | « sky/engine/core/dom/Document.h ('k') | sky/engine/core/dom/DocumentStyleSheetCollection.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 2697 matching lines...) Expand 10 before | Expand all | Expand 10 after
2708 PassOwnPtr<LifecycleNotifier<Document> > Document::createLifecycleNotifier() 2708 PassOwnPtr<LifecycleNotifier<Document> > Document::createLifecycleNotifier()
2709 { 2709 {
2710 return DocumentLifecycleNotifier::create(this); 2710 return DocumentLifecycleNotifier::create(this);
2711 } 2711 }
2712 2712
2713 DocumentLifecycleNotifier& Document::lifecycleNotifier() 2713 DocumentLifecycleNotifier& Document::lifecycleNotifier()
2714 { 2714 {
2715 return static_cast<DocumentLifecycleNotifier&>(LifecycleContext<Document>::l ifecycleNotifier()); 2715 return static_cast<DocumentLifecycleNotifier&>(LifecycleContext<Document>::l ifecycleNotifier());
2716 } 2716 }
2717 2717
2718 void Document::removedStyleSheet(StyleSheet* sheet) 2718 void Document::removedStyleSheet(CSSStyleSheet* sheet)
2719 { 2719 {
2720 // If we're in document teardown, then we don't need this notification of ou r sheet's removal. 2720 // If we're in document teardown, then we don't need this notification of ou r sheet's removal.
2721 // styleResolverChanged() is needed even when the document is inactive so th at 2721 // styleResolverChanged() is needed even when the document is inactive so th at
2722 // imported docuements (which is inactive) notifies the change to the master document. 2722 // imported docuements (which is inactive) notifies the change to the master document.
2723 if (isActive()) 2723 if (isActive())
2724 styleEngine()->modifiedStyleSheet(sheet); 2724 styleEngine()->modifiedStyleSheet(sheet);
2725 styleResolverChanged(); 2725 styleResolverChanged();
2726 } 2726 }
2727 2727
2728 void Document::modifiedStyleSheet(StyleSheet* sheet) 2728 void Document::modifiedStyleSheet(CSSStyleSheet* sheet)
2729 { 2729 {
2730 // If we're in document teardown, then we don't need this notification of ou r sheet's removal. 2730 // If we're in document teardown, then we don't need this notification of ou r sheet's removal.
2731 // styleResolverChanged() is needed even when the document is inactive so th at 2731 // styleResolverChanged() is needed even when the document is inactive so th at
2732 // imported docuements (which is inactive) notifies the change to the master document. 2732 // imported docuements (which is inactive) notifies the change to the master document.
2733 if (isActive()) 2733 if (isActive())
2734 styleEngine()->modifiedStyleSheet(sheet); 2734 styleEngine()->modifiedStyleSheet(sheet);
2735 styleResolverChanged(); 2735 styleResolverChanged();
2736 } 2736 }
2737 2737
2738 Element* Document::activeElement() const 2738 Element* Document::activeElement() const
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
2790 using namespace blink; 2790 using namespace blink;
2791 void showLiveDocumentInstances() 2791 void showLiveDocumentInstances()
2792 { 2792 {
2793 WeakDocumentSet& set = liveDocumentSet(); 2793 WeakDocumentSet& set = liveDocumentSet();
2794 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 2794 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
2795 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) { 2795 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) {
2796 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data()); 2796 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data());
2797 } 2797 }
2798 } 2798 }
2799 #endif 2799 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/dom/Document.h ('k') | sky/engine/core/dom/DocumentStyleSheetCollection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698