third_party/WebKit/Source/platform/exported/Platform.cpp - Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation

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/platform/exported/Platform.cpp

Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Fix copyrights and years. 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/platform/blink_platform.gypi ('k') | third_party/WebKit/Source/platform/exported/WebCompositorAnimationPlayerClient.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/exported/Platform.cpp

diff --git a/third_party/WebKit/Source/platform/exported/Platform.cpp b/third_party/WebKit/Source/platform/exported/Platform.cpp

index 11e174491a19f7d277edc1076d4f1c2dada86205..451fe7bb7b811df1a629f19e2e94e3ea03e79792 100644

--- a/third_party/WebKit/Source/platform/exported/Platform.cpp

+++ b/third_party/WebKit/Source/platform/exported/Platform.cpp

@@ -29,6 +29,7 @@

#include "platform/PartitionAllocMemoryDumpProvider.h"

+#include "platform/graphics/CompositorFactory.h"

#include "public/platform/Platform.h"

namespace blink {

@@ -49,10 +50,14 @@ void Platform::initialize(Platform* platform)

// TODO(ssid): remove this check after fixing crbug.com/486782.

if (s_platform && s_platform->m_mainThread)

s_platform->registerMemoryDumpProvider(PartitionAllocMemoryDumpProvider::instance(), "PartitionAlloc");

+ CompositorFactory::initializeDefault();

}

void Platform::shutdown()

{

+ CompositorFactory::shutdown();

if (s_platform->m_mainThread)

s_platform->unregisterMemoryDumpProvider(PartitionAllocMemoryDumpProvider::instance());