third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.h - Issue 1461193003: Revert of [Oilpan] Prepare full definition of classes before using Member

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/PropertySetCSSStyleDeclaration.h

Issue 1461193003: Revert of [Oilpan] Prepare full definition of classes before using Member (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Make patch applicable Created 5 years, 1 month 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/FontFace.cpp ('k') | third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.h

diff --git a/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.h b/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.h

index 120d298832382e6b31175421715d7e31e03ea350..c25c05afb10dbb3cfa55501ad0f691125ae043c0 100644

--- a/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.h

+++ b/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.h

@@ -41,7 +41,7 @@ class StyleSheetContents;

class AbstractPropertySetCSSStyleDeclaration : public CSSStyleDeclaration {

public:

- virtual Element* parentElement() const { return nullptr; }

+ virtual Element* parentElement() const { return 0; }

StyleSheetContents* contextStyleSheet() const;

DECLARE_VIRTUAL_TRACE();

@@ -127,7 +127,10 @@ protected:

class InlineCSSStyleDeclaration final : public AbstractPropertySetCSSStyleDeclaration {

public:

- explicit InlineCSSStyleDeclaration(Element* parentElement);

+ explicit InlineCSSStyleDeclaration(Element* parentElement)

+ : m_parentElement(parentElement)

+ {

+ }

DECLARE_VIRTUAL_TRACE();

@@ -138,7 +141,7 @@ private:

void deref() override;

#endif

CSSStyleSheet* parentStyleSheet() const override;

- Element* parentElement() const override;

+ Element* parentElement() const override { return m_parentElement; }

void didMutate(MutationType) override;