Bug 46955 – [Chromium] build fails unless ACCELERATED_2D_CANVAS defined

• Component: Platform
• Status: RESOLVED FIXED

[Hajime Morrita]

found at buildbot.

out/Release/obj.target/third_party/WebKit/WebKit/chromium/libwebkit.a(WebViewImpl.o): In function `WTF::RefCounted<WebCore::SharedGraphicsContext3D>::deref()':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/JavaScriptCore/wtf/RefCounted.h:139: undefined reference to `WebCore::SharedGraphicsContext3D::~SharedGraphicsContext3D()'
out/Release/obj.target/third_party/WebKit/WebKit/chromium/libwebkit.a(WebViewImpl.o): In function `WebKit::WebViewImpl::getSharedGraphicsContext3D()':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebKit/chromium/src/WebViewImpl.cpp:2433: undefined reference to `WebCore::SharedGraphicsContext3D::create(WTF::PassOwnPtr<WebCore::GraphicsContext3D>)'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(ImageSkia.o): In function `WebCore::drawBitmapGLES2(WebCore::GraphicsContext*, WebCore::NativeImageSkia*, WebCore::FloatRect const&, WebCore::FloatRect const&, WebCore::ColorSpace, WebCore::CompositeOperator)':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/ImageSkia.cpp:424: undefined reference to `WebCore::Texture::load(void*)'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(NativeImageSkia.o): In function `~NativeImageSkia':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/NativeImageSkia.cpp:59: undefined reference to `WebCore::SharedGraphicsContext3D::removeTexturesFor(WebCore::NativeImageSkia*)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/NativeImageSkia.cpp:59: undefined reference to `WebCore::SharedGraphicsContext3D::removeTexturesFor(WebCore::NativeImageSkia*)'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(PlatformContextSkia.o): In function `WebCore::PlatformContextSkia::readbackHardwareToSoftware() const':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp:841: undefined reference to `WebCore::SharedGraphicsContext3D::supportsBGRA()'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp:842: undefined reference to `WebCore::SharedGraphicsContext3D::readPixels(long, long, unsigned long, unsigned long, unsigned long, unsigned long, void*)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp:844: undefined reference to `WebCore::SharedGraphicsContext3D::readPixels(long, long, unsigned long, unsigned long, unsigned long, unsigned long, void*)'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(PlatformContextSkia.o): In function `WTF::RefCounted<WebCore::Texture>::deref()':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/JavaScriptCore/wtf/RefCounted.h:139: undefined reference to `WebCore::Texture::~Texture()'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(PlatformContextSkia.o): In function `WebCore::PlatformContextSkia::uploadSoftwareToHardware(WebCore::CompositeOperator) const':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp:815: undefined reference to `WebCore::SharedGraphicsContext3D::createTexture(WebCore::Texture::Format, int, int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp:817: undefined reference to `WebCore::Texture::updateSubRect(void*, WebCore::IntRect)'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(DrawingBufferChromium.o): In function `WebCore::DrawingBuffer::reset(WebCore::IntSize const&)':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:113: undefined reference to `WebCore::SharedGraphicsContext3D::bindTexture(unsigned int, unsigned int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:114: undefined reference to `WebCore::SharedGraphicsContext3D::texImage2D(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, void*)'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(DrawingBufferChromium.o): In function `~DrawingBuffer':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:85: undefined reference to `WebCore::SharedGraphicsContext3D::bindFramebuffer(unsigned int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:86: undefined reference to `WebCore::SharedGraphicsContext3D::deleteTexture(unsigned int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:87: undefined reference to `WebCore::SharedGraphicsContext3D::deleteFramebuffer(unsigned int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:85: undefined reference to `WebCore::SharedGraphicsContext3D::bindFramebuffer(unsigned int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:86: undefined reference to `WebCore::SharedGraphicsContext3D::deleteTexture(unsigned int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:87: undefined reference to `WebCore::SharedGraphicsContext3D::deleteFramebuffer(unsigned int)'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(DrawingBufferChromium.o): In function `WebCore::generateColorTexture(WebCore::SharedGraphicsContext3D*, WebCore::IntSize const&)':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:53: undefined reference to `WebCore::SharedGraphicsContext3D::createTexture()'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:57: undefined reference to `WebCore::SharedGraphicsContext3D::bindTexture(unsigned int, unsigned int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:58: undefined reference to `WebCore::SharedGraphicsContext3D::texParameteri(unsigned int, unsigned int, int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:59: undefined reference to `WebCore::SharedGraphicsContext3D::texParameteri(unsigned int, unsigned int, int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:60: undefined reference to `WebCore::SharedGraphicsContext3D::texParameteri(unsigned int, unsigned int, int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:61: undefined reference to `WebCore::SharedGraphicsContext3D::texParameteri(unsigned int, unsigned int, int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:62: undefined reference to `WebCore::SharedGraphicsContext3D::texImage2D(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, void*)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:63: undefined reference to `WebCore::SharedGraphicsContext3D::framebufferTexture2D(unsigned long, unsigned long, unsigned long, unsigned int, long)'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(DrawingBufferChromium.o): In function `DrawingBuffer':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:75: undefined reference to `WebCore::SharedGraphicsContext3D::bindFramebuffer(unsigned int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:75: undefined reference to `WebCore::SharedGraphicsContext3D::bindFramebuffer(unsigned int)'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::getTexture(WebCore::NativeImageSkia*)':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:251: undefined reference to `WebCore::SharedGraphicsContext3D::getTexture(WebCore::NativeImageSkia*)'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::createTexture(WebCore::NativeImageSkia*, WebCore::Texture::Format, int, int)':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:246: undefined reference to `WebCore::SharedGraphicsContext3D::createTexture(WebCore::NativeImageSkia*, WebCore::Texture::Format, int, int)'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::bindFramebuffer()':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:85: undefined reference to `WebCore::DrawingBuffer::bind()'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::drawQuad(WebCore::IntSize const&, WebCore::FloatRect const&, WebCore::FloatRect const&, WebCore::AffineTransform const&, float)':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:234: undefined reference to `WebCore::SharedGraphicsContext3D::useTextureProgram(WebCore::AffineTransform const&, WebCore::AffineTransform const&, float)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:235: undefined reference to `WebCore::SharedGraphicsContext3D::drawArrays(unsigned long, long, long)'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::drawTexturedRectTile(WebCore::Texture*, int, WebCore::FloatRect const&, WebCore::FloatRect const&, WebCore::AffineTransform const&, float)':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:209: undefined reference to `WebCore::Texture::bindTile(int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:213: undefined reference to `WebCore::TilingData::intersectDrawQuad(WebCore::FloatRect const&, WebCore::FloatRect const&, int, WebCore::FloatRect*, WebCore::FloatRect*) const'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:215: undefined reference to `WebCore::TilingData::tileBoundsWithBorder(int) const'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::drawTexturedRect(WebCore::Texture*, WebCore::FloatRect const&, WebCore::FloatRect const&, WebCore::AffineTransform const&, float, WebCore::ColorSpace, WebCore::CompositeOperator)':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:189: undefined reference to `WebCore::SharedGraphicsContext3D::applyCompositeOperator(WebCore::CompositeOperator)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:191: undefined reference to `WebCore::TilingData::overlappedTileIndices(WebCore::FloatRect const&) const'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:193: undefined reference to `WebCore::SharedGraphicsContext3D::useQuadVertices()'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:194: undefined reference to `WebCore::SharedGraphicsContext3D::setActiveTexture(unsigned int)'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::drawTexturedRect(unsigned int, WebCore::IntSize const&, WebCore::FloatRect const&, WebCore::FloatRect const&, WebCore::ColorSpace, WebCore::CompositeOperator)':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:171: undefined reference to `WebCore::SharedGraphicsContext3D::applyCompositeOperator(WebCore::CompositeOperator)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:173: undefined reference to `WebCore::SharedGraphicsContext3D::useQuadVertices()'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:174: undefined reference to `WebCore::SharedGraphicsContext3D::setActiveTexture(unsigned int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:176: undefined reference to `WebCore::SharedGraphicsContext3D::bindTexture(unsigned int, unsigned int)'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::fillRect(WebCore::FloatRect const&, WebCore::Color const&, WebCore::ColorSpace)':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:107: undefined reference to `WebCore::SharedGraphicsContext3D::applyCompositeOperator(WebCore::CompositeOperator)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:108: undefined reference to `WebCore::SharedGraphicsContext3D::useQuadVertices()'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:115: undefined reference to `WebCore::SharedGraphicsContext3D::useFillSolidProgram(WebCore::AffineTransform const&, WebCore::Color const&)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:118: undefined reference to `WebCore::SharedGraphicsContext3D::drawArrays(unsigned long, long, long)'
out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::clearRect(WebCore::FloatRect const&)':
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:92: undefined reference to `WebCore::SharedGraphicsContext3D::scissor(WebCore::FloatRect const&)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:93: undefined reference to `WebCore::SharedGraphicsContext3D::enable(unsigned int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:94: undefined reference to `WebCore::SharedGraphicsContext3D::clearColor(WebCore::Color const&)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:95: undefined reference to `WebCore::SharedGraphicsContext3D::clear(unsigned int)'
/b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:96: undefined reference to `WebCore::SharedGraphicsContext3D::disable(unsigned int)'

[Hajime Morrita]

Created attachment 69421 [details]
Patch

[James Robinson]

Comment on attachment 69421 [details]
Patch

Thanks for cleaning this up.  Needs a few things, though:

ENABLE(ACCELERATED_2D_CANVAS), not ENABLE(ENABLE_ACCELERATED_2D_CANVAS).
The ASSERT()s and NOT_REACHED() are unnecessary, those functions should just be no-ops if the ENABLE() isn't set.

[Hajime Morrita]

Created attachment 69422 [details]
Patch

[Hajime Morrita]

Hi James, thank you for reviewing!
I updated the patch:

> ENABLE(ACCELERATED_2D_CANVAS), not ENABLE(ENABLE_ACCELERATED_2D_CANVAS).
Done.

> The ASSERT()s and NOT_REACHED() are unnecessary, those functions should just be no-ops if the ENABLE() isn't set.
Remove assert()-s.

[James Robinson]

Comment on attachment 69422 [details]
Patch

R=me. thanks

[Hajime Morrita]

Committed r68865: <http://trac.webkit.org/changeset/68865>