DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update from https://crrev.com/316786

Browse Source 
List of manually-modified files:
gpu/command_buffer/service/in_process_command_buffer.cc
examples/sample_app/BUILD.gn
examples/sample_app/spinning_cube.cc
mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java
mojo/cc/context_provider_mojo.cc
mojo/cc/context_provider_mojo.h
mojo/common/trace_controller_impl.cc
mojo/gles2/command_buffer_client_impl.cc
mojo/gles2/command_buffer_client_impl.h
services/gles2/gpu_impl.cc
shell/android/apk/src/org/chromium/mojo/shell/MojoShellApplication.java
sky/engine/core/dom/Node.cpp
sky/shell/apk/src/org/domokit/sky/shell/SkyShellApplication.java
ui/events/latency_info.cc
ui/gfx/transform.cc
ui/gfx/transform.h
ui/gfx/transform_util.cc
ui/gfx/transform_util.h

Review URL: https://codereview.chromium.org/935333002
This commit is contained in:
Etienne Membrives 2015-02-19 17:27:12 +01:00
parent 3edb147679
commit 3ec2270eb2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/core/dom/Node.cpp
View File

@ -533,7 +533,7 @@ void Node::markAncestorsWithChildNeedsDistributionRecalc()
namespace {
class JSONTraceValue : public base::debug::ConvertableToTraceFormat {
class JSONTraceValue : public base::trace_event::ConvertableToTraceFormat {
public:
explicit JSONTraceValue(RefPtr<JSONValue> value)
: m_value(value.release()) { }

3
shell/apk/src/org/domokit/sky/shell/SkyShellApplication.java
View File

@ -10,6 +10,7 @@ import org.chromium.base.BaseChromiumApplication;
import org.chromium.base.PathUtils;
import org.chromium.base.ResourceExtractor;
import org.chromium.base.library_loader.LibraryLoader;
import org.chromium.base.library_loader.LibraryProcessType;
import org.chromium.base.library_loader.ProcessInitException;
/**
@ -43,7 +44,7 @@ public class SkyShellApplication extends BaseChromiumApplication {
*/
private void initializeNative() {
try {
LibraryLoader.ensureInitialized();
LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized();
} catch (ProcessInitException e) {
Log.e(TAG, "sky_shell initialization failed.", e);
throw new RuntimeException(e);