Index: tools/viewer/sk_app/unix/Window_unix.cpp |
diff --git a/tools/viewer/sk_app/unix/Window_unix.cpp b/tools/viewer/sk_app/unix/Window_unix.cpp |
index e6edfd9ef9b0cbcde91f2e2db7fd317f286d9b41..3520257b5f753f81843a6c9872f6afd5b2a3b45f 100644 |
--- a/tools/viewer/sk_app/unix/Window_unix.cpp |
+++ b/tools/viewer/sk_app/unix/Window_unix.cpp |
@@ -47,7 +47,7 @@ bool Window_unix::initWindow(Display* display, const DisplayParams* params) { |
// we already have a window |
if (fDisplay) { |
return true; |
- } |
+ } |
fDisplay = display; |
fWidth = 1280; |
@@ -272,19 +272,21 @@ void Window_unix::show() { |
bool Window_unix::attach(BackendType attachType, const DisplayParams& params) { |
this->initWindow(fDisplay, ¶ms); |
- window_context_factory::XlibWindowInfo xwinInfo; |
- xwinInfo.fDisplay = fDisplay; |
- xwinInfo.fWindow = fWindow; |
- xwinInfo.fVisualInfo = fVisualInfo; |
+ window_context_factory::XlibWindowInfo winInfo; |
+ winInfo.fDisplay = fDisplay; |
+ winInfo.fWindow = fWindow; |
+ winInfo.fVisualInfo = fVisualInfo; |
switch (attachType) { |
#ifdef SK_VULKAN |
case kVulkan_BackendType: |
- fWindowContext = window_context_factory::NewVulkanForXlib(xwinInfo, params); |
+ fWindowContext = window_context_factory::NewVulkanForXlib(winInfo, params); |
break; |
#endif |
case kNativeGL_BackendType: |
- default: |
- fWindowContext = window_context_factory::NewGLForXlib(xwinInfo, params); |
+ fWindowContext = window_context_factory::NewGLForXlib(winInfo, params); |
+ break; |
+ case kRaster_BackendType: |
+ fWindowContext = window_context_factory::NewRasterForXlib(winInfo, params); |
break; |
} |