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/wince | |
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/wince')
-rw-r--r-- | WebCore/platform/graphics/wince/FontPlatformData.h | 2 | ||||
-rw-r--r-- | WebCore/platform/graphics/wince/MediaPlayerPrivateWince.h | 2 | ||||
-rw-r--r-- | WebCore/platform/graphics/wince/MediaPlayerProxy.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/wince/FontPlatformData.h b/WebCore/platform/graphics/wince/FontPlatformData.h index bb49f75..0b973b8 100644 --- a/WebCore/platform/graphics/wince/FontPlatformData.h +++ b/WebCore/platform/graphics/wince/FontPlatformData.h @@ -27,6 +27,7 @@ #include "FontDescription.h" #include "StringImpl.h" +#include <wtf/Forward.h> #include <wtf/Noncopyable.h> typedef struct tagTEXTMETRICW TEXTMETRIC; @@ -35,7 +36,6 @@ typedef struct tagLOGFONTW LOGFONT; namespace WebCore { class FontPlatformPrivateData; - class String; class FontPlatformData { diff --git a/WebCore/platform/graphics/wince/MediaPlayerPrivateWince.h b/WebCore/platform/graphics/wince/MediaPlayerPrivateWince.h index a657e3e..e86b8a9 100644 --- a/WebCore/platform/graphics/wince/MediaPlayerPrivateWince.h +++ b/WebCore/platform/graphics/wince/MediaPlayerPrivateWince.h @@ -29,6 +29,7 @@ #if ENABLE(VIDEO) +#include <wtf/Forward.h> #include "MediaPlayerPrivate.h" #include "Timer.h" #include <wtf/OwnPtr.h> @@ -38,7 +39,6 @@ namespace WebCore { class GraphicsContext; class IntSize; class IntRect; - class String; class MediaPlayerPrivate : public MediaPlayerPrivateInterface { public: diff --git a/WebCore/platform/graphics/wince/MediaPlayerProxy.h b/WebCore/platform/graphics/wince/MediaPlayerProxy.h index 05f9b21..b02e0f4 100644 --- a/WebCore/platform/graphics/wince/MediaPlayerProxy.h +++ b/WebCore/platform/graphics/wince/MediaPlayerProxy.h @@ -23,13 +23,13 @@ #if ENABLE(VIDEO) +#include <wtf/Forward.h> #include "ScriptInstance.h" namespace WebCore { class IntRect; class IntSize; - class String; class MediaPlayer; class PluginView; class HTMLMediaElement; |