third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp - Issue 1855203002: Revert of Improve DEFINE_STATIC_LOCAL()'s handling of Blink GCed objects.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1855203002: Revert of Improve DEFINE_STATIC_LOCAL()'s handling of Blink GCed objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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 | « third_party/WebKit/Source/core/css/StylePropertySerializer.cpp ('k') | third_party/WebKit/Source/core/dom/ChildListMutationScope.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

index 1be5fad18b2b9d9ad5c2104ec45e908da5735dee..7bd797a5fb19fe4616f5ddbcd7d818ebb913b80f 100644

--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

@@ -141,18 +141,18 @@

static StylePropertySet* leftToRightDeclaration()

{

- DEFINE_STATIC_LOCAL(MutableStylePropertySet, leftToRightDecl, (MutableStylePropertySet::create(HTMLQuirksMode)));

- if (leftToRightDecl.isEmpty())

- leftToRightDecl.setProperty(CSSPropertyDirection, CSSValueLtr);

- return &leftToRightDecl;

+ DEFINE_STATIC_REF_WILL_BE_PERSISTENT(MutableStylePropertySet, leftToRightDecl, (MutableStylePropertySet::create(HTMLQuirksMode)));

+ if (leftToRightDecl->isEmpty())

+ leftToRightDecl->setProperty(CSSPropertyDirection, CSSValueLtr);

+ return leftToRightDecl;

}

static StylePropertySet* rightToLeftDeclaration()

{

- DEFINE_STATIC_LOCAL(MutableStylePropertySet, rightToLeftDecl, (MutableStylePropertySet::create(HTMLQuirksMode)));

- if (rightToLeftDecl.isEmpty())

- rightToLeftDecl.setProperty(CSSPropertyDirection, CSSValueRtl);

- return &rightToLeftDecl;

+ DEFINE_STATIC_REF_WILL_BE_PERSISTENT(MutableStylePropertySet, rightToLeftDecl, (MutableStylePropertySet::create(HTMLQuirksMode)));

+ if (rightToLeftDecl->isEmpty())

+ rightToLeftDecl->setProperty(CSSPropertyDirection, CSSValueRtl);

+ return rightToLeftDecl;

}

static void collectScopedResolversForHostedShadowTrees(const Element& element, HeapVector<Member<ScopedStyleResolver>, 8>& resolvers)