diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-22 15:40:17 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-22 15:40:17 +0200 |
commit | 43a42f108af6bcbd91f2672731c3047c26213af1 (patch) | |
tree | 7fa092e5f5d873c72f2486a70e26be26f7a38bec /Source/WebKit2/Shared/ShareableSurface.cpp | |
parent | d9cf437c840c6eb7417bdd97e6c40979255d3158 (diff) | |
download | qtwebkit-43a42f108af6bcbd91f2672731c3047c26213af1.tar.gz |
Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 (http://svn.webkit.org/repository/webkit/trunk@132067)
New snapshot that fixes build without QtWidgets
Diffstat (limited to 'Source/WebKit2/Shared/ShareableSurface.cpp')
-rw-r--r-- | Source/WebKit2/Shared/ShareableSurface.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebKit2/Shared/ShareableSurface.cpp b/Source/WebKit2/Shared/ShareableSurface.cpp index be093e0c0..f70769895 100644 --- a/Source/WebKit2/Shared/ShareableSurface.cpp +++ b/Source/WebKit2/Shared/ShareableSurface.cpp @@ -20,6 +20,7 @@ #include "config.h" #include "ShareableSurface.h" +#include "CoordinatedGraphicsArgumentCoders.h" #include "GraphicsContext.h" #include "WebCoreArgumentCoders.h" #include <WebCore/GraphicsSurfaceToken.h> @@ -195,13 +196,13 @@ void ShareableSurface::copyToTexture(PassRefPtr<WebCore::BitmapTexture> passText } RefPtr<Image> image = m_graphicsSurface->createReadOnlyImage(IntRect(sourceOffset, target.size())); - texture->updateContents(image.get(), target, IntPoint::zero()); + texture->updateContents(image.get(), target, IntPoint::zero(), BitmapTexture::UpdateCanModifyOriginalImageData); } #endif ASSERT(m_bitmap); RefPtr<Image> image = m_bitmap->createImage(); - texture->updateContents(image.get(), target, sourceOffset); + texture->updateContents(image.get(), target, sourceOffset, BitmapTexture::UpdateCanModifyOriginalImageData); return; } #endif // USE(TEXTURE_MAPPER) |