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

Unified Diff: tools/viewer/sk_app/WindowContext.h

Issue 1990893002: Revert of Add OpenGL context to Viewer. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 7 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 | « tools/viewer/sk_app/Window.cpp ('k') | tools/viewer/sk_app/android/Window_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/viewer/sk_app/WindowContext.h
diff --git a/tools/viewer/sk_app/WindowContext.h b/tools/viewer/sk_app/WindowContext.h
index 1fd921afb2e83a9f531134ffb601243d5326073b..d48e38e7466949b07031a3dd2443231f3011e847 100644
--- a/tools/viewer/sk_app/WindowContext.h
+++ b/tools/viewer/sk_app/WindowContext.h
@@ -9,54 +9,30 @@
#include "DisplayParams.h"
#include "GrTypes.h"
-#include "SkRefCnt.h"
-#include "SkSurfaceProps.h"
-class GrContext;
class SkSurface;
-class GrRenderTarget;
namespace sk_app {
+// TODO: fill this out with an interface
class WindowContext {
public:
- WindowContext() : fContext(nullptr)
- , fSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType) {}
-
virtual ~WindowContext() {}
- virtual sk_sp<SkSurface> getBackbufferSurface() = 0;
+ virtual SkSurface* getBackbufferSurface() = 0;
virtual void swapBuffers() = 0;
+
+ virtual bool makeCurrent() = 0;
virtual bool isValid() = 0;
virtual void resize(uint32_t w, uint32_t h) = 0;
- const DisplayParams& getDisplayParams() { return fDisplayParams; }
+ virtual const DisplayParams& getDisplayParams() = 0;
virtual void setDisplayParams(const DisplayParams& params) = 0;
- SkSurfaceProps getSurfaceProps() const { return fSurfaceProps; }
- void setSurfaceProps(const SkSurfaceProps& props) {
- fSurfaceProps = props;
- }
-
virtual GrBackendContext getBackendContext() = 0;
-
- sk_sp<SkSurface> createRenderSurface(sk_sp<GrRenderTarget>, int colorBits);
- void presentRenderSurface(sk_sp<SkSurface> renderSurface, sk_sp<GrRenderTarget> rt,
- int colorBits);
-
-protected:
- virtual bool isGpuContext() { return true; }
-
- GrContext* fContext;
-
- int fWidth;
- int fHeight;
- DisplayParams fDisplayParams;
- GrPixelConfig fPixelConfig;
- SkSurfaceProps fSurfaceProps;
};
} // namespace sk_app
« no previous file with comments | « tools/viewer/sk_app/Window.cpp ('k') | tools/viewer/sk_app/android/Window_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698