summaryrefslogtreecommitdiffstats
path: root/webkit/port
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-29 00:09:08 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-29 00:09:08 +0000
commitf9624dc2e6e23f762ecd726b9e80290f6424435b (patch)
tree324cf666e002e6c0ae1e944bb7595bd28b164f6f /webkit/port
parent6f3eb9b4df9cc29728bb7323448d47a9c8a9fef9 (diff)
downloadchromium_src-f9624dc2e6e23f762ecd726b9e80290f6424435b.zip
chromium_src-f9624dc2e6e23f762ecd726b9e80290f6424435b.tar.gz
chromium_src-f9624dc2e6e23f762ecd726b9e80290f6424435b.tar.bz2
Get a good piece of port building under Linux.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1515 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
-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
4 files changed, 6 insertions, 4 deletions
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"