119263 2013-07-30 09:06:21 -0700 [Qt] Images are down-scaled badly 2013-08-01 05:42:50 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 119392 1 allan.jensen allan.jensen commit-queue jturcotte noam webkit-ews oldest_to_newest 912864 0 allan.jensen 2013-07-30 09:06:21 -0700 If images are scaled down more than 2x the scaled result becomes increasingly worse. This is probably caused by QPainter using bilinear sampling, see https://bugreports.qt-project.org/browse/QTBUG-30682 . To avoid the issue we can prescale the image before sending it to QPainter. 913252 1 207823 allan.jensen 2013-07-31 03:01:50 -0700 Created attachment 207823 Patch 913253 2 commit-queue 2013-07-31 03:03:04 -0700 Attachment 207823 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/graphics/qt/ImageQt.cpp']" exit_code: 1 Source/WebCore/platform/graphics/qt/ImageQt.cpp:273: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/graphics/qt/ImageQt.cpp:274: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/graphics/qt/ImageQt.cpp:275: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/graphics/qt/ImageQt.cpp:276: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 4 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 913254 3 207823 webkit-ews 2013-07-31 03:07:48 -0700 Comment on attachment 207823 Patch Attachment 207823 did not pass qt-ews (qt): Output: http://webkit-queues.appspot.com/results/1292609 913255 4 207823 webkit-ews 2013-07-31 03:08:59 -0700 Comment on attachment 207823 Patch Attachment 207823 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/1293620 913256 5 207824 allan.jensen 2013-07-31 03:15:47 -0700 Created attachment 207824 Patch 913257 6 commit-queue 2013-07-31 03:17:47 -0700 Attachment 207824 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/graphics/qt/ImageQt.cpp']" exit_code: 1 Source/WebCore/platform/graphics/qt/ImageQt.cpp:273: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/graphics/qt/ImageQt.cpp:274: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/graphics/qt/ImageQt.cpp:275: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/platform/graphics/qt/ImageQt.cpp:276: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 4 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 913259 7 207824 webkit-ews 2013-07-31 03:21:24 -0700 Comment on attachment 207824 Patch Attachment 207824 did not pass qt-ews (qt): Output: http://webkit-queues.appspot.com/results/1289715 913260 8 207824 webkit-ews 2013-07-31 03:21:30 -0700 Comment on attachment 207824 Patch Attachment 207824 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/1275021 913263 9 allan.jensen 2013-07-31 03:24:24 -0700 (In reply to comment #8) > (From update of attachment 207824 [details]) > Attachment 207824 [details] did not pass qt-wk2-ews (qt-wk2): > Output: http://webkit-queues.appspot.com/results/1275021 Seems the EWS bot is building with Qt 5.0. 913270 10 207828 allan.jensen 2013-07-31 03:42:59 -0700 Created attachment 207828 Patch Fix build with Qt 5.0 913318 11 207828 jturcotte 2013-07-31 05:41:57 -0700 Comment on attachment 207828 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=207828&action=review > Source/WebCore/ChangeLog:8 > + Prescale images before painting and cache the result in the pixmap cache. Please add a note here or in the code explaining the difference of behavior between QPixmap and QPainter when down-scaling. > Source/WebCore/platform/graphics/qt/ImageQt.cpp:272 > + && (normalizedDst.width() * 1.5 * pixelRatio < normalizedSrc.width() > + || normalizedDst.height() * 1.5 * pixelRatio < normalizedSrc.height())) { 1.0 / 0.5 == 2.0, I'm not following why you're using 1.5 here. 913341 12 allan.jensen 2013-07-31 06:16:06 -0700 (In reply to comment #11) > (From update of attachment 207828 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=207828&action=review > > > Source/WebCore/ChangeLog:8 > > + Prescale images before painting and cache the result in the pixmap cache. > > Please add a note here or in the code explaining the difference of behavior between QPixmap and QPainter when down-scaling. > I will update the comments and ChangeLog. > > Source/WebCore/platform/graphics/qt/ImageQt.cpp:272 > > + && (normalizedDst.width() * 1.5 * pixelRatio < normalizedSrc.width() > > + || normalizedDst.height() * 1.5 * pixelRatio < normalizedSrc.height())) { > > 1.0 / 0.5 == 2.0, I'm not following why you're using 1.5 here. It is mentioned in the comment above. // We prescale before hitting 0.5x because prescaling quality is already better at 0.5x, and with caching often // faster than transforms in the raster paint engine. 913349 13 207848 allan.jensen 2013-07-31 06:30:57 -0700 Created attachment 207848 Patch Improve ChangeLog, and restrict prescaling to 0.5x and below. Quality can be better before, but the pixelation issues only trigger after. 913362 14 allan.jensen 2013-07-31 07:38:30 -0700 Committed r153522: <http://trac.webkit.org/changeset/153522> 207823 2013-07-31 03:01:50 -0700 2013-07-31 03:15:42 -0700 Patch bug-119263-20130731120149.patch text/plain 3615 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTBjODFiZjQ5YTQ0ZTVi MWE1MGZjODRkZWE1NThiZTc4YTQ0YWYyMC4uZTc3YTNjMjBlMzQ3ZGYyZDEzYmQ2NTNjM2QyODg5 NzVmYTMwYjM2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA3LTMxICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gSW1hZ2VzIGFyZSBkb3duLXNjYWxlZCBiYWRseQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5MjYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUHJlc2NhbGUgaW1hZ2VzIGJlZm9yZSBwYWludGluZyBh bmQgY2FjaGUgdGhlIHJlc3VsdCBpbiB0aGUgcGl4bWFwIGNhY2hlLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpCaXRtYXBJ bWFnZTo6ZHJhdyk6CisKIDIwMTMtMDctMjkgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFu LmplbnNlbkBkaWdpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTigxNDgzMDApIEdJRnMgbm90 IHJlYW5pbWF0ZWQgYWZ0ZXIgcmVzdW1lQWN0aXZlRE9NT2JqZWN0QW5kQW5pbWF0aW9ucwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcAppbmRleCBi ODY2Nzg1OGJmYWRiMDBiMTdiODZhM2EyMTI5ZDEzZTE4ZmI4YTg5Li5jMDdiMTUxMjAzZWIxMDUw OTI0ZjkxM2IzZDc0OWQxMDEyNGRmOTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcApAQCAtNDcsNyArNDcsOSBAQAogI2luY2x1ZGUgPFFJ bWFnZVJlYWRlcj4KICNpbmNsdWRlIDxRUGFpbnRlcj4KICNpbmNsdWRlIDxRUGl4bWFwPgorI2lu Y2x1ZGUgPFFQaXhtYXBDYWNoZT4KICNpbmNsdWRlIDxRVHJhbnNmb3JtPgorI2luY2x1ZGUgPHBy aXZhdGUvcWhleHN0cmluZ19wLmg+CiAKICNpbmNsdWRlIDxtYXRoLmg+CiAKQEAgLTI0NSw2ICsy NDcsNyBAQCB2b2lkIEJpdG1hcEltYWdlOjpkcmF3KEdyYXBoaWNzQ29udGV4dCogY3R4dCwgY29u c3QgRmxvYXRSZWN0JiBkc3QsCiAgICAgUVBpeG1hcCogaW1hZ2UgPSBuYXRpdmVJbWFnZUZvckN1 cnJlbnRGcmFtZSgpOwogICAgIGlmICghaW1hZ2UpCiAgICAgICAgIHJldHVybjsKKyAgICBRUGl4 bWFwIHByZXNjYWxlZDsKIAogICAgIGlmIChtYXlGaWxsV2l0aFNvbGlkQ29sb3IoKSkgewogICAg ICAgICBmaWxsV2l0aFNvbGlkQ29sb3IoY3R4dCwgbm9ybWFsaXplZERzdCwgc29saWRDb2xvcigp LCBzdHlsZUNvbG9yU3BhY2UsIG9wKTsKQEAgLTI1NSw2ICsyNTgsMzIgQEAgdm9pZCBCaXRtYXBJ bWFnZTo6ZHJhdyhHcmFwaGljc0NvbnRleHQqIGN0eHQsIGNvbnN0IEZsb2F0UmVjdCYgZHN0LAog ICAgIG5vcm1hbGl6ZWRTcmMgPSBhZGp1c3RTb3VyY2VSZWN0Rm9yRG93blNhbXBsaW5nKG5vcm1h bGl6ZWRTcmMsIGltYWdlLT5zaXplKCkpOwogI2VuZGlmCiAKKyAgICBRUGFpbnRlciogcGFpbnRl ciA9IGN0eHQtPnBsYXRmb3JtQ29udGV4dCgpOworICAgIC8vIFFQYWludGVyIGRvZXNuJ3Qgc2Nh bGUgZG93biB0aGF0IHdlbGwgYmV5b25kIDAuNXgsIHNvIHdlIHByZXNjYWxlIGlmIGhpZ2ggcXVh bGl0eSBzY2FsaW5nIGlzIHJlcXVlc3RlZC4KKyAgICBpbnQgcGl4ZWxSYXRpbyA9IHBhaW50ZXIt PmRldmljZSgpLT5kZXZpY2VQaXhlbFJhdGlvKCk7CisgICAgaWYgKHBhaW50ZXItPnJlbmRlckhp bnRzKCkgJiBRUGFpbnRlcjo6U21vb3RoUGl4bWFwVHJhbnNmb3JtCisgICAgICAgICYmIChub3Jt YWxpemVkRHN0LndpZHRoKCkgKiAyICogcGl4ZWxSYXRpbyA8IG5vcm1hbGl6ZWRTcmMud2lkdGgo KQorICAgICAgICAgICAgfHwgbm9ybWFsaXplZERzdC5oZWlnaHQoKSAqIDIgKiBwaXhlbFJhdGlv IDwgbm9ybWFsaXplZFNyYy5oZWlnaHQoKSkpIHsKKyAgICAgICAgLy8gVGhpcyBtYXkgbm90IHdv cmsgcmlnaHQgd2l0aCBzdWJwaXhlbCBwb3NpdGlvbnMsIGJ1dCB0aGF0IGNhbiBub3QgY3VycmVu dGx5IGhhcHBlbi4KKyAgICAgICAgUVJlY3QgcGl4ZWxTcmMgPSBub3JtYWxpemVkU3JjLnRvUmVj dCgpOworICAgICAgICBRU2l6ZSBzY2FsZWRTaXplKG5vcm1hbGl6ZWREc3Qud2lkdGgoKSAqIHBp eGVsUmF0aW8sIG5vcm1hbGl6ZWREc3QuaGVpZ2h0KCkgKiBwaXhlbFJhdGlvKTsKKyAgICAgICAg bm9ybWFsaXplZFNyYyA9IFFSZWN0RihRUG9pbnRGKCksIHByZXNjYWxlZC5zaXplKCkpOworICAg ICAgICBxaW50NjQgY2FjaGVLZXkgPSBpbWFnZS0+Y2FjaGVLZXkoKTsKKyAgICAgICAgUVN0cmlu ZyBrZXkgPSBRU3RyaW5nTGl0ZXJhbCgicXR3ZWJraXRfcHJlc2NhbGVkXyIpCisgICAgICAgICAg ICAgICAgICAgICAgJSBIZXhTdHJpbmc8cWludDY0PihjYWNoZUtleSkKKyAgICAgICAgICAgICAg ICAgICAgICAlIEhleFN0cmluZzxpbnQ+KHBpeGVsU3JjLngoKSkgJSBIZXhTdHJpbmc8aW50Pihw aXhlbFNyYy55KCkpCisgICAgICAgICAgICAgICAgICAgICAgJSBIZXhTdHJpbmc8aW50PihwaXhl bFNyYy53aWR0aCgpKSAlIEhleFN0cmluZzxpbnQ+KHBpeGVsU3JjLmhlaWdodCgpKQorICAgICAg ICAgICAgICAgICAgICAgICUgSGV4U3RyaW5nPGludD4oc2NhbGVkU2l6ZS53aWR0aCgpKSAlIEhl eFN0cmluZzxpbnQ+KHNjYWxlZFNpemUuaGVpZ2h0KCkpOworICAgICAgICBpZiAoIVFQaXhtYXBD YWNoZTo6ZmluZChrZXksICZwcmVzY2FsZWQpKSB7CisgICAgICAgICAgICBpZiAocGl4ZWxTcmMg IT0gaW1hZ2UtPnJlY3QoKSkKKyAgICAgICAgICAgICAgICBwcmVzY2FsZWQgPSBpbWFnZS0+Y29w eShwaXhlbFNyYykuc2NhbGVkKHNjYWxlZFNpemUsIFF0OjpJZ25vcmVBc3BlY3RSYXRpbywgUXQ6 OlNtb290aFRyYW5zZm9ybWF0aW9uKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAg ICBwcmVzY2FsZWQgPSBpbWFnZS0+c2NhbGVkKHNjYWxlZFNpemUsIFF0OjpJZ25vcmVBc3BlY3RS YXRpbywgUXQ6OlNtb290aFRyYW5zZm9ybWF0aW9uKTsKKyAgICAgICAgICAgIFFQaXhtYXBDYWNo ZTo6aW5zZXJ0KGtleSwgcHJlc2NhbGVkKTsKKyAgICAgICAgfQorICAgICAgICBpbWFnZSA9ICZw cmVzY2FsZWQ7CisgICAgfQorCiAgICAgQ29tcG9zaXRlT3BlcmF0b3IgcHJldmlvdXNPcGVyYXRv ciA9IGN0eHQtPmNvbXBvc2l0ZU9wZXJhdGlvbigpOwogICAgIGN0eHQtPnNldENvbXBvc2l0ZU9w ZXJhdGlvbighaW1hZ2UtPmhhc0FscGhhKCkgJiYgb3AgPT0gQ29tcG9zaXRlU291cmNlT3ZlciA/ IENvbXBvc2l0ZUNvcHkgOiBvcCk7CiAK 207824 2013-07-31 03:15:47 -0700 2013-07-31 03:42:54 -0700 Patch bug-119263-20130731121546.patch text/plain 3770 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTBjODFiZjQ5YTQ0ZTVi MWE1MGZjODRkZWE1NThiZTc4YTQ0YWYyMC4uZTc3YTNjMjBlMzQ3ZGYyZDEzYmQ2NTNjM2QyODg5 NzVmYTMwYjM2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA3LTMxICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gSW1hZ2VzIGFyZSBkb3duLXNjYWxlZCBiYWRseQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5MjYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUHJlc2NhbGUgaW1hZ2VzIGJlZm9yZSBwYWludGluZyBh bmQgY2FjaGUgdGhlIHJlc3VsdCBpbiB0aGUgcGl4bWFwIGNhY2hlLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpCaXRtYXBJ bWFnZTo6ZHJhdyk6CisKIDIwMTMtMDctMjkgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFu LmplbnNlbkBkaWdpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTigxNDgzMDApIEdJRnMgbm90 IHJlYW5pbWF0ZWQgYWZ0ZXIgcmVzdW1lQWN0aXZlRE9NT2JqZWN0QW5kQW5pbWF0aW9ucwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcAppbmRleCBi ODY2Nzg1OGJmYWRiMDBiMTdiODZhM2EyMTI5ZDEzZTE4ZmI4YTg5Li5kOTFkN2FiMDdhN2FjNmU4 NmRlODMxMWIyMDY3MmJmOTY1Mjg5YTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcApAQCAtNDcsNyArNDcsOSBAQAogI2luY2x1ZGUgPFFJ bWFnZVJlYWRlcj4KICNpbmNsdWRlIDxRUGFpbnRlcj4KICNpbmNsdWRlIDxRUGl4bWFwPgorI2lu Y2x1ZGUgPFFQaXhtYXBDYWNoZT4KICNpbmNsdWRlIDxRVHJhbnNmb3JtPgorI2luY2x1ZGUgPHBy aXZhdGUvcWhleHN0cmluZ19wLmg+CiAKICNpbmNsdWRlIDxtYXRoLmg+CiAKQEAgLTI0NSw2ICsy NDcsNyBAQCB2b2lkIEJpdG1hcEltYWdlOjpkcmF3KEdyYXBoaWNzQ29udGV4dCogY3R4dCwgY29u c3QgRmxvYXRSZWN0JiBkc3QsCiAgICAgUVBpeG1hcCogaW1hZ2UgPSBuYXRpdmVJbWFnZUZvckN1 cnJlbnRGcmFtZSgpOwogICAgIGlmICghaW1hZ2UpCiAgICAgICAgIHJldHVybjsKKyAgICBRUGl4 bWFwIHByZXNjYWxlZDsKIAogICAgIGlmIChtYXlGaWxsV2l0aFNvbGlkQ29sb3IoKSkgewogICAg ICAgICBmaWxsV2l0aFNvbGlkQ29sb3IoY3R4dCwgbm9ybWFsaXplZERzdCwgc29saWRDb2xvcigp LCBzdHlsZUNvbG9yU3BhY2UsIG9wKTsKQEAgLTI1NSw2ICsyNTgsMzMgQEAgdm9pZCBCaXRtYXBJ bWFnZTo6ZHJhdyhHcmFwaGljc0NvbnRleHQqIGN0eHQsIGNvbnN0IEZsb2F0UmVjdCYgZHN0LAog ICAgIG5vcm1hbGl6ZWRTcmMgPSBhZGp1c3RTb3VyY2VSZWN0Rm9yRG93blNhbXBsaW5nKG5vcm1h bGl6ZWRTcmMsIGltYWdlLT5zaXplKCkpOwogI2VuZGlmCiAKKyAgICBRUGFpbnRlciogcGFpbnRl ciA9IGN0eHQtPnBsYXRmb3JtQ29udGV4dCgpOworICAgIC8vIFFQYWludGVyIGRvZXNuJ3Qgc2Nh bGUgZG93biB0aGF0IHdlbGwgYmVsb3cgMC41eCwgc28gZm9yIGhpZ2ggcXVhbGl0eSBzY2FsaW5n IHdlIG5lZWQgdG8gcGVyZm9ybSBzY2FsaW5nIG91cnNlbHZlcy4KKyAgICAvLyBXZSBwcmVzY2Fs ZSBiZWZvcmUgaGl0dGluZyAwLjV4IGJlY2F1c2UgcHJlc2NhbGluZyBxdWFsaXR5IGlzIGFscmVh ZHkgYmV0dGVyIGF0IDAuNXgsIGFuZCB3aXRoIGNhY2hpbmcgb2Z0ZW4KKyAgICAvLyBmYXN0ZXIg dGhhbiB0cmFuc2Zvcm1zIGluIHRoZSByYXN0ZXIgcGFpbnQgZW5naW5lLgorICAgIGludCBwaXhl bFJhdGlvID0gcGFpbnRlci0+ZGV2aWNlKCktPmRldmljZVBpeGVsUmF0aW8oKTsKKyAgICBpZiAo cGFpbnRlci0+cmVuZGVySGludHMoKSAmIFFQYWludGVyOjpTbW9vdGhQaXhtYXBUcmFuc2Zvcm0K KyAgICAgICAgJiYgKG5vcm1hbGl6ZWREc3Qud2lkdGgoKSAqIDEuNSAqIHBpeGVsUmF0aW8gPCBu b3JtYWxpemVkU3JjLndpZHRoKCkKKyAgICAgICAgICAgIHx8IG5vcm1hbGl6ZWREc3QuaGVpZ2h0 KCkgKiAxLjUgKiBwaXhlbFJhdGlvIDwgbm9ybWFsaXplZFNyYy5oZWlnaHQoKSkpIHsKKyAgICAg ICAgLy8gVGhpcyBtYXkgbm90IHdvcmsgcmlnaHQgd2l0aCBzdWJwaXhlbCBwb3NpdGlvbnMsIGJ1 dCB0aGF0IGNhbiBub3QgY3VycmVudGx5IGhhcHBlbi4KKyAgICAgICAgUVJlY3QgcGl4ZWxTcmMg PSBub3JtYWxpemVkU3JjLnRvUmVjdCgpOworICAgICAgICBRU2l6ZSBzY2FsZWRTaXplKG5vcm1h bGl6ZWREc3Qud2lkdGgoKSAqIHBpeGVsUmF0aW8sIG5vcm1hbGl6ZWREc3QuaGVpZ2h0KCkgKiBw aXhlbFJhdGlvKTsKKyAgICAgICAgUVN0cmluZyBrZXkgPSBRU3RyaW5nTGl0ZXJhbCgicXR3ZWJr aXRfcHJlc2NhbGVkXyIpCisgICAgICAgICAgICAgICAgICAgICAgJSBIZXhTdHJpbmc8cWludDY0 PihpbWFnZS0+Y2FjaGVLZXkoKSkKKyAgICAgICAgICAgICAgICAgICAgICAlIEhleFN0cmluZzxp bnQ+KHBpeGVsU3JjLngoKSkgJSBIZXhTdHJpbmc8aW50PihwaXhlbFNyYy55KCkpCisgICAgICAg ICAgICAgICAgICAgICAgJSBIZXhTdHJpbmc8aW50PihwaXhlbFNyYy53aWR0aCgpKSAlIEhleFN0 cmluZzxpbnQ+KHBpeGVsU3JjLmhlaWdodCgpKQorICAgICAgICAgICAgICAgICAgICAgICUgSGV4 U3RyaW5nPGludD4oc2NhbGVkU2l6ZS53aWR0aCgpKSAlIEhleFN0cmluZzxpbnQ+KHNjYWxlZFNp emUuaGVpZ2h0KCkpOworICAgICAgICBpZiAoIVFQaXhtYXBDYWNoZTo6ZmluZChrZXksICZwcmVz Y2FsZWQpKSB7CisgICAgICAgICAgICBpZiAocGl4ZWxTcmMgIT0gaW1hZ2UtPnJlY3QoKSkKKyAg ICAgICAgICAgICAgICBwcmVzY2FsZWQgPSBpbWFnZS0+Y29weShwaXhlbFNyYykuc2NhbGVkKHNj YWxlZFNpemUsIFF0OjpJZ25vcmVBc3BlY3RSYXRpbywgUXQ6OlNtb290aFRyYW5zZm9ybWF0aW9u KTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBwcmVzY2FsZWQgPSBpbWFnZS0+ c2NhbGVkKHNjYWxlZFNpemUsIFF0OjpJZ25vcmVBc3BlY3RSYXRpbywgUXQ6OlNtb290aFRyYW5z Zm9ybWF0aW9uKTsKKyAgICAgICAgICAgIFFQaXhtYXBDYWNoZTo6aW5zZXJ0KGtleSwgcHJlc2Nh bGVkKTsKKyAgICAgICAgfQorICAgICAgICBub3JtYWxpemVkU3JjID0gUVJlY3RGKFFQb2ludEYo KSwgcHJlc2NhbGVkLnNpemUoKSk7CisgICAgICAgIGltYWdlID0gJnByZXNjYWxlZDsKKyAgICB9 CisKICAgICBDb21wb3NpdGVPcGVyYXRvciBwcmV2aW91c09wZXJhdG9yID0gY3R4dC0+Y29tcG9z aXRlT3BlcmF0aW9uKCk7CiAgICAgY3R4dC0+c2V0Q29tcG9zaXRlT3BlcmF0aW9uKCFpbWFnZS0+ aGFzQWxwaGEoKSAmJiBvcCA9PSBDb21wb3NpdGVTb3VyY2VPdmVyID8gQ29tcG9zaXRlQ29weSA6 IG9wKTsKIAo= 207828 2013-07-31 03:42:59 -0700 2013-07-31 06:30:53 -0700 Patch bug-119263-20130731124258.patch text/plain 3799 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjUxNmZiMWE1YjE2ZGU5 Y2ZkZmJkN2QyYzFiNGFiZTkzZDEwMDdiNS4uOTU2MGRhOTI5NGY1ZjUwYTAyZTViMzBlZGNlOWFm OTVhYThmNzk5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA3LTMxICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gSW1hZ2VzIGFyZSBkb3duLXNjYWxlZCBiYWRseQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5MjYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUHJlc2NhbGUgaW1hZ2VzIGJlZm9yZSBwYWludGluZyBh bmQgY2FjaGUgdGhlIHJlc3VsdCBpbiB0aGUgcGl4bWFwIGNhY2hlLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpCaXRtYXBJ bWFnZTo6ZHJhdyk6CisKIDIwMTMtMDctMzEgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWpr b3dza2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgUmVtb3ZlIGd1ZXNzZXNWZWN0b3IgcGFyYW0g ZnJvbSBpc1VuZ3JhbW1hdGljYWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3F0L0ltYWdlUXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvSW1hZ2VRdC5jcHAKaW5kZXggYjg2Njc4NThiZmFkYjAwYjE3Yjg2YTNhMjEyOWQxM2Ux OGZiOGE4OS4uZTUzOWY0ZWMyNDExNjAyN2Q0M2YzNzAxNDM5ODM2MGQyZjEwOGVmMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHAKQEAgLTQ3 LDcgKzQ3LDkgQEAKICNpbmNsdWRlIDxRSW1hZ2VSZWFkZXI+CiAjaW5jbHVkZSA8UVBhaW50ZXI+ CiAjaW5jbHVkZSA8UVBpeG1hcD4KKyNpbmNsdWRlIDxRUGl4bWFwQ2FjaGU+CiAjaW5jbHVkZSA8 UVRyYW5zZm9ybT4KKyNpbmNsdWRlIDxwcml2YXRlL3FoZXhzdHJpbmdfcC5oPgogCiAjaW5jbHVk ZSA8bWF0aC5oPgogCkBAIC0yNDUsNiArMjQ3LDcgQEAgdm9pZCBCaXRtYXBJbWFnZTo6ZHJhdyhH cmFwaGljc0NvbnRleHQqIGN0eHQsIGNvbnN0IEZsb2F0UmVjdCYgZHN0LAogICAgIFFQaXhtYXAq IGltYWdlID0gbmF0aXZlSW1hZ2VGb3JDdXJyZW50RnJhbWUoKTsKICAgICBpZiAoIWltYWdlKQog ICAgICAgICByZXR1cm47CisgICAgUVBpeG1hcCBwcmVzY2FsZWQ7CiAKICAgICBpZiAobWF5Rmls bFdpdGhTb2xpZENvbG9yKCkpIHsKICAgICAgICAgZmlsbFdpdGhTb2xpZENvbG9yKGN0eHQsIG5v cm1hbGl6ZWREc3QsIHNvbGlkQ29sb3IoKSwgc3R5bGVDb2xvclNwYWNlLCBvcCk7CkBAIC0yNTUs NiArMjU4LDM3IEBAIHZvaWQgQml0bWFwSW1hZ2U6OmRyYXcoR3JhcGhpY3NDb250ZXh0KiBjdHh0 LCBjb25zdCBGbG9hdFJlY3QmIGRzdCwKICAgICBub3JtYWxpemVkU3JjID0gYWRqdXN0U291cmNl UmVjdEZvckRvd25TYW1wbGluZyhub3JtYWxpemVkU3JjLCBpbWFnZS0+c2l6ZSgpKTsKICNlbmRp ZgogCisgICAgUVBhaW50ZXIqIHBhaW50ZXIgPSBjdHh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKKyAg ICAvLyBRUGFpbnRlciBkb2Vzbid0IHNjYWxlIGRvd24gdGhhdCB3ZWxsIGJlbG93IDAuNXgsIHNv IGZvciBoaWdoIHF1YWxpdHkgc2NhbGluZyB3ZSBuZWVkIHRvIHBlcmZvcm0gc2NhbGluZyBvdXJz ZWx2ZXMuCisgICAgLy8gV2UgcHJlc2NhbGUgYmVmb3JlIGhpdHRpbmcgMC41eCBiZWNhdXNlIHBy ZXNjYWxpbmcgcXVhbGl0eSBpcyBhbHJlYWR5IGJldHRlciBhdCAwLjV4LCBhbmQgd2l0aCBjYWNo aW5nIG9mdGVuCisgICAgLy8gZmFzdGVyIHRoYW4gdHJhbnNmb3JtcyBpbiB0aGUgcmFzdGVyIHBh aW50IGVuZ2luZS4KKyNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0soNSwgMSwgMCkK KyAgICBjb25zdCBmbG9hdCBwaXhlbFJhdGlvID0gcGFpbnRlci0+ZGV2aWNlKCktPmRldmljZVBp eGVsUmF0aW8oKTsKKyNlbHNlCisgICAgY29uc3QgZmxvYXQgcGl4ZWxSYXRpbyA9IDE7CisjZW5k aWYKKyAgICBpZiAocGFpbnRlci0+cmVuZGVySGludHMoKSAmIFFQYWludGVyOjpTbW9vdGhQaXht YXBUcmFuc2Zvcm0KKyAgICAgICAgJiYgKG5vcm1hbGl6ZWREc3Qud2lkdGgoKSAqIDEuNSAqIHBp eGVsUmF0aW8gPCBub3JtYWxpemVkU3JjLndpZHRoKCkKKyAgICAgICAgICAgIHx8IG5vcm1hbGl6 ZWREc3QuaGVpZ2h0KCkgKiAxLjUgKiBwaXhlbFJhdGlvIDwgbm9ybWFsaXplZFNyYy5oZWlnaHQo KSkpIHsKKyAgICAgICAgLy8gVGhpcyBtYXkgbm90IHdvcmsgcmlnaHQgd2l0aCBzdWJwaXhlbCBw b3NpdGlvbnMsIGJ1dCB0aGF0IGNhbiBub3QgY3VycmVudGx5IGhhcHBlbi4KKyAgICAgICAgUVJl Y3QgcGl4ZWxTcmMgPSBub3JtYWxpemVkU3JjLnRvUmVjdCgpOworICAgICAgICBRU2l6ZSBzY2Fs ZWRTaXplKG5vcm1hbGl6ZWREc3Qud2lkdGgoKSAqIHBpeGVsUmF0aW8sIG5vcm1hbGl6ZWREc3Qu aGVpZ2h0KCkgKiBwaXhlbFJhdGlvKTsKKyAgICAgICAgUVN0cmluZyBrZXkgPSBRU3RyaW5nTGl0 ZXJhbCgicXR3ZWJraXRfcHJlc2NhbGVkXyIpCisgICAgICAgICAgICAlIEhleFN0cmluZzxxaW50 NjQ+KGltYWdlLT5jYWNoZUtleSgpKQorICAgICAgICAgICAgJSBIZXhTdHJpbmc8aW50PihwaXhl bFNyYy54KCkpICUgSGV4U3RyaW5nPGludD4ocGl4ZWxTcmMueSgpKQorICAgICAgICAgICAgJSBI ZXhTdHJpbmc8aW50PihwaXhlbFNyYy53aWR0aCgpKSAlIEhleFN0cmluZzxpbnQ+KHBpeGVsU3Jj LmhlaWdodCgpKQorICAgICAgICAgICAgJSBIZXhTdHJpbmc8aW50PihzY2FsZWRTaXplLndpZHRo KCkpICUgSGV4U3RyaW5nPGludD4oc2NhbGVkU2l6ZS5oZWlnaHQoKSk7CisgICAgICAgIGlmICgh UVBpeG1hcENhY2hlOjpmaW5kKGtleSwgJnByZXNjYWxlZCkpIHsKKyAgICAgICAgICAgIGlmIChw aXhlbFNyYyAhPSBpbWFnZS0+cmVjdCgpKQorICAgICAgICAgICAgICAgIHByZXNjYWxlZCA9IGlt YWdlLT5jb3B5KHBpeGVsU3JjKS5zY2FsZWQoc2NhbGVkU2l6ZSwgUXQ6Oklnbm9yZUFzcGVjdFJh dGlvLCBRdDo6U21vb3RoVHJhbnNmb3JtYXRpb24pOworICAgICAgICAgICAgZWxzZQorICAgICAg ICAgICAgICAgIHByZXNjYWxlZCA9IGltYWdlLT5zY2FsZWQoc2NhbGVkU2l6ZSwgUXQ6Oklnbm9y ZUFzcGVjdFJhdGlvLCBRdDo6U21vb3RoVHJhbnNmb3JtYXRpb24pOworICAgICAgICAgICAgUVBp eG1hcENhY2hlOjppbnNlcnQoa2V5LCBwcmVzY2FsZWQpOworICAgICAgICB9CisgICAgICAgIG5v cm1hbGl6ZWRTcmMgPSBRUmVjdEYoUVBvaW50RigpLCBwcmVzY2FsZWQuc2l6ZSgpKTsKKyAgICAg ICAgaW1hZ2UgPSAmcHJlc2NhbGVkOworICAgIH0KKwogICAgIENvbXBvc2l0ZU9wZXJhdG9yIHBy ZXZpb3VzT3BlcmF0b3IgPSBjdHh0LT5jb21wb3NpdGVPcGVyYXRpb24oKTsKICAgICBjdHh0LT5z ZXRDb21wb3NpdGVPcGVyYXRpb24oIWltYWdlLT5oYXNBbHBoYSgpICYmIG9wID09IENvbXBvc2l0 ZVNvdXJjZU92ZXIgPyBDb21wb3NpdGVDb3B5IDogb3ApOwogCg== 207848 2013-07-31 06:30:57 -0700 2013-07-31 07:10:27 -0700 Patch bug-119263-20130731153056.patch text/plain 4127 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjUxNmZiMWE1YjE2ZGU5 Y2ZkZmJkN2QyYzFiNGFiZTkzZDEwMDdiNS4uODcxYmM2OWVjNWIyZmE5NzUzMTRkZGE5NjFkNzkw NmY3NTRmODVhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTA3LTMxICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gSW1hZ2VzIGFyZSBkb3duLXNjYWxlZCBiYWRseQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5MjYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUVBhaW50ZXIgb25seSBkb2VzIGJpbGluZWFyIGZpbHRl cmluZywgd2hpY2ggbWVhbnMgaXQgd2lsbCBkb3duc2NhbGluZyBiZXlvbmQKKyAgICAgICAgMC41 eCB3aWxsIHN0YXJ0IHNraXBwaW5nIHBpeGVsIGFuZCBzdGFydCB0byBkZWdyYWRlIHRoZSBlbmQg cmVzdWx0LiBTY2FsaW5nIGluCisgICAgICAgIFFJbWFnZSBhbmQgUVBpeG1hcCBob3dldmVyIHVz ZXMgYSBiZXR0ZXIgYnV0IG11Y2ggbW9yZSBleHBlbnNpdmUgc2FtcGxpbmcgdGhhdAorICAgICAg ICBjb3VudHMgYWxsIHBpeGVscy4KKworICAgICAgICBUbyBnZXQgdGhlIGhpZ2ggcXVhbGl0eSBk b3duc2NhbGluZyB3ZSBtdXN0IHRoZXJlZm9yZSBwcmVzY2FsZSB0aGUgaW1hZ2VzIGJlZm9yZQor ICAgICAgICBwYWludGluZyB0aGVtLiBUbyBhdm9pZCBhIHBlcmZvcm1hbmNlIGltcGFjdCBvbiBy ZXBlYXRlZCBwYWludHMgdGhlIHByZXNjYWxlZAorICAgICAgICBpbWFnZSBhcmUgc2F2ZWQgaW4g dGhlIFFQaXhtYXBDYWNoZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdl UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Qml0bWFwSW1hZ2U6OmRyYXcpOgorCiAyMDEzLTA3 LTMxICBHcnplZ29yeiBDemFqa293c2tpICA8Zy5jemFqa293c2tpQHNhbXN1bmcuY29tPgogCiAg ICAgICAgIFJlbW92ZSBndWVzc2VzVmVjdG9yIHBhcmFtIGZyb20gaXNVbmdyYW1tYXRpY2FsCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlUXQuY3BwCmluZGV4 IGI4NjY3ODU4YmZhZGIwMGIxN2I4NmEzYTIxMjlkMTNlMThmYjhhODkuLjY2Y2M1ODE3YmI1YjVi OTY4MWFhMTRlODUxNDYzNjRjMDhiYTE3NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlUXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3F0L0ltYWdlUXQuY3BwCkBAIC00Nyw3ICs0Nyw5IEBACiAjaW5jbHVkZSA8 UUltYWdlUmVhZGVyPgogI2luY2x1ZGUgPFFQYWludGVyPgogI2luY2x1ZGUgPFFQaXhtYXA+Cisj aW5jbHVkZSA8UVBpeG1hcENhY2hlPgogI2luY2x1ZGUgPFFUcmFuc2Zvcm0+CisjaW5jbHVkZSA8 cHJpdmF0ZS9xaGV4c3RyaW5nX3AuaD4KIAogI2luY2x1ZGUgPG1hdGguaD4KIApAQCAtMjQ1LDYg KzI0Nyw3IEBAIHZvaWQgQml0bWFwSW1hZ2U6OmRyYXcoR3JhcGhpY3NDb250ZXh0KiBjdHh0LCBj b25zdCBGbG9hdFJlY3QmIGRzdCwKICAgICBRUGl4bWFwKiBpbWFnZSA9IG5hdGl2ZUltYWdlRm9y Q3VycmVudEZyYW1lKCk7CiAgICAgaWYgKCFpbWFnZSkKICAgICAgICAgcmV0dXJuOworICAgIFFQ aXhtYXAgcHJlc2NhbGVkOwogCiAgICAgaWYgKG1heUZpbGxXaXRoU29saWRDb2xvcigpKSB7CiAg ICAgICAgIGZpbGxXaXRoU29saWRDb2xvcihjdHh0LCBub3JtYWxpemVkRHN0LCBzb2xpZENvbG9y KCksIHN0eWxlQ29sb3JTcGFjZSwgb3ApOwpAQCAtMjU1LDYgKzI1OCwzNyBAQCB2b2lkIEJpdG1h cEltYWdlOjpkcmF3KEdyYXBoaWNzQ29udGV4dCogY3R4dCwgY29uc3QgRmxvYXRSZWN0JiBkc3Qs CiAgICAgbm9ybWFsaXplZFNyYyA9IGFkanVzdFNvdXJjZVJlY3RGb3JEb3duU2FtcGxpbmcobm9y bWFsaXplZFNyYywgaW1hZ2UtPnNpemUoKSk7CiAjZW5kaWYKIAorICAgIFFQYWludGVyKiBwYWlu dGVyID0gY3R4dC0+cGxhdGZvcm1Db250ZXh0KCk7CisgICAgLy8gVGhlIHF1YWxpdHkgb2YgZG93 biBzY2FsaW5nIGF0IDAuNXggYW5kIGJlbG93IGluIFFQYWludGVyIGlzIG5vdCB2ZXJ5IGdvb2QK KyAgICAvLyBkdWUgb25seSB1c2luZyBiaWxpbmVhciBzYW1wbGluZywgc28gZm9yIGhpZ2ggcXVh bGl0eSBzY2FsaW5nIHdlIG5lZWQgdG8KKyAgICAvLyBwZXJmb3JtIHNjYWxpbmcgb3Vyc2VsdmVz LgorI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg1LCAxLCAwKQorICAgIGNvbnN0 IGZsb2F0IHBpeGVsUmF0aW8gPSBwYWludGVyLT5kZXZpY2UoKS0+ZGV2aWNlUGl4ZWxSYXRpbygp OworI2Vsc2UKKyAgICBjb25zdCBmbG9hdCBwaXhlbFJhdGlvID0gMTsKKyNlbmRpZgorICAgIGlm IChwYWludGVyLT5yZW5kZXJIaW50cygpICYgUVBhaW50ZXI6OlNtb290aFBpeG1hcFRyYW5zZm9y bQorICAgICAgICAmJiAobm9ybWFsaXplZERzdC53aWR0aCgpICogMiAqIHBpeGVsUmF0aW8gPCBu b3JtYWxpemVkU3JjLndpZHRoKCkKKyAgICAgICAgICAgIHx8IG5vcm1hbGl6ZWREc3QuaGVpZ2h0 KCkgKiAyICogcGl4ZWxSYXRpbyA8IG5vcm1hbGl6ZWRTcmMuaGVpZ2h0KCkpKSB7CisgICAgICAg IC8vIFRoaXMgbWF5IG5vdCB3b3JrIHJpZ2h0IHdpdGggc3VicGl4ZWwgcG9zaXRpb25zLCBidXQg dGhhdCBjYW4gbm90IGN1cnJlbnRseSBoYXBwZW4uCisgICAgICAgIFFSZWN0IHBpeGVsU3JjID0g bm9ybWFsaXplZFNyYy50b1JlY3QoKTsKKyAgICAgICAgUVNpemUgc2NhbGVkU2l6ZShub3JtYWxp emVkRHN0LndpZHRoKCkgKiBwaXhlbFJhdGlvLCBub3JtYWxpemVkRHN0LmhlaWdodCgpICogcGl4 ZWxSYXRpbyk7CisgICAgICAgIFFTdHJpbmcga2V5ID0gUVN0cmluZ0xpdGVyYWwoInF0d2Via2l0 X3ByZXNjYWxlZF8iKQorICAgICAgICAgICAgJSBIZXhTdHJpbmc8cWludDY0PihpbWFnZS0+Y2Fj aGVLZXkoKSkKKyAgICAgICAgICAgICUgSGV4U3RyaW5nPGludD4ocGl4ZWxTcmMueCgpKSAlIEhl eFN0cmluZzxpbnQ+KHBpeGVsU3JjLnkoKSkKKyAgICAgICAgICAgICUgSGV4U3RyaW5nPGludD4o cGl4ZWxTcmMud2lkdGgoKSkgJSBIZXhTdHJpbmc8aW50PihwaXhlbFNyYy5oZWlnaHQoKSkKKyAg ICAgICAgICAgICUgSGV4U3RyaW5nPGludD4oc2NhbGVkU2l6ZS53aWR0aCgpKSAlIEhleFN0cmlu ZzxpbnQ+KHNjYWxlZFNpemUuaGVpZ2h0KCkpOworICAgICAgICBpZiAoIVFQaXhtYXBDYWNoZTo6 ZmluZChrZXksICZwcmVzY2FsZWQpKSB7CisgICAgICAgICAgICBpZiAocGl4ZWxTcmMgIT0gaW1h Z2UtPnJlY3QoKSkKKyAgICAgICAgICAgICAgICBwcmVzY2FsZWQgPSBpbWFnZS0+Y29weShwaXhl bFNyYykuc2NhbGVkKHNjYWxlZFNpemUsIFF0OjpJZ25vcmVBc3BlY3RSYXRpbywgUXQ6OlNtb290 aFRyYW5zZm9ybWF0aW9uKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBwcmVz Y2FsZWQgPSBpbWFnZS0+c2NhbGVkKHNjYWxlZFNpemUsIFF0OjpJZ25vcmVBc3BlY3RSYXRpbywg UXQ6OlNtb290aFRyYW5zZm9ybWF0aW9uKTsKKyAgICAgICAgICAgIFFQaXhtYXBDYWNoZTo6aW5z ZXJ0KGtleSwgcHJlc2NhbGVkKTsKKyAgICAgICAgfQorICAgICAgICBub3JtYWxpemVkU3JjID0g UVJlY3RGKFFQb2ludEYoKSwgcHJlc2NhbGVkLnNpemUoKSk7CisgICAgICAgIGltYWdlID0gJnBy ZXNjYWxlZDsKKyAgICB9CisKICAgICBDb21wb3NpdGVPcGVyYXRvciBwcmV2aW91c09wZXJhdG9y ID0gY3R4dC0+Y29tcG9zaXRlT3BlcmF0aW9uKCk7CiAgICAgY3R4dC0+c2V0Q29tcG9zaXRlT3Bl cmF0aW9uKCFpbWFnZS0+aGFzQWxwaGEoKSAmJiBvcCA9PSBDb21wb3NpdGVTb3VyY2VPdmVyID8g Q29tcG9zaXRlQ29weSA6IG9wKTsKIAo=