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

Unified Diff: android_webview/browser/hardware_renderer.h

Issue 1001643004: Remove android webview rendering cruft (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename var Created 5 years, 9 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 | « android_webview/browser/child_frame.cc ('k') | android_webview/browser/hardware_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/browser/hardware_renderer.h
diff --git a/android_webview/browser/hardware_renderer.h b/android_webview/browser/hardware_renderer.h
index eff1b5cf31e9ef15235c7e222e401ce29c41790d..963b30bea0694201bc02f1ace0a681c4562dec39 100644
--- a/android_webview/browser/hardware_renderer.h
+++ b/android_webview/browser/hardware_renderer.h
@@ -5,7 +5,6 @@
#ifndef ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
#define ANDROID_WEBVIEW_BROWSER_HARDWARE_RENDERER_H_
-#include "android_webview/browser/parent_compositor_draw_constraints.h"
#include "android_webview/browser/shared_renderer_state.h"
#include "base/memory/scoped_ptr.h"
#include "cc/layers/delegated_frame_resource_collection.h"
@@ -24,6 +23,7 @@ class LayerTreeHost;
namespace android_webview {
class AwGLSurface;
+class ChildFrame;
class ParentOutputSurface;
class HardwareRenderer : public cc::LayerTreeHostClient,
@@ -69,15 +69,11 @@ class HardwareRenderer : public cc::LayerTreeHostClient,
void UnusedResourcesAreAvailable() override;
private:
- void SetFrameData();
-
SharedRendererState* shared_renderer_state_;
typedef void* EGLContext;
EGLContext last_egl_context_;
- scoped_ptr<cc::CompositorFrame> committed_frame_;
-
// Information about last delegated frame.
gfx::Size frame_size_;
@@ -90,6 +86,8 @@ class HardwareRenderer : public cc::LayerTreeHostClient,
bool stencil_enabled_;
bool viewport_clip_valid_for_dcheck_;
+ scoped_ptr<ChildFrame> child_frame_;
+
scoped_refptr<AwGLSurface> gl_surface_;
scoped_ptr<cc::LayerTreeHost> layer_tree_host_;
@@ -102,8 +100,6 @@ class HardwareRenderer : public cc::LayerTreeHostClient,
// This is owned indirectly by |layer_tree_host_|.
ParentOutputSurface* output_surface_;
- ParentCompositorDrawConstraints draw_constraints_;
-
DISALLOW_COPY_AND_ASSIGN(HardwareRenderer);
};
« no previous file with comments | « android_webview/browser/child_frame.cc ('k') | android_webview/browser/hardware_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698