Diff
Modified: trunk/ChangeLog (147878 => 147879)
--- trunk/ChangeLog 2013-04-07 20:56:41 UTC (rev 147878)
+++ trunk/ChangeLog 2013-04-07 21:19:46 UTC (rev 147879)
@@ -1,3 +1,13 @@
+2013-04-07 Patrick Gansterer <[email protected]>
+
+ Remove references to Skia and V8 from CMake files
+ https://bugs.webkit.org/show_bug.cgi?id=114130
+
+ Reviewed by Geoffrey Garen.
+
+ * Source/cmake/OptionsBlackBerry.cmake:
+ * Source/cmake/WebKitPackaging.cmake:
+
2013-04-07 David Kilzer <[email protected]>
Remove the rest of SVG_DOM_OBJC_BINDINGS
Modified: trunk/Source/_javascript_Core/ChangeLog (147878 => 147879)
--- trunk/Source/_javascript_Core/ChangeLog 2013-04-07 20:56:41 UTC (rev 147878)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-04-07 21:19:46 UTC (rev 147879)
@@ -1,3 +1,12 @@
+2013-04-07 Patrick Gansterer <[email protected]>
+
+ Remove references to Skia and V8 from CMake files
+ https://bugs.webkit.org/show_bug.cgi?id=114130
+
+ Reviewed by Geoffrey Garen.
+
+ * shell/PlatformBlackBerry.cmake:
+
2013-04-07 David Kilzer <[email protected]>
Remove the rest of SVG_DOM_OBJC_BINDINGS
Modified: trunk/Source/_javascript_Core/shell/PlatformBlackBerry.cmake (147878 => 147879)
--- trunk/Source/_javascript_Core/shell/PlatformBlackBerry.cmake 2013-04-07 20:56:41 UTC (rev 147878)
+++ trunk/Source/_javascript_Core/shell/PlatformBlackBerry.cmake 2013-04-07 21:19:46 UTC (rev 147879)
@@ -5,7 +5,6 @@
${INTL_LIBRARY} # Required for x86 builds
${M_LIBRARY}
${Screen_LIBRARY}
- ${Skia_QNX_LIBRARY}
${WebKitPlatform_LIBRARY}
${SLOG2_LIBRARY}
)
Modified: trunk/Source/WebCore/ChangeLog (147878 => 147879)
--- trunk/Source/WebCore/ChangeLog 2013-04-07 20:56:41 UTC (rev 147878)
+++ trunk/Source/WebCore/ChangeLog 2013-04-07 21:19:46 UTC (rev 147879)
@@ -1,3 +1,12 @@
+2013-04-07 Patrick Gansterer <[email protected]>
+
+ Remove references to Skia and V8 from CMake files
+ https://bugs.webkit.org/show_bug.cgi?id=114130
+
+ Reviewed by Geoffrey Garen.
+
+ * PlatformBlackBerry.cmake:
+
2013-04-07 David Kilzer <[email protected]>
Remove the rest of SVG_DOM_OBJC_BINDINGS
Modified: trunk/Source/WebCore/PlatformBlackBerry.cmake (147878 => 147879)
--- trunk/Source/WebCore/PlatformBlackBerry.cmake 2013-04-07 20:56:41 UTC (rev 147878)
+++ trunk/Source/WebCore/PlatformBlackBerry.cmake 2013-04-07 21:19:46 UTC (rev 147879)
@@ -10,54 +10,12 @@
list(APPEND WebCore_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/bindings/cpp"
"${WEBCORE_DIR}/platform/blackberry/CookieDatabaseBackingStore"
- "${WEBCORE_DIR}/platform/graphics/blackberry/skia"
"${WEBCORE_DIR}/platform/graphics/harfbuzz"
"${WEBCORE_DIR}/platform/graphics/opentype/"
- "${WEBCORE_DIR}/platform/graphics/skia"
- "${WEBCORE_DIR}/platform/image-decoders/skia"
- "${WEBCORE_DIR}/platform/image-encoders/skia"
"${WEBCORE_DIR}/platform/network/blackberry"
"${WEBCORE_DIR}/platform/network/blackberry/rss"
)
-# Skia sources
-list(APPEND WebCore_SOURCES
- platform/graphics/skia/FloatPointSkia.cpp
- platform/graphics/skia/FloatRectSkia.cpp
- platform/graphics/skia/FontCustomPlatformData.cpp
- platform/graphics/skia/GradientSkia.cpp
- platform/graphics/skia/GraphicsContext3DSkia.cpp
- platform/graphics/skia/GraphicsContextSkia.cpp
- platform/graphics/skia/HarfbuzzSkia.cpp
- platform/graphics/skia/ImageBufferSkia.cpp
- platform/graphics/skia/ImageSkia.cpp
- platform/graphics/skia/IntPointSkia.cpp
- platform/graphics/skia/IntRectSkia.cpp
- platform/graphics/skia/NativeImageSkia.cpp
- platform/graphics/skia/PathSkia.cpp
- platform/graphics/skia/PatternSkia.cpp
- platform/graphics/skia/PlatformContextSkia.cpp
- platform/graphics/skia/SkiaUtils.cpp
- platform/graphics/skia/TransformationMatrixSkia.cpp
- platform/graphics/chromium/VDMXParser.cpp
- platform/image-decoders/skia/ImageDecoderSkia.cpp
- platform/image-encoders/skia/PNGImageEncoder.cpp
-)
-
-# Skia font backend sources
-list(APPEND WebCore_SOURCES
- platform/graphics/blackberry/FontCacheBlackberry.cpp
- platform/graphics/blackberry/skia/PlatformBridge.cpp
- platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp
- platform/graphics/harfbuzz/FontHarfBuzz.cpp
- platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp
- platform/graphics/harfbuzz/HarfBuzzShaper.cpp
- platform/graphics/harfbuzz/HarfBuzzSkia.cpp
- platform/graphics/skia/FontCacheSkia.cpp
- platform/graphics/skia/GlyphPageTreeNodeSkia.cpp
- platform/graphics/skia/SimpleFontDataSkia.cpp
-)
-
# Other sources
list(APPEND WebCore_SOURCES
bindings/cpp/WebDOMCString.cpp
@@ -74,7 +32,6 @@
platform/graphics/WOFFFileFormat.cpp
platform/graphics/opentype/OpenTypeSanitizer.cpp
platform/image-encoders/JPEGImageEncoder.cpp
- platform/image-encoders/skia/JPEGImageEncoder.cpp
platform/posix/FileSystemPOSIX.cpp
platform/posix/SharedBufferPOSIX.cpp
platform/text/LocaleNone.cpp
Modified: trunk/Source/WebKit/ChangeLog (147878 => 147879)
--- trunk/Source/WebKit/ChangeLog 2013-04-07 20:56:41 UTC (rev 147878)
+++ trunk/Source/WebKit/ChangeLog 2013-04-07 21:19:46 UTC (rev 147879)
@@ -1,3 +1,12 @@
+2013-04-07 Patrick Gansterer <[email protected]>
+
+ Remove references to Skia and V8 from CMake files
+ https://bugs.webkit.org/show_bug.cgi?id=114130
+
+ Reviewed by Geoffrey Garen.
+
+ * PlatformBlackBerry.cmake:
+
2013-04-06 Patrick Gansterer <[email protected]>
[CMake] Remove general include directories from platform specific files
Modified: trunk/Source/WebKit/PlatformBlackBerry.cmake (147878 => 147879)
--- trunk/Source/WebKit/PlatformBlackBerry.cmake 2013-04-07 20:56:41 UTC (rev 147878)
+++ trunk/Source/WebKit/PlatformBlackBerry.cmake 2013-04-07 21:19:46 UTC (rev 147879)
@@ -13,6 +13,7 @@
"${WEBCORE_DIR}/platform/blackberry"
"${WEBCORE_DIR}/platform/graphics/gpu"
"${WEBCORE_DIR}/platform/graphics/blackberry"
+ "${WEBCORE_DIR}/platform/image-encoders"
"${WEBCORE_DIR}/platform/network/blackberry"
"${WEBCORE_DIR}/testing/js"
"${WEBCORE_DIR}/Modules/geolocation"
@@ -30,17 +31,6 @@
"${WEBCORE_DIR}/Modules/notifications"
)
endif ()
-if (WTF_USE_SKIA)
- list(APPEND WebKit_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/graphics/chromium"
- "${WEBCORE_DIR}/platform/graphics/blackberry/skia"
- "${WEBCORE_DIR}/platform/graphics/skia"
- )
-else ()
- list(APPEND WebKit_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/image-encoders"
- )
-endif ()
if (NOT PUBLIC_BUILD)
list(APPEND WebKit_INCLUDE_DIRECTORIES
@@ -190,6 +180,7 @@
${ICUI18N_LIBRARY}
${ICUUC_LIBRARY}
${INTL_LIBRARY}
+ ${ITYPE_LIBRARY}
${JPEG_LIBRARY}
${_javascript_Core_LIBRARY_NAME}
${LEVELDB_LIBRARY}
@@ -198,26 +189,13 @@
${OTS_LIBRARY}
${PNG_LIBRARY}
${SQLITE3_LIBRARY}
+ ${WTLE_LIBRARY}
${WebKitPlatform_LIBRARY}
${XML2_LIBRARY}
${XSLT_LIBRARY}
${Z_LIBRARY}
)
-if (WTF_USE_SKIA)
- list(APPEND WebKit_LIBRARIES
- ${FREETYPE_LIBRARY}
- ${HARFBUZZ_LIBRARY}
- ${Skia_LIBRARY}
- ${Skia_QNX_LIBRARY}
- )
-else ()
- list(APPEND WebKit_LIBRARIES
- ${ITYPE_LIBRARY}
- ${WTLE_LIBRARY}
- )
-endif ()
-
if (PROFILING)
list(APPEND WebKit_LIBRARIES
${PROFILING_LIBRARY}
Modified: trunk/Source/cmake/OptionsBlackBerry.cmake (147878 => 147879)
--- trunk/Source/cmake/OptionsBlackBerry.cmake 2013-04-07 20:56:41 UTC (rev 147878)
+++ trunk/Source/cmake/OptionsBlackBerry.cmake 2013-04-07 21:19:46 UTC (rev 147879)
@@ -66,8 +66,6 @@
set(${_var} "-Bstatic -l${_libname} -Bdynamic" CACHE STRING ${_libname})
endmacro()
-FIND_STAGING_LIBRARY(Skia_LIBRARY grskia)
-FIND_STAGING_LIBRARY(Skia_QNX_LIBRARY skia-qnx)
FIND_STAGING_LIBRARY(JPEG_LIBRARY jpeg)
FIND_STAGING_LIBRARY(PNG_LIBRARY png)
FIND_STAGING_LIBRARY(XML2_LIBRARY xml2)
Modified: trunk/Source/cmake/WebKitPackaging.cmake (147878 => 147879)
--- trunk/Source/cmake/WebKitPackaging.cmake 2013-04-07 20:56:41 UTC (rev 147878)
+++ trunk/Source/cmake/WebKitPackaging.cmake 2013-04-07 21:19:46 UTC (rev 147879)
@@ -127,9 +127,6 @@
"/qscriptvalue/" "/Qscriptvalue/" "qscriptvalue\\\\." "Qscriptvalue\\\\."
"/qt/" "/Qt/" "qt\\\\." "Qt\\\\."
"/qt4/" "/Qt4/" "qt4\\\\." "Qt4\\\\."
- "/skia/" "/Skia/" "skia\\\\." "Skia\\\\."
- "/v8/" "/V8/" "v8\\\\." "V8\\\\."
- "/V8/" "/V8/" "V8\\\\." "V8\\\\."
"/win/" "/Win/" "win\\\\." "Win\\\\."
"/wince/" "/Wince/" "wince\\\\." "Wince\\\\."
"/wx/" "/Wx/" "wx\\\\." "Wx\\\\."
