170275 2017-03-30 02:06:40 -0700 [WinCairo] ImageCairoWin.cpp: error C2660: 'WebCore::BitmapImage::draw': function does not take 6 arguments 2017-03-30 08:54:17 -0700 1 1 1 Unclassified WebKit Images WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 169771 1 fujii fujii commit-queue sabouhallawa oldest_to_newest 1292748 0 fujii 2017-03-30 02:06:40 -0700 WinCairo fails to build since Bug 169771 (r305537). > ImageCairoWin.cpp >Source\WebCore\platform\graphics\win\ImageCairoWin.cpp(84): error C2660: 'WebCore::BitmapImage::draw': function does not take 6 arguments >Source\WebCore\platform\graphics\win\ImageCairoWin.cpp(103): error C2660: 'WebCore::BitmapImage::draw': function does not take 6 arguments >Source\WebCore\platform\graphics\win\ImageCairoWin.cpp(111): error C2660: 'WebCore::BitmapImage::draw': function does not take 6 arguments 1292750 1 305849 fujii 2017-03-30 02:14:48 -0700 Created attachment 305849 Patch 1292751 2 305850 fujii 2017-03-30 02:24:21 -0700 Created attachment 305850 Patch 1292752 3 fujii 2017-03-30 02:25:15 -0700 (In reply to Fujii Hironori from comment #0) > WinCairo fails to build since Bug 169771 (r305537). Wrong rev number. https://trac.webkit.org/changeset/214450 1292795 4 305850 commit-queue 2017-03-30 08:54:13 -0700 Comment on attachment 305850 Patch Clearing flags on attachment: 305850 Committed r214606: <http://trac.webkit.org/changeset/214606> 1292796 5 commit-queue 2017-03-30 08:54:17 -0700 All reviewed patches have been landed. Closing bug. 305849 2017-03-30 02:14:48 -0700 2017-03-30 02:24:17 -0700 Patch bug-170275-20170330181447.patch text/plain 3420 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0NjAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRmNzM2YmIyNTAxNDc1 OGQ5ZTNlMGM2Y2QyMzJjZGIxYWY1ZThjOS4uOGZjODRlZTE2MjdjZmRjZWY3ZjZkMDhmZjA0NDM5 Y2RkYjM3MjdjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE3LTAzLTMwICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5DYWly b10gSW1hZ2VDYWlyb1dpbi5jcHA6IGVycm9yIEMyNjYwOiAnV2ViQ29yZTo6Qml0bWFwSW1hZ2U6 OmRyYXcnOiBmdW5jdGlvbiBkb2VzIG5vdCB0YWtlIDYgYXJndW1lbnRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzAyNzUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBcHBseSB0aGUgc2ltaWxhciBjaGFu Z2Ugb2YgSW1hZ2VDR1dpbi5jcHAgb2YgcjMwNTUzNyB0byBJbWFnZUNhaXJvV2luLmNwcC4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9JbWFnZUNhaXJvV2luLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkJpdG1hcEltYWdlOjpnZXRIQklUTUFQT2ZTaXplKTogUGFzcyBEZWNvZGlu Z01vZGU6OlN5bmNocm9ub3VzIHRvIEltYWdlOjpkcmF3KCkuCisgICAgICAgIChXZWJDb3JlOjpC aXRtYXBJbWFnZTo6ZHJhd0ZyYW1lTWF0Y2hpbmdTb3VyY2VTaXplKTogRGl0dG8uCisKIDIwMTct MDMtMjkgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRGlzY29u bmVjdGluZyBhIEhUTUxPYmplY3RFbGVtZW50IGRvZXMgbm90IGFsd2F5cyB1bmxvYWQgaXRzIGNv bnRlbnQgZG9jdW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbi9JbWFnZUNhaXJvV2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbi9JbWFnZUNhaXJvV2luLmNwcAppbmRleCBkYWI5NmEzOGM1NDgxMDJhYWUyN2FhMDE5 ZWViOTllNWE4YzQyMjI0Li4zMzAyYjU5NzlkNTk5MTdmOTFiN2JhNDdhYzQ0YzlhZTFjNjVkZmEy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vSW1hZ2VD YWlyb1dpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0lt YWdlQ2Fpcm9XaW4uY3BwCkBAIC04MSw3ICs4MSw3IEBAIGJvb2wgQml0bWFwSW1hZ2U6OmdldEhC SVRNQVBPZlNpemUoSEJJVE1BUCBibXAsIGNvbnN0IEludFNpemUqIHNpemUpCiAgICAgaWYgKHNp emUpCiAgICAgICAgIGRyYXdGcmFtZU1hdGNoaW5nU291cmNlU2l6ZShnYywgRmxvYXRSZWN0KDAu MGYsIDAuMGYsIGJtcEluZm8uYm1XaWR0aCwgYm1wSW5mby5ibUhlaWdodCksICpzaXplLCBDb21w b3NpdGVDb3B5KTsKICAgICBlbHNlCi0gICAgICAgIGRyYXcoZ2MsIEZsb2F0UmVjdCgwLjBmLCAw LjBmLCBibXBJbmZvLmJtV2lkdGgsIGJtcEluZm8uYm1IZWlnaHQpLCBGbG9hdFJlY3QoMC4wZiwg MC4wZiwgaW1hZ2VTaXplLndpZHRoKCksIGltYWdlU2l6ZS5oZWlnaHQoKSksIENvbXBvc2l0ZUNv cHksIEJsZW5kTW9kZU5vcm1hbCwgSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uKCkpOworICAg ICAgICBkcmF3KGdjLCBGbG9hdFJlY3QoMC4wZiwgMC4wZiwgYm1wSW5mby5ibVdpZHRoLCBibXBJ bmZvLmJtSGVpZ2h0KSwgRmxvYXRSZWN0KDAuMGYsIDAuMGYsIGltYWdlU2l6ZS53aWR0aCgpLCBp bWFnZVNpemUuaGVpZ2h0KCkpLCBDb21wb3NpdGVDb3B5LCBCbGVuZE1vZGVOb3JtYWwsIERlY29k aW5nTW9kZTo6U3luY2hyb25vdXMsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbigpKTsKIAog ICAgIC8vIERvIGNsZWFudXAKICAgICBjYWlyb19kZXN0cm95KHRhcmdldFJlZik7CkBAIC0xMDAs NyArMTAwLDcgQEAgdm9pZCBCaXRtYXBJbWFnZTo6ZHJhd0ZyYW1lTWF0Y2hpbmdTb3VyY2VTaXpl KEdyYXBoaWNzQ29udGV4dCYgY3R4dCwgY29uc3QgRmxvYXQKICAgICAgICAgaWYgKGNhaXJvX2lt YWdlX3N1cmZhY2VfZ2V0X2hlaWdodChzdXJmYWNlLmdldCgpKSA9PSBzdGF0aWNfY2FzdDxzaXpl X3Q+KHNyY1NpemUuaGVpZ2h0KCkpICYmIGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X3dpZHRoKHN1 cmZhY2UuZ2V0KCkpID09IHN0YXRpY19jYXN0PHNpemVfdD4oc3JjU2l6ZS53aWR0aCgpKSkgewog ICAgICAgICAgICAgc2l6ZV90IGN1cnJlbnRGcmFtZSA9IG1fY3VycmVudEZyYW1lOwogICAgICAg ICAgICAgbV9jdXJyZW50RnJhbWUgPSBpOwotICAgICAgICAgICAgZHJhdyhjdHh0LCBkc3RSZWN0 LCBGbG9hdFJlY3QoMC4wZiwgMC4wZiwgc3JjU2l6ZS53aWR0aCgpLCBzcmNTaXplLmhlaWdodCgp KSwgY29tcG9zaXRlT3AsIEJsZW5kTW9kZU5vcm1hbCwgSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0 aW9uKCkpOworICAgICAgICAgICAgZHJhdyhjdHh0LCBkc3RSZWN0LCBGbG9hdFJlY3QoMC4wZiwg MC4wZiwgc3JjU2l6ZS53aWR0aCgpLCBzcmNTaXplLmhlaWdodCgpKSwgY29tcG9zaXRlT3AsIEJs ZW5kTW9kZU5vcm1hbCwgRGVjb2RpbmdNb2RlOjpTeW5jaHJvbm91cywgSW1hZ2VPcmllbnRhdGlv bkRlc2NyaXB0aW9uKCkpOwogICAgICAgICAgICAgbV9jdXJyZW50RnJhbWUgPSBjdXJyZW50RnJh bWU7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTEwOCw3ICsxMDgsNyBAQCB2 b2lkIEJpdG1hcEltYWdlOjpkcmF3RnJhbWVNYXRjaGluZ1NvdXJjZVNpemUoR3JhcGhpY3NDb250 ZXh0JiBjdHh0LCBjb25zdCBGbG9hdAogCiAgICAgLy8gTm8gaW1hZ2Ugb2YgdGhlIGNvcnJlY3Qg c2l6ZSB3YXMgZm91bmQsIGZhbGxiYWNrIHRvIGRyYXdpbmcgdGhlIGN1cnJlbnQgZnJhbWUKICAg ICBGbG9hdFNpemUgaW1hZ2VTaXplID0gQml0bWFwSW1hZ2U6OnNpemUoKTsKLSAgICBkcmF3KGN0 eHQsIGRzdFJlY3QsIEZsb2F0UmVjdCgwLjBmLCAwLjBmLCBpbWFnZVNpemUud2lkdGgoKSwgaW1h Z2VTaXplLmhlaWdodCgpKSwgY29tcG9zaXRlT3AsIEJsZW5kTW9kZU5vcm1hbCwgSW1hZ2VPcmll bnRhdGlvbkRlc2NyaXB0aW9uKCkpOworICAgIGRyYXcoY3R4dCwgZHN0UmVjdCwgRmxvYXRSZWN0 KDAuMGYsIDAuMGYsIGltYWdlU2l6ZS53aWR0aCgpLCBpbWFnZVNpemUuaGVpZ2h0KCkpLCBjb21w b3NpdGVPcCwgQmxlbmRNb2RlTm9ybWFsLCBEZWNvZGluZ01vZGU6OlN5bmNocm9ub3VzLCBJbWFn ZU9yaWVudGF0aW9uRGVzY3JpcHRpb24oKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 305850 2017-03-30 02:24:21 -0700 2017-03-30 08:54:13 -0700 Patch bug-170275-20170330182420.patch text/plain 3420 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0NjAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRmNzM2YmIyNTAxNDc1 OGQ5ZTNlMGM2Y2QyMzJjZGIxYWY1ZThjOS4uMDYxOTliNjlhZmUzMTY0YzRmNGJjNmVjODEzYzZm ZmE1YTU2YTZiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE3LTAzLTMwICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5DYWly b10gSW1hZ2VDYWlyb1dpbi5jcHA6IGVycm9yIEMyNjYwOiAnV2ViQ29yZTo6Qml0bWFwSW1hZ2U6 OmRyYXcnOiBmdW5jdGlvbiBkb2VzIG5vdCB0YWtlIDYgYXJndW1lbnRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzAyNzUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBcHBseSB0aGUgc2ltaWxhciBjaGFu Z2Ugb2YgSW1hZ2VDR1dpbi5jcHAgb2YgcjIxNDQ1MCB0byBJbWFnZUNhaXJvV2luLmNwcC4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9JbWFnZUNhaXJvV2luLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkJpdG1hcEltYWdlOjpnZXRIQklUTUFQT2ZTaXplKTogUGFzcyBEZWNvZGlu Z01vZGU6OlN5bmNocm9ub3VzIHRvIEltYWdlOjpkcmF3KCkuCisgICAgICAgIChXZWJDb3JlOjpC aXRtYXBJbWFnZTo6ZHJhd0ZyYW1lTWF0Y2hpbmdTb3VyY2VTaXplKTogRGl0dG8uCisKIDIwMTct MDMtMjkgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRGlzY29u bmVjdGluZyBhIEhUTUxPYmplY3RFbGVtZW50IGRvZXMgbm90IGFsd2F5cyB1bmxvYWQgaXRzIGNv bnRlbnQgZG9jdW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbi9JbWFnZUNhaXJvV2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbi9JbWFnZUNhaXJvV2luLmNwcAppbmRleCBkYWI5NmEzOGM1NDgxMDJhYWUyN2FhMDE5 ZWViOTllNWE4YzQyMjI0Li4zMzAyYjU5NzlkNTk5MTdmOTFiN2JhNDdhYzQ0YzlhZTFjNjVkZmEy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vSW1hZ2VD YWlyb1dpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0lt YWdlQ2Fpcm9XaW4uY3BwCkBAIC04MSw3ICs4MSw3IEBAIGJvb2wgQml0bWFwSW1hZ2U6OmdldEhC SVRNQVBPZlNpemUoSEJJVE1BUCBibXAsIGNvbnN0IEludFNpemUqIHNpemUpCiAgICAgaWYgKHNp emUpCiAgICAgICAgIGRyYXdGcmFtZU1hdGNoaW5nU291cmNlU2l6ZShnYywgRmxvYXRSZWN0KDAu MGYsIDAuMGYsIGJtcEluZm8uYm1XaWR0aCwgYm1wSW5mby5ibUhlaWdodCksICpzaXplLCBDb21w b3NpdGVDb3B5KTsKICAgICBlbHNlCi0gICAgICAgIGRyYXcoZ2MsIEZsb2F0UmVjdCgwLjBmLCAw LjBmLCBibXBJbmZvLmJtV2lkdGgsIGJtcEluZm8uYm1IZWlnaHQpLCBGbG9hdFJlY3QoMC4wZiwg MC4wZiwgaW1hZ2VTaXplLndpZHRoKCksIGltYWdlU2l6ZS5oZWlnaHQoKSksIENvbXBvc2l0ZUNv cHksIEJsZW5kTW9kZU5vcm1hbCwgSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uKCkpOworICAg ICAgICBkcmF3KGdjLCBGbG9hdFJlY3QoMC4wZiwgMC4wZiwgYm1wSW5mby5ibVdpZHRoLCBibXBJ bmZvLmJtSGVpZ2h0KSwgRmxvYXRSZWN0KDAuMGYsIDAuMGYsIGltYWdlU2l6ZS53aWR0aCgpLCBp bWFnZVNpemUuaGVpZ2h0KCkpLCBDb21wb3NpdGVDb3B5LCBCbGVuZE1vZGVOb3JtYWwsIERlY29k aW5nTW9kZTo6U3luY2hyb25vdXMsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbigpKTsKIAog ICAgIC8vIERvIGNsZWFudXAKICAgICBjYWlyb19kZXN0cm95KHRhcmdldFJlZik7CkBAIC0xMDAs NyArMTAwLDcgQEAgdm9pZCBCaXRtYXBJbWFnZTo6ZHJhd0ZyYW1lTWF0Y2hpbmdTb3VyY2VTaXpl KEdyYXBoaWNzQ29udGV4dCYgY3R4dCwgY29uc3QgRmxvYXQKICAgICAgICAgaWYgKGNhaXJvX2lt YWdlX3N1cmZhY2VfZ2V0X2hlaWdodChzdXJmYWNlLmdldCgpKSA9PSBzdGF0aWNfY2FzdDxzaXpl X3Q+KHNyY1NpemUuaGVpZ2h0KCkpICYmIGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X3dpZHRoKHN1 cmZhY2UuZ2V0KCkpID09IHN0YXRpY19jYXN0PHNpemVfdD4oc3JjU2l6ZS53aWR0aCgpKSkgewog ICAgICAgICAgICAgc2l6ZV90IGN1cnJlbnRGcmFtZSA9IG1fY3VycmVudEZyYW1lOwogICAgICAg ICAgICAgbV9jdXJyZW50RnJhbWUgPSBpOwotICAgICAgICAgICAgZHJhdyhjdHh0LCBkc3RSZWN0 LCBGbG9hdFJlY3QoMC4wZiwgMC4wZiwgc3JjU2l6ZS53aWR0aCgpLCBzcmNTaXplLmhlaWdodCgp KSwgY29tcG9zaXRlT3AsIEJsZW5kTW9kZU5vcm1hbCwgSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0 aW9uKCkpOworICAgICAgICAgICAgZHJhdyhjdHh0LCBkc3RSZWN0LCBGbG9hdFJlY3QoMC4wZiwg MC4wZiwgc3JjU2l6ZS53aWR0aCgpLCBzcmNTaXplLmhlaWdodCgpKSwgY29tcG9zaXRlT3AsIEJs ZW5kTW9kZU5vcm1hbCwgRGVjb2RpbmdNb2RlOjpTeW5jaHJvbm91cywgSW1hZ2VPcmllbnRhdGlv bkRlc2NyaXB0aW9uKCkpOwogICAgICAgICAgICAgbV9jdXJyZW50RnJhbWUgPSBjdXJyZW50RnJh bWU7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTEwOCw3ICsxMDgsNyBAQCB2 b2lkIEJpdG1hcEltYWdlOjpkcmF3RnJhbWVNYXRjaGluZ1NvdXJjZVNpemUoR3JhcGhpY3NDb250 ZXh0JiBjdHh0LCBjb25zdCBGbG9hdAogCiAgICAgLy8gTm8gaW1hZ2Ugb2YgdGhlIGNvcnJlY3Qg c2l6ZSB3YXMgZm91bmQsIGZhbGxiYWNrIHRvIGRyYXdpbmcgdGhlIGN1cnJlbnQgZnJhbWUKICAg ICBGbG9hdFNpemUgaW1hZ2VTaXplID0gQml0bWFwSW1hZ2U6OnNpemUoKTsKLSAgICBkcmF3KGN0 eHQsIGRzdFJlY3QsIEZsb2F0UmVjdCgwLjBmLCAwLjBmLCBpbWFnZVNpemUud2lkdGgoKSwgaW1h Z2VTaXplLmhlaWdodCgpKSwgY29tcG9zaXRlT3AsIEJsZW5kTW9kZU5vcm1hbCwgSW1hZ2VPcmll bnRhdGlvbkRlc2NyaXB0aW9uKCkpOworICAgIGRyYXcoY3R4dCwgZHN0UmVjdCwgRmxvYXRSZWN0 KDAuMGYsIDAuMGYsIGltYWdlU2l6ZS53aWR0aCgpLCBpbWFnZVNpemUuaGVpZ2h0KCkpLCBjb21w b3NpdGVPcCwgQmxlbmRNb2RlTm9ybWFsLCBEZWNvZGluZ01vZGU6OlN5bmNocm9ub3VzLCBJbWFn ZU9yaWVudGF0aW9uRGVzY3JpcHRpb24oKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK