commit 082a4620fdae4bc825738c789e976103fc083583
author djsollen <djsollen@google.com> Fri Nov 14 07:21:29 2014 -0800
committer Commit bot <commit-bot@chromium.org> Fri Nov 14 07:21:29 2014 -0800
tree 82b4c7b9014e713fab251a9b26a19aa3613303b3
parent ac49acda520292b059bc37fd368dff912626c3d9

Move WGL header from include to src

NOTRY=true

Review URL: https://codereview.chromium.org/728823002

gyp/tools.gyp

diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index bb8be20..30e3e9e 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -656,7 +656,6 @@
           '<(skia_include_path)/utils/win',
           '<(skia_include_path)/utils/SkDebugUtils.h',
           '<(skia_include_path)/utils/SkJSONCPP.h',
-          '<(skia_include_path)/utils/SkWGL.h',
           '<(skia_include_path)/views/animated',
           '<(skia_include_path)/views/SkOSWindow_Android.h',
           '<(skia_include_path)/views/SkOSWindow_iOS.h',

gyp/utils.gypi

diff --git a/gyp/utils.gypi b/gyp/utils.gypi
index 5148491..8ec0807 100644
--- a/gyp/utils.gypi
+++ b/gyp/utils.gypi
@@ -38,7 +38,6 @@
         '<(skia_include_path)/utils/SkRTConf.h',
         '<(skia_include_path)/utils/SkProxyCanvas.h',
         '<(skia_include_path)/utils/SkTextBox.h',
-        '<(skia_include_path)/utils/SkWGL.h',
 
         '<(skia_src_path)/utils/SkBase64.cpp',
         '<(skia_src_path)/utils/SkBase64.h',
@@ -127,6 +126,7 @@
         '<(skia_src_path)/utils/win/SkDWriteGeometrySink.h',
         '<(skia_src_path)/utils/win/SkHRESULT.cpp',
         '<(skia_src_path)/utils/win/SkIStream.cpp',
+        '<(skia_src_path)/utils/win/SkWGL.h',
         '<(skia_src_path)/utils/win/SkWGL_win.cpp',
 
         #testing

src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp

diff --git a/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp b/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp
index b53d46c..890c784 100644
--- a/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp
+++ b/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp
@@ -10,7 +10,7 @@
 
 #include <windows.h>
 #include <GL/GL.h>
-#include "SkWGL.h"
+#include "win/SkWGL.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>

src/utils/win/SkWGL.h

diff --git a/include/utils/SkWGL.h b/src/utils/win/SkWGL.h
similarity index 100%
rename from include/utils/SkWGL.h
rename to src/utils/win/SkWGL.h

src/views/win/SkOSWindow_win.cpp

diff --git a/src/views/win/SkOSWindow_win.cpp b/src/views/win/SkOSWindow_win.cpp
index 447a5af..315ac2b 100644
--- a/src/views/win/SkOSWindow_win.cpp
+++ b/src/views/win/SkOSWindow_win.cpp
@@ -11,7 +11,7 @@
 
 #include <GL/gl.h>
 #include <WindowsX.h>
-#include "SkWGL.h"
+#include "win/SkWGL.h"
 #include "SkWindow.h"
 #include "SkCanvas.h"
 #include "SkOSMenu.h"