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

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: 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/webkit/common/gpu/context_provider_in_process.h b/android_webview/browser/context_provider_in_process.h
similarity index 79%
copy from webkit/common/gpu/context_provider_in_process.h
copy to android_webview/browser/context_provider_in_process.h
index dcb053a648db3a9bbea7dd6b16b11427f885cf49..85940efe6db662d8ab0acea9a0cd6369c59b4c89 100644
--- a/webkit/common/gpu/context_provider_in_process.h
+++ b/android_webview/browser/context_provider_in_process.h
@@ -2,8 +2,8 @@
// 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,7 +12,7 @@
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
#include "cc/blink/context_provider_web_context.h"
-#include "webkit/common/gpu/webkit_gpu_export.h"
+#include "skia/ext/refptr.h"
namespace blink { class WebGraphicsContext3D; }
@@ -20,11 +20,9 @@ namespace gpu_blink {
class WebGraphicsContext3DInProcessCommandBufferImpl;
}
-namespace webkit {
-namespace gpu {
-class GrContextForWebGraphicsContext3D;
+namespace android_webview {
-class WEBKIT_GPU_EXPORT ContextProviderInProcess
+class ContextProviderInProcess
: NON_EXPORTED_BASE(public cc_blink::ContextProviderWebContext) {
public:
static scoped_refptr<ContextProviderInProcess> Create(
@@ -32,10 +30,6 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess
context3d,
const std::string& debug_name);
- // Uses default attributes for creating an offscreen context.
- static scoped_refptr<ContextProviderInProcess> CreateOffscreen(
- bool lose_context_when_out_of_memory);
-
private:
ContextProviderInProcess(
scoped_ptr<gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl>
@@ -73,7 +67,7 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess
scoped_ptr<gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl>
context3d_;
- scoped_ptr<GrContextForWebGraphicsContext3D> gr_context_;
+ skia::RefPtr<class GrContext> gr_context_;
LostContextCallback lost_context_callback_;
@@ -90,7 +84,6 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess
DISALLOW_COPY_AND_ASSIGN(ContextProviderInProcess);
};
-} // namespace gpu
-} // namespace webkit
+} // 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