OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge WebKit at r84325: Initial merge by git.
[android-x86/external-webkit.git]
/
Source
/
WebCore
/
platform
/
graphics
/
cg
/
IntPointCG.cpp
diff --git
a/Source/WebCore/platform/graphics/cg/IntPointCG.cpp
b/Source/WebCore/platform/graphics/cg/IntPointCG.cpp
index
95dbe5f
..
4a1096b
100644
(file)
--- a/
Source/WebCore/platform/graphics/cg/IntPointCG.cpp
+++ b/
Source/WebCore/platform/graphics/cg/IntPointCG.cpp
@@
-26,7
+26,7
@@
#include "config.h"
#include "IntPoint.h"
-#if
PLATFORM(CG
)
+#if
USE(CG) || USE(SKIA_ON_MAC_CHROME
)
#include <ApplicationServices/ApplicationServices.h>
@@
-43,4
+43,4
@@
IntPoint::operator CGPoint() const
}
-#endif //
PLATFORM
(CG)
+#endif //
USE
(CG)