WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
ROLLOUT of r148247
bug-114490-20130411225933.patch (text/plain), 25.75 KB, created by
WebKit Commit Bot
on 2013-04-11 22:59:54 PDT
(
hide
)
Description:
ROLLOUT of r148247
Filename:
MIME Type:
Creator:
WebKit Commit Bot
Created:
2013-04-11 22:59:54 PDT
Size:
25.75 KB
patch
obsolete
>Subversion Revision: 148261 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 1124b4266fd9d6763bee910c8f69e32bf8c086e6..ae44ae88e70c7b0653cc2c8a1e67249040e31d56 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,38 @@ >+2013-04-11 Commit Queue <rniwa@webkit.org> >+ >+ Unreviewed, rolling out r148247. >+ http://trac.webkit.org/changeset/148247 >+ https://bugs.webkit.org/show_bug.cgi?id=114490 >+ >+ Cairo dep fails to build on builders due to missing EGL >+ headers (Requested by zdobersek on #webkit). >+ >+ * platform/graphics/GraphicsContext.cpp: >+ (WebCore): >+ * platform/graphics/ImageBuffer.cpp: >+ (WebCore): >+ * platform/graphics/cairo/GLContext.h: >+ (GLContext): >+ * platform/graphics/cairo/GraphicsContextCairo.cpp: >+ * platform/graphics/cairo/ImageBufferCairo.cpp: >+ (WebCore::ImageBufferData::ImageBufferData): >+ (WebCore::ImageBuffer::ImageBuffer): >+ (WebCore::ImageBuffer::platformTransformColorSpace): >+ (WebCore::getImageData): >+ (WebCore::ImageBuffer::putByteArray): >+ (WebCore): >+ * platform/graphics/cairo/ImageBufferDataCairo.h: >+ (ImageBufferData): >+ * platform/graphics/egl/GLContextEGL.cpp: >+ (WebCore::GLContextEGL::GLContextEGL): >+ (WebCore::GLContextEGL::~GLContextEGL): >+ * platform/graphics/egl/GLContextEGL.h: >+ * platform/graphics/glx/GLContextGLX.cpp: >+ (WebCore::GLContextGLX::GLContextGLX): >+ (WebCore::GLContextGLX::~GLContextGLX): >+ * platform/graphics/glx/GLContextGLX.h: >+ (GLContextGLX): >+ > 2013-04-11 Nico Weber <thakis@chromium.org> > > Remove debugging code that is no longer used with current mac sdks. >diff --git a/Source/WebCore/platform/graphics/GraphicsContext.cpp b/Source/WebCore/platform/graphics/GraphicsContext.cpp >index cf956611b236fece574e9da6a96af6c09e733914..762c60bed12039b5c36278ab59f5616002f11a58 100644 >--- a/Source/WebCore/platform/graphics/GraphicsContext.cpp >+++ b/Source/WebCore/platform/graphics/GraphicsContext.cpp >@@ -757,7 +757,7 @@ void GraphicsContext::setPlatformShouldSmoothFonts(bool) > } > #endif > >-#if !USE(SKIA) && !USE(CG) && !USE(CAIRO) >+#if !USE(SKIA) && !USE(CG) > bool GraphicsContext::isAcceleratedContext() const > { > return false; >diff --git a/Source/WebCore/platform/graphics/ImageBuffer.cpp b/Source/WebCore/platform/graphics/ImageBuffer.cpp >index 25e7365f427b5d7448c04afcfd63164fb27eb731..bfd547ac422bd46c82478014adc62beb824976b1 100644 >--- a/Source/WebCore/platform/graphics/ImageBuffer.cpp >+++ b/Source/WebCore/platform/graphics/ImageBuffer.cpp >@@ -99,7 +99,7 @@ void ImageBuffer::convertToLuminanceMask() > genericConvertToLuminanceMask(); > } > >-#if USE(ACCELERATED_COMPOSITING) && !USE(SKIA) && !USE(CAIRO) >+#if USE(ACCELERATED_COMPOSITING) && !USE(SKIA) > PlatformLayer* ImageBuffer::platformLayer() const > { > return 0; >diff --git a/Source/WebCore/platform/graphics/cairo/GLContext.h b/Source/WebCore/platform/graphics/cairo/GLContext.h >index 38df7a669ad80d2a5d6eee1dcf4bd509ceda5454..1a8807222f229aa362b77d666887fb6b17cf33d7 100644 >--- a/Source/WebCore/platform/graphics/cairo/GLContext.h >+++ b/Source/WebCore/platform/graphics/cairo/GLContext.h >@@ -25,8 +25,6 @@ > #include <wtf/Noncopyable.h> > #include <wtf/PassOwnPtr.h> > >-typedef struct _cairo_device cairo_device_t; >- > #if PLATFORM(X11) > typedef struct _XDisplay Display; > #endif >@@ -48,7 +46,6 @@ public: > virtual void waitNative() = 0; > virtual bool canRenderToDefaultFramebuffer() = 0; > virtual IntSize defaultFrameBufferSize() = 0; >- virtual cairo_device_t* cairoDevice() = 0; > > #if PLATFORM(X11) > static Display* sharedX11Display(); >diff --git a/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp b/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp >index bf53bde7a171d2e605b941d0181ad46d9e25df62..09998c91f3b8cf6e0bc74b88fc806089309287ac 100644 >--- a/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp >+++ b/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp >@@ -1142,11 +1142,6 @@ InterpolationQuality GraphicsContext::imageInterpolationQuality() const > return platformContext()->imageInterpolationQuality(); > } > >-bool GraphicsContext::isAcceleratedContext() const >-{ >- return cairo_surface_get_type(cairo_get_target(platformContext()->cr())) == CAIRO_SURFACE_TYPE_GL; >-} >- > #if ENABLE(3D_RENDERING) && USE(TEXTURE_MAPPER) > TransformationMatrix GraphicsContext::get3DTransform() const > { >diff --git a/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp b/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp >index 51fbf0f0827fd114ce394e59cf5d908fbf57bd41..9b469d072941cc3f1f61a1777f4058964afd25fd 100644 >--- a/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp >+++ b/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp >@@ -44,68 +44,22 @@ > #include <wtf/text/Base64.h> > #include <wtf/text/WTFString.h> > >-#if ENABLE(ACCELERATED_2D_CANVAS) >-#include "GLContext.h" >-#include "OpenGLShims.h" >-#include "TextureMapperGL.h" >-#include <cairo-gl.h> >-#endif >- > using namespace std; > > namespace WebCore { > >-ImageBufferData::ImageBufferData(const IntSize& size) >+ImageBufferData::ImageBufferData(const IntSize&) > : m_platformContext(0) >- , m_size(size) >-#if ENABLE(ACCELERATED_2D_CANVAS) >- , m_texture(0) >-#endif > { > } > >-#if ENABLE(ACCELERATED_2D_CANVAS) >-PassRefPtr<cairo_surface_t> createCairoGLSurface(const IntSize& size, uint32_t& texture) >-{ >- GLContext::sharingContext()->makeContextCurrent(); >- >- // We must generate the texture ourselves, because there is no Cairo API for extracting it >- // from a pre-existing surface. >- glGenTextures(1, &texture); >- glBindTexture(GL_TEXTURE_2D, texture); >- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); >- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); >- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); >- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); >- >- glPixelStorei(GL_UNPACK_ALIGNMENT, 1); >- >- glTexImage2D(GL_TEXTURE_2D, 0 /* level */, GL_RGBA8, size.width(), size.height(), 0 /* border */, GL_RGBA, GL_UNSIGNED_BYTE, 0); >- >- GLContext* context = GLContext::sharingContext(); >- cairo_device_t* device = context->cairoDevice(); >- >- // Thread-awareness is a huge performance hit on non-Intel drivers. >- cairo_gl_device_set_thread_aware(device, FALSE); >- >- return adoptRef(cairo_gl_surface_create_for_texture(device, CAIRO_CONTENT_COLOR_ALPHA, texture, size.width(), size.height())); >-} >-#endif >- >-ImageBuffer::ImageBuffer(const IntSize& size, float /* resolutionScale */, ColorSpace, RenderingMode renderingMode, bool& success) >+ImageBuffer::ImageBuffer(const IntSize& size, float /* resolutionScale */, ColorSpace, RenderingMode, bool& success) > : m_data(size) > , m_size(size) > , m_logicalSize(size) > { > success = false; // Make early return mean error. >- >-#if ENABLE(ACCELERATED_2D_CANVAS) >- if (renderingMode == Accelerated) >- m_data.m_surface = createCairoGLSurface(size, m_data.m_texture); >- else >-#endif >- m_data.m_surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, size.width(), size.height())); >- >+ m_data.m_surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, size.width(), size.height())); > if (cairo_surface_status(m_data.m_surface.get()) != CAIRO_STATUS_SUCCESS) > return; // create will notice we didn't set m_initialized and fail. > >@@ -160,9 +114,7 @@ void ImageBuffer::drawPattern(GraphicsContext* context, const FloatRect& srcRect > > void ImageBuffer::platformTransformColorSpace(const Vector<int>& lookUpTable) > { >- // FIXME: Enable color space conversions on accelerated canvases. >- if (cairo_surface_get_type(m_data.m_surface.get()) != CAIRO_SURFACE_TYPE_IMAGE) >- return; >+ ASSERT(cairo_surface_get_type(m_data.m_surface.get()) == CAIRO_SURFACE_TYPE_IMAGE); > > unsigned char* dataSrc = cairo_image_surface_get_data(m_data.m_surface.get()); > int stride = cairo_image_surface_get_stride(m_data.m_surface.get()); >@@ -181,46 +133,13 @@ void ImageBuffer::platformTransformColorSpace(const Vector<int>& lookUpTable) > cairo_surface_mark_dirty_rectangle(m_data.m_surface.get(), 0, 0, m_size.width(), m_size.height()); > } > >-static cairo_surface_t* mapSurfaceToImage(cairo_surface_t* surface, const IntSize& size) >-{ >- if (cairo_surface_get_type(surface) == CAIRO_SURFACE_TYPE_IMAGE) >- return surface; >- >- cairo_surface_t* imageSurface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, size.width(), size.height()); >- RefPtr<cairo_t> cr = adoptRef(cairo_create(imageSurface)); >- cairo_set_source_surface(cr.get(), surface, 0, 0); >- cairo_paint(cr.get()); >- return imageSurface; >-} >- >-static void unmapSurfaceFromImage(cairo_surface_t* surface, cairo_surface_t* imageSurface, const IntRect& dirtyRectangle = IntRect()) >-{ >- if (surface == imageSurface && dirtyRectangle.isEmpty()) >- return; >- >- if (dirtyRectangle.isEmpty()) { >- cairo_surface_destroy(imageSurface); >- return; >- } >- >- if (surface == imageSurface) { >- cairo_surface_mark_dirty_rectangle(surface, dirtyRectangle.x(), dirtyRectangle.y(), dirtyRectangle.width(), dirtyRectangle.height()); >- return; >- } >- >- RefPtr<cairo_t> cr = adoptRef(cairo_create(surface)); >- cairo_set_source_surface(cr.get(), imageSurface, 0, 0); >- cairo_rectangle(cr.get(), dirtyRectangle.x(), dirtyRectangle.y(), dirtyRectangle.width(), dirtyRectangle.height()); >- cairo_fill(cr.get()); >- cairo_surface_destroy(imageSurface); >-} >- > template <Multiply multiplied> > PassRefPtr<Uint8ClampedArray> getImageData(const IntRect& rect, const ImageBufferData& data, const IntSize& size) > { >+ ASSERT(cairo_surface_get_type(data.m_surface.get()) == CAIRO_SURFACE_TYPE_IMAGE); >+ > RefPtr<Uint8ClampedArray> result = Uint8ClampedArray::createUninitialized(rect.width() * rect.height() * 4); >- cairo_surface_t* imageSurface = mapSurfaceToImage(data.m_surface.get(), size); >- unsigned char* dataSrc = cairo_image_surface_get_data(imageSurface); >+ unsigned char* dataSrc = cairo_image_surface_get_data(data.m_surface.get()); > unsigned char* dataDst = result->data(); > > if (rect.x() < 0 || rect.y() < 0 || (rect.x() + rect.width()) > size.width() || (rect.y() + rect.height()) > size.height()) >@@ -248,7 +167,7 @@ PassRefPtr<Uint8ClampedArray> getImageData(const IntRect& rect, const ImageBuffe > endy = size.height(); > int numRows = endy - originy; > >- int stride = cairo_image_surface_get_stride(imageSurface); >+ int stride = cairo_image_surface_get_stride(data.m_surface.get()); > unsigned destBytesPerRow = 4 * rect.width(); > > unsigned char* destRows = dataDst + desty * destBytesPerRow + destx * 4; >@@ -281,7 +200,6 @@ PassRefPtr<Uint8ClampedArray> getImageData(const IntRect& rect, const ImageBuffe > destRows += destBytesPerRow; > } > >- unmapSurfaceFromImage(data.m_surface.get(), imageSurface); > return result.release(); > } > >@@ -297,8 +215,9 @@ PassRefPtr<Uint8ClampedArray> ImageBuffer::getPremultipliedImageData(const IntRe > > void ImageBuffer::putByteArray(Multiply multiplied, Uint8ClampedArray* source, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint, CoordinateSystem) > { >- cairo_surface_t* imageSurface = mapSurfaceToImage(m_data.m_surface.get(), sourceSize); >- unsigned char* dataDst = cairo_image_surface_get_data(imageSurface); >+ ASSERT(cairo_surface_get_type(m_data.m_surface.get()) == CAIRO_SURFACE_TYPE_IMAGE); >+ >+ unsigned char* dataDst = cairo_image_surface_get_data(m_data.m_surface.get()); > > ASSERT(sourceRect.width() > 0); > ASSERT(sourceRect.height() > 0); >@@ -327,7 +246,7 @@ void ImageBuffer::putByteArray(Multiply multiplied, Uint8ClampedArray* source, c > int numRows = endy - desty; > > unsigned srcBytesPerRow = 4 * sourceSize.width(); >- int stride = cairo_image_surface_get_stride(imageSurface); >+ int stride = cairo_image_surface_get_stride(m_data.m_surface.get()); > > unsigned char* srcRows = source->data() + originy * srcBytesPerRow + originx * 4; > for (int y = 0; y < numRows; ++y) { >@@ -355,8 +274,7 @@ void ImageBuffer::putByteArray(Multiply multiplied, Uint8ClampedArray* source, c > } > srcRows += srcBytesPerRow; > } >- >- unmapSurfaceFromImage(m_data.m_surface.get(), imageSurface, IntRect(destx, desty, numColumns, numRows)); >+ cairo_surface_mark_dirty_rectangle(m_data.m_surface.get(), destx, desty, numColumns, numRows); > } > > #if !PLATFORM(GTK) >@@ -391,32 +309,4 @@ String ImageBuffer::toDataURL(const String& mimeType, const double*, CoordinateS > } > #endif > >-#if ENABLE(ACCELERATED_2D_CANVAS) >-void ImageBufferData::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity) >-{ >- if (textureMapper->accelerationMode() != TextureMapper::OpenGLMode) { >- notImplemented(); >- return; >- } >- >- ASSERT(m_texture); >- >- // Cairo may change the active context, so we make sure to change it back after flushing. >- GLContext* previousActiveContext = GLContext::getCurrent(); >- cairo_surface_flush(m_surface.get()); >- previousActiveContext->makeContextCurrent(); >- >- static_cast<TextureMapperGL*>(textureMapper)->drawTexture(m_texture, TextureMapperGL::ShouldBlend, m_size, targetRect, matrix, opacity); >-} >-#endif >- >-PlatformLayer* ImageBuffer::platformLayer() const >-{ >-#if ENABLE(ACCELERATED_2D_CANVAS) >- if (m_data.m_texture) >- return const_cast<ImageBufferData*>(&m_data); >-#endif >- return 0; >-} >- > } // namespace WebCore >diff --git a/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h b/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h >index 72ea4c34f5e7b1045fe6b6da78a01a0765840d76..c9faf8da61cdc8e49ba8958337f3e722d3e476fc 100644 >--- a/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h >+++ b/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h >@@ -26,31 +26,16 @@ > #include "PlatformContextCairo.h" > #include "RefPtrCairo.h" > >-#if ENABLE(ACCELERATED_2D_CANVAS) >-#include "TextureMapper.h" >-#include "TextureMapperPlatformLayer.h" >-#endif >- > namespace WebCore { > > class IntSize; > >-class ImageBufferData >-#if ENABLE(ACCELERATED_2D_CANVAS) >- : public TextureMapperPlatformLayer >-#endif >-{ >+class ImageBufferData { > public: > ImageBufferData(const IntSize&); > > RefPtr<cairo_surface_t> m_surface; > PlatformContextCairo m_platformContext; >- IntSize m_size; >- >-#if ENABLE(ACCELERATED_2D_CANVAS) >- virtual void paintToTextureMapper(TextureMapper*, const FloatRect& target, const TransformationMatrix&, float opacity); >- uint32_t m_texture; >-#endif > }; > > } // namespace WebCore >diff --git a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp >index 8a9b59de6ef300f3ac6aefae8b479f311395e3d5..b9389b483f93cc24ed452acbeffc0da2c6d80bb0 100644 >--- a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp >+++ b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp >@@ -22,7 +22,6 @@ > #if USE(EGL) > > #include "GraphicsContext3D.h" >-#include <cairo.h> > #include <wtf/OwnPtr.h> > > #if USE(OPENGL_ES_2) >@@ -32,10 +31,6 @@ > #include "OpenGLShims.h" > #endif > >-#if ENABLE(ACCELERATED_2D_CANVAS) >-#include <cairo-gl.h> >-#endif >- > namespace WebCore { > > static EGLDisplay gSharedEGLDisplay = EGL_NO_DISPLAY; >@@ -213,15 +208,11 @@ GLContextEGL::GLContextEGL(EGLContext context, EGLSurface surface, EGLSurfaceTyp > : m_context(context) > , m_surface(surface) > , m_type(type) >- , m_cairoDevice(0) > { > } > > GLContextEGL::~GLContextEGL() > { >- if (m_cairoDevice) >- cairo_device_destroy(m_cairoDevice); >- > EGLDisplay display = sharedEGLDisplay(); > if (m_context) { > glBindFramebuffer(GL_FRAMEBUFFER, 0); >@@ -273,18 +264,6 @@ void GLContextEGL::waitNative() > eglWaitNative(EGL_CORE_NATIVE_ENGINE); > } > >-cairo_device_t* GLContextEGL::cairoDevice() >-{ >- if (m_cairoDevice) >- return m_cairoDevice; >- >-#if ENABLE(ACCELERATED_2D_CANVAS) >- m_cairoDevice = cairo_egl_device_create(sharedEGLDisplay(), m_context); >-#endif >- >- return m_cairoDevice; >-} >- > #if ENABLE(WEBGL) > PlatformGraphicsContext3D GLContextEGL::platformContext() > { >diff --git a/Source/WebCore/platform/graphics/egl/GLContextEGL.h b/Source/WebCore/platform/graphics/egl/GLContextEGL.h >index 7516c69bdcaaf078494684b8757eb4d3b8f61e73..c5d4bf75615c7b7238fa1ad2cb96a2239a55292f 100644 >--- a/Source/WebCore/platform/graphics/egl/GLContextEGL.h >+++ b/Source/WebCore/platform/graphics/egl/GLContextEGL.h >@@ -41,7 +41,7 @@ public: > virtual void waitNative(); > virtual bool canRenderToDefaultFramebuffer(); > virtual IntSize defaultFrameBufferSize(); >- virtual cairo_device_t* cairoDevice(); >+ > > #if ENABLE(WEBGL) > virtual PlatformGraphicsContext3D platformContext(); >@@ -59,7 +59,6 @@ private: > EGLContext m_context; > EGLSurface m_surface; > EGLSurfaceType m_type; >- cairo_device_t* m_cairoDevice; > }; > > } // namespace WebCore >diff --git a/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp b/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp >index 176f7722dcd25c9d2e9b5a85c6bc11bf774b907c..31f32cf0b800c900e5318ee505995e1b37c97606 100644 >--- a/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp >+++ b/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp >@@ -23,13 +23,8 @@ > #include "GraphicsContext3D.h" > #include "OpenGLShims.h" > #include <GL/glx.h> >-#include <cairo.h> > #include <wtf/OwnPtr.h> > >-#if ENABLE(ACCELERATED_2D_CANVAS) >-#include <cairo-gl.h> >-#endif >- > namespace WebCore { > > PassOwnPtr<GLContextGLX> GLContextGLX::createWindowContext(XID window, GLContext* sharingContext) >@@ -173,7 +168,6 @@ GLContextGLX::GLContextGLX(GLXContext context) > , m_pbuffer(0) > , m_pixmap(0) > , m_glxPixmap(0) >- , m_cairoDevice(0) > { > } > >@@ -183,15 +177,11 @@ GLContextGLX::GLContextGLX(GLXContext context, Pixmap pixmap, GLXPixmap glxPixma > , m_pbuffer(0) > , m_pixmap(pixmap) > , m_glxPixmap(glxPixmap) >- , m_cairoDevice(0) > { > } > > GLContextGLX::~GLContextGLX() > { >- if (m_cairoDevice) >- cairo_device_destroy(m_cairoDevice); >- > if (m_context) { > // This may be necessary to prevent crashes with NVidia's closed source drivers. Originally > // from Mozilla's 3D canvas implementation at: http://bitbucket.org/ilmari/canvas3d/ >@@ -261,18 +251,6 @@ void GLContextGLX::waitNative() > glXWaitX(); > } > >-cairo_device_t* GLContextGLX::cairoDevice() >-{ >- if (m_cairoDevice) >- return m_cairoDevice; >- >-#if ENABLE(ACCELERATED_2D_CANVAS) >- m_cairoDevice = cairo_glx_device_create(sharedX11Display(), m_context); >-#endif >- >- return m_cairoDevice; >-} >- > #if USE(3D_GRAPHICS) > PlatformGraphicsContext3D GLContextGLX::platformContext() > { >diff --git a/Source/WebCore/platform/graphics/glx/GLContextGLX.h b/Source/WebCore/platform/graphics/glx/GLContextGLX.h >index edefc04c26556aa29bf66dc45b2440017848649c..888146b11ef34e9493bb8d31fee298d80f06a68c 100644 >--- a/Source/WebCore/platform/graphics/glx/GLContextGLX.h >+++ b/Source/WebCore/platform/graphics/glx/GLContextGLX.h >@@ -46,7 +46,6 @@ public: > virtual void waitNative(); > virtual bool canRenderToDefaultFramebuffer(); > virtual IntSize defaultFrameBufferSize(); >- virtual cairo_device_t* cairoDevice(); > > #if USE(3D_GRAPHICS) > virtual PlatformGraphicsContext3D platformContext(); >@@ -64,7 +63,6 @@ private: > GLXPbuffer m_pbuffer; > Pixmap m_pixmap; > GLXPixmap m_glxPixmap; >- cairo_device_t* m_cairoDevice; > }; > > } // namespace WebCore >diff --git a/Source/autotools/FindDependencies.m4 b/Source/autotools/FindDependencies.m4 >index e15ea4c19f96fc98d41ed56216bfb4d3cca047e1..766098394e3c78a339346051a5194a14976030b3 100644 >--- a/Source/autotools/FindDependencies.m4 >+++ b/Source/autotools/FindDependencies.m4 >@@ -298,7 +298,6 @@ if test "$enable_accelerated_compositing" = "auto"; then > enable_accelerated_compositing="no"; > fi > fi >- > if test "$enable_gamepad" = "yes" && test "$os_linux" = no; then > AC_MSG_WARN([Gamepad support is only available on Linux. Disabling Gamepad support.]) > enable_gamepad=no; >@@ -466,21 +465,6 @@ if test "$with_acceleration_backend" = "opengl"; then > fi > AC_SUBST([OPENGL_LIBS]) > >-enable_accelerated_canvas=no >-if test "$enable_accelerated_compositing" = "yes" && test "$with_acceleration_backend" = "opengl"; then >- CAIRO_GL_LIBS="cairo-gl" >- if test "$enable_glx" = "yes"; then >- CAIRO_GL_LIBS+=" cairo-glx" >- fi >- if test "$enable_egl" = "yes"; then >- CAIRO_GL_LIBS+=" cairo-egl" >- fi >- >- # At the moment CairoGL does not add any extra cflags and libraries, so we can >- # safely ignore CAIRO_GL_LIBS and CAIRO_GL_CFLAGS for the moment. >- PKG_CHECK_MODULES(CAIRO_GL, $CAIRO_GL_LIBS, [enable_accelerated_canvas=yes], [enable_accelerated_canvas=no]) >-fi >- > if test "$enable_gamepad" = "yes"; then > PKG_CHECK_MODULES([GAMEPAD], [gio-unix-2.0 gudev-1.0]) > >diff --git a/Source/autotools/PrintBuildConfiguration.m4 b/Source/autotools/PrintBuildConfiguration.m4 >index 6a60a65324be25100d61a2f17e54f8cdbd79ab31..be9c520a23a0b7debcf1b85fb77208c0155204b3 100644 >--- a/Source/autotools/PrintBuildConfiguration.m4 >+++ b/Source/autotools/PrintBuildConfiguration.m4 >@@ -16,7 +16,6 @@ Features: > WebKit1 support : $enable_webkit1 > WebKit2 support : $enable_webkit2 > Accelerated Compositing : $enable_accelerated_compositing >- Accelerated 2D canvas : $enable_accelerated_canvas > Gamepad support : $enable_gamepad > Geolocation support : $enable_geolocation > HTML5 video element support : $enable_video >diff --git a/Source/autotools/SetupWebKitFeatures.m4 b/Source/autotools/SetupWebKitFeatures.m4 >index b5fa922742c079f2392c18575b4e020467dc0f56..b068b317d11d00dd4d53c5ba1afd93f9daaccef1 100644 >--- a/Source/autotools/SetupWebKitFeatures.m4 >+++ b/Source/autotools/SetupWebKitFeatures.m4 >@@ -71,12 +71,6 @@ else > CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_3D_RENDERING=0" > fi > >-if test "$enable_accelerated_canvas" = "yes"; then >- CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_ACCELERATED_2D_CANVAS=1" >-else >- CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_ACCELERATED_2D_CANVAS=0" >-fi >- > if test "$enable_web_audio" = "yes"; then > CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_WEB_AUDIO=1" > else >@@ -88,6 +82,7 @@ fi > # this command now rather than use AC_CONFIG_COMMANDS because automake rules depend > # on the output file (WebKitFeatures.txt). > $srcdir/Tools/gtk/generate-feature-defines-files $CONFIGURABLE_FEATURE_DEFINES \ >+ ENABLE_ACCELERATED_2D_CANVAS=0 \ > ENABLE_BATTERY_STATUS=0 \ > ENABLE_BLOB=1 \ > ENABLE_CANVAS_PATH=0 \ >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 1f72da6d5595a0a71ce4540af1a8fdaa8a2d0484..aa3c57cef720718750631cf19b66b67f563c1e09 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,16 @@ >+2013-04-11 Commit Queue <rniwa@webkit.org> >+ >+ Unreviewed, rolling out r148247. >+ http://trac.webkit.org/changeset/148247 >+ https://bugs.webkit.org/show_bug.cgi?id=114490 >+ >+ Cairo dep fails to build on builders due to missing EGL >+ headers (Requested by zdobersek on #webkit). >+ >+ * Scripts/webkitdirs.pm: >+ (buildAutotoolsProject): >+ * gtk/jhbuild.modules: >+ > 2013-04-11 Martin Robinson <mrobinson@igalia.com> > > [GTK] Add accelerated 2D canvas support using cairo-gl >diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm >index af8eed62ca11ff83211153544b59e64883aaa85b..dba6dddccccc6b3982366652fc07ee7a85db9bf8 100755 >--- a/Tools/Scripts/webkitdirs.pm >+++ b/Tools/Scripts/webkitdirs.pm >@@ -2119,18 +2119,11 @@ sub buildAutotoolsProject($@) > "web-audio" => 1, > "xslt" => 1, > ); >- >- # These features are ones which build-webkit cannot control, typically because >- # they can only be active when we have the proper dependencies. >- my %unsetFeatures = ( >- "accelerated-2d-canvas" => 1, >- ); >- > my @overridableFeatures = (); > foreach (@features) { > if ($configurableFeatures{$_->{option}}) { > push @buildArgs, autotoolsFlag(${$_->{value}}, $_->{option});; >- } elsif (!$unsetFeatures{$_->{option}}) { >+ } else { > push @overridableFeatures, $_->{define} . "=" . (${$_->{value}} ? "1" : "0"); > } > } >diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules >index 48c87a3c01fdace4e0ce7fde47858cfde155c190..496e08814eb734341435d5175d75b6e5fc8d1caa 100644 >--- a/Tools/gtk/jhbuild.modules >+++ b/Tools/gtk/jhbuild.modules >@@ -61,8 +61,7 @@ > </branch> > </autotools> > >- <autotools id="cairo" autogen-sh="configure" >- autogenargs="--enable-gl=yes --enable-egl=yes --enable-glx=yes"> >+ <autotools id="cairo" autogen-sh="configure"> > <dependencies> > <dep package="fontconfig"/> > <dep package="pixman"/> >diff --git a/ChangeLog b/ChangeLog >index f751a6efdb24f03e31f0a32a938c7c5c26466cf8..cec54a78e1aa54f25e1397d739f4d0869b30685e 100644 >--- a/ChangeLog >+++ b/ChangeLog >@@ -1,3 +1,16 @@ >+2013-04-11 Commit Queue <rniwa@webkit.org> >+ >+ Unreviewed, rolling out r148247. >+ http://trac.webkit.org/changeset/148247 >+ https://bugs.webkit.org/show_bug.cgi?id=114490 >+ >+ Cairo dep fails to build on builders due to missing EGL >+ headers (Requested by zdobersek on #webkit). >+ >+ * Source/autotools/FindDependencies.m4: >+ * Source/autotools/PrintBuildConfiguration.m4: >+ * Source/autotools/SetupWebKitFeatures.m4: >+ > 2013-04-11 PaweÅ Forysiuk <tuxator@o2.pl> > > [GTK] Webkit fails to build with MinGW compiler after changeset 146468
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=197718">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 114490
: 197718