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

Unified Diff: sky/engine/core/css/resolver/StyleResolver.cpp

Issue 834693007: Remove the remaining parts of ignorePendingStylesheets and placeholder styles. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Remove comment. Created 5 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
« no previous file with comments | « sky/engine/core/css/resolver/StyleResolver.h ('k') | sky/engine/core/dom/Document.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/resolver/StyleResolver.cpp
diff --git a/sky/engine/core/css/resolver/StyleResolver.cpp b/sky/engine/core/css/resolver/StyleResolver.cpp
index 4449fb74a1a26215206a040be66417069b68f8b2..fa42df139a583592f2d2263b54d5b5e79cd5df0e 100644
--- a/sky/engine/core/css/resolver/StyleResolver.cpp
+++ b/sky/engine/core/css/resolver/StyleResolver.cpp
@@ -88,8 +88,6 @@ void setAnimationUpdateIfNeeded(StyleResolverState& state, Element& element)
namespace blink {
-RenderStyle* StyleResolver::s_styleNotYetAvailable;
-
static void addFontFaceRule(Document* document, CSSFontSelector* cssFontSelector, const StyleRuleFontFace* fontFaceRule)
{
RefPtr<FontFace> fontFace = FontFace::create(document, fontFaceRule);
@@ -397,19 +395,6 @@ PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
ASSERT(!hasPendingAuthorStyleSheets());
ASSERT(!m_needCollectFeatures);
- // Once an element has a renderer, we don't try to destroy it, since otherwise the renderer
- // will vanish if a style recalc happens during loading.
- if (sharingBehavior == AllowStyleSharing && !document().isRenderingReady() && !element->renderer()) {
- if (!s_styleNotYetAvailable) {
- s_styleNotYetAvailable = RenderStyle::create().leakRef();
- s_styleNotYetAvailable->setDisplay(NONE);
- s_styleNotYetAvailable->font().update(document().styleEngine()->fontSelector());
- }
-
- document().setHasNodesWithPlaceholderStyle();
- return s_styleNotYetAvailable;
- }
-
didAccess();
if (element == document().documentElement())
« no previous file with comments | « sky/engine/core/css/resolver/StyleResolver.h ('k') | sky/engine/core/dom/Document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698