third_party/WebKit/Source/core/css/FontFace.h - Issue 1750453002: Reduce ActiveDOMObjects from core/

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

Issue 1750453002: Reduce ActiveDOMObjects from core/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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/animation/Animation.cpp ('k') | third_party/WebKit/Source/core/css/FontFace.cpp » ('j') | third_party/WebKit/Source/core/css/FontFace.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d243d62f7a8f27eb7f6e0f313482c5999a402e6a..b80bf1db55f9a0f01f118a280dc5e2e2c33d8277 100644

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

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

@@ -36,7 +36,7 @@

#include "bindings/core/v8/ScriptWrappable.h"

#include "core/CSSPropertyNames.h"

#include "core/css/CSSValue.h"

-#include "core/dom/ActiveDOMObject.h"

+#include "core/dom/ContextLifecycleObserver.h"

#include "core/dom/DOMException.h"

#include "platform/fonts/FontTraits.h"

#include "wtf/PassRefPtr.h"

@@ -56,7 +56,7 @@ class StringOrArrayBufferOrArrayBufferView;

class StylePropertySet;

class StyleRuleFontFace;

-class FontFace : public RefCountedWillBeGarbageCollectedFinalized<FontFace>, public ScriptWrappable, public ActiveDOMObject {

+class FontFace : public RefCountedWillBeGarbageCollectedFinalized<FontFace>, public ScriptWrappable, public ContextLifecycleObserver {

DEFINE_WRAPPERTYPEINFO();

WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FontFace);

public:

@@ -65,7 +65,7 @@ public:

static PassRefPtrWillBeRawPtr<FontFace> create(ExecutionContext*, const AtomicString& family, StringOrArrayBufferOrArrayBufferView&, const FontFaceDescriptors&);

static PassRefPtrWillBeRawPtr<FontFace> create(Document*, const StyleRuleFontFace*);

- ~FontFace();

+ virtual ~FontFace();

sof 2016/02/29 08:38:51 The "virtual" won't be needed with !OILPAN, right?

haraken 2016/02/29 08:58:00 Done.

const AtomicString& family() const { return m_family; }

String style() const;

@@ -109,7 +109,6 @@ public:

};

void loadWithCallback(PassRefPtrWillBeRawPtr<LoadFontCallback>, ExecutionContext*);

- // ActiveDOMObject

bool hasPendingActivity() const override;

private: