87851 2012-05-30 07:09:34 -0700 [Qt] ImageDecoderQt doesn't support some decoders 2012-05-30 23:39:13 -0700 1 1 1 Unclassified WebKit Images 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 87849 1 allan.jensen allan.jensen webkit.review.bot oldest_to_newest 637184 0 allan.jensen 2012-05-30 07:09:34 -0700 The new ImageDecoderQt doesn't support decoders that return images with 8bit colors, or decoders that always replace the input buffer like the GIF-decoder does. While the GIF-decoder is no longer necessary, there might be similar plugins elsewhere. 637187 1 144806 allan.jensen 2012-05-30 07:14:30 -0700 Created attachment 144806 Patch 637224 2 144816 allan.jensen 2012-05-30 07:59:22 -0700 Created attachment 144816 Patch 637225 3 144816 allan.jensen 2012-05-30 08:00:06 -0700 Comment on attachment 144816 Patch Wrong bug 637232 4 144806 kenneth 2012-05-30 08:02:54 -0700 Comment on attachment 144806 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144806&action=review > Source/WebCore/ChangeLog:4 > > + [Qt] ImageDecoderQt doesn't support some decoders. > + https://bugs.webkit.org/show_bug.cgi?id=87851 More info about which? > Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp:161 > + // We don't need the tables set by prepareScaleDataIfNecessary, but their dimensions > + // are used by ImageDecoder::scaledSize(). Can we split those lines more equally // We don't need the tables set by prepareScaleDataIfNecessary, but // their dimensions are used by ImageDecoder::scaledSize(). 637242 5 144806 webkit-ews 2012-05-30 08:10:22 -0700 Comment on attachment 144806 Patch Attachment 144806 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/12859019 637256 6 144806 webkit-ews 2012-05-30 08:23:25 -0700 Comment on attachment 144806 Patch Attachment 144806 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12848893 637264 7 144826 allan.jensen 2012-05-30 08:32:59 -0700 Created attachment 144826 Patch 637666 8 144826 kenneth 2012-05-30 13:57:11 -0700 Comment on attachment 144826 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144826&action=review > Source/WebCore/ChangeLog:15 > + This patch also add support for down-scaling in the decoder. > + You should probably list tests for this? 637741 9 144826 webkit.review.bot 2012-05-30 15:09:13 -0700 Comment on attachment 144826 Patch Clearing flags on attachment: 144826 Committed r118980: <http://trac.webkit.org/changeset/118980> 637742 10 webkit.review.bot 2012-05-30 15:09:18 -0700 All reviewed patches have been landed. Closing bug. 144806 2012-05-30 07:14:30 -0700 2012-05-30 08:32:53 -0700 Patch bug-87851-20120530161439.patch text/plain 3110 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4OTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDFjYjEzZjdkZjdiNTZl ZDQwYTUyZDM1NTJmYmQ1MzdlMmIzN2JlZS4uYzBhMjU4MTExMzk1NWY5MGZjYWRjNTZiNDBjNWQy NDAwZDM2MjI5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDEyLTA1LTMwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgogCisgICAgICAgIFtR dF0gSW1hZ2VEZWNvZGVyUXQgZG9lc24ndCBzdXBwb3J0IHNvbWUgZGVjb2RlcnMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Nzg1MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbnZlcnQgbG93IGRlcHRo IGNvbG9yIHNwYWNlIGludG8gQVJHQiBjb2xvciBzcGFjZSwgYW5kIHBlcmZvcm0gbWFudWFsCisg ICAgICAgIG1lbS1jb3B5IHdoZW4gdGhlIGltYWdlIGhhcyBiZWVuIGRlY29kZWQgaW50byBhIG5l dyBidWZmZXIuCisgICAgICAgIFRoaXMgcGF0Y2ggYWxzbyBhZGQgc3VwcG9ydCBmb3IgZG93bi1z Y2FsaW5nIGluIHRoZSBkZWNvZGVyLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQv SW1hZ2VEZWNvZGVyUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGVyUXQ6Omlu dGVybmFsRGVjb2RlU2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZURlY29kZXJRdDo6aW50 ZXJuYWxIYW5kbGVDdXJyZW50SW1hZ2UpOgorCisyMDEyLTA1LTMwICBBbGxhbiBTYW5kZmVsZCBK ZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCiAgICAgICAgIFtRdF0gU3VwcG9ydCBJ TUFHRV9ERUNPREVSX0RPV05fU0FNUExJTkcgZmxhZy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3ODQwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlRGVjb2RlclF0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlRGVjb2RlclF0LmNwcAppbmRleCAxNTFlM2Qx MTc3OWFjZDAzNjBhZWNjYTc1NjQ1MDUxNmY1ZmJmZjNiLi45MzY5YWY2OWI5ODUyYjc3MDBlMzIz YjUyNDQ1YTNmYzE5MDY2NmFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9JbWFnZURlY29kZXJRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvcXQvSW1hZ2VEZWNvZGVyUXQuY3BwCkBAIC0xNTYsNiArMTU2LDEyIEBAIHZv aWQgSW1hZ2VEZWNvZGVyUXQ6OmludGVybmFsRGVjb2RlU2l6ZSgpCiAgICAgfQogCiAgICAgc2V0 U2l6ZShzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkpOworCisgICAgLy8gV2UgZG9uJ3QgbmVl ZCB0aGUgdGFibGVzIHNldCBieSBwcmVwYXJlU2NhbGVEYXRhSWZOZWNlc3NhcnksIGJ1dCB0aGVp ciBkaW1lbnNpb25zCisgICAgLy8gYXJlIHVzZWQgYnkgSW1hZ2VEZWNvZGVyOjpzY2FsZWRTaXpl KCkuCisgICAgcHJlcGFyZVNjYWxlRGF0YUlmTmVjZXNzYXJ5KCk7CisgICAgaWYgKG1fc2NhbGVk KQorICAgICAgICBtX3JlYWRlci0+c2V0U2NhbGVkU2l6ZShzY2FsZWRTaXplKCkpOwogfQogCiB2 b2lkIEltYWdlRGVjb2RlclF0OjppbnRlcm5hbFJlYWRJbWFnZShzaXplX3QgZnJhbWVJbmRleCkK QEAgLTE4NCw3ICsxOTAsOSBAQCB2b2lkIEltYWdlRGVjb2RlclF0OjppbnRlcm5hbFJlYWRJbWFn ZShzaXplX3QgZnJhbWVJbmRleCkKIGJvb2wgSW1hZ2VEZWNvZGVyUXQ6OmludGVybmFsSGFuZGxl Q3VycmVudEltYWdlKHNpemVfdCBmcmFtZUluZGV4KQogewogICAgIEltYWdlRnJhbWUqIGNvbnN0 IGJ1ZmZlciA9ICZtX2ZyYW1lQnVmZmVyQ2FjaGVbZnJhbWVJbmRleF07Ci0gICAgUVNpemUgaW1h Z2VTaXplID0gbV9yZWFkZXItPnNpemUoKTsKKyAgICBRU2l6ZSBpbWFnZVNpemUgPSBtX3JlYWRl ci0+c2NhbGVkU2l6ZSgpOworICAgIGlmIChpbWFnZVNpemUuaXNFbXB0eSgpKQorICAgICAgICBp bWFnZVNpemUgPSBtX3JlYWRlci0+c2l6ZSgpOwogCiAgICAgaWYgKCFidWZmZXItPnNldFNpemUo aW1hZ2VTaXplLndpZHRoKCksIGltYWdlU2l6ZS5oZWlnaHQoKSkpCiAgICAgICAgIHJldHVybiBm YWxzZTsKQEAgLTE5NCw2ICsyMDIsMTkgQEAgYm9vbCBJbWFnZURlY29kZXJRdDo6aW50ZXJuYWxI YW5kbGVDdXJyZW50SW1hZ2Uoc2l6ZV90IGZyYW1lSW5kZXgpCiAgICAgYnVmZmVyLT5zZXREdXJh dGlvbihtX3JlYWRlci0+bmV4dEltYWdlRGVsYXkoKSk7CiAgICAgbV9yZWFkZXItPnJlYWQoJmlt YWdlKTsKIAorICAgIC8vIEltYWdlRnJhbWUgZXhwZWN0cyBBUkdCMzIuCisgICAgaWYgKGltYWdl LmRlcHRoKCkgPCAyNCkgeworICAgICAgICBpZiAoYnVmZmVyLT5wcmVtdWx0aXBseUFscGhhKCkp CisgICAgICAgICAgICBpbWFnZSA9IGltYWdlLmNvbnZlcnRUb0Zvcm1hdChRSW1hZ2U6OkZvcm1h dF9BUkdCMzJfUHJlbXVsdGlwbGllZCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGltYWdl ID0gaW1hZ2UuY29udmVydFRvRm9ybWF0KFFJbWFnZTo6Rm9ybWF0X0FSR0IzMik7CisgICAgfQor CisgICAgaWYgKHJlaW50ZXJwcmV0X2Nhc3Q8dWNoYXIqPihpbWFnZS5jb25zdFNjYW5MaW5lKDAp KSAhPSByZWludGVycHJldF9jYXN0PHVjaGFyKj4oYnVmZmVyLT5nZXRBZGRyKDAsIDApKSkgewor ICAgICAgICAvLyBUaGUgaW4tYnVmZmVyIHdhcyByZXBsYWNlZCBkdXJpbmcgZGVjb2Rpbmcgd2l0 aCBhbm90aGVyLCBzbyBjb3B5IGludG8gaXQgbWFudWFsbHkuCisgICAgICAgIG1lbWNweShidWZm ZXItPmdldEFkZHIoMCwgMCksIGltYWdlLmNvbnN0Qml0cygpLCAgaW1hZ2UuYnl0ZUNvdW50KCkp OworICAgIH0KKwogICAgIGlmIChpbWFnZS5pc051bGwoKSkgewogICAgICAgICBmcmFtZUNvdW50 KCk7CiAgICAgICAgIHJlcGV0aXRpb25Db3VudCgpOwo= 144816 2012-05-30 07:59:22 -0700 2012-05-30 08:00:06 -0700 Patch bug-87851-20120530165932.patch text/plain 6309 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4OTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjM0NWI3MjRmZmYxMDA0 NGYyNDAzMDcyMjM3YzQ0NjNlYzA3NDMyNS4uNDFjYjEzZjdkZjdiNTZlZDQwYTUyZDM1NTJmYmQ1 MzdlMmIzN2JlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA1LTMwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFtR dF0gU3VwcG9ydCBJTUFHRV9ERUNPREVSX0RPV05fU0FNUExJTkcgZmxhZy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3ODQwCisKKyAgICAgICAgQmFz ZWQgb24gcGF0Y2hlcyBieSBRaSBaaGFuZyBhbmQgSnVzc2kgTGVodG8uCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvSW1h Z2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2U6OmFkanVzdFNvdXJjZVJlY3RGb3JEb3du U2FtcGxpbmcpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ltYWdlLmg6CisgICAgICAg IChJbWFnZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL0ltYWdlT3BlblZH LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkJpdG1hcEltYWdlOjpkcmF3KToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdl OjpkcmF3UGF0dGVybik6CisgICAgICAgIChXZWJDb3JlOjpCaXRtYXBJbWFnZTo6ZHJhdyk6CisK IDIwMTItMDUtMzAgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgW1F0XSBTZXQgV2ViQ29yZSBpbWFnZWRlY29kZXJzIGFzIGRlZmF1bHQgYW5kIGFkZCBmYWxs YmFjayB0byBRSW1hZ2VEZWNvZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9JbWFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9J bWFnZS5jcHAKaW5kZXggYmI3ZDNmNzNjNDkwODYwZWM3ODRhY2NkYTU2YTM4Y2MzMzhlZDE2ZC4u MGFjZTdhYzIwNzVkMDZhMzA3YWIwM2Y3NDEzODI2ODg3YzVkYjhkMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdlLmNwcApAQCAtMTY3LDYgKzE2NywyMyBAQCB2b2lk IEltYWdlOjpkcmF3VGlsZWQoR3JhcGhpY3NDb250ZXh0KiBjdHh0LCBjb25zdCBGbG9hdFJlY3Qm IGRzdFJlY3QsIGNvbnN0IEZsbwogICAgIHN0YXJ0QW5pbWF0aW9uKCk7CiB9CiAKKyNpZiBFTkFC TEUoSU1BR0VfREVDT0RFUl9ET1dOX1NBTVBMSU5HKQorRmxvYXRSZWN0IEltYWdlOjphZGp1c3RT b3VyY2VSZWN0Rm9yRG93blNhbXBsaW5nKGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwgY29uc3Qg SW50U2l6ZSYgc2NhbGVkU2l6ZSkgY29uc3QKK3sKKyAgICBjb25zdCBJbnRTaXplIHVuc2NhbGVk U2l6ZSA9IHNpemUoKTsKKyAgICBpZiAodW5zY2FsZWRTaXplID09IHNjYWxlZFNpemUpCisgICAg ICAgIHJldHVybiBzcmNSZWN0OworCisgICAgLy8gSW1hZ2UgaGFzIGJlZW4gZG93bi1zYW1wbGVk LgorICAgIGZsb2F0IHhzY2FsZSA9IHN0YXRpY19jYXN0PGZsb2F0PihzY2FsZWRTaXplLndpZHRo KCkpIC8gdW5zY2FsZWRTaXplLndpZHRoKCk7CisgICAgZmxvYXQgeXNjYWxlID0gc3RhdGljX2Nh c3Q8ZmxvYXQ+KHNjYWxlZFNpemUuaGVpZ2h0KCkpIC8gdW5zY2FsZWRTaXplLmhlaWdodCgpOwor ICAgIEZsb2F0UmVjdCBzY2FsZWRTcmNSZWN0ID0gc3JjUmVjdDsKKyAgICBzY2FsZWRTcmNSZWN0 LnNjYWxlKHhzY2FsZSwgeXNjYWxlKTsKKworICAgIHJldHVybiBzY2FsZWRTcmNSZWN0OworfQor I2VuZGlmCisKIHZvaWQgSW1hZ2U6OmNvbXB1dGVJbnRyaW5zaWNEaW1lbnNpb25zKExlbmd0aCYg aW50cmluc2ljV2lkdGgsIExlbmd0aCYgaW50cmluc2ljSGVpZ2h0LCBGbG9hdFNpemUmIGludHJp bnNpY1JhdGlvKQogewogICAgIGludHJpbnNpY1JhdGlvID0gc2l6ZSgpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2UuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdlLmgKaW5kZXggYjc4ZmM3ZDgxNjRiM2FkODI4MGEzOTNi NDMyY2I2OWY2NGU0NmJmZS4uM2ZmNDgyMzZhMDJmOGI5ZTVlZjg5N2UzMDYyN2E0ZjU3NGZhYmQ5 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2UuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFnZS5oCkBAIC0xNjMsNiAr MTYzLDEwIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZHJhd1BhdHRlcm4oR3JhcGhpY3ND b250ZXh0KiwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0m IHBhdHRlcm5UcmFuc2Zvcm0sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEZs b2F0UG9pbnQmIHBoYXNlLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgQ29tcG9zaXRlT3Bl cmF0b3IsIGNvbnN0IEZsb2F0UmVjdCYgZGVzdFJlY3QpOwogCisjaWYgRU5BQkxFKElNQUdFX0RF Q09ERVJfRE9XTl9TQU1QTElORykKKyAgICBGbG9hdFJlY3QgYWRqdXN0U291cmNlUmVjdEZvckRv d25TYW1wbGluZyhjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsIGNvbnN0IEludFNpemUmIHNjYWxl ZFNpemUpIGNvbnN0OworI2VuZGlmCisKICNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgdmlydHVh bCBib29sIG5vdFNvbGlkQ29sb3IoKSB7IHJldHVybiB0cnVlOyB9CiAjZW5kaWYKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW52Zy9JbWFnZU9wZW5WRy5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVudmcvSW1hZ2VPcGVuVkcu Y3BwCmluZGV4IDk4YTczMGMwNmVjMjI0ZTkzMzI4MTJiMzYzNzRhODhlZmNlYWU5Y2QuLjk1MTA4 ODJjYzg1NDQwNjU0YTlkZTBiYTE4ZGQ3ZjRhMTlmMjBmMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW52Zy9JbWFnZU9wZW5WRy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL0ltYWdlT3BlblZHLmNwcApAQCAt MTA1LDI0ICsxMDUsNiBAQCB2b2lkIEJpdG1hcEltYWdlOjppbnZhbGlkYXRlUGxhdGZvcm1EYXRh KCkKIHsKIH0KIAotI2lmIEVOQUJMRShJTUFHRV9ERUNPREVSX0RPV05fU0FNUExJTkcpCi1zdGF0 aWMgdm9pZCBhZGp1c3RTb3VyY2VSZWN0Rm9yRG93blNhbXBsaW5nKEZsb2F0UmVjdCYgc3JjUmVj dCwgY29uc3QgSW50U2l6ZSYgb3JpZ1NpemUsIGNvbnN0IEludFNpemUmIHNjYWxlZFNpemUpCi17 Ci0gICAgLy8gV2UgYXNzdW1lIGRvd24tc2FtcGxpbmcgem9vbSByYXRlcyBpbiBYIGRpcmVjdGlv biBhbmQgaW4gWSBkaXJlY3Rpb24gYXJlIHNhbWUuCi0gICAgaWYgKG9yaWdTaXplLndpZHRoKCkg PT0gc2NhbGVkU2l6ZS53aWR0aCgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICAvLyBJbWFnZSBo YXMgYmVlbiBkb3duIHNhbXBsZWQuCi0gICAgZG91YmxlIHJhdGUgPSBzdGF0aWNfY2FzdDxkb3Vi bGU+KHNjYWxlZFNpemUud2lkdGgoKSkgLyBvcmlnU2l6ZS53aWR0aCgpOwotICAgIGRvdWJsZSB0 ZW1wID0gc3JjUmVjdC5yaWdodCgpICogcmF0ZTsKLSAgICBzcmNSZWN0LnNldFgoc3JjUmVjdC54 KCkgKiByYXRlKTsKLSAgICBzcmNSZWN0LnNldFdpZHRoKHRlbXAgLSBzcmNSZWN0LngoKSk7Ci0g ICAgdGVtcCA9IHNyY1JlY3QuYm90dG9tKCkgKiByYXRlOwotICAgIHNyY1JlY3Quc2V0WShzcmNS ZWN0LnkoKSAqIHJhdGUpOwotICAgIHNyY1JlY3Quc2V0SGVpZ2h0KHRlbXAgLSBzcmNSZWN0Lnko KSk7Ci19Ci0jZW5kaWYKLQogdm9pZCBCaXRtYXBJbWFnZTo6ZHJhdyhHcmFwaGljc0NvbnRleHQq IGNvbnRleHQsIGNvbnN0IEZsb2F0UmVjdCYgZHN0LCBjb25zdCBGbG9hdFJlY3QmIHNyYywgQ29s b3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIENvbXBvc2l0ZU9wZXJhdG9yIG9wKQogewogICAgIGlm IChkc3QuaXNFbXB0eSgpIHx8IHNyYy5pc0VtcHR5KCkpCkBAIC0xNDcsOSArMTI5LDEwIEBAIHZv aWQgQml0bWFwSW1hZ2U6OmRyYXcoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBGbG9h dFJlY3QmIGRzdCwgY29uc3QgRmxvCiAgICAgZWxzZQogICAgICAgICBjb250ZXh0LT5zZXRDb21w b3NpdGVPcGVyYXRpb24ob3ApOwogCi0gICAgRmxvYXRSZWN0IHNyY1JlY3RMb2NhbChzcmMpOwog I2lmIEVOQUJMRShJTUFHRV9ERUNPREVSX0RPV05fU0FNUExJTkcpCi0gICAgYWRqdXN0U291cmNl UmVjdEZvckRvd25TYW1wbGluZyhzcmNSZWN0TG9jYWwsIHNpemUoKSwgaW1hZ2UtPnNpemUoKSk7 CisgICAgRmxvYXRSZWN0IHNyY1JlY3RMb2NhbCA9IGFkanVzdFNvdXJjZVJlY3RGb3JEb3duU2Ft cGxpbmcoc3JjLCBpbWFnZS0+c2l6ZSgpKTsKKyNlbHNlCisgICAgRmxvYXRSZWN0IHNyY1JlY3RM b2NhbChzcmMpOwogI2VuZGlmCiAKICAgICBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+YWN0 aXZlUGFpbnRlcigpLT5kcmF3SW1hZ2UoaW1hZ2UsIGRzdCwgc3JjUmVjdExvY2FsKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlUXQuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHAKaW5kZXggMTgy YjM2Njg0NDAxYjczMzcwYTg5YjEzNGJkMDEyNzJmYzBhMTY0NS4uODQ5NDM1ZjYzM2U2MjE1NjI5 MWU4NDRkZDRiZDE0Y2QzNjBjOTFkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHAKQEAgLTEzMiw5ICsxMzIsMTUgQEAgdm9pZCBJbWFnZTo6 ZHJhd1BhdHRlcm4oR3JhcGhpY3NDb250ZXh0KiBjdHh0LCBjb25zdCBGbG9hdFJlY3QmIHRpbGVS ZWN0LCBjb25zdAogICAgIGlmICghZnJhbWVQaXhtYXApIC8vIElmIGl0J3MgdG9vIGVhcmx5IHdl IHdvbid0IGhhdmUgYW4gaW1hZ2UgeWV0LgogICAgICAgICByZXR1cm47CiAKKyNpZiBFTkFCTEUo SU1BR0VfREVDT0RFUl9ET1dOX1NBTVBMSU5HKQorICAgIEZsb2F0UmVjdCB0aWxlUmVjdEFkanVz dGVkID0gYWRqdXN0U291cmNlUmVjdEZvckRvd25TYW1wbGluZyh0aWxlUmVjdCwgZnJhbWVQaXht YXAtPnNpemUoKSk7CisjZWxzZQorICAgIEZsb2F0UmVjdCB0aWxlUmVjdEFkanVzdGVkID0gdGls ZVJlY3Q7CisjZW5kaWYKKwogICAgIC8vIFF0IGludGVycHJldHMgMCB3aWR0aC9oZWlnaHQgYXMg ZnVsbCB3aWR0aC9oZWlnaHQgc28ganVzdCBzaG9ydCBjaXJjdWl0LgogICAgIFFSZWN0RiBkciA9 IFFSZWN0RihkZXN0UmVjdCkubm9ybWFsaXplZCgpOwotICAgIFFSZWN0IHRyID0gUVJlY3RGKHRp bGVSZWN0KS50b1JlY3QoKS5ub3JtYWxpemVkKCk7CisgICAgUVJlY3QgdHIgPSBRUmVjdEYodGls ZVJlY3RBZGp1c3RlZCkudG9SZWN0KCkubm9ybWFsaXplZCgpOwogICAgIGlmICghZHIud2lkdGgo KSB8fCAhZHIuaGVpZ2h0KCkgfHwgIXRyLndpZHRoKCkgfHwgIXRyLmhlaWdodCgpKQogICAgICAg ICByZXR1cm47CiAKQEAgLTIzOSw2ICsyNDUsMTAgQEAgdm9pZCBCaXRtYXBJbWFnZTo6ZHJhdyhH cmFwaGljc0NvbnRleHQqIGN0eHQsIGNvbnN0IEZsb2F0UmVjdCYgZHN0LAogICAgICAgICByZXR1 cm47CiAgICAgfQogCisjaWYgRU5BQkxFKElNQUdFX0RFQ09ERVJfRE9XTl9TQU1QTElORykKKyAg ICBub3JtYWxpemVkU3JjID0gYWRqdXN0U291cmNlUmVjdEZvckRvd25TYW1wbGluZyhub3JtYWxp emVkU3JjLCBpbWFnZS0+c2l6ZSgpKTsKKyNlbmRpZgorCiAgICAgQ29tcG9zaXRlT3BlcmF0b3Ig cHJldmlvdXNPcGVyYXRvciA9IGN0eHQtPmNvbXBvc2l0ZU9wZXJhdGlvbigpOwogICAgIGN0eHQt PnNldENvbXBvc2l0ZU9wZXJhdGlvbighaW1hZ2UtPmhhc0FscGhhKCkgJiYgb3AgPT0gQ29tcG9z aXRlU291cmNlT3ZlciA/IENvbXBvc2l0ZUNvcHkgOiBvcCk7CiAK 144826 2012-05-30 08:32:59 -0700 2012-05-30 15:09:13 -0700 Patch bug-87851-20120530173309.patch text/plain 3355 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4OTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDFjYjEzZjdkZjdiNTZl ZDQwYTUyZDM1NTJmYmQ1MzdlMmIzN2JlZS4uNDQ3ZTlhZGUyMWYwZjljZmFjODRjMzQ4YjZiMmUz YmJjN2JhZDEwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEyLTA1LTMwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgogCisgICAgICAgIFtR dF0gSW1hZ2VEZWNvZGVyUXQgZG9lc24ndCBzdXBwb3J0IHNvbWUgZGVjb2RlcnMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Nzg1MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIGZvcmNlZCB0byBkZWNv ZGUgR0lGIGFuZCBKUEVHLCBJbWFnZURlY29kZXJRdCBzaG93IHNldmVyYWwKKyAgICAgICAgYXJ0 aWZhY3RzLiBUaGlzIGlzIGNhdXNlZCBieSBtaXNtYXRjaGVkIGRlY29kZWQgaW1hZ2UtZm9ybWF0 cy4KKworICAgICAgICBDb252ZXJ0IG1pc21hdGNoZWQgY29sb3Igc3BhY2VzIGludG8gQVJHQiBj b2xvciBzcGFjZSwgYW5kIHBlcmZvcm0KKyAgICAgICAgbWFudWFsIG1lbS1jb3B5IHdoZW4gdGhl IGltYWdlIGhhcyBiZWVuIGRlY29kZWQgaW50byBhIG5ldyBidWZmZXIuCisKKyAgICAgICAgVGhp cyBwYXRjaCBhbHNvIGFkZCBzdXBwb3J0IGZvciBkb3duLXNjYWxpbmcgaW4gdGhlIGRlY29kZXIu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZURlY29kZXJRdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbWFnZURlY29kZXJRdDo6aW50ZXJuYWxEZWNvZGVTaXplKToKKyAg ICAgICAgKFdlYkNvcmU6OkltYWdlRGVjb2RlclF0OjppbnRlcm5hbEhhbmRsZUN1cnJlbnRJbWFn ZSk6CisKKzIwMTItMDUtMzAgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBu b2tpYS5jb20+CisKICAgICAgICAgW1F0XSBTdXBwb3J0IElNQUdFX0RFQ09ERVJfRE9XTl9TQU1Q TElORyBmbGFnLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODc4NDAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv cXQvSW1hZ2VEZWNvZGVyUXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv cXQvSW1hZ2VEZWNvZGVyUXQuY3BwCmluZGV4IDE1MWUzZDExNzc5YWNkMDM2MGFlY2NhNzU2NDUw NTE2ZjVmYmZmM2IuLmUwMzYzNmYyMGQ1OWU5MzUyMDY4YjYyYWU4MmY3NDRjMjM3ZmY2NGIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlRGVjb2Rl clF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZURl Y29kZXJRdC5jcHAKQEAgLTE1Niw2ICsxNTYsMTIgQEAgdm9pZCBJbWFnZURlY29kZXJRdDo6aW50 ZXJuYWxEZWNvZGVTaXplKCkKICAgICB9CiAKICAgICBzZXRTaXplKHNpemUud2lkdGgoKSwgc2l6 ZS5oZWlnaHQoKSk7CisKKyAgICAvLyBXZSBkb24ndCBuZWVkIHRoZSB0YWJsZXMgc2V0IGJ5IHBy ZXBhcmVTY2FsZURhdGFJZk5lY2Vzc2FyeSwKKyAgICAvLyBidXQgdGhlaXIgZGltZW5zaW9ucyBh cmUgdXNlZCBieSBJbWFnZURlY29kZXI6OnNjYWxlZFNpemUoKS4KKyAgICBwcmVwYXJlU2NhbGVE YXRhSWZOZWNlc3NhcnkoKTsKKyAgICBpZiAobV9zY2FsZWQpCisgICAgICAgIG1fcmVhZGVyLT5z ZXRTY2FsZWRTaXplKHNjYWxlZFNpemUoKSk7CiB9CiAKIHZvaWQgSW1hZ2VEZWNvZGVyUXQ6Omlu dGVybmFsUmVhZEltYWdlKHNpemVfdCBmcmFtZUluZGV4KQpAQCAtMTg0LDcgKzE5MCw5IEBAIHZv aWQgSW1hZ2VEZWNvZGVyUXQ6OmludGVybmFsUmVhZEltYWdlKHNpemVfdCBmcmFtZUluZGV4KQog Ym9vbCBJbWFnZURlY29kZXJRdDo6aW50ZXJuYWxIYW5kbGVDdXJyZW50SW1hZ2Uoc2l6ZV90IGZy YW1lSW5kZXgpCiB7CiAgICAgSW1hZ2VGcmFtZSogY29uc3QgYnVmZmVyID0gJm1fZnJhbWVCdWZm ZXJDYWNoZVtmcmFtZUluZGV4XTsKLSAgICBRU2l6ZSBpbWFnZVNpemUgPSBtX3JlYWRlci0+c2l6 ZSgpOworICAgIFFTaXplIGltYWdlU2l6ZSA9IG1fcmVhZGVyLT5zY2FsZWRTaXplKCk7CisgICAg aWYgKGltYWdlU2l6ZS5pc0VtcHR5KCkpCisgICAgICAgIGltYWdlU2l6ZSA9IG1fcmVhZGVyLT5z aXplKCk7CiAKICAgICBpZiAoIWJ1ZmZlci0+c2V0U2l6ZShpbWFnZVNpemUud2lkdGgoKSwgaW1h Z2VTaXplLmhlaWdodCgpKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTk0LDYgKzIwMiwy MCBAQCBib29sIEltYWdlRGVjb2RlclF0OjppbnRlcm5hbEhhbmRsZUN1cnJlbnRJbWFnZShzaXpl X3QgZnJhbWVJbmRleCkKICAgICBidWZmZXItPnNldER1cmF0aW9uKG1fcmVhZGVyLT5uZXh0SW1h Z2VEZWxheSgpKTsKICAgICBtX3JlYWRlci0+cmVhZCgmaW1hZ2UpOwogCisgICAgLy8gSW1hZ2VG cmFtZSBleHBlY3RzIEFSR0IzMi4KKyAgICBpZiAoYnVmZmVyLT5wcmVtdWx0aXBseUFscGhhKCkp IHsKKyAgICAgICAgaWYgKGltYWdlLmZvcm1hdCgpICE9IFFJbWFnZTo6Rm9ybWF0X0FSR0IzMl9Q cmVtdWx0aXBsaWVkKQorICAgICAgICAgICAgaW1hZ2UgPSBpbWFnZS5jb252ZXJ0VG9Gb3JtYXQo UUltYWdlOjpGb3JtYXRfQVJHQjMyX1ByZW11bHRpcGxpZWQpOworICAgIH0gZWxzZSB7CisgICAg ICAgIGlmIChpbWFnZS5mb3JtYXQoKSAhPSBRSW1hZ2U6OkZvcm1hdF9BUkdCMzIpCisgICAgICAg ICAgICBpbWFnZSA9IGltYWdlLmNvbnZlcnRUb0Zvcm1hdChRSW1hZ2U6OkZvcm1hdF9BUkdCMzIp OworICAgIH0KKworICAgIGlmIChyZWludGVycHJldF9jYXN0PGNvbnN0IHVjaGFyKj4oaW1hZ2Uu Y29uc3RCaXRzKCkpICE9IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWNoYXIqPihidWZmZXItPmdl dEFkZHIoMCwgMCkpKSB7CisgICAgICAgIC8vIFRoZSBpbi1idWZmZXIgd2FzIHJlcGxhY2VkIGR1 cmluZyBkZWNvZGluZyB3aXRoIGFub3RoZXIsIHNvIGNvcHkgaW50byBpdCBtYW51YWxseS4KKyAg ICAgICAgbWVtY3B5KGJ1ZmZlci0+Z2V0QWRkcigwLCAwKSwgaW1hZ2UuY29uc3RCaXRzKCksICBp bWFnZS5ieXRlQ291bnQoKSk7CisgICAgfQorCiAgICAgaWYgKGltYWdlLmlzTnVsbCgpKSB7CiAg ICAgICAgIGZyYW1lQ291bnQoKTsKICAgICAgICAgcmVwZXRpdGlvbkNvdW50KCk7Cg==