diff --git a/engine/core/dom/Node.cpp b/engine/core/dom/Node.cpp index 60f5fe971ed..473ae8e5a2e 100644 --- a/engine/core/dom/Node.cpp +++ b/engine/core/dom/Node.cpp @@ -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 value) : m_value(value.release()) { } diff --git a/shell/apk/src/org/domokit/sky/shell/SkyShellApplication.java b/shell/apk/src/org/domokit/sky/shell/SkyShellApplication.java index efb12ddc9cf..d60ce5f5f54 100644 --- a/shell/apk/src/org/domokit/sky/shell/SkyShellApplication.java +++ b/shell/apk/src/org/domokit/sky/shell/SkyShellApplication.java @@ -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);