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

Side by Side Diff: Source/core/css/resolver/ScopedStyleResolver.cpp

Issue 23133006: Merge ContentDistributor into ElementShadow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Don't find git copies Created 7 years, 4 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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * Copyright (C) 2012 Google Inc. All rights reserved. 4 * Copyright (C) 2012 Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 17 matching lines...) Expand all
28 #include "core/css/resolver/ScopedStyleResolver.h" 28 #include "core/css/resolver/ScopedStyleResolver.h"
29 29
30 #include "HTMLNames.h" 30 #include "HTMLNames.h"
31 #include "core/css/CSSStyleSheet.h" 31 #include "core/css/CSSStyleSheet.h"
32 #include "core/css/PageRuleCollector.h" 32 #include "core/css/PageRuleCollector.h"
33 #include "core/css/RuleFeature.h" 33 #include "core/css/RuleFeature.h"
34 #include "core/css/RuleSet.h" 34 #include "core/css/RuleSet.h"
35 #include "core/css/StyleRule.h" 35 #include "core/css/StyleRule.h"
36 #include "core/css/resolver/StyleResolver.h" // For MatchRequest. 36 #include "core/css/resolver/StyleResolver.h" // For MatchRequest.
37 #include "core/dom/Document.h" 37 #include "core/dom/Document.h"
38 #include "core/dom/shadow/ContentDistributor.h"
39 #include "core/dom/shadow/ElementShadow.h" 38 #include "core/dom/shadow/ElementShadow.h"
40 #include "core/dom/shadow/ShadowRoot.h" 39 #include "core/dom/shadow/ShadowRoot.h"
41 #include "core/html/HTMLStyleElement.h" 40 #include "core/html/HTMLStyleElement.h"
42 41
43 namespace WebCore { 42 namespace WebCore {
44 43
45 ScopedStyleResolver* ScopedStyleTree::ensureScopedStyleResolver(const ContainerN ode* scopingNode) 44 ScopedStyleResolver* ScopedStyleTree::ensureScopedStyleResolver(const ContainerN ode* scopingNode)
46 { 45 {
47 ASSERT(scopingNode); 46 ASSERT(scopingNode);
48 bool isNewEntry; 47 bool isNewEntry;
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 collector.matchPageRules(m_authorStyle.get()); 419 collector.matchPageRules(m_authorStyle.get());
421 } 420 }
422 421
423 void ScopedStyleResolver::collectViewportRulesTo(StyleResolver* resolver) const 422 void ScopedStyleResolver::collectViewportRulesTo(StyleResolver* resolver) const
424 { 423 {
425 if (m_authorStyle) 424 if (m_authorStyle)
426 resolver->collectViewportRules(m_authorStyle.get()); 425 resolver->collectViewportRules(m_authorStyle.get());
427 } 426 }
428 427
429 } // namespace WebCore 428 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698