aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/viewer/sk_app/win
diff options
context:
space:
mode:
authorGravatar Jim Van Verth <jvanverth@google.com>2017-05-02 16:15:53 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-05-02 20:27:26 +0000
commitfbdc080d3cae3695544ffbc05c6ff6f5b4514c02 (patch)
treed4085ac19224469f9a4c2bbefeeba360a8997e96 /tools/viewer/sk_app/win
parent93f20f5629e52eed732d2b9d6dbbb351cc30b2cd (diff)
Add wireframe mode to Viewer.
Change-Id: I0ff11088465a4702acf9841a791d76f286ddbaf1 Reviewed-on: https://skia-review.googlesource.com/15147 Commit-Queue: Jim Van Verth <jvanverth@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'tools/viewer/sk_app/win')
-rw-r--r--tools/viewer/sk_app/win/GLWindowContext_win.cpp4
-rw-r--r--tools/viewer/sk_app/win/RasterWindowContext_win.cpp7
2 files changed, 8 insertions, 3 deletions
diff --git a/tools/viewer/sk_app/win/GLWindowContext_win.cpp b/tools/viewer/sk_app/win/GLWindowContext_win.cpp
index 24db9659f0..20c3d9140a 100644
--- a/tools/viewer/sk_app/win/GLWindowContext_win.cpp
+++ b/tools/viewer/sk_app/win/GLWindowContext_win.cpp
@@ -33,10 +33,12 @@ protected:
private:
HWND fHWND;
HGLRC fHGLRC;
+
+ typedef GLWindowContext INHERITED;
};
GLWindowContext_win::GLWindowContext_win(HWND wnd, const DisplayParams& params)
- : GLWindowContext(params)
+ : INHERITED(params)
, fHWND(wnd)
, fHGLRC(NULL) {
diff --git a/tools/viewer/sk_app/win/RasterWindowContext_win.cpp b/tools/viewer/sk_app/win/RasterWindowContext_win.cpp
index 96fe8f22a9..85bb65e674 100644
--- a/tools/viewer/sk_app/win/RasterWindowContext_win.cpp
+++ b/tools/viewer/sk_app/win/RasterWindowContext_win.cpp
@@ -31,11 +31,14 @@ protected:
SkAutoMalloc fSurfaceMemory;
sk_sp<SkSurface> fBackbufferSurface;
HWND fWnd;
+
+private:
+ typedef RasterWindowContext INHERITED;
};
RasterWindowContext_win::RasterWindowContext_win(HWND wnd, const DisplayParams& params)
- : fWnd(wnd) {
- fDisplayParams = params;
+ : INHERITED(params)
+ , fWnd(wnd) {
RECT rect;
GetWindowRect(wnd, &rect);
this->resize(rect.right - rect.left, rect.bottom - rect.top);