103125 2012-11-23 04:23:46 -0800 tst_qwebpage fails after QMimeDatabase patch 2012-11-23 06:06:23 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 allan.jensen allan.jensen hausmann webkit.review.bot oldest_to_newest 774422 0 allan.jensen 2012-11-23 04:23:46 -0800 The API test tst_qwebpage relies on a static translation of extensions to mimetypes and fails after QtWebKit has been updated to use the QMimeDatabase, because one of the types has a different translation in QMimeDatabase. 774426 1 175777 allan.jensen 2012-11-23 04:29:05 -0800 Created attachment 175777 Patch 774430 2 webkit.review.bot 2012-11-23 04:33:31 -0800 Attachment 175777 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/ChangeLog', u'Source/WebK..." exit_code: 1 Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2992: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 774472 3 175777 hausmann 2012-11-23 05:20:50 -0800 Comment on attachment 175777 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175777&action=review >> Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2992 >> + contentTypes << "application/x-mimearchive"; > > Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] This is indeed a three character indent instead of four. Please fix before landing :) 774495 4 allan.jensen 2012-11-23 06:06:23 -0800 Committed r135602: <http://trac.webkit.org/changeset/135602> 175777 2012-11-23 04:29:05 -0800 2012-11-23 05:20:50 -0800 Patch bug-103125-20121123132622.patch text/plain 3555 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGJhNWI4N2RkZDYx NDAzMWMyZWI1ZWJkYzRhNWNhMjEzNmRkMTRlNjQuLjQ0NzY2MmNhMTdkMzk4MmZiOGFjMmQ3NGZj OWVmMGZmZTk5ZWJiMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMTEt MjMgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBkaWdpYS5jb20+CisKKyAg ICAgICAgdHN0X3F3ZWJwYWdlIGZhaWxzIGFmdGVyIFFNaW1lRGF0YWJhc2UgcGF0Y2gKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzEyNQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcGxhY2UgdGhlIHN0 YXRpYyBleHRlbnNpb24tPm1pbWV0eXBlIHRhYmxlIHdpdGggYSBRTWltZURhdGFiYXNlIGxvb2t1 cAorCisgICAgICAgICogdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcDoKKyAgICAgICAg KHRzdF9RV2ViUGFnZTo6ZmluZFRleHQpOgorICAgICAgICAodHN0X1FXZWJQYWdlOjpzdXBwb3J0 ZWRDb250ZW50VHlwZSk6CisKIDIwMTItMTEtMjMgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1 c21hbm5AZGlnaWEuY29tPgogCiAgICAgICAgIFtRdF0gQ29tcGlsaW5nIGFnYWluc3QgUXRXZWJr aXQgQVBJIHJlcXVpcmVzIFFUX0RMTCB0byBiZSBkZWZpbmVkCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKaW5kZXggNzZiY2YyNjNkMTY2OTcz MDc5ZTM5N2E4MzhjYmNkNjlmYWM3ODZhNi4uNDUyYWNhODYwN2YwYmE4ZjM2MTcyMzlkNDVhNDdl ZTU0ZWZmMzNhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90 c3RfcXdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0 X3F3ZWJwYWdlLmNwcApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUgPFFMaW5lRWRpdD4KICNp bmNsdWRlIDxRTWFpbldpbmRvdz4KICNpbmNsdWRlIDxRTWVudT4KKyNpbmNsdWRlIDxRTWltZURh dGFiYXNlPgogI2luY2x1ZGUgPFFQdXNoQnV0dG9uPgogI2luY2x1ZGUgPFFTdGF0ZU1hY2hpbmU+ CiAjaW5jbHVkZSA8UVN0eWxlPgpAQCAtMjk2OSw1MSArMjk3MCwxMSBAQCB2b2lkIHRzdF9RV2Vi UGFnZTo6ZmluZFRleHQoKQogICAgIH0KIH0KIAotc3RydWN0IEltYWdlRXh0ZW5zaW9uTWFwIHsK LSAgICBjb25zdCBjaGFyKiBleHRlbnNpb247Ci0gICAgY29uc3QgY2hhciogbWltZVR5cGU7Ci19 OwotCi1zdGF0aWMgY29uc3QgSW1hZ2VFeHRlbnNpb25NYXAgZXh0ZW5zaW9uTWFwW10gPSB7Ci0g ICAgeyAiYm1wIiwgImltYWdlL2JtcCIgfSwKLSAgICB7ICJjc3MiLCAidGV4dC9jc3MiIH0sCi0g ICAgeyAiZ2lmIiwgImltYWdlL2dpZiIgfSwKLSAgICB7ICJodG1sIiwgInRleHQvaHRtbCIgfSwK LSAgICB7ICJodG0iLCAidGV4dC9odG1sIiB9LAotICAgIHsgImljbyIsICJpbWFnZS94LWljb24i IH0sCi0gICAgeyAianBlZyIsICJpbWFnZS9qcGVnIiB9LAotICAgIHsgImpwZyIsICJpbWFnZS9q cGVnIiB9LAotICAgIHsgImpzIiwgImFwcGxpY2F0aW9uL3gtamF2YXNjcmlwdCIgfSwKLSAgICB7 ICJtbmciLCAidmlkZW8veC1tbmciIH0sCi0gICAgeyAicGJtIiwgImltYWdlL3gtcG9ydGFibGUt Yml0bWFwIiB9LAotICAgIHsgInBnbSIsICJpbWFnZS94LXBvcnRhYmxlLWdyYXltYXAiIH0sCi0g ICAgeyAicGRmIiwgImFwcGxpY2F0aW9uL3BkZiIgfSwKLSAgICB7ICJwbmciLCAiaW1hZ2UvcG5n IiB9LAotICAgIHsgInBwbSIsICJpbWFnZS94LXBvcnRhYmxlLXBpeG1hcCIgfSwKLSAgICB7ICJy c3MiLCAiYXBwbGljYXRpb24vcnNzK3htbCIgfSwKLSAgICB7ICJzdmciLCAiaW1hZ2Uvc3ZnK3ht bCIgfSwKLSAgICB7ICJ0ZXh0IiwgInRleHQvcGxhaW4iIH0sCi0gICAgeyAidGlmIiwgImltYWdl L3RpZmYiIH0sCi0gICAgeyAidGlmZiIsICJpbWFnZS90aWZmIiB9LAotICAgIHsgInR4dCIsICJ0 ZXh0L3BsYWluIiB9LAotICAgIHsgInhibSIsICJpbWFnZS94LXhiaXRtYXAiIH0sCi0gICAgeyAi eG1sIiwgInRleHQveG1sIiB9LAotICAgIHsgInhwbSIsICJpbWFnZS94LXhwbSIgfSwKLSAgICB7 ICJ4c2wiLCAidGV4dC94c2wiIH0sCi0gICAgeyAieGh0bWwiLCAiYXBwbGljYXRpb24veGh0bWwr eG1sIiB9LAotICAgIHsgIndtbCIsICJ0ZXh0L3ZuZC53YXAud21sIiB9LAotICAgIHsgIndtbGMi LCAiYXBwbGljYXRpb24vdm5kLndhcC53bWxjIiB9LAotICAgIHsgMCwgMCB9Ci19OwotCiBzdGF0 aWMgUVN0cmluZyBnZXRNaW1lVHlwZUZvckV4dGVuc2lvbihjb25zdCBRU3RyaW5nICZleHQpCiB7 Ci0gICAgY29uc3QgSW1hZ2VFeHRlbnNpb25NYXAgKmUgPSBleHRlbnNpb25NYXA7Ci0gICAgd2hp bGUgKGUtPmV4dGVuc2lvbikgewotICAgICAgICBpZiAoZXh0LmNvbXBhcmUoUUxhdGluMVN0cmlu ZyhlLT5leHRlbnNpb24pLCBRdDo6Q2FzZUluc2Vuc2l0aXZlKSA9PSAwKQotICAgICAgICAgICAg cmV0dXJuIFFMYXRpbjFTdHJpbmcoZS0+bWltZVR5cGUpOwotICAgICAgICArK2U7Ci0gICAgfQor ICAgIFFNaW1lVHlwZSBtaW1lVHlwZSA9IFFNaW1lRGF0YWJhc2UoKS5taW1lVHlwZUZvckZpbGUo UVN0cmluZ0xpdGVyYWwoImZpbGVuYW1lLiIpICsgZXh0LCBRTWltZURhdGFiYXNlOjpNYXRjaEV4 dGVuc2lvbik7CisgICAgaWYgKG1pbWVUeXBlLmlzVmFsaWQoKSAmJiAhbWltZVR5cGUuaXNEZWZh dWx0KCkpCisgICAgICAgIHJldHVybiBtaW1lVHlwZS5uYW1lKCk7CiAKICAgICByZXR1cm4gUVN0 cmluZygpOwogfQpAQCAtMzAyNyw2ICsyOTg4LDEwIEBAIHZvaWQgdHN0X1FXZWJQYWdlOjpzdXBw b3J0ZWRDb250ZW50VHlwZSgpCiAgICAgICAgICAgICAgICAgPDwgImFwcGxpY2F0aW9uL3htbCIg PDwgImFwcGxpY2F0aW9uL3hodG1sK3htbCIgPDwgImFwcGxpY2F0aW9uL3ZuZC53YXAueGh0bWwr eG1sIgogICAgICAgICAgICAgICAgIDw8ICJhcHBsaWNhdGlvbi9yc3MreG1sIiA8PCAiYXBwbGlj YXRpb24vYXRvbSt4bWwiIDw8ICJhcHBsaWNhdGlvbi9qc29uIjsKIAorI2lmIEVOQUJMRV9NSFRN TAorICAgY29udGVudFR5cGVzIDw8ICJhcHBsaWNhdGlvbi94LW1pbWVhcmNoaXZlIjsKKyNlbmRp ZgorCiAgICAvLyBBZGQgc3VwcG9ydGVkIGltYWdlIHR5cGVzLi4uCiAgICBRX0ZPUkVBQ0goY29u c3QgUUJ5dGVBcnJheSYgaW1hZ2VUeXBlLCBRSW1hZ2VXcml0ZXI6OnN1cHBvcnRlZEltYWdlRm9y bWF0cygpKSB7CiAgICAgICBjb25zdCBRU3RyaW5nIG1pbWVUeXBlID0gZ2V0TWltZVR5cGVGb3JF eHRlbnNpb24oaW1hZ2VUeXBlKTsK