diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
| commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
| tree | db769fadd053248f85db67434a5b275224defef7 /Source/WebCore/platform/graphics/wx | |
| parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
| download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 | |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/WebCore/platform/graphics/wx')
| -rw-r--r-- | Source/WebCore/platform/graphics/wx/FontCustomPlatformData.h | 4 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/wx/ImageBufferWx.cpp | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/wx/FontCustomPlatformData.h b/Source/WebCore/platform/graphics/wx/FontCustomPlatformData.h index cc348e3..86f99b2 100644 --- a/Source/WebCore/platform/graphics/wx/FontCustomPlatformData.h +++ b/Source/WebCore/platform/graphics/wx/FontCustomPlatformData.h @@ -24,14 +24,14 @@ #include "FontOrientation.h" #include "FontRenderingMode.h" #include <wtf/Forward.h> -#include <wtf/Noncopyable.h> namespace WebCore { class FontPlatformData; class SharedBuffer; - struct FontCustomPlatformData : Noncopyable { + struct FontCustomPlatformData { + WTF_MAKE_NONCOPYABLE(FontCustomPlatformData); public: FontCustomPlatformData() { } ~FontCustomPlatformData(); diff --git a/Source/WebCore/platform/graphics/wx/ImageBufferWx.cpp b/Source/WebCore/platform/graphics/wx/ImageBufferWx.cpp index ba33287..b603a60 100644 --- a/Source/WebCore/platform/graphics/wx/ImageBufferWx.cpp +++ b/Source/WebCore/platform/graphics/wx/ImageBufferWx.cpp @@ -48,6 +48,12 @@ ImageBuffer::~ImageBuffer() { } +size_t ImageBuffer::dataSize() const +{ + notImplemented(); + return 0; +} + GraphicsContext* ImageBuffer::context() const { notImplemented(); |