58434 2011-04-13 06:00:30 -0700 Gtk+ port fails to build when enabling WebGL 2011-04-13 09:23:45 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 thierry.reding webkit-unassigned mrobinson thierry.reding oldest_to_newest 384817 0 thierry.reding 2011-04-13 06:00:30 -0700 I'm getting the following error when building latest WebKit (r83714): CXX Source/WebCore/platform/graphics/opengl/libWebCore_la-GraphicsContext3DOpenGL.lo In file included from ../Source/JavaScriptCore/wtf/PassRefPtr.h:25:0, from ../Source/JavaScriptCore/wtf/CrossThreadRefCounted.h:35, from ../Source/JavaScriptCore/wtf/text/StringImpl.h:28, from ../Source/JavaScriptCore/wtf/text/WTFString.h:28, from ../Source/WebCore/platform/text/PlatformString.h:28, from ../Source/WebCore/platform/graphics/GraphicsContext3D.h:32, from ../Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:30: ../Source/JavaScriptCore/wtf/NullPtr.h:48:1: warning: identifier ‘nullptr’ will become a keyword in C++0x [-Wc++0x-compat] ../Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp: In member function ‘void WebCore::GraphicsContext3D::paintRenderingResultsToCanvas(WebCore::CanvasRenderingContext*)’: ../Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:143:95: error: no matching function for call to ‘WebCore::GraphicsContext3D::paintToCanvas(WTF::OwnArrayPtr<unsigned char>::PtrType, int&, int&, int, int, PlatformGraphicsContext*)’ ../Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:143:95: note: candidate is: ../Source/WebCore/platform/graphics/GraphicsContext3D.h:767:10: note: void WebCore::GraphicsContext3D::paintToCanvas(const unsigned char*, int, int, int, int, cairo_t*) ../Source/WebCore/platform/graphics/GraphicsContext3D.h:767:10: note: no known conversion for argument 6 from ‘PlatformGraphicsContext*’ to ‘cairo_t*’ The error seems to be caused by commit 82962, which wraps the cairo context within PlatformContextCairo. The attached patch fixes things. 384822 1 89368 thierry.reding 2011-04-13 06:13:18 -0700 Created attachment 89368 Fix Gtk+ port with WebGL enabled. 384937 2 mrobinson 2011-04-13 09:23:45 -0700 Committed r83745: <http://trac.webkit.org/changeset/83745> 89368 2011-04-13 06:13:18 -0700 2011-04-13 06:13:18 -0700 Fix Gtk+ port with WebGL enabled. webgl-gtk.patch text/plain 3585 thierry.reding ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29u dGV4dDNELmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRl eHQzRC5oCmluZGV4IDA4MWYzMTEuLjJhM2Y1YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaApAQCAtNjMsNyArNjMsNiBA QCBjbGFzcyBRUGFpbnRlcjsKIGNsYXNzIFFSZWN0OwogUVRfRU5EX05BTUVTUEFDRQogI2VsaWYg UExBVEZPUk0oR1RLKQotdHlwZWRlZiBzdHJ1Y3QgX2NhaXJvIGNhaXJvX3Q7CiB0eXBlZGVmIHVu c2lnbmVkIGludCBHTHVpbnQ7CiAjZW5kaWYKIApAQCAtODYsNiArODUsOSBAQCBjbGFzcyBDYW52 YXNSZW5kZXJpbmdDb250ZXh0OwogY2xhc3MgRHJhd2luZ0J1ZmZlcjsKIGNsYXNzIEV4dGVuc2lv bnMzRDsKICNpZiBQTEFURk9STShNQUMpIHx8IFBMQVRGT1JNKEdUSykKKyNpZiBQTEFURk9STShD QUlSTykKK2NsYXNzIFBsYXRmb3JtQ29udGV4dENhaXJvOworI2VuZGlmCiBjbGFzcyBFeHRlbnNp b25zM0RPcGVuR0w7CiAjZW5kaWYKIGNsYXNzIEhvc3RXaW5kb3c7CkBAIC03NjUsNyArNzY3LDcg QEAgcHVibGljOgogICAgICAgICAgICAgICAgICAgICAgICBpbnQgY2FudmFzV2lkdGgsIGludCBj YW52YXNIZWlnaHQsIENHQ29udGV4dFJlZiBjb250ZXh0KTsKICNlbGlmIFBMQVRGT1JNKEdUSykK ICAgICB2b2lkIHBhaW50VG9DYW52YXMoY29uc3QgdW5zaWduZWQgY2hhciogaW1hZ2VQaXhlbHMs IGludCBpbWFnZVdpZHRoLCBpbnQgaW1hZ2VIZWlnaHQsCi0gICAgICAgICAgICAgICAgICAgICAg IGludCBjYW52YXNXaWR0aCwgaW50IGNhbnZhc0hlaWdodCwgY2Fpcm9fdCogY29udGV4dCk7Cisg ICAgICAgICAgICAgICAgICAgICAgIGludCBjYW52YXNXaWR0aCwgaW50IGNhbnZhc0hlaWdodCwg UGxhdGZvcm1Db250ZXh0Q2Fpcm8qIGNvbnRleHQpOwogI2VuZGlmCiAKICAgICB2b2lkIG1hcmtD b250ZXh0Q2hhbmdlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0M0RDYWlyby5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHQzRENhaXJvLmNwcAppbmRleCBm ZDYwOTBiLi5jOTBkOGFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYWlyby9HcmFwaGljc0NvbnRleHQzRENhaXJvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHQzRENhaXJvLmNwcApAQCAt MjcsNiArMjcsNyBAQAogCiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiR3JhcGhpY3ND b250ZXh0M0QuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybUNvbnRleHRDYWlyby5oIgogCiAjaWYgRU5B QkxFKFdFQkdMKQogCkBAIC04MywzMCArODQsMzEgQEAgYm9vbCBHcmFwaGljc0NvbnRleHQzRDo6 Z2V0SW1hZ2VEYXRhKEltYWdlKiBpbWFnZSwgdW5zaWduZWQgaW50IGZvcm1hdCwgdW5zaWduZWQK ICAgICAgICAgICAgICAgICAgICAgICB3aWR0aCwgaGVpZ2h0LCBzcmNVbnBhY2tBbGlnbm1lbnQs IGZvcm1hdCwgdHlwZSwgYWxwaGFPcCwgb3V0cHV0VmVjdG9yLmRhdGEoKSk7CiB9CiAKLXZvaWQg R3JhcGhpY3NDb250ZXh0M0Q6OnBhaW50VG9DYW52YXMoY29uc3QgdW5zaWduZWQgY2hhciogaW1h Z2VQaXhlbHMsIGludCBpbWFnZVdpZHRoLCBpbnQgaW1hZ2VIZWlnaHQsIGludCBjYW52YXNXaWR0 aCwgaW50IGNhbnZhc0hlaWdodCwgY2Fpcm9fdCogY29udGV4dCkKK3ZvaWQgR3JhcGhpY3NDb250 ZXh0M0Q6OnBhaW50VG9DYW52YXMoY29uc3QgdW5zaWduZWQgY2hhciogaW1hZ2VQaXhlbHMsIGlu dCBpbWFnZVdpZHRoLCBpbnQgaW1hZ2VIZWlnaHQsIGludCBjYW52YXNXaWR0aCwgaW50IGNhbnZh c0hlaWdodCwgUGxhdGZvcm1Db250ZXh0Q2Fpcm8qIGNvbnRleHQpCiB7CiAgICAgaWYgKCFpbWFn ZVBpeGVscyB8fCBpbWFnZVdpZHRoIDw9IDAgfHwgaW1hZ2VIZWlnaHQgPD0gMCB8fCBjYW52YXNX aWR0aCA8PSAwIHx8IGNhbnZhc0hlaWdodCA8PSAwIHx8ICFjb250ZXh0KQogICAgICAgICByZXR1 cm47CiAKLSAgICBjYWlyb19zYXZlKGNvbnRleHQpOworICAgIGNhaXJvX3QgKmNyID0gY29udGV4 dC0+Y3IoKTsKKyAgICBjb250ZXh0LT5zYXZlKCk7CiAKLSAgICBjYWlyb19yZWN0YW5nbGUoY29u dGV4dCwgMCwgMCwgY2FudmFzV2lkdGgsIGNhbnZhc0hlaWdodCk7Ci0gICAgY2Fpcm9fc2V0X29w ZXJhdG9yKGNvbnRleHQsIENBSVJPX09QRVJBVE9SX0NMRUFSKTsKLSAgICBjYWlyb19wYWludChj b250ZXh0KTsKKyAgICBjYWlyb19yZWN0YW5nbGUoY3IsIDAsIDAsIGNhbnZhc1dpZHRoLCBjYW52 YXNIZWlnaHQpOworICAgIGNhaXJvX3NldF9vcGVyYXRvcihjciwgQ0FJUk9fT1BFUkFUT1JfQ0xF QVIpOworICAgIGNhaXJvX3BhaW50KGNyKTsKIAogICAgIFJlZlB0cjxjYWlyb19zdXJmYWNlX3Q+ IGltYWdlU3VyZmFjZSA9IGFkb3B0UmVmKGNhaXJvX2ltYWdlX3N1cmZhY2VfY3JlYXRlX2Zvcl9k YXRhKAogICAgICAgICBjb25zdF9jYXN0PHVuc2lnbmVkIGNoYXIqPihpbWFnZVBpeGVscyksIENB SVJPX0ZPUk1BVF9BUkdCMzIsIGltYWdlV2lkdGgsIGltYWdlSGVpZ2h0LCBpbWFnZVdpZHRoICog NCkpOwogCiAgICAgLy8gT3BlbkdMIGtlZXBzIHRoZSBwaXhlbHMgc3RvcmVkIGJvdHRvbSB1cCwg c28gd2UgbmVlZCB0byBmbGlwIHRoZSBpbWFnZSBoZXJlLgotICAgIGNhaXJvX3RyYW5zbGF0ZShj b250ZXh0LCAwLCBpbWFnZUhlaWdodCk7Ci0gICAgY2Fpcm9fc2NhbGUoY29udGV4dCwgMSwgLTEp OworICAgIGNhaXJvX3RyYW5zbGF0ZShjciwgMCwgaW1hZ2VIZWlnaHQpOworICAgIGNhaXJvX3Nj YWxlKGNyLCAxLCAtMSk7CiAKLSAgICBjYWlyb19zZXRfb3BlcmF0b3IoY29udGV4dCwgQ0FJUk9f T1BFUkFUT1JfT1ZFUik7Ci0gICAgY2Fpcm9fc2V0X3NvdXJjZV9zdXJmYWNlKGNvbnRleHQsIGlt YWdlU3VyZmFjZS5nZXQoKSwgMCwgMCk7Ci0gICAgY2Fpcm9fcmVjdGFuZ2xlKGNvbnRleHQsIDAs IDAsIGNhbnZhc1dpZHRoLCAtY2FudmFzSGVpZ2h0KTsKKyAgICBjYWlyb19zZXRfb3BlcmF0b3Io Y3IsIENBSVJPX09QRVJBVE9SX09WRVIpOworICAgIGNhaXJvX3NldF9zb3VyY2Vfc3VyZmFjZShj ciwgaW1hZ2VTdXJmYWNlLmdldCgpLCAwLCAwKTsKKyAgICBjYWlyb19yZWN0YW5nbGUoY3IsIDAs IDAsIGNhbnZhc1dpZHRoLCAtY2FudmFzSGVpZ2h0KTsKIAotICAgIGNhaXJvX2ZpbGwoY29udGV4 dCk7Ci0gICAgY2Fpcm9fcmVzdG9yZShjb250ZXh0KTsKKyAgICBjYWlyb19maWxsKGNyKTsKKyAg ICBjb250ZXh0LT5yZXN0b3JlKCk7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0M0Q6OnNldENv bnRleHRMb3N0Q2FsbGJhY2soUGFzc093blB0cjxDb250ZXh0TG9zdENhbGxiYWNrPikK