| Index: skia/ext/image_operations.h
|
| ===================================================================
|
| --- skia/ext/image_operations.h (revision 6267)
|
| +++ skia/ext/image_operations.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_IMAGE_OPERATIONS_H__
|
| -#define BASE_GFX_IMAGE_OPERATIONS_H__
|
| +#ifndef SKIA_EXT_IMAGE_OPERATIONS_H_
|
| +#define SKIA_EXT_IMAGE_OPERATIONS_H_
|
|
|
| #include "base/basictypes.h"
|
| #include "base/gfx/rect.h"
|
| @@ -59,5 +59,5 @@
|
|
|
| } // namespace gfx
|
|
|
| -#endif // BASE_GFX_IMAGE_OPERATIONS_H__
|
| +#endif // SKIA_EXT_IMAGE_OPERATIONS_H__
|
|
|
|
|
| Property changes on: skia\ext\image_operations.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/base/gfx/image_operations.h:r69-2775
|
|
|
|
|