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

Unified Diff: cc/output/output_surface.h

Issue 15647021: Factor out cc::OutputSurface::InitializeAndSetContext3D (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor clean up Created 7 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 | « no previous file | cc/output/output_surface.cc » ('j') | cc/output/output_surface.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/output_surface.h
diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
index d6f4b82ed8b64d9a9d81a87d52a5b0552746c852..c7910db77c6cc09a966de9b68163645e36f26fd7 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -105,14 +105,16 @@ class CC_EXPORT OutputSurface {
virtual void SetNeedsBeginFrame(bool enable) {}
protected:
+ bool InitializeAndSetContext3D(
+ scoped_ptr<WebKit::WebGraphicsContext3D> context3d);
+
OutputSurfaceClient* client_;
struct cc::OutputSurface::Capabilities capabilities_;
+ scoped_ptr<OutputSurfaceCallbacks> callbacks_;
scoped_ptr<WebKit::WebGraphicsContext3D> context3d_;
scoped_ptr<cc::SoftwareOutputDevice> software_device_;
bool has_gl_discard_backbuffer_;
- scoped_ptr<OutputSurfaceCallbacks> callbacks_;
-
private:
DISALLOW_COPY_AND_ASSIGN(OutputSurface);
};
« no previous file with comments | « no previous file | cc/output/output_surface.cc » ('j') | cc/output/output_surface.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698