diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebCore/platform/graphics/win | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebCore/platform/graphics/win')
4 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/platform/graphics/win/FontCustomPlatformData.h b/WebCore/platform/graphics/win/FontCustomPlatformData.h index 46ddbb5..d19a8a5 100644 --- a/WebCore/platform/graphics/win/FontCustomPlatformData.h +++ b/WebCore/platform/graphics/win/FontCustomPlatformData.h @@ -23,6 +23,7 @@ #include "FontRenderingMode.h" #include "PlatformString.h" +#include <wtf/Forward.h> #include <wtf/Noncopyable.h> typedef struct CGFont* CGFontRef; @@ -31,7 +32,6 @@ namespace WebCore { class FontPlatformData; class SharedBuffer; -class String; struct FontCustomPlatformData : Noncopyable { FontCustomPlatformData(HANDLE fontReference, const String& name) diff --git a/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.h b/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.h index 75fe3d1..2dbea51 100644 --- a/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.h +++ b/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.h @@ -21,6 +21,7 @@ #ifndef FontCustomPlatformDataCairo_h #define FontCustomPlatformDataCairo_h +#include <wtf/Forward.h> #include <wtf/Noncopyable.h> #include <cairo.h> @@ -29,7 +30,6 @@ namespace WebCore { class FontPlatformData; class SharedBuffer; -class String; struct FontCustomPlatformDataCairo : Noncopyable { FontCustomPlatformDataCairo(cairo_font_face_t* fontFace) diff --git a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h index 7bf796c..9c449dd 100644 --- a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h +++ b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h @@ -31,6 +31,7 @@ #include "GraphicsLayer.h" #include "MediaPlayerPrivate.h" #include "Timer.h" +#include <wtf/Forward.h> #include <wtf/OwnPtr.h> #include <wtf/RetainPtr.h> @@ -47,7 +48,6 @@ namespace WebCore { class GraphicsContext; class IntSize; class IntRect; -class String; #if USE(ACCELERATED_COMPOSITING) class WKCAImageQueue; diff --git a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.h b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.h index ecdb9da..ab9b1f0 100644 --- a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.h +++ b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.h @@ -32,6 +32,7 @@ #include "Timer.h" #include <QTMovie.h> #include <QTMovieGWorld.h> +#include <wtf/Forward.h> #include <wtf/OwnPtr.h> #include <wtf/RetainPtr.h> @@ -50,7 +51,6 @@ namespace WebCore { class GraphicsContext; class IntSize; class IntRect; -class String; class MediaPlayerPrivate : public MediaPlayerPrivateInterface, public QTMovieClient, public QTMovieGWorldClient #if USE(ACCELERATED_COMPOSITING) |