aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar plesner <plesner@t.undra.org>2015-11-05 08:10:45 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-11-05 08:10:45 -0800
commitd975fc9599e2e6f909d3a11913ce1ab63525ab31 (patch)
tree058381e9a4d656e0e47105cf0a5ae759a221940d
parent2944fbb5329fc3026c541fa818489954d910625d (diff)
Add ifdef guard around gpu-specific code in native windows window.
-rw-r--r--AUTHORS1
-rw-r--r--src/views/win/SkOSWindow_win.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 9d8e661fd4..47f675b500 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -37,3 +37,4 @@ The Chromium Authors <*@chromium.org>
Thiago Fransosi Farina <thiago.farina@gmail.com>
Jose Mayol <jei.mayol@gmail.com>
Linaro <*@linaro.org>
+Christian Plesner Hansen <plesner@t.undra.org>
diff --git a/src/views/win/SkOSWindow_win.cpp b/src/views/win/SkOSWindow_win.cpp
index aba5a6f4ae..4b7abb1e96 100644
--- a/src/views/win/SkOSWindow_win.cpp
+++ b/src/views/win/SkOSWindow_win.cpp
@@ -692,9 +692,11 @@ bool SkOSWindow::makeFullscreen() {
if (fFullscreen) {
return true;
}
+#if SK_SUPPORT_GPU
if (fHGLRC) {
this->detachGL();
}
+#endif // SK_SUPPORT_GPU
// This is hacked together from various sources on the web. It can certainly be improved and be
// made more robust.