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

Unified Diff: third_party/WebKit/Source/core/css/resolver/SharedStyleFinder.cpp

Issue 1523843004: Add support for new CSS ::slotted() pseudo element (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: UseCounter update to resolve merge conflict. Created 4 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/css/resolver/SharedStyleFinder.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/SharedStyleFinder.cpp b/third_party/WebKit/Source/core/css/resolver/SharedStyleFinder.cpp
index 0f993d87aea9d8f88aac90c8dc41b76c2ed396b3..0bc7bbf42b3850aade06990549537e6f96757297 100644
--- a/third_party/WebKit/Source/core/css/resolver/SharedStyleFinder.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/SharedStyleFinder.cpp
@@ -278,6 +278,10 @@ bool SharedStyleFinder::canShareStyleWithElement(Element& candidate) const
return false;
}
+ // TODO(kochi): Investigate cases when assigned slots can share styles.
+ if (element().assignedSlot())
kochi 2016/01/07 09:54:09 I found that this now causes assertion in ElementS
+ return false;
+
return true;
}
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.cpp ('k') | third_party/WebKit/Source/core/frame/UseCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698