summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--webkit/SConscript2
-rw-r--r--webkit/SConscript.port186
-rw-r--r--webkit/port/platform/graphics/SkGraphicsContext.h7
-rw-r--r--webkit/port/platform/graphics/svg/SVGPaintServerSkia.cpp1
-rw-r--r--webkit/port/platform/graphics/svg/SVGResourceClipperSkia.cpp1
-rw-r--r--webkit/port/platform/graphics/svg/SkiaSupport.cpp1
6 files changed, 105 insertions, 93 deletions
diff --git a/webkit/SConscript b/webkit/SConscript
index 74dff83..62ad189 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -166,6 +166,7 @@ env.Append(
# This list is the SConscripts that work on Windows and Linux.
sconscript_dirs = [
+ 'SConscript.port',
'SConscript.javascriptcore_pcre',
'build/JSConfig/SConscript',
'build/JavaScriptCore/SConscript',
@@ -176,7 +177,6 @@ if env['PLATFORM'] == 'win32':
# These extra dirs aren't win32-specific, they're just the dirs that
# haven't yet been made portable.
sconscript_dirs.extend([
- 'SConscript.port',
'activex_shim/SConscript',
'activex_shim_dll/SConscript',
'build/localized_strings/SConscript',
diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index deeb930..26197da 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -44,93 +44,103 @@ if env['PLATFORM'] == 'win32':
],)
input_files = [
- '$PORT_DIR/css/RGBColor.cpp',
- '$PORT_DIR/history/CachedPage.cpp',
- '$PORT_DIR/history/BackForwardList.cpp',
- '$PORT_DIR/bridge/PluginsWin.cpp',
- '$PORT_DIR/bridge/PageWin.cpp',
- '$PORT_DIR/bridge/HistoryWin.cpp',
- '$PORT_DIR/bridge/FrameWin.cpp',
- '$PORT_DIR/rendering/RenderThemeWin.cpp',
- '$PORT_DIR/platform/network/CookieJarWin.cpp',
- '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp',
- '$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp',
- '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp',
- '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp',
- '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp',
- '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp',
- '$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp',
- '$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp',
- '$PORT_DIR/platform/graphics/svg/SVGResourceMaskerSkia.cpp',
- '$PORT_DIR/platform/graphics/svg/SVGResourceFilterSkia.cpp',
- '$PORT_DIR/platform/graphics/svg/SVGResourceClipperSkia.cpp',
- '$PORT_DIR/platform/graphics/svg/SVGPaintServerSolidSkia.cpp',
- '$PORT_DIR/platform/graphics/svg/SVGPaintServerSkia.cpp',
- '$PORT_DIR/platform/graphics/svg/SVGPaintServerPatternSkia.cpp',
- '$PORT_DIR/platform/graphics/svg/SVGPaintServerGradientSkia.cpp',
- '$PORT_DIR/platform/graphics/svg/SkiaSupport.cpp',
- '$PORT_DIR/platform/graphics/svg/RenderPathSkia.cpp',
- '$PORT_DIR/platform/graphics/SkPaintContext.cpp',
- '$PORT_DIR/platform/graphics/SkiaUtils.cpp',
- '$PORT_DIR/platform/graphics/SkGraphicsContext.cpp',
- '$PORT_DIR/platform/graphics/SimpleFontDataWin.cpp',
- '$PORT_DIR/platform/graphics/PlatformContextSkia.cpp',
- '$PORT_DIR/platform/graphics/PathSkia.cpp',
- '$PORT_DIR/platform/graphics/IntSizeWin.cpp',
- '$PORT_DIR/platform/graphics/IntRectWin.cpp',
- '$PORT_DIR/platform/graphics/IntPointWin.cpp',
- '$PORT_DIR/platform/graphics/ImageSourceSkia.cpp',
- '$PORT_DIR/platform/graphics/ImageSkia.cpp',
- '$PORT_DIR/platform/graphics/ImageBufferSkia.cpp',
- '$PORT_DIR/platform/graphics/IconWin.cpp',
- '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp',
- '$PORT_DIR/platform/graphics/GraphicsContextPrivate.cpp',
- '$PORT_DIR/platform/graphics/GlyphPageTreeNodeWin.cpp',
- '$PORT_DIR/platform/graphics/FontWin.cpp',
- '$PORT_DIR/platform/graphics/FontPlatformDataWin.cpp',
- '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp',
- '$PORT_DIR/platform/graphics/FontCacheWin.cpp',
- '$PORT_DIR/platform/graphics/AffineTransformSkia.cpp',
- '$PORT_DIR/platform/graphics/NativeImageSkia.cpp',
- '$PORT_DIR/platform/WidgetWin.cpp',
- '$PORT_DIR/platform/WheelEventWin.cpp',
- '$PORT_DIR/platform/WCDataObject.cpp',
- '$PORT_DIR/platform/UniscribeStateTextRun.cpp',
- '$PORT_DIR/platform/TextBreakIteratorInternalICUWin.cpp',
- '$PORT_DIR/platform/TextBoundariesWin.cpp',
- '$PORT_DIR/platform/TemporaryLinkStubs.cpp',
- '$PORT_DIR/platform/SystemTimeWin.cpp',
- '$PORT_DIR/platform/SSLKeyGeneratorWin.cpp',
- '$PORT_DIR/platform/SoundWin.cpp',
- '$PORT_DIR/platform/SharedTimerWin.cpp',
- '$PORT_DIR/platform/SearchPopupMenuWin.cpp',
- '$PORT_DIR/platform/ScrollViewWin.cpp',
- '$PORT_DIR/platform/ScreenWin.cpp',
- '$PORT_DIR/platform/PopupMenuWin.cpp',
- '$PORT_DIR/platform/PlatformScrollBarWin.cpp',
- '$PORT_DIR/platform/PlatformMouseEventWin.cpp',
- '$PORT_DIR/platform/PasteboardWin.cpp',
- '$PORT_DIR/platform/MimeTypeRegistryWin.cpp',
- '$PORT_DIR/platform/LogWin.cpp',
- '$PORT_DIR/platform/Language.cpp',
- '$PORT_DIR/platform/KeyEventWin.cpp',
- '$PORT_DIR/platform/GKURL.cpp',
- '$PORT_DIR/platform/FramelessScrollView.cpp',
- '$PORT_DIR/platform/FileChooserWin.cpp',
- '$PORT_DIR/platform/EditorWin.cpp',
- '$PORT_DIR/platform/DragImageWin.cpp',
- '$PORT_DIR/platform/DragDataWin.cpp',
- '$PORT_DIR/platform/CursorWin.cpp',
- '$PORT_DIR/platform/ContextMenuWin.cpp',
- '$PORT_DIR/platform/ContextMenuItemWin.cpp',
- '$PORT_DIR/platform/ClipboardWin.cpp',
- '$PORT_DIR/platform/ClipboardUtilitiesWin.cpp',
- '$PORT_DIR/platform/BString.cpp',
- '$PORT_DIR/loader/IconLoader.cpp',
- '$PORT_DIR/loader/IconDatabaseNone.cpp',
- '$PORT_DIR/page/AXObjectCacheWin.cpp',
- '$PORT_DIR/page/EventHandlerWin.cpp',
- '$PORT_DIR/page/DragControllerWin.cpp',
- ]
+ '$PORT_DIR/css/RGBColor.cpp',
+ '$PORT_DIR/history/CachedPage.cpp',
+ '$PORT_DIR/platform/TemporaryLinkStubs.cpp',
+ '$PORT_DIR/platform/graphics/AffineTransformSkia.cpp',
+ '$PORT_DIR/platform/graphics/ImageSourceSkia.cpp',
+ '$PORT_DIR/platform/graphics/NativeImageSkia.cpp',
+ '$PORT_DIR/platform/graphics/PathSkia.cpp',
+ '$PORT_DIR/platform/graphics/SkiaUtils.cpp',
+ '$PORT_DIR/platform/graphics/svg/RenderPathSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGPaintServerGradientSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGPaintServerPatternSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGPaintServerSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGPaintServerSolidSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGResourceClipperSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGResourceFilterSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SkiaSupport.cpp',
+ '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp',
+ '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp',
+ '$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp',
+ '$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp',
+ '$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp',
+ '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp',
+ '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp',
+ '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp',
+]
+
+if env['PLATFORM'] == 'win32':
+ # These files aren't win32-specific, they're just files that haven't yet been
+ # made portable.
+ input_files = [
+ '$PORT_DIR/bridge/FrameWin.cpp',
+ '$PORT_DIR/bridge/HistoryWin.cpp',
+ '$PORT_DIR/bridge/PageWin.cpp',
+ '$PORT_DIR/bridge/PluginsWin.cpp',
+ '$PORT_DIR/history/BackForwardList.cpp',
+ '$PORT_DIR/loader/IconDatabaseNone.cpp',
+ '$PORT_DIR/loader/IconLoader.cpp',
+ '$PORT_DIR/page/AXObjectCacheWin.cpp',
+ '$PORT_DIR/page/DragControllerWin.cpp',
+ '$PORT_DIR/page/EventHandlerWin.cpp',
+ '$PORT_DIR/platform/BString.cpp',
+ '$PORT_DIR/platform/ClipboardUtilitiesWin.cpp',
+ '$PORT_DIR/platform/ClipboardWin.cpp',
+ '$PORT_DIR/platform/ContextMenuItemWin.cpp',
+ '$PORT_DIR/platform/ContextMenuWin.cpp',
+ '$PORT_DIR/platform/CursorWin.cpp',
+ '$PORT_DIR/platform/DragDataWin.cpp',
+ '$PORT_DIR/platform/DragImageWin.cpp',
+ '$PORT_DIR/platform/EditorWin.cpp',
+ '$PORT_DIR/platform/FileChooserWin.cpp',
+ '$PORT_DIR/platform/FramelessScrollView.cpp',
+ '$PORT_DIR/platform/GKURL.cpp',
+ '$PORT_DIR/platform/KeyEventWin.cpp',
+ '$PORT_DIR/platform/Language.cpp',
+ '$PORT_DIR/platform/LogWin.cpp',
+ '$PORT_DIR/platform/MimeTypeRegistryWin.cpp',
+ '$PORT_DIR/platform/PasteboardWin.cpp',
+ '$PORT_DIR/platform/PlatformMouseEventWin.cpp',
+ '$PORT_DIR/platform/PlatformScrollBarWin.cpp',
+ '$PORT_DIR/platform/PopupMenuWin.cpp',
+ '$PORT_DIR/platform/SSLKeyGeneratorWin.cpp',
+ '$PORT_DIR/platform/ScreenWin.cpp',
+ '$PORT_DIR/platform/ScrollViewWin.cpp',
+ '$PORT_DIR/platform/SearchPopupMenuWin.cpp',
+ '$PORT_DIR/platform/SharedTimerWin.cpp',
+ '$PORT_DIR/platform/SoundWin.cpp',
+ '$PORT_DIR/platform/SystemTimeWin.cpp',
+ '$PORT_DIR/platform/TextBoundariesWin.cpp',
+ '$PORT_DIR/platform/TextBreakIteratorInternalICUWin.cpp',
+ '$PORT_DIR/platform/UniscribeStateTextRun.cpp',
+ '$PORT_DIR/platform/WCDataObject.cpp',
+ '$PORT_DIR/platform/WheelEventWin.cpp',
+ '$PORT_DIR/platform/WidgetWin.cpp',
+ '$PORT_DIR/platform/graphics/FontCacheWin.cpp',
+ '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp',
+ '$PORT_DIR/platform/graphics/FontPlatformDataWin.cpp',
+ '$PORT_DIR/platform/graphics/FontWin.cpp',
+ '$PORT_DIR/platform/graphics/GlyphPageTreeNodeWin.cpp',
+ '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp',
+ '$PORT_DIR/platform/graphics/IconWin.cpp',
+ '$PORT_DIR/platform/graphics/ImageBufferSkia.cpp',
+ '$PORT_DIR/platform/graphics/ImageSkia.cpp',
+ '$PORT_DIR/platform/graphics/PlatformContextSkia.cpp',
+ '$PORT_DIR/platform/graphics/SimpleFontDataWin.cpp',
+ '$PORT_DIR/platform/graphics/SkGraphicsContext.cpp',
+ '$PORT_DIR/platform/graphics/SkPaintContext.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGResourceMaskerSkia.cpp',
+ '$PORT_DIR/platform/network/CookieJarWin.cpp',
+ '$PORT_DIR/rendering/RenderThemeWin.cpp',
+ ]
+
+if env['PLATFORM'] == 'win32':
+ # These are extremely win32 specific and will never be ported.
+ input_files = [
+ '$PORT_DIR/platform/graphics/IntPointWin.cpp',
+ '$PORT_DIR/platform/graphics/IntRectWin.cpp',
+ '$PORT_DIR/platform/graphics/IntSizeWin.cpp',
+ ]
env.ChromeStaticLibrary("port", input_files)
diff --git a/webkit/port/platform/graphics/SkGraphicsContext.h b/webkit/port/platform/graphics/SkGraphicsContext.h
index f1e9698..9301620 100644
--- a/webkit/port/platform/graphics/SkGraphicsContext.h
+++ b/webkit/port/platform/graphics/SkGraphicsContext.h
@@ -31,6 +31,12 @@ typedef HFONT FontHandle;
#elif defined(OS_MACOSX)
typedef CGImageRef IconHandle;
typedef CTFontRef FontHandle;
+#elif defined(OS_LINUX)
+// TODO(erg): Type needs to be defined for half the rest of the stack to
+// compile. When the corresponding implementation to this file gets written,
+// these void pointers need to be replaced with whatever we end up using.
+typedef void* IconHandle;
+typedef void* IconHandle;
#endif
class SkGraphicsContext {
@@ -142,4 +148,3 @@ class SkGraphicsContext {
};
#endif // SkGraphicsContext_h
-
diff --git a/webkit/port/platform/graphics/svg/SVGPaintServerSkia.cpp b/webkit/port/platform/graphics/svg/SVGPaintServerSkia.cpp
index d952f74..7684396 100644
--- a/webkit/port/platform/graphics/svg/SVGPaintServerSkia.cpp
+++ b/webkit/port/platform/graphics/svg/SVGPaintServerSkia.cpp
@@ -35,7 +35,6 @@
#include "GraphicsContext.h"
#include "RenderPath.h"
-#include "base/gfx/platform_canvas_win.h"
#include "SkiaUtils.h"
#include "SkDashPathEffect.h"
diff --git a/webkit/port/platform/graphics/svg/SVGResourceClipperSkia.cpp b/webkit/port/platform/graphics/svg/SVGResourceClipperSkia.cpp
index 961b943..1bf7ce8 100644
--- a/webkit/port/platform/graphics/svg/SVGResourceClipperSkia.cpp
+++ b/webkit/port/platform/graphics/svg/SVGResourceClipperSkia.cpp
@@ -50,7 +50,6 @@ void SVGResourceClipper::applyClip(GraphicsContext* context, const FloatRect& bo
for (unsigned int x = 0; x < count; x++) {
Path path = data[x].path;
- WindRule rule = data[x].windRule;
if (path.isEmpty())
continue;
diff --git a/webkit/port/platform/graphics/svg/SkiaSupport.cpp b/webkit/port/platform/graphics/svg/SkiaSupport.cpp
index 8e45abe..fbc752b 100644
--- a/webkit/port/platform/graphics/svg/SkiaSupport.cpp
+++ b/webkit/port/platform/graphics/svg/SkiaSupport.cpp
@@ -41,7 +41,6 @@
#include "SVGPaintServer.h"
#include "SVGRenderStyle.h"
-#include "base/gfx/platform_canvas_win.h"
#include "SkiaUtils.h"
#include "SkDashPathEffect.h"
generated by cgit v1.1 at 2025-02-02 23:17:53 +0000