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

Unified Diff: android_webview/browser/hardware_renderer.cc

Issue 2360423003: aw: Fix FBO restore in webview functor (Closed)
Patch Set: review Created 4 years, 3 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/hardware_renderer.h ('k') | android_webview/browser/parent_output_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/browser/hardware_renderer.cc
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc
index c0702cc4553d57443c2da1104efde4c867b2d5db..fdc5d70dc7a9b26fcdfef1eef1bf8d757f7d90cf 100644
--- a/android_webview/browser/hardware_renderer.cc
+++ b/android_webview/browser/hardware_renderer.cc
@@ -71,8 +71,7 @@ void HardwareRenderer::CommitFrame() {
DCHECK(!child_frame_->frame->gl_frame_data);
}
-void HardwareRenderer::DrawGL(AwDrawGLInfo* draw_info,
- const ScopedAppGLStateRestore& gl_state) {
+void HardwareRenderer::DrawGL(AwDrawGLInfo* draw_info) {
TRACE_EVENT0("android_webview", "HardwareRenderer::DrawGL");
// We need to watch if the current Android context has changed and enforce
@@ -144,8 +143,7 @@ void HardwareRenderer::DrawGL(AwDrawGLInfo* draw_info,
gfx::Rect clip(draw_info->clip_left, draw_info->clip_top,
draw_info->clip_right - draw_info->clip_left,
draw_info->clip_bottom - draw_info->clip_top);
- surfaces_->DrawAndSwap(viewport, clip, transform, frame_size_, child_id_,
- gl_state);
+ surfaces_->DrawAndSwap(viewport, clip, transform, frame_size_, child_id_);
}
void HardwareRenderer::AllocateSurface() {
@@ -175,11 +173,6 @@ void HardwareRenderer::SetBeginFrameSource(
// TODO(tansell): Hook this up.
}
-void HardwareRenderer::SetBackingFrameBufferObject(
- int framebuffer_binding_ext) {
- surfaces_->SetBackingFrameBufferObject(framebuffer_binding_ext);
-}
-
void HardwareRenderer::ReturnResourcesInChildFrame() {
if (child_frame_.get() && child_frame_->frame.get()) {
cc::ReturnedResourceArray resources_to_return;
« no previous file with comments | « android_webview/browser/hardware_renderer.h ('k') | android_webview/browser/parent_output_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698