93662 2012-08-09 15:15:16 -0700 Allow users to specify a different hover image for TextFieldDecorationElement 2012-10-09 06:43:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 gcasto webkit-unassigned abarth dglazkov fishd guohui jamesr tkent tkent+wkapi webkit.review.bot zysxqn oldest_to_newest 691907 0 gcasto 2012-08-09 15:15:16 -0700 Allow users to specify a different hover image for TextFieldDecorationElement 691911 1 157559 gcasto 2012-08-09 15:19:08 -0700 Created attachment 157559 Patch 691912 2 webkit.review.bot 2012-08-09 15:22:08 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 692085 3 157559 tkent 2012-08-09 18:46:09 -0700 Comment on attachment 157559 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=157559&action=review The code change looks good. > Source/WebKit/chromium/ChangeLog:8 > + Additional information of the change such as approach, rationale. Please add per-function descriptions below (OOPS!). Please replace this line with something or remove this line. r- because of this. 693196 4 157893 gcasto 2012-08-12 02:53:27 -0700 Created attachment 157893 Patch 693259 5 157893 tkent 2012-08-12 06:22:41 -0700 Comment on attachment 157893 Patch ok 737130 6 167632 gcasto 2012-10-08 15:33:45 -0700 Created attachment 167632 Patch 737136 7 gcasto 2012-10-08 15:42:10 -0700 So I just realized that this hasn't been submitted. The new patch has updated ChangeLog files, but everything else should be unchanged. Kent-san, would you mind sending this through the commit queue after review? 737742 8 167632 tkent 2012-10-09 06:37:33 -0700 Comment on attachment 167632 Patch You needed to set "commit-queue ?" flag to ask to commit the patch. 737747 9 167632 webkit.review.bot 2012-10-09 06:43:09 -0700 Comment on attachment 167632 Patch Clearing flags on attachment: 167632 Committed r130756: <http://trac.webkit.org/changeset/130756> 737748 10 webkit.review.bot 2012-10-09 06:43:13 -0700 All reviewed patches have been landed. Closing bug. 157559 2012-08-09 15:19:08 -0700 2012-08-12 02:53:22 -0700 Patch bug-93662-20120809151841.patch text/plain 9582 gcasto U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0OTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjU4M2ZmMzI3OWMzYzg4 Y2M3Zjc3N2Y1ODM2NDI3OWYxZWQ4ZTRiOC4uMTdjMTVmMzMyZTQ0MTFkZWUzYTk2YjkyMDA5MjQ0 ZjQxNTllMjE5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA4LTA5ICBHYXJy ZXR0IENhc3RvICA8Z2Nhc3RvQGNocm9taXVtLm9yZz4KKworICAgICAgICBBbGxvdyB1c2VycyB0 byBzcGVjaWZ5IGEgZGlmZmVyZW50IGhvdmVyIGltYWdlIGZvciBUZXh0RmllbGREZWNvcmF0aW9u RWxlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTM2NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGh0bWwvc2hhZG93L1RleHRGaWVsZERlY29yYXRpb25FbGVtZW50LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlRleHRGaWVsZERlY29yYXRpb25FbGVtZW50OjpUZXh0RmllbGREZWNvcmF0aW9uRWxl bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0RmllbGREZWNvcmF0aW9uRWxlbWVudDo6dXBk YXRlSW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQ6 OmRlZmF1bHRFdmVudEhhbmRsZXIpOiBIYW5kbGVzIG1vdXNlb3ZlciBhbmQgbW91c2VvdXQgZXZl bnRzLgorICAgICAgICAoV2ViQ29yZTo6VGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQ6OndpbGxS ZXNwb25kVG9Nb3VzZU1vdmVFdmVudHMpOiBOb3cgcmV0dXJucyB0cnVlIGlmIHRoZSBlbGVtZW50 IGlzIG5vdCBkaXNhYmxlZC4KKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIGh0bWwvc2hh ZG93L1RleHRGaWVsZERlY29yYXRpb25FbGVtZW50Lmg6CisgICAgICAgIChUZXh0RmllbGREZWNv cmF0b3IpOgorICAgICAgICAoVGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQpOgorCiAyMDEyLTA4 LTA3ICBNaWtlIFJlZWQgIDxyZWVkQGdvb2dsZS5jb20+CiAKICAgICAgICAgcmVpbXBsZW1lbnQg ZmFzdE1vZCB3L28gKHNvb24gdG8gYmUpIHByaXZhdGUgc2tpYSBtYWNyb3MKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKaW5kZXggNjA2NTA2MDhhNzUzMjBlODljMDAwZGQyODE2YmRiZDcwZTIzZjAz YS4uMjc5NjQxNGRmYTY2MjcyNDc2M2ZjMTIwM2M5M2MyZjg3ZWUxNDZkMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMi0wOC0wOSAgR2FycmV0dCBDYXN0 byAgPGdjYXN0b0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWxsb3cgdXNlcnMgdG8gc3BlY2lm eSBhIGRpZmZlcmVudCBob3ZlciBpbWFnZSBmb3IgVGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzNjYyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkaXRpb25h bCBpbmZvcm1hdGlvbiBvZiB0aGUgY2hhbmdlIHN1Y2ggYXMgYXBwcm9hY2gsIHJhdGlvbmFsZS4g UGxlYXNlIGFkZCBwZXItZnVuY3Rpb24gZGVzY3JpcHRpb25zIGJlbG93IChPT1BTISkuCisKKyAg ICAgICAgKiBwdWJsaWMvV2ViVGV4dEZpZWxkRGVjb3JhdG9yQ2xpZW50Lmg6CisgICAgICAgIChX ZWJUZXh0RmllbGREZWNvcmF0b3JDbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJUZXh0Rmll bGREZWNvcmF0b3JDbGllbnQ6OmltYWdlTmFtZUZvckhvdmVyU3RhdGUpOiBBbGxvdyB1c2VycyB0 byBzcGVjaWZ5IHRoZSBuYW1lIG9mIHRoZSBpbWFnZSBmb3IgbW91c2VvdmVyLgorICAgICAgICAq IHNyYy9UZXh0RmllbGREZWNvcmF0b3JJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6VGV4dEZp ZWxkRGVjb3JhdG9ySW1wbDo6aW1hZ2VGb3JSZWFkb25seVN0YXRlKToKKyAgICAgICAgKFdlYktp dDo6VGV4dEZpZWxkRGVjb3JhdG9ySW1wbDo6aW1hZ2VGb3JIb3ZlclN0YXRlKToKKyAgICAgICAg KFdlYktpdCk6CisgICAgICAgICogc3JjL1RleHRGaWVsZERlY29yYXRvckltcGwuaDoKKyAgICAg ICAgKFRleHRGaWVsZERlY29yYXRvckltcGwpOgorCiAyMDEyLTA4LTA3ICBKb3NodWEgQmVsbCAg PGpzYmVsbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMTI0ODY1KTogSXQg YnJva2UgdGhlIEFSTSBDaHJvbWl1bSBidWlsZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvVGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNv cmUvaHRtbC9zaGFkb3cvVGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQuY3BwCmluZGV4IDY4OWFh MGFkMjIyMjE4Y2QxNzY2NGIyZTRhNWE5YjFlMjJhYzg2ZTAuLmJlMDg1ZTQzMDY0Mjc1NzM4ZjFh NWJhZjliMzk5NDk1MTFmOTIyODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hh ZG93L1RleHRGaWVsZERlY29yYXRpb25FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL3NoYWRvdy9UZXh0RmllbGREZWNvcmF0aW9uRWxlbWVudC5jcHAKQEAgLTU3LDYgKzU3LDcg QEAgVGV4dEZpZWxkRGVjb3JhdG9yOjp+VGV4dEZpZWxkRGVjb3JhdG9yKCkKIFRleHRGaWVsZERl Y29yYXRpb25FbGVtZW50OjpUZXh0RmllbGREZWNvcmF0aW9uRWxlbWVudChEb2N1bWVudCogZG9j dW1lbnQsIFRleHRGaWVsZERlY29yYXRvciogZGVjb3JhdG9yKQogICAgIDogSFRNTERpdkVsZW1l bnQoSFRNTE5hbWVzOjpkaXZUYWcsIGRvY3VtZW50KQogICAgICwgbV90ZXh0RmllbGREZWNvcmF0 b3IoZGVjb3JhdG9yKQorICAgICwgbV9pc0luSG92ZXJTdGF0ZShmYWxzZSkKIHsKICAgICBBU1NF UlQoZGVjb3JhdG9yKTsKICAgICBzZXRIYXNDdXN0b21DYWxsYmFja3MoKTsKQEAgLTEzNyw2ICsx MzgsOCBAQCB2b2lkIFRleHRGaWVsZERlY29yYXRpb25FbGVtZW50Ojp1cGRhdGVJbWFnZSgpCiAg ICAgICAgIGltYWdlID0gbV90ZXh0RmllbGREZWNvcmF0b3ItPmltYWdlRm9yRGlzYWJsZWRTdGF0 ZSgpOwogICAgIGVsc2UgaWYgKGhvc3RJbnB1dCgpLT5yZWFkT25seSgpKQogICAgICAgICBpbWFn ZSA9IG1fdGV4dEZpZWxkRGVjb3JhdG9yLT5pbWFnZUZvclJlYWRvbmx5U3RhdGUoKTsKKyAgICBl bHNlIGlmIChtX2lzSW5Ib3ZlclN0YXRlKQorICAgICAgICBpbWFnZSA9IG1fdGV4dEZpZWxkRGVj b3JhdG9yLT5pbWFnZUZvckhvdmVyU3RhdGUoKTsKICAgICBlbHNlCiAgICAgICAgIGltYWdlID0g bV90ZXh0RmllbGREZWNvcmF0b3ItPmltYWdlRm9yTm9ybWFsU3RhdGUoKTsKICAgICBBU1NFUlQo aW1hZ2UpOwpAQCAtMTk0LDEwICsxOTcsMjkgQEAgdm9pZCBUZXh0RmllbGREZWNvcmF0aW9uRWxl bWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiAgICAgICAgIGV2ZW50LT5z ZXREZWZhdWx0SGFuZGxlZCgpOwogICAgIH0KIAorICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2 ZW50TmFtZXMoKS5tb3VzZW92ZXJFdmVudCkgeworICAgICAgICBtX2lzSW5Ib3ZlclN0YXRlID0g dHJ1ZTsKKyAgICAgICAgdXBkYXRlSW1hZ2UoKTsKKyAgICB9CisKKyAgICBpZiAoZXZlbnQtPnR5 cGUoKSA9PSBldmVudE5hbWVzKCkubW91c2VvdXRFdmVudCkgeworICAgICAgICBtX2lzSW5Ib3Zl clN0YXRlID0gZmFsc2U7CisgICAgICAgIHVwZGF0ZUltYWdlKCk7CisgICAgfQorCiAgICAgaWYg KCFldmVudC0+ZGVmYXVsdEhhbmRsZWQoKSkKICAgICAgICAgSFRNTERpdkVsZW1lbnQ6OmRlZmF1 bHRFdmVudEhhbmRsZXIoZXZlbnQpOwogfQogCitib29sIFRleHRGaWVsZERlY29yYXRpb25FbGVt ZW50Ojp3aWxsUmVzcG9uZFRvTW91c2VNb3ZlRXZlbnRzKCkKK3sKKyAgICBjb25zdCBIVE1MSW5w dXRFbGVtZW50KiBpbnB1dCA9IGhvc3RJbnB1dCgpOworICAgIGlmICghaW5wdXQtPmRpc2FibGVk KCkgJiYgIWlucHV0LT5yZWFkT25seSgpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHJl dHVybiBIVE1MRGl2RWxlbWVudDo6d2lsbFJlc3BvbmRUb01vdXNlTW92ZUV2ZW50cygpOworfQor CiBib29sIFRleHRGaWVsZERlY29yYXRpb25FbGVtZW50Ojp3aWxsUmVzcG9uZFRvTW91c2VDbGlj a0V2ZW50cygpCiB7CiAgICAgY29uc3QgSFRNTElucHV0RWxlbWVudCogaW5wdXQgPSBob3N0SW5w dXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1RleHRGaWVsZERl Y29yYXRpb25FbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9UZXh0RmllbGRE ZWNvcmF0aW9uRWxlbWVudC5oCmluZGV4IDJjOGQ4MjJiM2I5ODczNzc3NmJkMzk2MDA2M2NjMWFk Y2VjNDMyMTkuLmZkNWEyYzQ5NTRiYWU0ZWNmMTJiNThlYTdiMWY1MzI5YThkOThlZTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1RleHRGaWVsZERlY29yYXRpb25FbGVt ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvVGV4dEZpZWxkRGVjb3JhdGlv bkVsZW1lbnQuaApAQCAtNTIsNiArNTIsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBDYWNoZWRJ bWFnZSogaW1hZ2VGb3JOb3JtYWxTdGF0ZSgpID0gMDsKICAgICB2aXJ0dWFsIENhY2hlZEltYWdl KiBpbWFnZUZvckRpc2FibGVkU3RhdGUoKSA9IDA7CiAgICAgdmlydHVhbCBDYWNoZWRJbWFnZSog aW1hZ2VGb3JSZWFkb25seVN0YXRlKCkgPSAwOworICAgIHZpcnR1YWwgQ2FjaGVkSW1hZ2UqIGlt YWdlRm9ySG92ZXJTdGF0ZSgpID0gMDsKIAogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVDbGljayhI VE1MSW5wdXRFbGVtZW50KikgPSAwOwogICAgIC8vIFRoaXMgZnVuY3Rpb24gaXMgY2FsbGVkIGp1 c3QgYmVmb3JlIGRldGFjaGluZyB0aGUgZGVjb3JhdGlvbi4gSXQgbXVzdCBub3QKQEAgLTcxLDYg KzcyLDcgQEAgcHVibGljOgogICAgIFRleHRGaWVsZERlY29yYXRvciogdGV4dEZpZWxkRGVjb3Jh dG9yKCkgeyByZXR1cm4gbV90ZXh0RmllbGREZWNvcmF0b3I7IH0KICAgICB2b2lkIGRlY29yYXRl KEhUTUxJbnB1dEVsZW1lbnQqLCBib29sIHZpc2libGUpOwogCisgICAgdmlydHVhbCBib29sIHdp bGxSZXNwb25kVG9Nb3VzZU1vdmVFdmVudHMoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIGJvb2wg d2lsbFJlc3BvbmRUb01vdXNlQ2xpY2tFdmVudHMoKSBPVkVSUklERTsKIAogcHJpdmF0ZToKQEAg LTg3LDYgKzg5LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHVwZGF0ZUltYWdlKCk7CiAKICAgICBU ZXh0RmllbGREZWNvcmF0b3IqIG1fdGV4dEZpZWxkRGVjb3JhdG9yOworICAgIGJvb2wgbV9pc0lu SG92ZXJTdGF0ZTsKIH07CiAKIGlubGluZSBUZXh0RmllbGREZWNvcmF0aW9uRWxlbWVudCogdG9U ZXh0RmllbGREZWNvcmF0aW9uRWxlbWVudChOb2RlKiBub2RlKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVGV4dEZpZWxkRGVjb3JhdG9yQ2xpZW50LmggYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJUZXh0RmllbGREZWNvcmF0b3JDbGllbnQu aAppbmRleCA3NzJlMTIxNmJjMWE0NzI2OGU2YjEwMjM1Y2Y2OTA0ZTI3MmMyMWM1Li44NmYzZmY2 ZDRjMjhmOGYyYjIxNDY5MWRkMzQ3NGM1M2VlNGI3MDk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJUZXh0RmllbGREZWNvcmF0b3JDbGllbnQuaAorKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJUZXh0RmllbGREZWNvcmF0b3JDbGllbnQu aApAQCAtNTgsOSArNTgsMTMgQEAgcHVibGljOgogICAgIC8vIGVtcHR5IHN0cmluZywgaW1hZ2VO YW1lRm9yTm9ybWFsU3RhdGUoKSBpcyB1c2VkIGV2ZW4gZm9yIHRoZSBkaXNhYmxlZAogICAgIC8v IHN0YXRlLgogICAgIHZpcnR1YWwgV2ViQ1N0cmluZyBpbWFnZU5hbWVGb3JEaXNhYmxlZFN0YXRl KCkgPSAwOwotICAgIC8vIEltYWdlIHJlc291cmNlIG5hbWUgZm9yIHRoZSBkaXNhYmxlZCBzdGF0 ZS4gSWYgdGhpcyBmdW5jdGlvbiByZXR1cm5zIGFuCisgICAgLy8gSW1hZ2UgcmVzb3VyY2UgbmFt ZSBmb3IgdGhlIHJlYWQgb25seSBzdGF0ZS4gSWYgdGhpcyBmdW5jdGlvbiByZXR1cm5zIGFuCiAg ICAgLy8gZW1wdHkgc3RyaW5nLCB0aGUgaW1hZ2Ugc2FtZSBhcyBpbWFnZU5hbWVGb3JEaXNhYmxl ZFN0YXRlKCkgaXMgdXNlZC4KICAgICB2aXJ0dWFsIFdlYkNTdHJpbmcgaW1hZ2VOYW1lRm9yUmVh ZE9ubHlTdGF0ZSgpID0gMDsKKyAgICAvLyBJbWFnZSByZXNvdXJjZSBuYW1lIGZvciB3aGVuIHRo ZSBpbWFnZWQgaXMgYmVpbmcgaG92ZXJlZCBvdmVyLiBJZiB0aGlzCisgICAgLy8gZnVuY3Rpb24g cmV0dXJucyBhbiBlbXB0eSBzdHJpbmcsIGltYWdlTmFtZUZvck5vcm1hbFN0YXRlKCkgaXMgdXNl ZAorICAgIC8vIGluc3RlYWQuCisgICAgdmlydHVhbCBXZWJDU3RyaW5nIGltYWdlTmFtZUZvckhv dmVyU3RhdGUoKSB7cmV0dXJuIFdlYkNTdHJpbmcoKTt9CiAKICAgICAvLyBUaGlzIGlzIGNhbGxl ZCB3aGVuIHRoZSBkZWNvcmF0aW9uIGljb24gaXMgY2xpY2tlZC4KICAgICB2aXJ0dWFsIHZvaWQg aGFuZGxlQ2xpY2soV2ViSW5wdXRFbGVtZW50JikgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvVGV4dEZpZWxkRGVjb3JhdG9ySW1wbC5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9UZXh0RmllbGREZWNvcmF0b3JJbXBsLmNwcAppbmRleCBhNzRhYTgy NWFhZWRlYmU3Y2U4NDJjMmY5YzMwMjFhYmZlM2RmMGU2Li40NGJhYzQwMzg1Yzc4MzQ4MzQ4NzI5 MDNhZjM1YTkxZmIzZDM3NDFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9UZXh0RmllbGREZWNvcmF0b3JJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9UZXh0RmllbGREZWNvcmF0b3JJbXBsLmNwcApAQCAtMTAzLDcgKzEwMyw3IEBAIENhY2hl ZEltYWdlKiBUZXh0RmllbGREZWNvcmF0b3JJbXBsOjppbWFnZUZvclJlYWRvbmx5U3RhdGUoKQog ICAgIGlmICghbV9jYWNoZWRJbWFnZUZvclJlYWRvbmx5U3RhdGUpIHsKICAgICAgICAgV2ViQ1N0 cmluZyBpbWFnZU5hbWUgPSBtX2NsaWVudC0+aW1hZ2VOYW1lRm9yUmVhZE9ubHlTdGF0ZSgpOwog ICAgICAgICBpZiAoaW1hZ2VOYW1lLmlzRW1wdHkoKSkKLSAgICAgICAgICAgIG1fY2FjaGVkSW1h Z2VGb3JEaXNhYmxlZFN0YXRlID0gaW1hZ2VGb3JEaXNhYmxlZFN0YXRlKCk7CisgICAgICAgICAg ICBtX2NhY2hlZEltYWdlRm9yUmVhZG9ubHlTdGF0ZSA9IGltYWdlRm9yRGlzYWJsZWRTdGF0ZSgp OwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UgPSBJbWFn ZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoaW1hZ2VOYW1lLmRhdGEoKSk7CiAgICAgICAgICAgICBt X2NhY2hlZEltYWdlRm9yUmVhZG9ubHlTdGF0ZSA9IG5ldyBDYWNoZWRJbWFnZShpbWFnZS5nZXQo KSk7CkBAIC0xMTIsNiArMTEyLDIwIEBAIENhY2hlZEltYWdlKiBUZXh0RmllbGREZWNvcmF0b3JJ bXBsOjppbWFnZUZvclJlYWRvbmx5U3RhdGUoKQogICAgIHJldHVybiBtX2NhY2hlZEltYWdlRm9y UmVhZG9ubHlTdGF0ZS5nZXQoKTsKIH0KIAorQ2FjaGVkSW1hZ2UqIFRleHRGaWVsZERlY29yYXRv ckltcGw6OmltYWdlRm9ySG92ZXJTdGF0ZSgpCit7CisgICAgaWYgKCFtX2NhY2hlZEltYWdlRm9y SG92ZXJTdGF0ZSkgeworICAgICAgICBXZWJDU3RyaW5nIGltYWdlTmFtZSA9IG1fY2xpZW50LT5p bWFnZU5hbWVGb3JIb3ZlclN0YXRlKCk7CisgICAgICAgIGlmIChpbWFnZU5hbWUuaXNFbXB0eSgp KQorICAgICAgICAgICAgbV9jYWNoZWRJbWFnZUZvckhvdmVyU3RhdGUgPSBpbWFnZUZvck5vcm1h bFN0YXRlKCk7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgUmVmUHRyPEltYWdlPiBpbWFn ZSA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZShpbWFnZU5hbWUuZGF0YSgpKTsKKyAgICAg ICAgICAgIG1fY2FjaGVkSW1hZ2VGb3JIb3ZlclN0YXRlID0gbmV3IENhY2hlZEltYWdlKGltYWdl LmdldCgpKTsKKyAgICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gbV9jYWNoZWRJbWFnZUZvckhv dmVyU3RhdGUuZ2V0KCk7Cit9CisKIHZvaWQgVGV4dEZpZWxkRGVjb3JhdG9ySW1wbDo6aGFuZGxl Q2xpY2soSFRNTElucHV0RWxlbWVudCogaW5wdXQpCiB7CiAgICAgQVNTRVJUKGlucHV0KTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1RleHRGaWVsZERlY29yYXRvcklt cGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1RleHRGaWVsZERlY29yYXRvckltcGwu aAppbmRleCA4ZjUyMDY5YmFmNmY2YWY0NzRkNjc0MDYxNDVkMGFmNzNlYTIwODc5Li45MmFiMGRm YjMyNzJiNmNjNjhmNDBkY2UzODRkNmNmNjZmOTlmMThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9UZXh0RmllbGREZWNvcmF0b3JJbXBsLmgKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvVGV4dEZpZWxkRGVjb3JhdG9ySW1wbC5oCkBAIC01MSw2ICs1MSw3 IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBXZWJDb3JlOjpDYWNoZWRJbWFnZSogaW1hZ2VGb3JO b3JtYWxTdGF0ZSgpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6Q2FjaGVkSW1hZ2Uq IGltYWdlRm9yRGlzYWJsZWRTdGF0ZSgpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6 Q2FjaGVkSW1hZ2UqIGltYWdlRm9yUmVhZG9ubHlTdGF0ZSgpIE9WRVJSSURFOworICAgIHZpcnR1 YWwgV2ViQ29yZTo6Q2FjaGVkSW1hZ2UqIGltYWdlRm9ySG92ZXJTdGF0ZSgpIE9WRVJSSURFOwog ICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVDbGljayhXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50Kikg T1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHdpbGxEZXRhY2goV2ViQ29yZTo6SFRNTElucHV0 RWxlbWVudCopIE9WRVJSSURFOwogCkBAIC02MCw2ICs2MSw3IEBAIHByaXZhdGU6CiAgICAgV2Vi Q29yZTo6Q2FjaGVkUmVzb3VyY2VIYW5kbGU8V2ViQ29yZTo6Q2FjaGVkSW1hZ2U+IG1fY2FjaGVk SW1hZ2VGb3JOb3JtYWxTdGF0ZTsKICAgICBXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUhhbmRsZTxX ZWJDb3JlOjpDYWNoZWRJbWFnZT4gbV9jYWNoZWRJbWFnZUZvckRpc2FibGVkU3RhdGU7CiAgICAg V2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VIYW5kbGU8V2ViQ29yZTo6Q2FjaGVkSW1hZ2U+IG1fY2Fj aGVkSW1hZ2VGb3JSZWFkb25seVN0YXRlOworICAgIFdlYkNvcmU6OkNhY2hlZFJlc291cmNlSGFu ZGxlPFdlYkNvcmU6OkNhY2hlZEltYWdlPiBtX2NhY2hlZEltYWdlRm9ySG92ZXJTdGF0ZTsKIH07 CiAKIH0K 157893 2012-08-12 02:53:27 -0700 2012-10-08 15:33:43 -0700 Patch bug-93662-20120812025257.patch text/plain 9453 gcasto U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0OTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjU4M2ZmMzI3OWMzYzg4 Y2M3Zjc3N2Y1ODM2NDI3OWYxZWQ4ZTRiOC4uMTdjMTVmMzMyZTQ0MTFkZWUzYTk2YjkyMDA5MjQ0 ZjQxNTllMjE5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA4LTA5ICBHYXJy ZXR0IENhc3RvICA8Z2Nhc3RvQGNocm9taXVtLm9yZz4KKworICAgICAgICBBbGxvdyB1c2VycyB0 byBzcGVjaWZ5IGEgZGlmZmVyZW50IGhvdmVyIGltYWdlIGZvciBUZXh0RmllbGREZWNvcmF0aW9u RWxlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTM2NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGh0bWwvc2hhZG93L1RleHRGaWVsZERlY29yYXRpb25FbGVtZW50LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlRleHRGaWVsZERlY29yYXRpb25FbGVtZW50OjpUZXh0RmllbGREZWNvcmF0aW9uRWxl bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0RmllbGREZWNvcmF0aW9uRWxlbWVudDo6dXBk YXRlSW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQ6 OmRlZmF1bHRFdmVudEhhbmRsZXIpOiBIYW5kbGVzIG1vdXNlb3ZlciBhbmQgbW91c2VvdXQgZXZl bnRzLgorICAgICAgICAoV2ViQ29yZTo6VGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQ6OndpbGxS ZXNwb25kVG9Nb3VzZU1vdmVFdmVudHMpOiBOb3cgcmV0dXJucyB0cnVlIGlmIHRoZSBlbGVtZW50 IGlzIG5vdCBkaXNhYmxlZC4KKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIGh0bWwvc2hh ZG93L1RleHRGaWVsZERlY29yYXRpb25FbGVtZW50Lmg6CisgICAgICAgIChUZXh0RmllbGREZWNv cmF0b3IpOgorICAgICAgICAoVGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQpOgorCiAyMDEyLTA4 LTA3ICBNaWtlIFJlZWQgIDxyZWVkQGdvb2dsZS5jb20+CiAKICAgICAgICAgcmVpbXBsZW1lbnQg ZmFzdE1vZCB3L28gKHNvb24gdG8gYmUpIHByaXZhdGUgc2tpYSBtYWNyb3MKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKaW5kZXggNjA2NTA2MDhhNzUzMjBlODljMDAwZGQyODE2YmRiZDcwZTIzZjAz YS4uYzVmMmI0MzQwNjQ2ZTMxYjQ2MDJlNTlkZGFiY2QyMGM3OGE5Y2RkZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMi0wOC0wOSAgR2FycmV0dCBDYXN0 byAgPGdjYXN0b0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWxsb3cgdXNlcnMgdG8gc3BlY2lm eSBhIGRpZmZlcmVudCBob3ZlciBpbWFnZSBmb3IgVGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzNjYyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMv V2ViVGV4dEZpZWxkRGVjb3JhdG9yQ2xpZW50Lmg6CisgICAgICAgIChXZWJUZXh0RmllbGREZWNv cmF0b3JDbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJUZXh0RmllbGREZWNvcmF0b3JDbGll bnQ6OmltYWdlTmFtZUZvckhvdmVyU3RhdGUpOiBBbGxvdyB1c2VycyB0byBzcGVjaWZ5IHRoZSBu YW1lIG9mIHRoZSBpbWFnZSBmb3IgbW91c2VvdmVyLgorICAgICAgICAqIHNyYy9UZXh0RmllbGRE ZWNvcmF0b3JJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6VGV4dEZpZWxkRGVjb3JhdG9ySW1w bDo6aW1hZ2VGb3JSZWFkb25seVN0YXRlKToKKyAgICAgICAgKFdlYktpdDo6VGV4dEZpZWxkRGVj b3JhdG9ySW1wbDo6aW1hZ2VGb3JIb3ZlclN0YXRlKToKKyAgICAgICAgKFdlYktpdCk6CisgICAg ICAgICogc3JjL1RleHRGaWVsZERlY29yYXRvckltcGwuaDoKKyAgICAgICAgKFRleHRGaWVsZERl Y29yYXRvckltcGwpOgorCiAyMDEyLTA4LTA3ICBKb3NodWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMTI0ODY1KTogSXQgYnJva2UgdGhlIEFSTSBD aHJvbWl1bSBidWlsZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvVGV4 dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cv VGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQuY3BwCmluZGV4IDY4OWFhMGFkMjIyMjE4Y2QxNzY2 NGIyZTRhNWE5YjFlMjJhYzg2ZTAuLmJlMDg1ZTQzMDY0Mjc1NzM4ZjFhNWJhZjliMzk5NDk1MTFm OTIyODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1RleHRGaWVsZERl Y29yYXRpb25FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9UZXh0 RmllbGREZWNvcmF0aW9uRWxlbWVudC5jcHAKQEAgLTU3LDYgKzU3LDcgQEAgVGV4dEZpZWxkRGVj b3JhdG9yOjp+VGV4dEZpZWxkRGVjb3JhdG9yKCkKIFRleHRGaWVsZERlY29yYXRpb25FbGVtZW50 OjpUZXh0RmllbGREZWNvcmF0aW9uRWxlbWVudChEb2N1bWVudCogZG9jdW1lbnQsIFRleHRGaWVs ZERlY29yYXRvciogZGVjb3JhdG9yKQogICAgIDogSFRNTERpdkVsZW1lbnQoSFRNTE5hbWVzOjpk aXZUYWcsIGRvY3VtZW50KQogICAgICwgbV90ZXh0RmllbGREZWNvcmF0b3IoZGVjb3JhdG9yKQor ICAgICwgbV9pc0luSG92ZXJTdGF0ZShmYWxzZSkKIHsKICAgICBBU1NFUlQoZGVjb3JhdG9yKTsK ICAgICBzZXRIYXNDdXN0b21DYWxsYmFja3MoKTsKQEAgLTEzNyw2ICsxMzgsOCBAQCB2b2lkIFRl eHRGaWVsZERlY29yYXRpb25FbGVtZW50Ojp1cGRhdGVJbWFnZSgpCiAgICAgICAgIGltYWdlID0g bV90ZXh0RmllbGREZWNvcmF0b3ItPmltYWdlRm9yRGlzYWJsZWRTdGF0ZSgpOwogICAgIGVsc2Ug aWYgKGhvc3RJbnB1dCgpLT5yZWFkT25seSgpKQogICAgICAgICBpbWFnZSA9IG1fdGV4dEZpZWxk RGVjb3JhdG9yLT5pbWFnZUZvclJlYWRvbmx5U3RhdGUoKTsKKyAgICBlbHNlIGlmIChtX2lzSW5I b3ZlclN0YXRlKQorICAgICAgICBpbWFnZSA9IG1fdGV4dEZpZWxkRGVjb3JhdG9yLT5pbWFnZUZv ckhvdmVyU3RhdGUoKTsKICAgICBlbHNlCiAgICAgICAgIGltYWdlID0gbV90ZXh0RmllbGREZWNv cmF0b3ItPmltYWdlRm9yTm9ybWFsU3RhdGUoKTsKICAgICBBU1NFUlQoaW1hZ2UpOwpAQCAtMTk0 LDEwICsxOTcsMjkgQEAgdm9pZCBUZXh0RmllbGREZWNvcmF0aW9uRWxlbWVudDo6ZGVmYXVsdEV2 ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiAgICAgICAgIGV2ZW50LT5zZXREZWZhdWx0SGFuZGxl ZCgpOwogICAgIH0KIAorICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3Vz ZW92ZXJFdmVudCkgeworICAgICAgICBtX2lzSW5Ib3ZlclN0YXRlID0gdHJ1ZTsKKyAgICAgICAg dXBkYXRlSW1hZ2UoKTsKKyAgICB9CisKKyAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5h bWVzKCkubW91c2VvdXRFdmVudCkgeworICAgICAgICBtX2lzSW5Ib3ZlclN0YXRlID0gZmFsc2U7 CisgICAgICAgIHVwZGF0ZUltYWdlKCk7CisgICAgfQorCiAgICAgaWYgKCFldmVudC0+ZGVmYXVs dEhhbmRsZWQoKSkKICAgICAgICAgSFRNTERpdkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIo ZXZlbnQpOwogfQogCitib29sIFRleHRGaWVsZERlY29yYXRpb25FbGVtZW50Ojp3aWxsUmVzcG9u ZFRvTW91c2VNb3ZlRXZlbnRzKCkKK3sKKyAgICBjb25zdCBIVE1MSW5wdXRFbGVtZW50KiBpbnB1 dCA9IGhvc3RJbnB1dCgpOworICAgIGlmICghaW5wdXQtPmRpc2FibGVkKCkgJiYgIWlucHV0LT5y ZWFkT25seSgpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHJldHVybiBIVE1MRGl2RWxl bWVudDo6d2lsbFJlc3BvbmRUb01vdXNlTW92ZUV2ZW50cygpOworfQorCiBib29sIFRleHRGaWVs ZERlY29yYXRpb25FbGVtZW50Ojp3aWxsUmVzcG9uZFRvTW91c2VDbGlja0V2ZW50cygpCiB7CiAg ICAgY29uc3QgSFRNTElucHV0RWxlbWVudCogaW5wdXQgPSBob3N0SW5wdXQoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1RleHRGaWVsZERlY29yYXRpb25FbGVtZW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9UZXh0RmllbGREZWNvcmF0aW9uRWxlbWVu dC5oCmluZGV4IDJjOGQ4MjJiM2I5ODczNzc3NmJkMzk2MDA2M2NjMWFkY2VjNDMyMTkuLmZkNWEy YzQ5NTRiYWU0ZWNmMTJiNThlYTdiMWY1MzI5YThkOThlZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvc2hhZG93L1RleHRGaWVsZERlY29yYXRpb25FbGVtZW50LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvVGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQuaApAQCAt NTIsNiArNTIsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBDYWNoZWRJbWFnZSogaW1hZ2VGb3JO b3JtYWxTdGF0ZSgpID0gMDsKICAgICB2aXJ0dWFsIENhY2hlZEltYWdlKiBpbWFnZUZvckRpc2Fi bGVkU3RhdGUoKSA9IDA7CiAgICAgdmlydHVhbCBDYWNoZWRJbWFnZSogaW1hZ2VGb3JSZWFkb25s eVN0YXRlKCkgPSAwOworICAgIHZpcnR1YWwgQ2FjaGVkSW1hZ2UqIGltYWdlRm9ySG92ZXJTdGF0 ZSgpID0gMDsKIAogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVDbGljayhIVE1MSW5wdXRFbGVtZW50 KikgPSAwOwogICAgIC8vIFRoaXMgZnVuY3Rpb24gaXMgY2FsbGVkIGp1c3QgYmVmb3JlIGRldGFj aGluZyB0aGUgZGVjb3JhdGlvbi4gSXQgbXVzdCBub3QKQEAgLTcxLDYgKzcyLDcgQEAgcHVibGlj OgogICAgIFRleHRGaWVsZERlY29yYXRvciogdGV4dEZpZWxkRGVjb3JhdG9yKCkgeyByZXR1cm4g bV90ZXh0RmllbGREZWNvcmF0b3I7IH0KICAgICB2b2lkIGRlY29yYXRlKEhUTUxJbnB1dEVsZW1l bnQqLCBib29sIHZpc2libGUpOwogCisgICAgdmlydHVhbCBib29sIHdpbGxSZXNwb25kVG9Nb3Vz ZU1vdmVFdmVudHMoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIGJvb2wgd2lsbFJlc3BvbmRUb01v dXNlQ2xpY2tFdmVudHMoKSBPVkVSUklERTsKIAogcHJpdmF0ZToKQEAgLTg3LDYgKzg5LDcgQEAg cHJpdmF0ZToKICAgICB2b2lkIHVwZGF0ZUltYWdlKCk7CiAKICAgICBUZXh0RmllbGREZWNvcmF0 b3IqIG1fdGV4dEZpZWxkRGVjb3JhdG9yOworICAgIGJvb2wgbV9pc0luSG92ZXJTdGF0ZTsKIH07 CiAKIGlubGluZSBUZXh0RmllbGREZWNvcmF0aW9uRWxlbWVudCogdG9UZXh0RmllbGREZWNvcmF0 aW9uRWxlbWVudChOb2RlKiBub2RlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViVGV4dEZpZWxkRGVjb3JhdG9yQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJUZXh0RmllbGREZWNvcmF0b3JDbGllbnQuaAppbmRleCA3NzJlMTIx NmJjMWE0NzI2OGU2YjEwMjM1Y2Y2OTA0ZTI3MmMyMWM1Li44NmYzZmY2ZDRjMjhmOGYyYjIxNDY5 MWRkMzQ3NGM1M2VlNGI3MDk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJUZXh0RmllbGREZWNvcmF0b3JDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJUZXh0RmllbGREZWNvcmF0b3JDbGllbnQuaApAQCAtNTgsOSArNTgs MTMgQEAgcHVibGljOgogICAgIC8vIGVtcHR5IHN0cmluZywgaW1hZ2VOYW1lRm9yTm9ybWFsU3Rh dGUoKSBpcyB1c2VkIGV2ZW4gZm9yIHRoZSBkaXNhYmxlZAogICAgIC8vIHN0YXRlLgogICAgIHZp cnR1YWwgV2ViQ1N0cmluZyBpbWFnZU5hbWVGb3JEaXNhYmxlZFN0YXRlKCkgPSAwOwotICAgIC8v IEltYWdlIHJlc291cmNlIG5hbWUgZm9yIHRoZSBkaXNhYmxlZCBzdGF0ZS4gSWYgdGhpcyBmdW5j dGlvbiByZXR1cm5zIGFuCisgICAgLy8gSW1hZ2UgcmVzb3VyY2UgbmFtZSBmb3IgdGhlIHJlYWQg b25seSBzdGF0ZS4gSWYgdGhpcyBmdW5jdGlvbiByZXR1cm5zIGFuCiAgICAgLy8gZW1wdHkgc3Ry aW5nLCB0aGUgaW1hZ2Ugc2FtZSBhcyBpbWFnZU5hbWVGb3JEaXNhYmxlZFN0YXRlKCkgaXMgdXNl ZC4KICAgICB2aXJ0dWFsIFdlYkNTdHJpbmcgaW1hZ2VOYW1lRm9yUmVhZE9ubHlTdGF0ZSgpID0g MDsKKyAgICAvLyBJbWFnZSByZXNvdXJjZSBuYW1lIGZvciB3aGVuIHRoZSBpbWFnZWQgaXMgYmVp bmcgaG92ZXJlZCBvdmVyLiBJZiB0aGlzCisgICAgLy8gZnVuY3Rpb24gcmV0dXJucyBhbiBlbXB0 eSBzdHJpbmcsIGltYWdlTmFtZUZvck5vcm1hbFN0YXRlKCkgaXMgdXNlZAorICAgIC8vIGluc3Rl YWQuCisgICAgdmlydHVhbCBXZWJDU3RyaW5nIGltYWdlTmFtZUZvckhvdmVyU3RhdGUoKSB7cmV0 dXJuIFdlYkNTdHJpbmcoKTt9CiAKICAgICAvLyBUaGlzIGlzIGNhbGxlZCB3aGVuIHRoZSBkZWNv cmF0aW9uIGljb24gaXMgY2xpY2tlZC4KICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlQ2xpY2soV2Vi SW5wdXRFbGVtZW50JikgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvVGV4dEZpZWxkRGVjb3JhdG9ySW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9UZXh0RmllbGREZWNvcmF0b3JJbXBsLmNwcAppbmRleCBhNzRhYTgyNWFhZWRlYmU3Y2U4NDJj MmY5YzMwMjFhYmZlM2RmMGU2Li40NGJhYzQwMzg1Yzc4MzQ4MzQ4NzI5MDNhZjM1YTkxZmIzZDM3 NDFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9UZXh0RmllbGREZWNv cmF0b3JJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9UZXh0RmllbGRE ZWNvcmF0b3JJbXBsLmNwcApAQCAtMTAzLDcgKzEwMyw3IEBAIENhY2hlZEltYWdlKiBUZXh0Rmll bGREZWNvcmF0b3JJbXBsOjppbWFnZUZvclJlYWRvbmx5U3RhdGUoKQogICAgIGlmICghbV9jYWNo ZWRJbWFnZUZvclJlYWRvbmx5U3RhdGUpIHsKICAgICAgICAgV2ViQ1N0cmluZyBpbWFnZU5hbWUg PSBtX2NsaWVudC0+aW1hZ2VOYW1lRm9yUmVhZE9ubHlTdGF0ZSgpOwogICAgICAgICBpZiAoaW1h Z2VOYW1lLmlzRW1wdHkoKSkKLSAgICAgICAgICAgIG1fY2FjaGVkSW1hZ2VGb3JEaXNhYmxlZFN0 YXRlID0gaW1hZ2VGb3JEaXNhYmxlZFN0YXRlKCk7CisgICAgICAgICAgICBtX2NhY2hlZEltYWdl Rm9yUmVhZG9ubHlTdGF0ZSA9IGltYWdlRm9yRGlzYWJsZWRTdGF0ZSgpOwogICAgICAgICBlbHNl IHsKICAgICAgICAgICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UgPSBJbWFnZTo6bG9hZFBsYXRmb3Jt UmVzb3VyY2UoaW1hZ2VOYW1lLmRhdGEoKSk7CiAgICAgICAgICAgICBtX2NhY2hlZEltYWdlRm9y UmVhZG9ubHlTdGF0ZSA9IG5ldyBDYWNoZWRJbWFnZShpbWFnZS5nZXQoKSk7CkBAIC0xMTIsNiAr MTEyLDIwIEBAIENhY2hlZEltYWdlKiBUZXh0RmllbGREZWNvcmF0b3JJbXBsOjppbWFnZUZvclJl YWRvbmx5U3RhdGUoKQogICAgIHJldHVybiBtX2NhY2hlZEltYWdlRm9yUmVhZG9ubHlTdGF0ZS5n ZXQoKTsKIH0KIAorQ2FjaGVkSW1hZ2UqIFRleHRGaWVsZERlY29yYXRvckltcGw6OmltYWdlRm9y SG92ZXJTdGF0ZSgpCit7CisgICAgaWYgKCFtX2NhY2hlZEltYWdlRm9ySG92ZXJTdGF0ZSkgewor ICAgICAgICBXZWJDU3RyaW5nIGltYWdlTmFtZSA9IG1fY2xpZW50LT5pbWFnZU5hbWVGb3JIb3Zl clN0YXRlKCk7CisgICAgICAgIGlmIChpbWFnZU5hbWUuaXNFbXB0eSgpKQorICAgICAgICAgICAg bV9jYWNoZWRJbWFnZUZvckhvdmVyU3RhdGUgPSBpbWFnZUZvck5vcm1hbFN0YXRlKCk7CisgICAg ICAgIGVsc2UgeworICAgICAgICAgICAgUmVmUHRyPEltYWdlPiBpbWFnZSA9IEltYWdlOjpsb2Fk UGxhdGZvcm1SZXNvdXJjZShpbWFnZU5hbWUuZGF0YSgpKTsKKyAgICAgICAgICAgIG1fY2FjaGVk SW1hZ2VGb3JIb3ZlclN0YXRlID0gbmV3IENhY2hlZEltYWdlKGltYWdlLmdldCgpKTsKKyAgICAg ICAgfQorICAgIH0KKyAgICByZXR1cm4gbV9jYWNoZWRJbWFnZUZvckhvdmVyU3RhdGUuZ2V0KCk7 Cit9CisKIHZvaWQgVGV4dEZpZWxkRGVjb3JhdG9ySW1wbDo6aGFuZGxlQ2xpY2soSFRNTElucHV0 RWxlbWVudCogaW5wdXQpCiB7CiAgICAgQVNTRVJUKGlucHV0KTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1RleHRGaWVsZERlY29yYXRvckltcGwuaCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1RleHRGaWVsZERlY29yYXRvckltcGwuaAppbmRleCA4ZjUyMDY5 YmFmNmY2YWY0NzRkNjc0MDYxNDVkMGFmNzNlYTIwODc5Li45MmFiMGRmYjMyNzJiNmNjNjhmNDBk Y2UzODRkNmNmNjZmOTlmMThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9UZXh0RmllbGREZWNvcmF0b3JJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvVGV4dEZpZWxkRGVjb3JhdG9ySW1wbC5oCkBAIC01MSw2ICs1MSw3IEBAIHByaXZhdGU6CiAg ICAgdmlydHVhbCBXZWJDb3JlOjpDYWNoZWRJbWFnZSogaW1hZ2VGb3JOb3JtYWxTdGF0ZSgpIE9W RVJSSURFOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6Q2FjaGVkSW1hZ2UqIGltYWdlRm9yRGlzYWJs ZWRTdGF0ZSgpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6Q2FjaGVkSW1hZ2UqIGlt YWdlRm9yUmVhZG9ubHlTdGF0ZSgpIE9WRVJSSURFOworICAgIHZpcnR1YWwgV2ViQ29yZTo6Q2Fj aGVkSW1hZ2UqIGltYWdlRm9ySG92ZXJTdGF0ZSgpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9p ZCBoYW5kbGVDbGljayhXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50KikgT1ZFUlJJREU7CiAgICAg dmlydHVhbCB2b2lkIHdpbGxEZXRhY2goV2ViQ29yZTo6SFRNTElucHV0RWxlbWVudCopIE9WRVJS SURFOwogCkBAIC02MCw2ICs2MSw3IEBAIHByaXZhdGU6CiAgICAgV2ViQ29yZTo6Q2FjaGVkUmVz b3VyY2VIYW5kbGU8V2ViQ29yZTo6Q2FjaGVkSW1hZ2U+IG1fY2FjaGVkSW1hZ2VGb3JOb3JtYWxT dGF0ZTsKICAgICBXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUhhbmRsZTxXZWJDb3JlOjpDYWNoZWRJ bWFnZT4gbV9jYWNoZWRJbWFnZUZvckRpc2FibGVkU3RhdGU7CiAgICAgV2ViQ29yZTo6Q2FjaGVk UmVzb3VyY2VIYW5kbGU8V2ViQ29yZTo6Q2FjaGVkSW1hZ2U+IG1fY2FjaGVkSW1hZ2VGb3JSZWFk b25seVN0YXRlOworICAgIFdlYkNvcmU6OkNhY2hlZFJlc291cmNlSGFuZGxlPFdlYkNvcmU6OkNh Y2hlZEltYWdlPiBtX2NhY2hlZEltYWdlRm9ySG92ZXJTdGF0ZTsKIH07CiAKIH0K 167632 2012-10-08 15:33:45 -0700 2012-10-09 06:43:09 -0700 Patch bug-93662-20121008153248.patch text/plain 9441 gcasto U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNkYjFkOWQ0Yjk1YjJm NjA3NGUyMWZlZmQwZTZiZjg1NmY5ZDI1Ni4uYTU2N2M3ZWY1NDMwNTBkMzlkNWUxMjAyZWJkOTMy ZTQyMTRiMmI4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA4LTA5ICBHYXJy ZXR0IENhc3RvICA8Z2Nhc3RvQGNocm9taXVtLm9yZz4KKworICAgICAgICBBbGxvdyB1c2VycyB0 byBzcGVjaWZ5IGEgZGlmZmVyZW50IGhvdmVyIGltYWdlIGZvciBUZXh0RmllbGREZWNvcmF0aW9u RWxlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTM2NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGh0bWwvc2hhZG93L1RleHRGaWVsZERlY29yYXRpb25FbGVtZW50LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlRleHRGaWVsZERlY29yYXRpb25FbGVtZW50OjpUZXh0RmllbGREZWNvcmF0aW9uRWxl bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0RmllbGREZWNvcmF0aW9uRWxlbWVudDo6dXBk YXRlSW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQ6 OmRlZmF1bHRFdmVudEhhbmRsZXIpOiBIYW5kbGVzIG1vdXNlb3ZlciBhbmQgbW91c2VvdXQgZXZl bnRzLgorICAgICAgICAoV2ViQ29yZTo6VGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQ6OndpbGxS ZXNwb25kVG9Nb3VzZU1vdmVFdmVudHMpOiBOb3cgcmV0dXJucyB0cnVlIGlmIHRoZSBlbGVtZW50 IGlzIG5vdCBkaXNhYmxlZC4KKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIGh0bWwvc2hh ZG93L1RleHRGaWVsZERlY29yYXRpb25FbGVtZW50Lmg6CisgICAgICAgIChUZXh0RmllbGREZWNv cmF0b3IpOgorICAgICAgICAoVGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQpOgorCiAyMDEyLTEw LTA2ICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgQnVpbGQgZml4Lgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA3MDc5MjBkZWMyNmE2MTAyNWI2ZjcyYzkzYmRm N2YxYmRlMzZiOWRkLi5lZThkNGQwOGIxZmIxZjNiODcxM2ViMDdhZTJhZjNkMWE3ZGY4NDdhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA4LTA5ICBH YXJyZXR0IENhc3RvICA8Z2Nhc3RvQGNocm9taXVtLm9yZz4KKworICAgICAgICBBbGxvdyB1c2Vy cyB0byBzcGVjaWZ5IGEgZGlmZmVyZW50IGhvdmVyIGltYWdlIGZvciBUZXh0RmllbGREZWNvcmF0 aW9uRWxlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTM2NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHB1YmxpYy9XZWJUZXh0RmllbGREZWNvcmF0b3JDbGllbnQuaDoKKyAgICAgICAgKFdlYlRl eHRGaWVsZERlY29yYXRvckNsaWVudCk6CisgICAgICAgIChXZWJLaXQ6OldlYlRleHRGaWVsZERl Y29yYXRvckNsaWVudDo6aW1hZ2VOYW1lRm9ySG92ZXJTdGF0ZSk6IEFsbG93IHVzZXJzIHRvIHNw ZWNpZnkgdGhlIG5hbWUgb2YgdGhlIGltYWdlIGZvciBtb3VzZW92ZXIuCisgICAgICAgICogc3Jj L1RleHRGaWVsZERlY29yYXRvckltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpUZXh0RmllbGRE ZWNvcmF0b3JJbXBsOjppbWFnZUZvclJlYWRvbmx5U3RhdGUpOgorICAgICAgICAoV2ViS2l0OjpU ZXh0RmllbGREZWNvcmF0b3JJbXBsOjppbWFnZUZvckhvdmVyU3RhdGUpOgorICAgICAgICAoV2Vi S2l0KToKKyAgICAgICAgKiBzcmMvVGV4dEZpZWxkRGVjb3JhdG9ySW1wbC5oOgorICAgICAgICAo VGV4dEZpZWxkRGVjb3JhdG9ySW1wbCk6CisKIDIwMTItMTAtMDYgIElseWEgVGlraG9ub3Zza3kg IDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5NSSBmaXgg U3RyaW5nIGluc3RydW1lbnRhdGlvbiB0aGUgd2F5IGl0IHdhcyBkaXNjdXNzZWQgaW4gV0s5Nzk2 NApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvVGV4dEZpZWxkRGVjb3Jh dGlvbkVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvVGV4dEZpZWxkRGVj b3JhdGlvbkVsZW1lbnQuY3BwCmluZGV4IDY4OWFhMGFkMjIyMjE4Y2QxNzY2NGIyZTRhNWE5YjFl MjJhYzg2ZTAuLmJlMDg1ZTQzMDY0Mjc1NzM4ZjFhNWJhZjliMzk5NDk1MTFmOTIyODMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1RleHRGaWVsZERlY29yYXRpb25FbGVt ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9UZXh0RmllbGREZWNvcmF0 aW9uRWxlbWVudC5jcHAKQEAgLTU3LDYgKzU3LDcgQEAgVGV4dEZpZWxkRGVjb3JhdG9yOjp+VGV4 dEZpZWxkRGVjb3JhdG9yKCkKIFRleHRGaWVsZERlY29yYXRpb25FbGVtZW50OjpUZXh0RmllbGRE ZWNvcmF0aW9uRWxlbWVudChEb2N1bWVudCogZG9jdW1lbnQsIFRleHRGaWVsZERlY29yYXRvciog ZGVjb3JhdG9yKQogICAgIDogSFRNTERpdkVsZW1lbnQoSFRNTE5hbWVzOjpkaXZUYWcsIGRvY3Vt ZW50KQogICAgICwgbV90ZXh0RmllbGREZWNvcmF0b3IoZGVjb3JhdG9yKQorICAgICwgbV9pc0lu SG92ZXJTdGF0ZShmYWxzZSkKIHsKICAgICBBU1NFUlQoZGVjb3JhdG9yKTsKICAgICBzZXRIYXND dXN0b21DYWxsYmFja3MoKTsKQEAgLTEzNyw2ICsxMzgsOCBAQCB2b2lkIFRleHRGaWVsZERlY29y YXRpb25FbGVtZW50Ojp1cGRhdGVJbWFnZSgpCiAgICAgICAgIGltYWdlID0gbV90ZXh0RmllbGRE ZWNvcmF0b3ItPmltYWdlRm9yRGlzYWJsZWRTdGF0ZSgpOwogICAgIGVsc2UgaWYgKGhvc3RJbnB1 dCgpLT5yZWFkT25seSgpKQogICAgICAgICBpbWFnZSA9IG1fdGV4dEZpZWxkRGVjb3JhdG9yLT5p bWFnZUZvclJlYWRvbmx5U3RhdGUoKTsKKyAgICBlbHNlIGlmIChtX2lzSW5Ib3ZlclN0YXRlKQor ICAgICAgICBpbWFnZSA9IG1fdGV4dEZpZWxkRGVjb3JhdG9yLT5pbWFnZUZvckhvdmVyU3RhdGUo KTsKICAgICBlbHNlCiAgICAgICAgIGltYWdlID0gbV90ZXh0RmllbGREZWNvcmF0b3ItPmltYWdl Rm9yTm9ybWFsU3RhdGUoKTsKICAgICBBU1NFUlQoaW1hZ2UpOwpAQCAtMTk0LDEwICsxOTcsMjkg QEAgdm9pZCBUZXh0RmllbGREZWNvcmF0aW9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihF dmVudCogZXZlbnQpCiAgICAgICAgIGV2ZW50LT5zZXREZWZhdWx0SGFuZGxlZCgpOwogICAgIH0K IAorICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZW92ZXJFdmVudCkg eworICAgICAgICBtX2lzSW5Ib3ZlclN0YXRlID0gdHJ1ZTsKKyAgICAgICAgdXBkYXRlSW1hZ2Uo KTsKKyAgICB9CisKKyAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkubW91c2Vv dXRFdmVudCkgeworICAgICAgICBtX2lzSW5Ib3ZlclN0YXRlID0gZmFsc2U7CisgICAgICAgIHVw ZGF0ZUltYWdlKCk7CisgICAgfQorCiAgICAgaWYgKCFldmVudC0+ZGVmYXVsdEhhbmRsZWQoKSkK ICAgICAgICAgSFRNTERpdkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoZXZlbnQpOwogfQog Citib29sIFRleHRGaWVsZERlY29yYXRpb25FbGVtZW50Ojp3aWxsUmVzcG9uZFRvTW91c2VNb3Zl RXZlbnRzKCkKK3sKKyAgICBjb25zdCBIVE1MSW5wdXRFbGVtZW50KiBpbnB1dCA9IGhvc3RJbnB1 dCgpOworICAgIGlmICghaW5wdXQtPmRpc2FibGVkKCkgJiYgIWlucHV0LT5yZWFkT25seSgpKQor ICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHJldHVybiBIVE1MRGl2RWxlbWVudDo6d2lsbFJl c3BvbmRUb01vdXNlTW92ZUV2ZW50cygpOworfQorCiBib29sIFRleHRGaWVsZERlY29yYXRpb25F bGVtZW50Ojp3aWxsUmVzcG9uZFRvTW91c2VDbGlja0V2ZW50cygpCiB7CiAgICAgY29uc3QgSFRN TElucHV0RWxlbWVudCogaW5wdXQgPSBob3N0SW5wdXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvc2hhZG93L1RleHRGaWVsZERlY29yYXRpb25FbGVtZW50LmggYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL3NoYWRvdy9UZXh0RmllbGREZWNvcmF0aW9uRWxlbWVudC5oCmluZGV4IDJj OGQ4MjJiM2I5ODczNzc3NmJkMzk2MDA2M2NjMWFkY2VjNDMyMTkuLmZkNWEyYzQ5NTRiYWU0ZWNm MTJiNThlYTdiMWY1MzI5YThkOThlZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv c2hhZG93L1RleHRGaWVsZERlY29yYXRpb25FbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvVGV4dEZpZWxkRGVjb3JhdGlvbkVsZW1lbnQuaApAQCAtNTIsNiArNTIsNyBA QCBwdWJsaWM6CiAgICAgdmlydHVhbCBDYWNoZWRJbWFnZSogaW1hZ2VGb3JOb3JtYWxTdGF0ZSgp ID0gMDsKICAgICB2aXJ0dWFsIENhY2hlZEltYWdlKiBpbWFnZUZvckRpc2FibGVkU3RhdGUoKSA9 IDA7CiAgICAgdmlydHVhbCBDYWNoZWRJbWFnZSogaW1hZ2VGb3JSZWFkb25seVN0YXRlKCkgPSAw OworICAgIHZpcnR1YWwgQ2FjaGVkSW1hZ2UqIGltYWdlRm9ySG92ZXJTdGF0ZSgpID0gMDsKIAog ICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVDbGljayhIVE1MSW5wdXRFbGVtZW50KikgPSAwOwogICAg IC8vIFRoaXMgZnVuY3Rpb24gaXMgY2FsbGVkIGp1c3QgYmVmb3JlIGRldGFjaGluZyB0aGUgZGVj b3JhdGlvbi4gSXQgbXVzdCBub3QKQEAgLTcxLDYgKzcyLDcgQEAgcHVibGljOgogICAgIFRleHRG aWVsZERlY29yYXRvciogdGV4dEZpZWxkRGVjb3JhdG9yKCkgeyByZXR1cm4gbV90ZXh0RmllbGRE ZWNvcmF0b3I7IH0KICAgICB2b2lkIGRlY29yYXRlKEhUTUxJbnB1dEVsZW1lbnQqLCBib29sIHZp c2libGUpOwogCisgICAgdmlydHVhbCBib29sIHdpbGxSZXNwb25kVG9Nb3VzZU1vdmVFdmVudHMo KSBPVkVSUklERTsKICAgICB2aXJ0dWFsIGJvb2wgd2lsbFJlc3BvbmRUb01vdXNlQ2xpY2tFdmVu dHMoKSBPVkVSUklERTsKIAogcHJpdmF0ZToKQEAgLTg3LDYgKzg5LDcgQEAgcHJpdmF0ZToKICAg ICB2b2lkIHVwZGF0ZUltYWdlKCk7CiAKICAgICBUZXh0RmllbGREZWNvcmF0b3IqIG1fdGV4dEZp ZWxkRGVjb3JhdG9yOworICAgIGJvb2wgbV9pc0luSG92ZXJTdGF0ZTsKIH07CiAKIGlubGluZSBU ZXh0RmllbGREZWNvcmF0aW9uRWxlbWVudCogdG9UZXh0RmllbGREZWNvcmF0aW9uRWxlbWVudChO b2RlKiBub2RlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi VGV4dEZpZWxkRGVjb3JhdG9yQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJUZXh0RmllbGREZWNvcmF0b3JDbGllbnQuaAppbmRleCA3NzJlMTIxNmJjMWE0NzI2OGU2 YjEwMjM1Y2Y2OTA0ZTI3MmMyMWM1Li44NmYzZmY2ZDRjMjhmOGYyYjIxNDY5MWRkMzQ3NGM1M2Vl NGI3MDk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJUZXh0 RmllbGREZWNvcmF0b3JDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJUZXh0RmllbGREZWNvcmF0b3JDbGllbnQuaApAQCAtNTgsOSArNTgsMTMgQEAgcHVibGlj OgogICAgIC8vIGVtcHR5IHN0cmluZywgaW1hZ2VOYW1lRm9yTm9ybWFsU3RhdGUoKSBpcyB1c2Vk IGV2ZW4gZm9yIHRoZSBkaXNhYmxlZAogICAgIC8vIHN0YXRlLgogICAgIHZpcnR1YWwgV2ViQ1N0 cmluZyBpbWFnZU5hbWVGb3JEaXNhYmxlZFN0YXRlKCkgPSAwOwotICAgIC8vIEltYWdlIHJlc291 cmNlIG5hbWUgZm9yIHRoZSBkaXNhYmxlZCBzdGF0ZS4gSWYgdGhpcyBmdW5jdGlvbiByZXR1cm5z IGFuCisgICAgLy8gSW1hZ2UgcmVzb3VyY2UgbmFtZSBmb3IgdGhlIHJlYWQgb25seSBzdGF0ZS4g SWYgdGhpcyBmdW5jdGlvbiByZXR1cm5zIGFuCiAgICAgLy8gZW1wdHkgc3RyaW5nLCB0aGUgaW1h Z2Ugc2FtZSBhcyBpbWFnZU5hbWVGb3JEaXNhYmxlZFN0YXRlKCkgaXMgdXNlZC4KICAgICB2aXJ0 dWFsIFdlYkNTdHJpbmcgaW1hZ2VOYW1lRm9yUmVhZE9ubHlTdGF0ZSgpID0gMDsKKyAgICAvLyBJ bWFnZSByZXNvdXJjZSBuYW1lIGZvciB3aGVuIHRoZSBpbWFnZWQgaXMgYmVpbmcgaG92ZXJlZCBv dmVyLiBJZiB0aGlzCisgICAgLy8gZnVuY3Rpb24gcmV0dXJucyBhbiBlbXB0eSBzdHJpbmcsIGlt YWdlTmFtZUZvck5vcm1hbFN0YXRlKCkgaXMgdXNlZAorICAgIC8vIGluc3RlYWQuCisgICAgdmly dHVhbCBXZWJDU3RyaW5nIGltYWdlTmFtZUZvckhvdmVyU3RhdGUoKSB7cmV0dXJuIFdlYkNTdHJp bmcoKTt9CiAKICAgICAvLyBUaGlzIGlzIGNhbGxlZCB3aGVuIHRoZSBkZWNvcmF0aW9uIGljb24g aXMgY2xpY2tlZC4KICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlQ2xpY2soV2ViSW5wdXRFbGVtZW50 JikgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvVGV4dEZpZWxk RGVjb3JhdG9ySW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9UZXh0RmllbGRE ZWNvcmF0b3JJbXBsLmNwcAppbmRleCBhNzRhYTgyNWFhZWRlYmU3Y2U4NDJjMmY5YzMwMjFhYmZl M2RmMGU2Li40NGJhYzQwMzg1Yzc4MzQ4MzQ4NzI5MDNhZjM1YTkxZmIzZDM3NDFkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9UZXh0RmllbGREZWNvcmF0b3JJbXBsLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9UZXh0RmllbGREZWNvcmF0b3JJbXBs LmNwcApAQCAtMTAzLDcgKzEwMyw3IEBAIENhY2hlZEltYWdlKiBUZXh0RmllbGREZWNvcmF0b3JJ bXBsOjppbWFnZUZvclJlYWRvbmx5U3RhdGUoKQogICAgIGlmICghbV9jYWNoZWRJbWFnZUZvclJl YWRvbmx5U3RhdGUpIHsKICAgICAgICAgV2ViQ1N0cmluZyBpbWFnZU5hbWUgPSBtX2NsaWVudC0+ aW1hZ2VOYW1lRm9yUmVhZE9ubHlTdGF0ZSgpOwogICAgICAgICBpZiAoaW1hZ2VOYW1lLmlzRW1w dHkoKSkKLSAgICAgICAgICAgIG1fY2FjaGVkSW1hZ2VGb3JEaXNhYmxlZFN0YXRlID0gaW1hZ2VG b3JEaXNhYmxlZFN0YXRlKCk7CisgICAgICAgICAgICBtX2NhY2hlZEltYWdlRm9yUmVhZG9ubHlT dGF0ZSA9IGltYWdlRm9yRGlzYWJsZWRTdGF0ZSgpOwogICAgICAgICBlbHNlIHsKICAgICAgICAg ICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UgPSBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoaW1h Z2VOYW1lLmRhdGEoKSk7CiAgICAgICAgICAgICBtX2NhY2hlZEltYWdlRm9yUmVhZG9ubHlTdGF0 ZSA9IG5ldyBDYWNoZWRJbWFnZShpbWFnZS5nZXQoKSk7CkBAIC0xMTIsNiArMTEyLDIwIEBAIENh Y2hlZEltYWdlKiBUZXh0RmllbGREZWNvcmF0b3JJbXBsOjppbWFnZUZvclJlYWRvbmx5U3RhdGUo KQogICAgIHJldHVybiBtX2NhY2hlZEltYWdlRm9yUmVhZG9ubHlTdGF0ZS5nZXQoKTsKIH0KIAor Q2FjaGVkSW1hZ2UqIFRleHRGaWVsZERlY29yYXRvckltcGw6OmltYWdlRm9ySG92ZXJTdGF0ZSgp Cit7CisgICAgaWYgKCFtX2NhY2hlZEltYWdlRm9ySG92ZXJTdGF0ZSkgeworICAgICAgICBXZWJD U3RyaW5nIGltYWdlTmFtZSA9IG1fY2xpZW50LT5pbWFnZU5hbWVGb3JIb3ZlclN0YXRlKCk7Cisg ICAgICAgIGlmIChpbWFnZU5hbWUuaXNFbXB0eSgpKQorICAgICAgICAgICAgbV9jYWNoZWRJbWFn ZUZvckhvdmVyU3RhdGUgPSBpbWFnZUZvck5vcm1hbFN0YXRlKCk7CisgICAgICAgIGVsc2Ugewor ICAgICAgICAgICAgUmVmUHRyPEltYWdlPiBpbWFnZSA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNv dXJjZShpbWFnZU5hbWUuZGF0YSgpKTsKKyAgICAgICAgICAgIG1fY2FjaGVkSW1hZ2VGb3JIb3Zl clN0YXRlID0gbmV3IENhY2hlZEltYWdlKGltYWdlLmdldCgpKTsKKyAgICAgICAgfQorICAgIH0K KyAgICByZXR1cm4gbV9jYWNoZWRJbWFnZUZvckhvdmVyU3RhdGUuZ2V0KCk7Cit9CisKIHZvaWQg VGV4dEZpZWxkRGVjb3JhdG9ySW1wbDo6aGFuZGxlQ2xpY2soSFRNTElucHV0RWxlbWVudCogaW5w dXQpCiB7CiAgICAgQVNTRVJUKGlucHV0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1RleHRGaWVsZERlY29yYXRvckltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1RleHRGaWVsZERlY29yYXRvckltcGwuaAppbmRleCA4ZjUyMDY5YmFmNmY2YWY0NzRk Njc0MDYxNDVkMGFmNzNlYTIwODc5Li45MmFiMGRmYjMyNzJiNmNjNjhmNDBkY2UzODRkNmNmNjZm OTlmMThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9UZXh0RmllbGRE ZWNvcmF0b3JJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvVGV4dEZpZWxk RGVjb3JhdG9ySW1wbC5oCkBAIC01MSw2ICs1MSw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBX ZWJDb3JlOjpDYWNoZWRJbWFnZSogaW1hZ2VGb3JOb3JtYWxTdGF0ZSgpIE9WRVJSSURFOwogICAg IHZpcnR1YWwgV2ViQ29yZTo6Q2FjaGVkSW1hZ2UqIGltYWdlRm9yRGlzYWJsZWRTdGF0ZSgpIE9W RVJSSURFOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6Q2FjaGVkSW1hZ2UqIGltYWdlRm9yUmVhZG9u bHlTdGF0ZSgpIE9WRVJSSURFOworICAgIHZpcnR1YWwgV2ViQ29yZTo6Q2FjaGVkSW1hZ2UqIGlt YWdlRm9ySG92ZXJTdGF0ZSgpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVDbGlj ayhXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50KikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lk IHdpbGxEZXRhY2goV2ViQ29yZTo6SFRNTElucHV0RWxlbWVudCopIE9WRVJSSURFOwogCkBAIC02 MCw2ICs2MSw3IEBAIHByaXZhdGU6CiAgICAgV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VIYW5kbGU8 V2ViQ29yZTo6Q2FjaGVkSW1hZ2U+IG1fY2FjaGVkSW1hZ2VGb3JOb3JtYWxTdGF0ZTsKICAgICBX ZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUhhbmRsZTxXZWJDb3JlOjpDYWNoZWRJbWFnZT4gbV9jYWNo ZWRJbWFnZUZvckRpc2FibGVkU3RhdGU7CiAgICAgV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VIYW5k bGU8V2ViQ29yZTo6Q2FjaGVkSW1hZ2U+IG1fY2FjaGVkSW1hZ2VGb3JSZWFkb25seVN0YXRlOwor ICAgIFdlYkNvcmU6OkNhY2hlZFJlc291cmNlSGFuZGxlPFdlYkNvcmU6OkNhY2hlZEltYWdlPiBt X2NhY2hlZEltYWdlRm9ySG92ZXJTdGF0ZTsKIH07CiAKIH0K