143758 2015-04-15 06:19:47 -0700 WebCore uses M_PI_2 instead of piOverTwoDouble 2015-05-18 23:40:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 133028 1 lrn1986 webkit-unassigned cgarcia darin lrn1986 mcrha oldest_to_newest 1085453 0 lrn1986 2015-04-15 06:19:47 -0700 This doesn't work well when M_PI_2 is undefined. 1085526 1 250803 lrn1986 2015-04-15 09:50:27 -0700 Created attachment 250803 Use piOverTwoDouble instead of M_PI_2 Because M_PI_2 is not defined everywhere. Fixes errors like: CXX Source/WebCore/platform/graphics/freetype/libPlatformGtk_la-FontPlatformDataFreeType.lo ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp: In function 'void WebCore::rotateCairoMatrixForVerticalOrientation(cairo_matrix_t*)': ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp:123:34: error: 'M_PI_2' was not declared in this scope cairo_matrix_rotate(matrix, -M_PI_2); ^ GNUmakefile:51663: recipe for target 'Source/WebCore/platform/graphics/freetype/libPlatformGtk_la-FontPlatformDataFreeType.lo' failed 1085576 2 darin 2015-04-15 10:35:59 -0700 All these patches you uploaded are wrong; they all have No new tests (OOPS!) in them. It was a big mistake to upload tons of patches all at once before you tried one or two and learned how to do them correctly. 1086469 3 mcrha 2015-04-17 16:10:18 -0700 I do not need this change with webkit-2.4 branch at revision 182543 1086470 4 mcrha 2015-04-17 16:13:27 -0700 (In reply to comment #3) > I do not need this change with webkit-2.4 branch at revision 182543 Oops, no, I was wrong, it's still in use here. I'm sorry for confusion. 1086477 5 mcrha 2015-04-17 16:40:31 -0700 I also patch the same file with this, to be able to build it in webkit-2.4 branch at revision 182543: --- webkitgtk-2.4.9.orig/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2015-04-08 16:19:51 +0000 +++ webkitgtk-2.4.9/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2015-04-08 17:11:16 +0000 @@ -32,6 +32,7 @@ #include <ft2build.h> #include FT_TRUETYPE_TABLES_H #include <wtf/text/WTFString.h> +#include <wtf/MathExtras.h> #if !PLATFORM(EFL) #include <gdk/gdk.h> 1087037 6 lrn1986 2015-04-21 04:12:08 -0700 (In reply to comment #5) > I also patch the same file with this, to be able to build it in webkit-2.4 > branch at revision 182543: > > --- > webkitgtk-2.4.9.orig/Source/WebCore/platform/graphics/freetype/ > FontPlatformDataFreeType.cpp 2015-04-08 16:19:51 +0000 > +++ > webkitgtk-2.4.9/Source/WebCore/platform/graphics/freetype/ > FontPlatformDataFreeType.cpp 2015-04-08 17:11:16 +0000 > @@ -32,6 +32,7 @@ > #include <ft2build.h> > #include FT_TRUETYPE_TABLES_H > #include <wtf/text/WTFString.h> > +#include <wtf/MathExtras.h> > > #if !PLATFORM(EFL) > #include <gdk/gdk.h> What error do you get when you compile without this change? Do you apply any other math-related patches (apart from attachment 250803 or its equivalent) that might need this include? 1087045 7 mcrha 2015-04-21 06:06:27 -0700 This is all what I apply on top of webkitgtk3 2.4.4, which is mostly applicable on top of webkit-2.4 branch too (some chunks fail due to being applied already in the branch): https://git.gnome.org/browse/evolution/tree/win32/patches/webkitgtk.patch 1087046 8 lrn1986 2015-04-21 06:26:01 -0700 (In reply to comment #7) > This is all what I apply on top of webkitgtk3 2.4.4, which is mostly > applicable on top of webkit-2.4 branch too (some chunks fail due to being > applied already in the branch): > > https://git.gnome.org/browse/evolution/tree/win32/patches/webkitgtk.patch I haven't asked "what patches are you applying". I've asked "what error do you get when this particular patch (from https://bugs.webkit.org/show_bug.cgi?id=143758#c5 ) is not applied"? This should help greatly in pushing these patches upstream. 1087048 9 lrn1986 2015-04-21 06:48:36 -0700 (In reply to comment #8) > (In reply to comment #7) > > This is all what I apply on top of webkitgtk3 2.4.4, which is mostly > > applicable on top of webkit-2.4 branch too (some chunks fail due to being > > applied already in the branch): > > > > https://git.gnome.org/browse/evolution/tree/win32/patches/webkitgtk.patch > > I haven't asked "what patches are you applying". > > I've asked "what error do you get when this particular patch (from > https://bugs.webkit.org/show_bug.cgi?id=143758#c5 ) is not applied"? > > This should help greatly in pushing these patches upstream. OK, sorry, that does answer the other half of my question. You don't seem to add any other math-related patches to FontPlatformDataFreeType, and changes to math headers are minimal. So there must be a codepath that is activated in your build but not in mine. Which brings us back to the first half of the question - what error are you getting? 1087880 10 mcrha 2015-04-23 10:41:09 -0700 (In reply to comment #6) > > +#include <wtf/MathExtras.h> > > What error do you get when you compile without this change? Hmm, it builds without it too. I do not know why I added it there, possibly because I prefer explicit includes, than implicit. 1087906 11 darin 2015-04-23 11:56:43 -0700 (In reply to comment #10) > (In reply to comment #6) > > > +#include <wtf/MathExtras.h> > > > > What error do you get when you compile without this change? > > Hmm, it builds without it too. I do not know why I added it there, possibly > because I prefer explicit includes, than implicit. OK. We’d like you to follow our project coding style guideline of not doing explicit includes. 1095853 12 cgarcia 2015-05-18 23:40:37 -0700 Committed to 2.4 http://trac.webkit.org/changeset/184550 250803 2015-04-15 09:50:27 -0700 2015-04-15 10:35:18 -0700 Use piOverTwoDouble instead of M_PI_2 Use-piOverTwoDouble-instead-of-MPI2.patch text/plain 3585 lrn1986 RnJvbSAzYmU2MGI3M2QxMDFhYjNlNDU0YmVmMmQ1ODA4ZGE0ZDA2MWFhMWFlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/PUQwPUEwPUQxPTgzPUQxPTgxPUQwPUJCPUQw PUIwPUQwPUJEPTIwPUQwPTk4PUQwPUI2PUQwPUIxPz0KID0/VVRGLTg/cT89RDE9ODM9RDA9QkI9 RDA9QjA9RDE9ODI9RDA9QkU9RDA9QjI/PSA8bHJuMTk4NkBnbWFpbC5jb20+CkRhdGU6IE1vbiwg MTMgQXByIDIwMTUgMDg6MzM6MjkgKzAwMDAKU3ViamVjdDogW1BBVENIXSBVc2UgcGlPdmVyVHdv RG91YmxlIGluc3RlYWQgb2YgTV9QSV8yCgpCZWNhdXNlIE1fUElfMiBpcyBub3QgZGVmaW5lZCBl dmVyeXdoZXJlLgpGaXhlcyBlcnJvcnMgbGlrZToKICBDWFggICAgICBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9saWJQbGF0Zm9ybUd0a19sYS1Gb250UGxhdGZvcm1E YXRhRnJlZVR5cGUubG8KLi4vd2Via2l0Z3RrLTIuNC44L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHA6IEluIGZ1bmN0 aW9uICd2b2lkIFdlYkNvcmU6OnJvdGF0ZUNhaXJvTWF0cml4Rm9yVmVydGljYWxPcmllbnRhdGlv bihjYWlyb19tYXRyaXhfdCopJzoKLi4vd2Via2l0Z3RrLTIuNC44L1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHA6MTIz OjM0OiBlcnJvcjogJ01fUElfMicgd2FzIG5vdCBkZWNsYXJlZCBpbiB0aGlzIHNjb3BlCiAgICAg Y2Fpcm9fbWF0cml4X3JvdGF0ZShtYXRyaXgsIC1NX1BJXzIpOwogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgXgpHTlVtYWtlZmlsZTo1MTY2MzogcmVjaXBlIGZvciB0YXJnZXQgJ1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL2xpYlBsYXRmb3JtR3RrX2xh LUZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5sbycgZmFpbGVkCgpodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNzU4Ci0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n ICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAyMyArKysrKysrKysrKysrKysrKysrKysrCiAu Li4vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcCB8ICAyICst CiAyIGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggNWJjYTdhZi4uNDkyNmYzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisy MDE1LTA0LTE1ICDQoNGD0YHQu9Cw0L0g0JjQttCx0YPQu9Cw0YLQvtCyICA8bHJuMTk4NkBnbWFp bC5jb20+CisKKyAgICAgICAgVXNlIHBpT3ZlclR3b0RvdWJsZSBpbnN0ZWFkIG9mIE1fUElfMgor CisgICAgICAgIEJlY2F1c2UgTV9QSV8yIGlzIG5vdCBkZWZpbmVkIGV2ZXJ5d2hlcmUuCisgICAg ICAgIEZpeGVzIGVycm9ycyBsaWtlOgorICAgICAgICAgIENYWCAgICAgIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL2xpYlBsYXRmb3JtR3RrX2xhLUZvbnRQbGF0Zm9y bURhdGFGcmVlVHlwZS5sbworICAgICAgICAuLi93ZWJraXRndGstMi40LjgvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNw cDogSW4gZnVuY3Rpb24gJ3ZvaWQgV2ViQ29yZTo6cm90YXRlQ2Fpcm9NYXRyaXhGb3JWZXJ0aWNh bE9yaWVudGF0aW9uKGNhaXJvX21hdHJpeF90KiknOgorICAgICAgICAuLi93ZWJraXRndGstMi40 LjgvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3Jt RGF0YUZyZWVUeXBlLmNwcDoxMjM6MzQ6IGVycm9yOiAnTV9QSV8yJyB3YXMgbm90IGRlY2xhcmVk IGluIHRoaXMgc2NvcGUKKyAgICAgICAgICAgICBjYWlyb19tYXRyaXhfcm90YXRlKG1hdHJpeCwg LU1fUElfMik7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBeCisg ICAgICAgIEdOVW1ha2VmaWxlOjUxNjYzOiByZWNpcGUgZm9yIHRhcmdldCAnU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvbGliUGxhdGZvcm1HdGtfbGEtRm9udFBsYXRm b3JtRGF0YUZyZWVUeXBlLmxvJyBmYWlsZWQKKworICAgICAgICBXZWJDb3JlIHVzZXMgTV9QSV8y IGluc3RlYWQgb2YgcGlPdmVyVHdvRG91YmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM3NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpyb3RhdGVDYWlyb01hdHJpeEZvclZlcnRpY2FsT3JpZW50YXRpb24p OgorCiAyMDE1LTA0LTA4ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNv bT4KIAogICAgICAgICBbR1RLXSBDcmFzaCBpbiBET01PYmplY3RDYWNoZSB3aGVuIGEgd3JhcHBl ZCBvYmplY3Qgb3duZWQgYnkgdGhlIGNhY2hlIGlzIHVucmVmZmVkIGJ5IHRoZSB1c2VyCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxh dGZvcm1EYXRhRnJlZVR5cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcAppbmRleCAwYjZjZGQxLi43YzRk ODUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlw ZS9Gb250UGxhdGZvcm1EYXRhRnJlZVR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHAKQEAgLTEy MCw3ICsxMjAsNyBAQCBzdGF0aWMgdm9pZCByb3RhdGVDYWlyb01hdHJpeEZvclZlcnRpY2FsT3Jp ZW50YXRpb24oY2Fpcm9fbWF0cml4X3QqIG1hdHJpeCkKICAgICAvLyBjb21iaW5hdGlvbiBvZiBy b3RhdGlvbiAoUikgYW5kIHRyYW5zbGF0aW9uIChUKSBhcHBsaWVkIG9uIHRoZQogICAgIC8vIGhv cml6b250YWwgbWF0cml4IChIKS4gViA9IEggLiBSIC4gVCwgd2hlcmUgUiByb3RhdGVzIGJ5IC05 MCBkZWdyZWVzCiAgICAgLy8gYW5kIFQgdHJhbnNsYXRlcyBieSBmb250IHNpemUgdG93YXJkcyB5 IGF4aXMuCi0gICAgY2Fpcm9fbWF0cml4X3JvdGF0ZShtYXRyaXgsIC1NX1BJXzIpOworICAgIGNh aXJvX21hdHJpeF9yb3RhdGUobWF0cml4LCAtcGlPdmVyVHdvRG91YmxlKTsKICAgICBjYWlyb19t YXRyaXhfdHJhbnNsYXRlKG1hdHJpeCwgMC4wLCAxLjApOwogfQogCi0tIAoxLjguNS4z