summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/base.xcodeproj/project.pbxproj6
-rwxr-xr-xskia/ext/bitmap_platform_device_mac.cc2
-rwxr-xr-xskia/ext/platform_device_mac.cc2
-rw-r--r--skia/ext/skia_utils_mac.cc (renamed from base/gfx/skia_utils_mac.cc)2
-rw-r--r--skia/ext/skia_utils_mac.h (renamed from base/gfx/skia_utils_mac.h)8
-rw-r--r--skia/skia.xcodeproj/project.pbxproj10
6 files changed, 15 insertions, 15 deletions
diff --git a/base/base.xcodeproj/project.pbxproj b/base/base.xcodeproj/project.pbxproj
index c23cb39..85bd3df 100644
--- a/base/base.xcodeproj/project.pbxproj
+++ b/base/base.xcodeproj/project.pbxproj
@@ -40,7 +40,6 @@
4D11B59C0E91730500EF7617 /* rand_util_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D11B5970E9172F800EF7617 /* rand_util_unittest.cc */; };
4D11B89E0E929F0400EF7617 /* file_path.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D11B89B0E929EFF00EF7617 /* file_path.cc */; };
4D11B89F0E929F0700EF7617 /* file_path_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D11B89D0E929EFF00EF7617 /* file_path_unittest.cc */; };
- 4D64ABDA0EE6FA110021761F /* skia_utils_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = A7436A470EE6F591003562CC /* skia_utils_mac.cc */; };
536092FA0ECE474500D1B91E /* dtoa.cc in Sources */ = {isa = PBXBuildFile; fileRef = 536092F80ECE474500D1B91E /* dtoa.cc */; settings = {COMPILER_FLAGS = "-Wno-write-strings -Wno-all"; }; };
536092FB0ECE474500D1B91E /* g_fmt.cc in Sources */ = {isa = PBXBuildFile; fileRef = 536092F90ECE474500D1B91E /* g_fmt.cc */; settings = {COMPILER_FLAGS = "-Wno-write-strings -Wno-all"; }; };
7B26302F0E82F218001CE27F /* message_pump_libevent.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B26302D0E82F218001CE27F /* message_pump_libevent.cc */; };
@@ -596,8 +595,6 @@
A5A0270A0E4A630D00498DA9 /* file_util_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = file_util_mac.mm; sourceTree = "<group>"; };
A5A0276B0E4BA33700498DA9 /* build_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = build_config.h; path = ../build/build_config.h; sourceTree = SOURCE_ROOT; };
A5A0282D0E4CFA8500498DA9 /* file_util_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_util_unittest.cc; sourceTree = "<group>"; };
- A7436A470EE6F591003562CC /* skia_utils_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skia_utils_mac.cc; sourceTree = "<group>"; };
- A7436A480EE6F591003562CC /* skia_utils_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = skia_utils_mac.h; sourceTree = "<group>"; };
AB14B6060EBFA74C00FB3807 /* time_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = time_posix.cc; sourceTree = "<group>"; };
ABE1BA290E7574D1009041DA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<group>"; };
ABF4B98E0DC2BA6900A6E319 /* base_paths_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = base_paths_mac.mm; sourceTree = "<group>"; };
@@ -1076,8 +1073,6 @@
E45629E40E27C058005E4685 /* rect_unittest.cc */,
7B8505A40E5B3FBE00730B43 /* size.cc */,
825403D70D92D31D0006B936 /* size.h */,
- A7436A470EE6F591003562CC /* skia_utils_mac.cc */,
- A7436A480EE6F591003562CC /* skia_utils_mac.h */,
);
path = gfx;
sourceTree = "<group>";
@@ -1416,7 +1411,6 @@
825403F20D92D31D0006B936 /* point.cc in Sources */,
825403F50D92D31D0006B936 /* rect.cc in Sources */,
7B8505B30E5B432200730B43 /* size.cc in Sources */,
- 4D64ABDA0EE6FA110021761F /* skia_utils_mac.cc in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc
index d4458d7..52ce586 100755
--- a/skia/ext/bitmap_platform_device_mac.cc
+++ b/skia/ext/bitmap_platform_device_mac.cc
@@ -10,8 +10,8 @@
#include "SkRegion.h"
#include "SkUtils.h"
-#include "base/gfx/skia_utils_mac.h"
#include "base/logging.h"
+#include "skia/ext/skia_utils_mac.h"
namespace gfx {
diff --git a/skia/ext/platform_device_mac.cc b/skia/ext/platform_device_mac.cc
index 9539e0f..3cc6fb4 100755
--- a/skia/ext/platform_device_mac.cc
+++ b/skia/ext/platform_device_mac.cc
@@ -5,7 +5,7 @@
#include "skia/ext/bitmap_platform_device_mac.h"
#include "base/logging.h"
-#include "base/gfx/skia_utils_mac.h"
+#include "skia/ext/skia_utils_mac.h"
#include "SkMatrix.h"
#include "SkPath.h"
#include "SkUtils.h"
diff --git a/base/gfx/skia_utils_mac.cc b/skia/ext/skia_utils_mac.cc
index b5962c3..a7610aa 100644
--- a/base/gfx/skia_utils_mac.cc
+++ b/skia/ext/skia_utils_mac.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/gfx/skia_utils_mac.h"
+#include "skia/ext/skia_utils_mac.h"
#include "base/logging.h"
#include "SkMatrix.h"
diff --git a/base/gfx/skia_utils_mac.h b/skia/ext/skia_utils_mac.h
index a99905f..c43f6eb 100644
--- a/base/gfx/skia_utils_mac.h
+++ b/skia/ext/skia_utils_mac.h
@@ -3,8 +3,8 @@
// found in the LICENSE file.
-#ifndef BASE_GFX_SKIA_UTILS_MAC_H__
-#define BASE_GFX_SKIA_UTILS_MAC_H__
+#ifndef SKIA_EXT_SKIA_UTILS_MAC_H_
+#define SKIA_EXT_SKIA_UTILS_MAC_H_
#include "SkColor.h"
#include <CoreGraphics/CGColor.h>
@@ -30,7 +30,7 @@ inline const SkPoint& CGPointToSkPoint(const CGPoint& point) {
// Matrix converters.
CGAffineTransform SkMatrixToCGAffineTransform(const SkMatrix& matrix);
-
+
// Rectangle converters.
SkRect CGRectToSkRect(const CGRect& rect);
SkIRect CGRectToSkIRect(const CGRect& rect);
@@ -47,5 +47,5 @@ CGColorRef SkColorToCGColorRef(SkColor color);
} // namespace gfx
-#endif
+#endif // SKIA_EXT_SKIA_UTILS_MAC_H_
diff --git a/skia/skia.xcodeproj/project.pbxproj b/skia/skia.xcodeproj/project.pbxproj
index 67404c5..6e3f25e 100644
--- a/skia/skia.xcodeproj/project.pbxproj
+++ b/skia/skia.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
7B4DF47E0E5B5FE0004D7619 /* SkNinePatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B4DF47D0E5B5FE0004D7619 /* SkNinePatch.cpp */; };
7B4DF4800E5B6005004D7619 /* SkScaledBitmapSampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B4DF47F0E5B6005004D7619 /* SkScaledBitmapSampler.cpp */; };
7B4DF48A0E5B609B004D7619 /* SkTypeface_fake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B4DF4820E5B6087004D7619 /* SkTypeface_fake.cpp */; };
+ A708CBA30EE7078500C531EA /* skia_utils_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = A708CBA10EE7078500C531EA /* skia_utils_mac.cc */; };
A70A3BAE0ED7385F00C31871 /* bitmap_platform_device_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = A70A3BA80ED7385F00C31871 /* bitmap_platform_device_mac.cc */; };
A70A3BAF0ED7385F00C31871 /* platform_canvas_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = A70A3BAA0ED7385F00C31871 /* platform_canvas_mac.cc */; };
A70A3BB00ED7385F00C31871 /* platform_device_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = A70A3BAC0ED7385F00C31871 /* platform_device_mac.cc */; };
@@ -149,6 +150,8 @@
7B4DF47F0E5B6005004D7619 /* SkScaledBitmapSampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkScaledBitmapSampler.cpp; sourceTree = "<group>"; };
7B4DF4810E5B6087004D7619 /* SkDrawProcs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkDrawProcs.h; sourceTree = "<group>"; };
7B4DF4820E5B6087004D7619 /* SkTypeface_fake.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkTypeface_fake.cpp; sourceTree = "<group>"; };
+ A708CBA10EE7078500C531EA /* skia_utils_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = skia_utils_mac.cc; path = ext/skia_utils_mac.cc; sourceTree = "<group>"; };
+ A708CBA20EE7078500C531EA /* skia_utils_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = skia_utils_mac.h; path = ext/skia_utils_mac.h; sourceTree = "<group>"; };
A70A3BA80ED7385F00C31871 /* bitmap_platform_device_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bitmap_platform_device_mac.cc; path = ext/bitmap_platform_device_mac.cc; sourceTree = "<group>"; };
A70A3BA90ED7385F00C31871 /* bitmap_platform_device_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bitmap_platform_device_mac.h; path = ext/bitmap_platform_device_mac.h; sourceTree = "<group>"; };
A70A3BAA0ED7385F00C31871 /* platform_canvas_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = platform_canvas_mac.cc; path = ext/platform_canvas_mac.cc; sourceTree = "<group>"; };
@@ -500,6 +503,8 @@
A70A3BAB0ED7385F00C31871 /* platform_canvas_mac.h */,
A70A3BAC0ED7385F00C31871 /* platform_device_mac.cc */,
A70A3BAD0ED7385F00C31871 /* platform_device_mac.h */,
+ A708CBA10EE7078500C531EA /* skia_utils_mac.cc */,
+ A708CBA20EE7078500C531EA /* skia_utils_mac.h */,
);
name = ext;
sourceTree = "<group>";
@@ -926,6 +931,8 @@
buildActionMask = 2147483647;
files = (
A70A3BAE0ED7385F00C31871 /* bitmap_platform_device_mac.cc in Sources */,
+ A74368B90EE61BBF003562CC /* convolver.cc in Sources */,
+ A74368BA0EE61BBF003562CC /* image_operations.cc in Sources */,
A70A3BAF0ED7385F00C31871 /* platform_canvas_mac.cc in Sources */,
A70A3BB00ED7385F00C31871 /* platform_device_mac.cc in Sources */,
E48EE4D20E34E873009DE966 /* Sk1DPathEffect.cpp in Sources */,
@@ -985,6 +992,7 @@
E48EE5060E34E873009DE966 /* SkGlyphCache.cpp in Sources */,
E48EE5070E34E873009DE966 /* SkGradientShader.cpp in Sources */,
E48EE5080E34E873009DE966 /* SkGraphics.cpp in Sources */,
+ A708CBA30EE7078500C531EA /* skia_utils_mac.cc in Sources */,
E48EE5090E34E873009DE966 /* SkImageDecoder.cpp in Sources */,
E48EE50A0E34E873009DE966 /* SkImageDecoder_Factory.cpp in Sources */,
E48EE50B0E34E873009DE966 /* SkImageRef.cpp in Sources */,
@@ -1045,8 +1053,6 @@
E48EE5380E34E873009DE966 /* SkUtils.cpp in Sources */,
E48EE5390E34E873009DE966 /* SkWriter32.cpp in Sources */,
E48EE53A0E34E873009DE966 /* SkXfermode.cpp in Sources */,
- A74368B90EE61BBF003562CC /* convolver.cc in Sources */,
- A74368BA0EE61BBF003562CC /* image_operations.cc in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
generated by cgit v1.1 at 2025-01-29 16:46:35 +0000