| Index: skia/ext/skia_utils_win.h
 | 
| ===================================================================
 | 
| --- skia/ext/skia_utils_win.h	(revision 6142)
 | 
| +++ skia/ext/skia_utils_win.h	(working copy)
 | 
| @@ -2,8 +2,8 @@
 | 
|  // Use of this source code is governed by a BSD-style license that can be
 | 
|  // found in the LICENSE file.
 | 
|  
 | 
| -#ifndef BASE_GFX_SKIA_UTILS_H__
 | 
| -#define BASE_GFX_SKIA_UTILS_H__
 | 
| +#ifndef SKIA_EXT_SKIA_UTILS_WIN_H_
 | 
| +#define SKIA_EXT_SKIA_UTILS_WIN_H_
 | 
|  
 | 
|  #include "SkColor.h"
 | 
|  #include "SkShader.h"
 | 
| @@ -16,7 +16,7 @@
 | 
|  typedef struct tagPOINT POINT;
 | 
|  typedef struct tagRECT RECT;
 | 
|  
 | 
| -namespace gfx {
 | 
| +namespace skia {
 | 
|  
 | 
|  // Converts a Skia point to a Windows POINT.
 | 
|  POINT SkPointToPOINT(const SkPoint& point);
 | 
| @@ -50,7 +50,7 @@
 | 
|  // Converts ARGB to COLORREFs (0BGR).
 | 
|  COLORREF SkColorToCOLORREF(SkColor color);
 | 
|  
 | 
| -}  // namespace gfx
 | 
| +}  // namespace skia
 | 
|  
 | 
| -#endif
 | 
| +#endif  // SKIA_EXT_SKIA_UTILS_WIN_H_
 | 
|  
 | 
| 
 | 
| Property changes on: skia\ext\skia_utils_win.h
 | 
| ___________________________________________________________________
 | 
| Added: svn:mergeinfo
 | 
|    Merged /branches/chrome_webkit_merge_branch/base/gfx/skia_utils.h:r69-2775
 | 
| 
 | 
| 
 |