Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1925)

Unified Diff: android_webview/browser/context_provider_in_process.h

Issue 1083843002: android_webview: Remove dependency on webkit's ContextProviderInProcess. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: it links Created 5 years, 8 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
Index: android_webview/browser/context_provider_in_process.h
diff --git a/ui/compositor/test/in_process_context_provider.h b/android_webview/browser/context_provider_in_process.h
similarity index 55%
copy from ui/compositor/test/in_process_context_provider.h
copy to android_webview/browser/context_provider_in_process.h
index 4033a7cf31a9a5ade8e0798e85f5ba1c497f0aaa..7f04f648a8c9bbd951464a45061aa2dedbab48a2 100644
--- a/ui/compositor/test/in_process_context_provider.h
+++ b/android_webview/browser/context_provider_in_process.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_
-#define WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_
+#ifndef ANDROID_WEBVIEW_BROWSER_CONTEXT_PROVIDER_IN_PROCESS_H_
+#define ANDROID_WEBVIEW_BROWSER_CONTEXT_PROVIDER_IN_PROCESS_H_
#include <string>
@@ -12,35 +12,22 @@
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
#include "cc/output/context_provider.h"
-#include "gpu/command_buffer/common/gles2_cmd_utils.h"
#include "skia/ext/refptr.h"
-#include "ui/gfx/native_widget_types.h"
namespace gpu {
class GLInProcessContext;
}
-namespace ui {
+namespace android_webview {
-class InProcessContextProvider : public cc::ContextProvider {
+class ContextProviderInProcess : public cc::ContextProvider {
public:
- static scoped_refptr<InProcessContextProvider> Create(
- const gpu::gles2::ContextCreationAttribHelper& attribs,
- bool lose_context_when_out_of_memory,
- gfx::AcceleratedWidget window,
+ static scoped_refptr<ContextProviderInProcess> Create(
const std::string& debug_name);
- // Uses default attributes for creating an offscreen context.
- static scoped_refptr<InProcessContextProvider> CreateOffscreen(
- bool lose_context_when_out_of_memory);
-
private:
- InProcessContextProvider(
- const gpu::gles2::ContextCreationAttribHelper& attribs,
- bool lose_context_when_out_of_memory,
- gfx::AcceleratedWidget window,
- const std::string& debug_name);
- ~InProcessContextProvider() override;
+ ContextProviderInProcess(const std::string& debug_name);
+ ~ContextProviderInProcess() override;
// cc::ContextProvider:
bool BindToCurrentThread() override;
@@ -68,9 +55,6 @@ class InProcessContextProvider : public cc::ContextProvider {
scoped_ptr<gpu::GLInProcessContext> context_;
skia::RefPtr<class GrContext> gr_context_;
- gpu::gles2::ContextCreationAttribHelper attribs_;
- bool lose_context_when_out_of_memory_;
- gfx::AcceleratedWidget window_;
std::string debug_name_;
cc::ContextProvider::Capabilities capabilities_;
@@ -81,9 +65,9 @@ class InProcessContextProvider : public cc::ContextProvider {
base::Lock context_lock_;
- DISALLOW_COPY_AND_ASSIGN(InProcessContextProvider);
+ DISALLOW_COPY_AND_ASSIGN(ContextProviderInProcess);
};
-} // namespace ui
+} // namespace android_webview
-#endif // WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_
+#endif // ANDROID_WEBVIEW_BROWSER_CONTEXT_PROVIDER_IN_PROCESS_H_

Powered by Google App Engine
This is Rietveld 408576698