diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/platform/graphics/texmap/TextureMapperNode.h | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/platform/graphics/texmap/TextureMapperNode.h')
-rw-r--r-- | Source/WebCore/platform/graphics/texmap/TextureMapperNode.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h b/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h index 9694043..c5decc1 100644 --- a/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h +++ b/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h @@ -20,19 +20,19 @@ #ifndef TextureMapperNode_h #define TextureMapperNode_h -#include "CurrentTime.h" #include "FloatRect.h" #include "GraphicsContext.h" #include "GraphicsLayer.h" -#include "HashMap.h" #include "Image.h" -#include "RefCounted.h" #include "TextureMapper.h" #include "TextureMapperPlatformLayer.h" #include "Timer.h" #include "TransformOperations.h" #include "TranslateTransformOperation.h" #include "UnitBezier.h" +#include <wtf/CurrentTime.h> +#include <wtf/HashMap.h> +#include <wtf/RefCounted.h> namespace WebCore { @@ -94,7 +94,7 @@ public: ContentType contentType; RefPtr<Image> image; - TextureMapperVideoLayer* media; + TextureMapperMediaLayer* media; ContentData() : needsDisplay(false) |