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

Unified Diff: cc/test/fake_output_surface.h

Issue 2089753003: cc: Use the correct internal format for glCopyTexImage2D calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: copytextureformat: comments Created 4 years, 6 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 | « cc/test/data/force_anti_aliasing_off.png ('k') | cc/test/fake_output_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/fake_output_surface.h
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h
index a08bf454b2b78c49f16c3714ba332e9109798e5e..7c5add8aed990676449550e6eb5a65e7a7e0144b 100644
--- a/cc/test/fake_output_surface.h
+++ b/cc/test/fake_output_surface.h
@@ -117,8 +117,12 @@ class FakeOutputSurface : public OutputSurface {
OutputSurfaceClient* client() { return client_; }
bool BindToClient(OutputSurfaceClient* client) override;
- void set_framebuffer(unsigned framebuffer) { framebuffer_ = framebuffer; }
+ void set_framebuffer(GLint framebuffer, GLenum format) {
+ framebuffer_ = framebuffer;
+ framebuffer_format_ = format;
+ }
void BindFramebuffer() override;
+ uint32_t GetFramebufferCopyTextureFormat() override;
void SetTreeActivationCallback(const base::Closure& callback);
@@ -165,15 +169,16 @@ class FakeOutputSurface : public OutputSurface {
std::unique_ptr<SoftwareOutputDevice> software_device,
bool delegated_rendering);
- OutputSurfaceClient* client_;
+ OutputSurfaceClient* client_ = nullptr;
CompositorFrame last_sent_frame_;
- size_t num_sent_frames_;
- bool has_external_stencil_test_;
- bool suspended_for_recycle_;
- unsigned framebuffer_;
+ size_t num_sent_frames_ = 0;
+ bool has_external_stencil_test_ = false;
+ bool suspended_for_recycle_ = false;
+ GLint framebuffer_ = 0;
+ GLenum framebuffer_format_ = 0;
TransferableResourceArray resources_held_by_parent_;
std::unique_ptr<ManagedMemoryPolicy> memory_policy_to_set_at_bind_;
- OverlayCandidateValidator* overlay_candidate_validator_;
+ OverlayCandidateValidator* overlay_candidate_validator_ = nullptr;
gfx::Rect last_swap_rect_;
};
« no previous file with comments | « cc/test/data/force_anti_aliasing_off.png ('k') | cc/test/fake_output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698