71070 2011-10-27 15:48:27 -0700 [chromium] fix minor style nit in CCLayerImpl 2011-11-17 14:51:32 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 shawnsingh shawnsingh cc-bugs jamesr webkit.review.bot oldest_to_newest 492039 0 shawnsingh 2011-10-27 15:48:27 -0700 after https://bugs.webkit.org/show_bug.cgi?id=70442 lands, we could fix the if-statements in the CCLayerImpl settors to be more consistent with usual webkit style. 492042 1 jamesr 2011-10-27 15:51:01 -0700 https://bugs.webkit.org/show_bug.cgi?id=38829 is going to add another bool that we'll want to plumb through so it might be worth doing that at the same time 504485 2 115503 shawnsingh 2011-11-16 18:16:02 -0800 Created attachment 115503 Patch discussed with James offline, the extra bool won't be part of this patch 504486 3 115503 jamesr 2011-11-16 18:16:37 -0800 Comment on attachment 115503 Patch R=me. Thanks 504521 4 115503 webkit.review.bot 2011-11-16 19:23:34 -0800 Comment on attachment 115503 Patch Rejecting attachment 115503 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: r', u'James Robinson', u'--f..." exit_code: 1 Parsed 2 diffs from patch file(s). patching file Source/WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.cpp Hunk #1 FAILED at 241. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.cpp.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'James Robinson', u'--f..." exit_code: 1 Full output: http://queues.webkit.org/results/10505200 505013 5 115630 shawnsingh 2011-11-17 11:29:39 -0800 Created attachment 115630 updated closer to tip of tree 505249 6 115630 webkit.review.bot 2011-11-17 14:51:27 -0800 Comment on attachment 115630 updated closer to tip of tree Clearing flags on attachment: 115630 Committed r100682: <http://trac.webkit.org/changeset/100682> 505250 7 webkit.review.bot 2011-11-17 14:51:32 -0800 All reviewed patches have been landed. Closing bug. 115503 2011-11-16 18:16:02 -0800 2011-11-17 11:29:36 -0800 Patch bug-71070-20111116181601.patch text/plain 10230 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwMjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWM1NzEwOTNiNjQwZDNm Y2Q1Zjg1MGQ3ZWRiMjUzNDk1NmVkOTRmNC4uNzM0MzUyNjZmZTgzODVjMTYyZmExNjY0NjM4YTFm YzczNDU5M2ZlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDExLTExLTE2ICBTaGF3 biBTaW5naCAgPHNoYXduc2luZ2hAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g Rml4IG1pbm9yIHN0eWxlIG5pdCBpbiBDQ0xheWVySW1wbAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzEwNzAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXhlcyBpZi1zdGF0ZW1lbnRzIG9uIHNldmVyYWwg c2V0dG9ycyB0byBmb2xsb3cgV2ViS2l0CisgICAgICAgIGNvbnZlbnRpb25zLiBFeGlzdGluZyBD Q0xheWVySW1wbFRlc3QgdW5pdCB0ZXN0cyBhbHJlYWR5IGNvdmVyCisgICAgICAgIHRoaXMgY2hh bmdlLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllcklt cGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllckltcGw6OnNldEJvdW5kcyk6CisgICAg ICAgIChXZWJDb3JlOjpDQ0xheWVySW1wbDo6c2V0TWFza0xheWVyKToKKyAgICAgICAgKFdlYkNv cmU6OkNDTGF5ZXJJbXBsOjpzZXRSZXBsaWNhTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q0NM YXllckltcGw6OnNldERyYXdzQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVySW1w bDo6c2V0QW5jaG9yUG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllckltcGw6OnNldEFu Y2hvclBvaW50Wik6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVySW1wbDo6c2V0QmFja2dyb3Vu ZENvbG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpzZXRNYXNrc1RvQm91bmRz KToKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpzZXRPcGFxdWUpOgorICAgICAgICAo V2ViQ29yZTo6Q0NMYXllckltcGw6OnNldE9wYWNpdHkpOgorICAgICAgICAoV2ViQ29yZTo6Q0NM YXllckltcGw6OnNldFBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpz ZXRQcmVzZXJ2ZXMzRCk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVySW1wbDo6c2V0Wm9vbUFu aW1hdG9yVHJhbnNmb3JtKToKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpzZXRTdWJs YXllclRyYW5zZm9ybSk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVySW1wbDo6c2V0VHJhbnNm b3JtKToKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpzZXREZWJ1Z0JvcmRlckNvbG9y KToKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpzZXREZWJ1Z0JvcmRlcldpZHRoKToK KyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpzZXRDb250ZW50Qm91bmRzKToKKyAgICAg ICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpzZXRTY3JvbGxQb3NpdGlvbik6CisgICAgICAgIChX ZWJDb3JlOjpDQ0xheWVySW1wbDo6c2V0U2Nyb2xsRGVsdGEpOgorICAgICAgICAoV2ViQ29yZTo6 Q0NMYXllckltcGw6OnNldFNjYWxlRGVsdGEpOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllcklt cGw6OnNldERvdWJsZVNpZGVkKToKKwogMjAxMS0xMS0xNSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQu cmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQg cjEwMDIxMy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJJbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJJbXBsLmNwcAppbmRleCA5MDQ4ZmRjODJkMTA1YjNjNjI2 MGRlYWIxZDkxMGQxMDgxZWFhNDY2Li5lODdjMTAwYmMwZThiNGIzZmE2ZWRkMzdlNzgzMjdhMjRj YzgyNzQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVySW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckltcGwuY3BwCkBAIC0yNDEsMTg0ICsyNDEsMjA2IEBA IHZvaWQgQ0NMYXllckltcGw6Om5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvckRlc2NlbmRhbnRz KCkKIAogdm9pZCBDQ0xheWVySW1wbDo6c2V0Qm91bmRzKGNvbnN0IEludFNpemUmIGJvdW5kcykK IHsKLSAgICBpZiAobV9ib3VuZHMgIT0gYm91bmRzKSB7Ci0gICAgICAgIG1fYm91bmRzID0gYm91 bmRzOworICAgIGlmIChtX2JvdW5kcyA9PSBib3VuZHMpCisgICAgICAgIHJldHVybjsKIAotICAg ICAgICBpZiAobWFza3NUb0JvdW5kcygpKQotICAgICAgICAgICAgbm90ZUxheWVyUHJvcGVydHlD aGFuZ2VkRm9yU3VidHJlZSgpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX2xheWVyUHJv cGVydHlDaGFuZ2VkID0gdHJ1ZTsKLSAgICB9CisgICAgbV9ib3VuZHMgPSBib3VuZHM7CisKKyAg ICBpZiAobWFza3NUb0JvdW5kcygpKQorICAgICAgICBub3RlTGF5ZXJQcm9wZXJ0eUNoYW5nZWRG b3JTdWJ0cmVlKCk7CisgICAgZWxzZQorICAgICAgICBtX2xheWVyUHJvcGVydHlDaGFuZ2VkID0g dHJ1ZTsKIH0KIAogdm9pZCBDQ0xheWVySW1wbDo6c2V0TWFza0xheWVyKFBhc3NSZWZQdHI8Q0NM YXllckltcGw+IG1hc2tMYXllcikKIHsKLSAgICBpZiAobV9tYXNrTGF5ZXIgIT0gbWFza0xheWVy KSB7Ci0gICAgICAgIG1fbWFza0xheWVyID0gbWFza0xheWVyOwotICAgICAgICBub3RlTGF5ZXJQ cm9wZXJ0eUNoYW5nZWRGb3JTdWJ0cmVlKCk7Ci0gICAgfQorICAgIGlmIChtX21hc2tMYXllciA9 PSBtYXNrTGF5ZXIpCisgICAgICAgIHJldHVybjsKKworICAgIG1fbWFza0xheWVyID0gbWFza0xh eWVyOworICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKIH0KIAogdm9p ZCBDQ0xheWVySW1wbDo6c2V0UmVwbGljYUxheWVyKFBhc3NSZWZQdHI8Q0NMYXllckltcGw+IHJl cGxpY2FMYXllcikKIHsKLSAgICBpZiAobV9yZXBsaWNhTGF5ZXIgIT0gcmVwbGljYUxheWVyKSB7 Ci0gICAgICAgIG1fcmVwbGljYUxheWVyID0gcmVwbGljYUxheWVyOwotICAgICAgICBub3RlTGF5 ZXJQcm9wZXJ0eUNoYW5nZWRGb3JTdWJ0cmVlKCk7Ci0gICAgfQorICAgIGlmIChtX3JlcGxpY2FM YXllciA9PSByZXBsaWNhTGF5ZXIpCisgICAgICAgIHJldHVybjsKKworICAgIG1fcmVwbGljYUxh eWVyID0gcmVwbGljYUxheWVyOworICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRy ZWUoKTsKIH0KIAogdm9pZCBDQ0xheWVySW1wbDo6c2V0RHJhd3NDb250ZW50KGJvb2wgZHJhd3ND b250ZW50KQogewotICAgIGlmIChtX2RyYXdzQ29udGVudCAhPSBkcmF3c0NvbnRlbnQpIHsKLSAg ICAgICAgbV9kcmF3c0NvbnRlbnQgPSBkcmF3c0NvbnRlbnQ7Ci0gICAgICAgIG1fbGF5ZXJQcm9w ZXJ0eUNoYW5nZWQgPSB0cnVlOwotICAgIH0KKyAgICBpZiAobV9kcmF3c0NvbnRlbnQgPT0gZHJh d3NDb250ZW50KQorICAgICAgICByZXR1cm47CisKKyAgICBtX2RyYXdzQ29udGVudCA9IGRyYXdz Q29udGVudDsKKyAgICBtX2xheWVyUHJvcGVydHlDaGFuZ2VkID0gdHJ1ZTsKIH0KIAogdm9pZCBD Q0xheWVySW1wbDo6c2V0QW5jaG9yUG9pbnQoY29uc3QgRmxvYXRQb2ludCYgYW5jaG9yUG9pbnQp CiB7Ci0gICAgaWYgKG1fYW5jaG9yUG9pbnQgIT0gYW5jaG9yUG9pbnQpIHsKLSAgICAgICAgbV9h bmNob3JQb2ludCA9IGFuY2hvclBvaW50OwotICAgICAgICBub3RlTGF5ZXJQcm9wZXJ0eUNoYW5n ZWRGb3JTdWJ0cmVlKCk7Ci0gICAgfQorICAgIGlmIChtX2FuY2hvclBvaW50ID09IGFuY2hvclBv aW50KQorICAgICAgICByZXR1cm47CisKKyAgICBtX2FuY2hvclBvaW50ID0gYW5jaG9yUG9pbnQ7 CisgICAgbm90ZUxheWVyUHJvcGVydHlDaGFuZ2VkRm9yU3VidHJlZSgpOwogfQogCiB2b2lkIEND TGF5ZXJJbXBsOjpzZXRBbmNob3JQb2ludFooZmxvYXQgYW5jaG9yUG9pbnRaKQogewotICAgIGlm IChtX2FuY2hvclBvaW50WiAhPSBhbmNob3JQb2ludFopIHsKLSAgICAgICAgbV9hbmNob3JQb2lu dFogPSBhbmNob3JQb2ludFo7Ci0gICAgICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1 YnRyZWUoKTsKLSAgICB9CisgICAgaWYgKG1fYW5jaG9yUG9pbnRaID09IGFuY2hvclBvaW50WikK KyAgICAgICAgcmV0dXJuOworCisgICAgbV9hbmNob3JQb2ludFogPSBhbmNob3JQb2ludFo7Cisg ICAgbm90ZUxheWVyUHJvcGVydHlDaGFuZ2VkRm9yU3VidHJlZSgpOwogfQogCiB2b2lkIENDTGF5 ZXJJbXBsOjpzZXRCYWNrZ3JvdW5kQ29sb3IoY29uc3QgQ29sb3ImIGJhY2tncm91bmRDb2xvcikK IHsKLSAgICBpZiAobV9iYWNrZ3JvdW5kQ29sb3IgIT0gYmFja2dyb3VuZENvbG9yKSB7Ci0gICAg ICAgIG1fYmFja2dyb3VuZENvbG9yID0gYmFja2dyb3VuZENvbG9yOwotICAgICAgICBtX2xheWVy UHJvcGVydHlDaGFuZ2VkID0gdHJ1ZTsKLSAgICB9CisgICAgaWYgKG1fYmFja2dyb3VuZENvbG9y ID09IGJhY2tncm91bmRDb2xvcikKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9iYWNrZ3JvdW5k Q29sb3IgPSBiYWNrZ3JvdW5kQ29sb3I7CisgICAgbV9sYXllclByb3BlcnR5Q2hhbmdlZCA9IHRy dWU7CiB9CiAKIHZvaWQgQ0NMYXllckltcGw6OnNldE1hc2tzVG9Cb3VuZHMoYm9vbCBtYXNrc1Rv Qm91bmRzKQogewotICAgIGlmIChtX21hc2tzVG9Cb3VuZHMgIT0gbWFza3NUb0JvdW5kcykgewot ICAgICAgICBtX21hc2tzVG9Cb3VuZHMgPSBtYXNrc1RvQm91bmRzOwotICAgICAgICBub3RlTGF5 ZXJQcm9wZXJ0eUNoYW5nZWRGb3JTdWJ0cmVlKCk7Ci0gICAgfQorICAgIGlmIChtX21hc2tzVG9C b3VuZHMgPT0gbWFza3NUb0JvdW5kcykKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9tYXNrc1Rv Qm91bmRzID0gbWFza3NUb0JvdW5kczsKKyAgICBub3RlTGF5ZXJQcm9wZXJ0eUNoYW5nZWRGb3JT dWJ0cmVlKCk7CiB9CiAKIHZvaWQgQ0NMYXllckltcGw6OnNldE9wYXF1ZShib29sIG9wYXF1ZSkK IHsKLSAgICBpZiAobV9vcGFxdWUgIT0gb3BhcXVlKSB7Ci0gICAgICAgIG1fb3BhcXVlID0gb3Bh cXVlOwotICAgICAgICBub3RlTGF5ZXJQcm9wZXJ0eUNoYW5nZWRGb3JTdWJ0cmVlKCk7Ci0gICAg fQorICAgIGlmIChtX29wYXF1ZSA9PSBvcGFxdWUpCisgICAgICAgIHJldHVybjsKKworICAgIG1f b3BhcXVlID0gb3BhcXVlOworICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUo KTsKIH0KIAogdm9pZCBDQ0xheWVySW1wbDo6c2V0T3BhY2l0eShmbG9hdCBvcGFjaXR5KQogewot ICAgIGlmIChtX29wYWNpdHkgIT0gb3BhY2l0eSkgewotICAgICAgICBtX29wYWNpdHkgPSBvcGFj aXR5OwotICAgICAgICBub3RlTGF5ZXJQcm9wZXJ0eUNoYW5nZWRGb3JTdWJ0cmVlKCk7Ci0gICAg fQorICAgIGlmIChtX29wYWNpdHkgPT0gb3BhY2l0eSkKKyAgICAgICAgcmV0dXJuOworCisgICAg bV9vcGFjaXR5ID0gb3BhY2l0eTsKKyAgICBub3RlTGF5ZXJQcm9wZXJ0eUNoYW5nZWRGb3JTdWJ0 cmVlKCk7CiB9CiAKIHZvaWQgQ0NMYXllckltcGw6OnNldFBvc2l0aW9uKGNvbnN0IEZsb2F0UG9p bnQmIHBvc2l0aW9uKQogewotICAgIGlmIChtX3Bvc2l0aW9uICE9IHBvc2l0aW9uKSB7Ci0gICAg ICAgIG1fcG9zaXRpb24gPSBwb3NpdGlvbjsKLSAgICAgICAgbm90ZUxheWVyUHJvcGVydHlDaGFu Z2VkRm9yU3VidHJlZSgpOwotICAgIH0KKyAgICBpZiAobV9wb3NpdGlvbiA9PSBwb3NpdGlvbikK KyAgICAgICAgcmV0dXJuOworCisgICAgbV9wb3NpdGlvbiA9IHBvc2l0aW9uOworICAgIG5vdGVM YXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKIH0KIAogdm9pZCBDQ0xheWVySW1wbDo6 c2V0UHJlc2VydmVzM0QoYm9vbCBwcmVzZXJ2ZXMzRCkKIHsKLSAgICBpZiAobV9wcmVzZXJ2ZXMz RCAhPSBwcmVzZXJ2ZXMzRCkgewotICAgICAgICBtX3ByZXNlcnZlczNEID0gcHJlc2VydmVzM0Q7 Ci0gICAgICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKLSAgICB9Cisg ICAgaWYgKG1fcHJlc2VydmVzM0QgPT0gcHJlc2VydmVzM0QpCisgICAgICAgIHJldHVybjsKKwor ICAgIG1fcHJlc2VydmVzM0QgPSBwcmVzZXJ2ZXMzRDsKKyAgICBub3RlTGF5ZXJQcm9wZXJ0eUNo YW5nZWRGb3JTdWJ0cmVlKCk7CiB9CiAKIHZvaWQgQ0NMYXllckltcGw6OnNldFpvb21BbmltYXRv clRyYW5zZm9ybShjb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgem9vbUFuaW1hdG9yVHJhbnNm b3JtKQogewotICAgIGlmIChtX3pvb21BbmltYXRvclRyYW5zZm9ybSAhPSB6b29tQW5pbWF0b3JU cmFuc2Zvcm0pIHsKLSAgICAgICAgbV96b29tQW5pbWF0b3JUcmFuc2Zvcm0gPSB6b29tQW5pbWF0 b3JUcmFuc2Zvcm07Ci0gICAgICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUo KTsKLSAgICB9CisgICAgaWYgKG1fem9vbUFuaW1hdG9yVHJhbnNmb3JtID09IHpvb21BbmltYXRv clRyYW5zZm9ybSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV96b29tQW5pbWF0b3JUcmFuc2Zv cm0gPSB6b29tQW5pbWF0b3JUcmFuc2Zvcm07CisgICAgbm90ZUxheWVyUHJvcGVydHlDaGFuZ2Vk Rm9yU3VidHJlZSgpOwogfQogCiAKIHZvaWQgQ0NMYXllckltcGw6OnNldFN1YmxheWVyVHJhbnNm b3JtKGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiBzdWJsYXllclRyYW5zZm9ybSkKIHsKLSAg ICBpZiAobV9zdWJsYXllclRyYW5zZm9ybSAhPSBzdWJsYXllclRyYW5zZm9ybSkgewotICAgICAg ICBtX3N1YmxheWVyVHJhbnNmb3JtID0gc3VibGF5ZXJUcmFuc2Zvcm07Ci0gICAgICAgIC8vIHN1 YmxheWVyIHRyYW5zZm9ybSBkb2VzIG5vdCBhZmZlY3QgdGhlIGN1cnJlbnQgbGF5ZXI7IGl0IGFm ZmVjdHMgb25seSBpdHMgY2hpbGRyZW4uCi0gICAgICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdl ZEZvckRlc2NlbmRhbnRzKCk7Ci0gICAgfQorICAgIGlmIChtX3N1YmxheWVyVHJhbnNmb3JtID09 IHN1YmxheWVyVHJhbnNmb3JtKQorICAgICAgICByZXR1cm47CisKKyAgICBtX3N1YmxheWVyVHJh bnNmb3JtID0gc3VibGF5ZXJUcmFuc2Zvcm07CisgICAgLy8gc3VibGF5ZXIgdHJhbnNmb3JtIGRv ZXMgbm90IGFmZmVjdCB0aGUgY3VycmVudCBsYXllcjsgaXQgYWZmZWN0cyBvbmx5IGl0cyBjaGls ZHJlbi4KKyAgICBub3RlTGF5ZXJQcm9wZXJ0eUNoYW5nZWRGb3JEZXNjZW5kYW50cygpOwogfQog CiB2b2lkIENDTGF5ZXJJbXBsOjpzZXRUcmFuc2Zvcm0oY29uc3QgVHJhbnNmb3JtYXRpb25NYXRy aXgmIHRyYW5zZm9ybSkKIHsKLSAgICBpZiAobV90cmFuc2Zvcm0gIT0gdHJhbnNmb3JtKSB7Ci0g ICAgICAgIG1fdHJhbnNmb3JtID0gdHJhbnNmb3JtOwotICAgICAgICBub3RlTGF5ZXJQcm9wZXJ0 eUNoYW5nZWRGb3JTdWJ0cmVlKCk7Ci0gICAgfQorICAgIGlmIChtX3RyYW5zZm9ybSA9PSB0cmFu c2Zvcm0pCisgICAgICAgIHJldHVybjsKKworICAgIG1fdHJhbnNmb3JtID0gdHJhbnNmb3JtOwor ICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKIH0KIAogdm9pZCBDQ0xh eWVySW1wbDo6c2V0RGVidWdCb3JkZXJDb2xvcihDb2xvciBkZWJ1Z0JvcmRlckNvbG9yKQogewot ICAgIGlmIChtX2RlYnVnQm9yZGVyQ29sb3IgIT0gZGVidWdCb3JkZXJDb2xvcikgewotICAgICAg ICBtX2RlYnVnQm9yZGVyQ29sb3IgPSBkZWJ1Z0JvcmRlckNvbG9yOwotICAgICAgICBtX2xheWVy UHJvcGVydHlDaGFuZ2VkID0gdHJ1ZTsKLSAgICB9CisgICAgaWYgKG1fZGVidWdCb3JkZXJDb2xv ciA9PSBkZWJ1Z0JvcmRlckNvbG9yKQorICAgICAgICByZXR1cm47CisKKyAgICBtX2RlYnVnQm9y ZGVyQ29sb3IgPSBkZWJ1Z0JvcmRlckNvbG9yOworICAgIG1fbGF5ZXJQcm9wZXJ0eUNoYW5nZWQg PSB0cnVlOwogfQogCiB2b2lkIENDTGF5ZXJJbXBsOjpzZXREZWJ1Z0JvcmRlcldpZHRoKGZsb2F0 IGRlYnVnQm9yZGVyV2lkdGgpCiB7Ci0gICAgaWYgKG1fZGVidWdCb3JkZXJXaWR0aCAhPSBkZWJ1 Z0JvcmRlcldpZHRoKSB7Ci0gICAgICAgIG1fZGVidWdCb3JkZXJXaWR0aCA9IGRlYnVnQm9yZGVy V2lkdGg7Ci0gICAgICAgIG1fbGF5ZXJQcm9wZXJ0eUNoYW5nZWQgPSB0cnVlOwotICAgIH0KKyAg ICBpZiAobV9kZWJ1Z0JvcmRlcldpZHRoID09IGRlYnVnQm9yZGVyV2lkdGgpCisgICAgICAgIHJl dHVybjsKKworICAgIG1fZGVidWdCb3JkZXJXaWR0aCA9IGRlYnVnQm9yZGVyV2lkdGg7CisgICAg bV9sYXllclByb3BlcnR5Q2hhbmdlZCA9IHRydWU7CiB9CiAKIHZvaWQgQ0NMYXllckltcGw6OnNl dENvbnRlbnRCb3VuZHMoY29uc3QgSW50U2l6ZSYgY29udGVudEJvdW5kcykKIHsKLSAgICBpZiAo bV9jb250ZW50Qm91bmRzICE9IGNvbnRlbnRCb3VuZHMpIHsKLSAgICAgICAgbV9jb250ZW50Qm91 bmRzID0gY29udGVudEJvdW5kczsKLSAgICAgICAgbV9sYXllclByb3BlcnR5Q2hhbmdlZCA9IHRy dWU7Ci0gICAgfQorICAgIGlmIChtX2NvbnRlbnRCb3VuZHMgPT0gY29udGVudEJvdW5kcykKKyAg ICAgICAgcmV0dXJuOworCisgICAgbV9jb250ZW50Qm91bmRzID0gY29udGVudEJvdW5kczsKKyAg ICBtX2xheWVyUHJvcGVydHlDaGFuZ2VkID0gdHJ1ZTsKIH0KIAogdm9pZCBDQ0xheWVySW1wbDo6 c2V0U2Nyb2xsUG9zaXRpb24oY29uc3QgSW50UG9pbnQmIHNjcm9sbFBvc2l0aW9uKQogewotICAg IGlmIChtX3Njcm9sbFBvc2l0aW9uICE9IHNjcm9sbFBvc2l0aW9uKSB7Ci0gICAgICAgIG1fc2Ny b2xsUG9zaXRpb24gPSBzY3JvbGxQb3NpdGlvbjsKLSAgICAgICAgbm90ZUxheWVyUHJvcGVydHlD aGFuZ2VkRm9yU3VidHJlZSgpOwotICAgIH0KKyAgICBpZiAobV9zY3JvbGxQb3NpdGlvbiA9PSBz Y3JvbGxQb3NpdGlvbikKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9zY3JvbGxQb3NpdGlvbiA9 IHNjcm9sbFBvc2l0aW9uOworICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUo KTsKIH0KIAogdm9pZCBDQ0xheWVySW1wbDo6c2V0U2Nyb2xsRGVsdGEoY29uc3QgSW50U2l6ZSYg c2Nyb2xsRGVsdGEpCiB7Ci0gICAgaWYgKG1fc2Nyb2xsRGVsdGEgIT0gc2Nyb2xsRGVsdGEpIHsK LSAgICAgICAgbV9zY3JvbGxEZWx0YSA9IHNjcm9sbERlbHRhOwotICAgICAgICBub3RlTGF5ZXJQ cm9wZXJ0eUNoYW5nZWRGb3JTdWJ0cmVlKCk7Ci0gICAgfQorICAgIGlmIChtX3Njcm9sbERlbHRh ID09IHNjcm9sbERlbHRhKQorICAgICAgICByZXR1cm47CisKKyAgICBtX3Njcm9sbERlbHRhID0g c2Nyb2xsRGVsdGE7CisgICAgbm90ZUxheWVyUHJvcGVydHlDaGFuZ2VkRm9yU3VidHJlZSgpOwog fQogCiB2b2lkIENDTGF5ZXJJbXBsOjpzZXRTY2FsZURlbHRhKGZsb2F0IHNjYWxlRGVsdGEpCiB7 Ci0gICAgaWYgKG1fc2NhbGVEZWx0YSAhPSBzY2FsZURlbHRhKSB7Ci0gICAgICAgIG1fc2NhbGVE ZWx0YSA9IHNjYWxlRGVsdGE7Ci0gICAgICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1 YnRyZWUoKTsKLSAgICB9CisgICAgaWYgKG1fc2NhbGVEZWx0YSA9PSBzY2FsZURlbHRhKQorICAg ICAgICByZXR1cm47CisKKyAgICBtX3NjYWxlRGVsdGEgPSBzY2FsZURlbHRhOworICAgIG5vdGVM YXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKIH0KIAogdm9pZCBDQ0xheWVySW1wbDo6 c2V0RG91YmxlU2lkZWQoYm9vbCBkb3VibGVTaWRlZCkKIHsKLSAgICBpZiAobV9kb3VibGVTaWRl ZCAhPSBkb3VibGVTaWRlZCkgewotICAgICAgICBtX2RvdWJsZVNpZGVkID0gZG91YmxlU2lkZWQ7 Ci0gICAgICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKLSAgICB9Cisg ICAgaWYgKG1fZG91YmxlU2lkZWQgPT0gZG91YmxlU2lkZWQpCisgICAgICAgIHJldHVybjsKKwor ICAgIG1fZG91YmxlU2lkZWQgPSBkb3VibGVTaWRlZDsKKyAgICBub3RlTGF5ZXJQcm9wZXJ0eUNo YW5nZWRGb3JTdWJ0cmVlKCk7CiB9CiAKIH0K 115630 2011-11-17 11:29:39 -0800 2011-11-17 14:51:27 -0800 updated closer to tip of tree bug-71070-20111117112938.patch text/plain 10341 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNjQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKb2xkIG1vZGUgMTAwNzU1Cm5ldyBt b2RlIDEwMDY0NAppbmRleCBhYzE2OTc3MzY3YTE1OGMwNjA1MjQxYzZlYTQ2ZjRiMTYxMzE0NDgz Li44MDM3YjNhMGIxY2U2NjFkNTRmMmU0NDQ1NjIwZmQ1NjEzNWYzYjFiCi0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwzOCBAQAorMjAxMS0xMS0xNiAgU2hhd24gU2luZ2ggIDxzaGF3bnNpbmdoQGNocm9taXVtLm9y Zz4KKworICAgICAgICBbY2hyb21pdW1dIEZpeCBtaW5vciBzdHlsZSBuaXQgaW4gQ0NMYXllcklt cGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxMDcw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZXMg aWYtc3RhdGVtZW50cyBvbiBzZXZlcmFsIHNldHRvcnMgdG8gZm9sbG93IFdlYktpdAorICAgICAg ICBjb252ZW50aW9ucy4gRXhpc3RpbmcgQ0NMYXllckltcGxUZXN0IHVuaXQgdGVzdHMgYWxyZWFk eSBjb3ZlcgorICAgICAgICB0aGlzIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5 ZXJJbXBsOjpzZXRCb3VuZHMpOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllckltcGw6OnNldE1h c2tMYXllcik6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVySW1wbDo6c2V0UmVwbGljYUxheWVy KToKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpzZXREcmF3c0NvbnRlbnQpOgorICAg ICAgICAoV2ViQ29yZTo6Q0NMYXllckltcGw6OnNldEFuY2hvclBvaW50KToKKyAgICAgICAgKFdl YkNvcmU6OkNDTGF5ZXJJbXBsOjpzZXRBbmNob3JQb2ludFopOgorICAgICAgICAoV2ViQ29yZTo6 Q0NMYXllckltcGw6OnNldEJhY2tncm91bmRDb2xvcik6CisgICAgICAgIChXZWJDb3JlOjpDQ0xh eWVySW1wbDo6c2V0TWFza3NUb0JvdW5kcyk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVySW1w bDo6c2V0T3BhcXVlKToKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpzZXRPcGFjaXR5 KToKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpzZXRQb3NpdGlvbik6CisgICAgICAg IChXZWJDb3JlOjpDQ0xheWVySW1wbDo6c2V0UHJlc2VydmVzM0QpOgorICAgICAgICAoV2ViQ29y ZTo6Q0NMYXllckltcGw6OnNldFpvb21BbmltYXRvclRyYW5zZm9ybSk6CisgICAgICAgIChXZWJD b3JlOjpDQ0xheWVySW1wbDo6c2V0U3VibGF5ZXJUcmFuc2Zvcm0pOgorICAgICAgICAoV2ViQ29y ZTo6Q0NMYXllckltcGw6OnNldFRyYW5zZm9ybSk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVy SW1wbDo6c2V0RGVidWdCb3JkZXJDb2xvcik6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVySW1w bDo6c2V0RGVidWdCb3JkZXJXaWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVySW1wbDo6 c2V0Q29udGVudEJvdW5kcyk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVySW1wbDo6c2V0U2Ny b2xsUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6Q0NMYXllckltcGw6OnNldFNjcm9sbERl bHRhKToKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpzZXRTY2FsZURlbHRhKToKKyAg ICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpzZXREb3VibGVTaWRlZCk6CisKIDIwMTEtMTEt MTcgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAg W0dUS10gcGx1Z2lucy9nZXQtdXJsLW5vdGlmeS13aXRoLXVybC10aGF0LWZhaWxzLXRvLWxvYWQu aHRtbCBvbiBib3RzIGFmdGVyIHIxMDA0NjYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJJbXBsLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJJbXBsLmNwcAppbmRleCAx YWIyZTdlOGU2Nzc4NjEzN2EzOWE4NzE1MjVjYmI1OGI5YjMwZjI1Li5hN2Y2ZTgzNjgwNGFiNDVh NTk2MjRhMzcwZDYyODMyNWE4NzlmY2QxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVySW1wbC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckltcGwuY3BwCkBAIC0y NTIsMTg0ICsyNTIsMjA2IEBAIHZvaWQgQ0NMYXllckltcGw6OnJlc2V0UHJvcGVydHlDaGFuZ2Vk RmxhZ0ZvclN1YnRyZWUoKQogCiB2b2lkIENDTGF5ZXJJbXBsOjpzZXRCb3VuZHMoY29uc3QgSW50 U2l6ZSYgYm91bmRzKQogewotICAgIGlmIChtX2JvdW5kcyAhPSBib3VuZHMpIHsKLSAgICAgICAg bV9ib3VuZHMgPSBib3VuZHM7CisgICAgaWYgKG1fYm91bmRzID09IGJvdW5kcykKKyAgICAgICAg cmV0dXJuOwogCi0gICAgICAgIGlmIChtYXNrc1RvQm91bmRzKCkpCi0gICAgICAgICAgICBub3Rl TGF5ZXJQcm9wZXJ0eUNoYW5nZWRGb3JTdWJ0cmVlKCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAg ICAgIG1fbGF5ZXJQcm9wZXJ0eUNoYW5nZWQgPSB0cnVlOwotICAgIH0KKyAgICBtX2JvdW5kcyA9 IGJvdW5kczsKKworICAgIGlmIChtYXNrc1RvQm91bmRzKCkpCisgICAgICAgIG5vdGVMYXllclBy b3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKKyAgICBlbHNlCisgICAgICAgIG1fbGF5ZXJQcm9w ZXJ0eUNoYW5nZWQgPSB0cnVlOwogfQogCiB2b2lkIENDTGF5ZXJJbXBsOjpzZXRNYXNrTGF5ZXIo UGFzc1JlZlB0cjxDQ0xheWVySW1wbD4gbWFza0xheWVyKQogewotICAgIGlmIChtX21hc2tMYXll ciAhPSBtYXNrTGF5ZXIpIHsKLSAgICAgICAgbV9tYXNrTGF5ZXIgPSBtYXNrTGF5ZXI7Ci0gICAg ICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKLSAgICB9CisgICAgaWYg KG1fbWFza0xheWVyID09IG1hc2tMYXllcikKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9tYXNr TGF5ZXIgPSBtYXNrTGF5ZXI7CisgICAgbm90ZUxheWVyUHJvcGVydHlDaGFuZ2VkRm9yU3VidHJl ZSgpOwogfQogCiB2b2lkIENDTGF5ZXJJbXBsOjpzZXRSZXBsaWNhTGF5ZXIoUGFzc1JlZlB0cjxD Q0xheWVySW1wbD4gcmVwbGljYUxheWVyKQogewotICAgIGlmIChtX3JlcGxpY2FMYXllciAhPSBy ZXBsaWNhTGF5ZXIpIHsKLSAgICAgICAgbV9yZXBsaWNhTGF5ZXIgPSByZXBsaWNhTGF5ZXI7Ci0g ICAgICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKLSAgICB9CisgICAg aWYgKG1fcmVwbGljYUxheWVyID09IHJlcGxpY2FMYXllcikKKyAgICAgICAgcmV0dXJuOworCisg ICAgbV9yZXBsaWNhTGF5ZXIgPSByZXBsaWNhTGF5ZXI7CisgICAgbm90ZUxheWVyUHJvcGVydHlD aGFuZ2VkRm9yU3VidHJlZSgpOwogfQogCiB2b2lkIENDTGF5ZXJJbXBsOjpzZXREcmF3c0NvbnRl bnQoYm9vbCBkcmF3c0NvbnRlbnQpCiB7Ci0gICAgaWYgKG1fZHJhd3NDb250ZW50ICE9IGRyYXdz Q29udGVudCkgewotICAgICAgICBtX2RyYXdzQ29udGVudCA9IGRyYXdzQ29udGVudDsKLSAgICAg ICAgbV9sYXllclByb3BlcnR5Q2hhbmdlZCA9IHRydWU7Ci0gICAgfQorICAgIGlmIChtX2RyYXdz Q29udGVudCA9PSBkcmF3c0NvbnRlbnQpCisgICAgICAgIHJldHVybjsKKworICAgIG1fZHJhd3ND b250ZW50ID0gZHJhd3NDb250ZW50OworICAgIG1fbGF5ZXJQcm9wZXJ0eUNoYW5nZWQgPSB0cnVl OwogfQogCiB2b2lkIENDTGF5ZXJJbXBsOjpzZXRBbmNob3JQb2ludChjb25zdCBGbG9hdFBvaW50 JiBhbmNob3JQb2ludCkKIHsKLSAgICBpZiAobV9hbmNob3JQb2ludCAhPSBhbmNob3JQb2ludCkg ewotICAgICAgICBtX2FuY2hvclBvaW50ID0gYW5jaG9yUG9pbnQ7Ci0gICAgICAgIG5vdGVMYXll clByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKLSAgICB9CisgICAgaWYgKG1fYW5jaG9yUG9p bnQgPT0gYW5jaG9yUG9pbnQpCisgICAgICAgIHJldHVybjsKKworICAgIG1fYW5jaG9yUG9pbnQg PSBhbmNob3JQb2ludDsKKyAgICBub3RlTGF5ZXJQcm9wZXJ0eUNoYW5nZWRGb3JTdWJ0cmVlKCk7 CiB9CiAKIHZvaWQgQ0NMYXllckltcGw6OnNldEFuY2hvclBvaW50WihmbG9hdCBhbmNob3JQb2lu dFopCiB7Ci0gICAgaWYgKG1fYW5jaG9yUG9pbnRaICE9IGFuY2hvclBvaW50WikgewotICAgICAg ICBtX2FuY2hvclBvaW50WiA9IGFuY2hvclBvaW50WjsKLSAgICAgICAgbm90ZUxheWVyUHJvcGVy dHlDaGFuZ2VkRm9yU3VidHJlZSgpOwotICAgIH0KKyAgICBpZiAobV9hbmNob3JQb2ludFogPT0g YW5jaG9yUG9pbnRaKQorICAgICAgICByZXR1cm47CisKKyAgICBtX2FuY2hvclBvaW50WiA9IGFu Y2hvclBvaW50WjsKKyAgICBub3RlTGF5ZXJQcm9wZXJ0eUNoYW5nZWRGb3JTdWJ0cmVlKCk7CiB9 CiAKIHZvaWQgQ0NMYXllckltcGw6OnNldEJhY2tncm91bmRDb2xvcihjb25zdCBDb2xvciYgYmFj a2dyb3VuZENvbG9yKQogewotICAgIGlmIChtX2JhY2tncm91bmRDb2xvciAhPSBiYWNrZ3JvdW5k Q29sb3IpIHsKLSAgICAgICAgbV9iYWNrZ3JvdW5kQ29sb3IgPSBiYWNrZ3JvdW5kQ29sb3I7Ci0g ICAgICAgIG1fbGF5ZXJQcm9wZXJ0eUNoYW5nZWQgPSB0cnVlOwotICAgIH0KKyAgICBpZiAobV9i YWNrZ3JvdW5kQ29sb3IgPT0gYmFja2dyb3VuZENvbG9yKQorICAgICAgICByZXR1cm47CisKKyAg ICBtX2JhY2tncm91bmRDb2xvciA9IGJhY2tncm91bmRDb2xvcjsKKyAgICBtX2xheWVyUHJvcGVy dHlDaGFuZ2VkID0gdHJ1ZTsKIH0KIAogdm9pZCBDQ0xheWVySW1wbDo6c2V0TWFza3NUb0JvdW5k cyhib29sIG1hc2tzVG9Cb3VuZHMpCiB7Ci0gICAgaWYgKG1fbWFza3NUb0JvdW5kcyAhPSBtYXNr c1RvQm91bmRzKSB7Ci0gICAgICAgIG1fbWFza3NUb0JvdW5kcyA9IG1hc2tzVG9Cb3VuZHM7Ci0g ICAgICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKLSAgICB9CisgICAg aWYgKG1fbWFza3NUb0JvdW5kcyA9PSBtYXNrc1RvQm91bmRzKQorICAgICAgICByZXR1cm47CisK KyAgICBtX21hc2tzVG9Cb3VuZHMgPSBtYXNrc1RvQm91bmRzOworICAgIG5vdGVMYXllclByb3Bl cnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKIH0KIAogdm9pZCBDQ0xheWVySW1wbDo6c2V0T3BhcXVl KGJvb2wgb3BhcXVlKQogewotICAgIGlmIChtX29wYXF1ZSAhPSBvcGFxdWUpIHsKLSAgICAgICAg bV9vcGFxdWUgPSBvcGFxdWU7Ci0gICAgICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1 YnRyZWUoKTsKLSAgICB9CisgICAgaWYgKG1fb3BhcXVlID09IG9wYXF1ZSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgbV9vcGFxdWUgPSBvcGFxdWU7CisgICAgbm90ZUxheWVyUHJvcGVydHlDaGFu Z2VkRm9yU3VidHJlZSgpOwogfQogCiB2b2lkIENDTGF5ZXJJbXBsOjpzZXRPcGFjaXR5KGZsb2F0 IG9wYWNpdHkpCiB7Ci0gICAgaWYgKG1fb3BhY2l0eSAhPSBvcGFjaXR5KSB7Ci0gICAgICAgIG1f b3BhY2l0eSA9IG9wYWNpdHk7Ci0gICAgICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1 YnRyZWUoKTsKLSAgICB9CisgICAgaWYgKG1fb3BhY2l0eSA9PSBvcGFjaXR5KQorICAgICAgICBy ZXR1cm47CisKKyAgICBtX29wYWNpdHkgPSBvcGFjaXR5OworICAgIG5vdGVMYXllclByb3BlcnR5 Q2hhbmdlZEZvclN1YnRyZWUoKTsKIH0KIAogdm9pZCBDQ0xheWVySW1wbDo6c2V0UG9zaXRpb24o Y29uc3QgRmxvYXRQb2ludCYgcG9zaXRpb24pCiB7Ci0gICAgaWYgKG1fcG9zaXRpb24gIT0gcG9z aXRpb24pIHsKLSAgICAgICAgbV9wb3NpdGlvbiA9IHBvc2l0aW9uOwotICAgICAgICBub3RlTGF5 ZXJQcm9wZXJ0eUNoYW5nZWRGb3JTdWJ0cmVlKCk7Ci0gICAgfQorICAgIGlmIChtX3Bvc2l0aW9u ID09IHBvc2l0aW9uKQorICAgICAgICByZXR1cm47CisKKyAgICBtX3Bvc2l0aW9uID0gcG9zaXRp b247CisgICAgbm90ZUxheWVyUHJvcGVydHlDaGFuZ2VkRm9yU3VidHJlZSgpOwogfQogCiB2b2lk IENDTGF5ZXJJbXBsOjpzZXRQcmVzZXJ2ZXMzRChib29sIHByZXNlcnZlczNEKQogewotICAgIGlm IChtX3ByZXNlcnZlczNEICE9IHByZXNlcnZlczNEKSB7Ci0gICAgICAgIG1fcHJlc2VydmVzM0Qg PSBwcmVzZXJ2ZXMzRDsKLSAgICAgICAgbm90ZUxheWVyUHJvcGVydHlDaGFuZ2VkRm9yU3VidHJl ZSgpOwotICAgIH0KKyAgICBpZiAobV9wcmVzZXJ2ZXMzRCA9PSBwcmVzZXJ2ZXMzRCkKKyAgICAg ICAgcmV0dXJuOworCisgICAgbV9wcmVzZXJ2ZXMzRCA9IHByZXNlcnZlczNEOworICAgIG5vdGVM YXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKIH0KIAogdm9pZCBDQ0xheWVySW1wbDo6 c2V0Wm9vbUFuaW1hdG9yVHJhbnNmb3JtKGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiB6b29t QW5pbWF0b3JUcmFuc2Zvcm0pCiB7Ci0gICAgaWYgKG1fem9vbUFuaW1hdG9yVHJhbnNmb3JtICE9 IHpvb21BbmltYXRvclRyYW5zZm9ybSkgewotICAgICAgICBtX3pvb21BbmltYXRvclRyYW5zZm9y bSA9IHpvb21BbmltYXRvclRyYW5zZm9ybTsKLSAgICAgICAgbm90ZUxheWVyUHJvcGVydHlDaGFu Z2VkRm9yU3VidHJlZSgpOwotICAgIH0KKyAgICBpZiAobV96b29tQW5pbWF0b3JUcmFuc2Zvcm0g PT0gem9vbUFuaW1hdG9yVHJhbnNmb3JtKQorICAgICAgICByZXR1cm47CisKKyAgICBtX3pvb21B bmltYXRvclRyYW5zZm9ybSA9IHpvb21BbmltYXRvclRyYW5zZm9ybTsKKyAgICBub3RlTGF5ZXJQ cm9wZXJ0eUNoYW5nZWRGb3JTdWJ0cmVlKCk7CiB9CiAKIAogdm9pZCBDQ0xheWVySW1wbDo6c2V0 U3VibGF5ZXJUcmFuc2Zvcm0oY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIHN1YmxheWVyVHJh bnNmb3JtKQogewotICAgIGlmIChtX3N1YmxheWVyVHJhbnNmb3JtICE9IHN1YmxheWVyVHJhbnNm b3JtKSB7Ci0gICAgICAgIG1fc3VibGF5ZXJUcmFuc2Zvcm0gPSBzdWJsYXllclRyYW5zZm9ybTsK LSAgICAgICAgLy8gc3VibGF5ZXIgdHJhbnNmb3JtIGRvZXMgbm90IGFmZmVjdCB0aGUgY3VycmVu dCBsYXllcjsgaXQgYWZmZWN0cyBvbmx5IGl0cyBjaGlsZHJlbi4KLSAgICAgICAgbm90ZUxheWVy UHJvcGVydHlDaGFuZ2VkRm9yRGVzY2VuZGFudHMoKTsKLSAgICB9CisgICAgaWYgKG1fc3VibGF5 ZXJUcmFuc2Zvcm0gPT0gc3VibGF5ZXJUcmFuc2Zvcm0pCisgICAgICAgIHJldHVybjsKKworICAg IG1fc3VibGF5ZXJUcmFuc2Zvcm0gPSBzdWJsYXllclRyYW5zZm9ybTsKKyAgICAvLyBzdWJsYXll ciB0cmFuc2Zvcm0gZG9lcyBub3QgYWZmZWN0IHRoZSBjdXJyZW50IGxheWVyOyBpdCBhZmZlY3Rz IG9ubHkgaXRzIGNoaWxkcmVuLgorICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvckRlc2Nl bmRhbnRzKCk7CiB9CiAKIHZvaWQgQ0NMYXllckltcGw6OnNldFRyYW5zZm9ybShjb25zdCBUcmFu c2Zvcm1hdGlvbk1hdHJpeCYgdHJhbnNmb3JtKQogewotICAgIGlmIChtX3RyYW5zZm9ybSAhPSB0 cmFuc2Zvcm0pIHsKLSAgICAgICAgbV90cmFuc2Zvcm0gPSB0cmFuc2Zvcm07Ci0gICAgICAgIG5v dGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKLSAgICB9CisgICAgaWYgKG1fdHJh bnNmb3JtID09IHRyYW5zZm9ybSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV90cmFuc2Zvcm0g PSB0cmFuc2Zvcm07CisgICAgbm90ZUxheWVyUHJvcGVydHlDaGFuZ2VkRm9yU3VidHJlZSgpOwog fQogCiB2b2lkIENDTGF5ZXJJbXBsOjpzZXREZWJ1Z0JvcmRlckNvbG9yKENvbG9yIGRlYnVnQm9y ZGVyQ29sb3IpCiB7Ci0gICAgaWYgKG1fZGVidWdCb3JkZXJDb2xvciAhPSBkZWJ1Z0JvcmRlckNv bG9yKSB7Ci0gICAgICAgIG1fZGVidWdCb3JkZXJDb2xvciA9IGRlYnVnQm9yZGVyQ29sb3I7Ci0g ICAgICAgIG1fbGF5ZXJQcm9wZXJ0eUNoYW5nZWQgPSB0cnVlOwotICAgIH0KKyAgICBpZiAobV9k ZWJ1Z0JvcmRlckNvbG9yID09IGRlYnVnQm9yZGVyQ29sb3IpCisgICAgICAgIHJldHVybjsKKwor ICAgIG1fZGVidWdCb3JkZXJDb2xvciA9IGRlYnVnQm9yZGVyQ29sb3I7CisgICAgbV9sYXllclBy b3BlcnR5Q2hhbmdlZCA9IHRydWU7CiB9CiAKIHZvaWQgQ0NMYXllckltcGw6OnNldERlYnVnQm9y ZGVyV2lkdGgoZmxvYXQgZGVidWdCb3JkZXJXaWR0aCkKIHsKLSAgICBpZiAobV9kZWJ1Z0JvcmRl cldpZHRoICE9IGRlYnVnQm9yZGVyV2lkdGgpIHsKLSAgICAgICAgbV9kZWJ1Z0JvcmRlcldpZHRo ID0gZGVidWdCb3JkZXJXaWR0aDsKLSAgICAgICAgbV9sYXllclByb3BlcnR5Q2hhbmdlZCA9IHRy dWU7Ci0gICAgfQorICAgIGlmIChtX2RlYnVnQm9yZGVyV2lkdGggPT0gZGVidWdCb3JkZXJXaWR0 aCkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9kZWJ1Z0JvcmRlcldpZHRoID0gZGVidWdCb3Jk ZXJXaWR0aDsKKyAgICBtX2xheWVyUHJvcGVydHlDaGFuZ2VkID0gdHJ1ZTsKIH0KIAogdm9pZCBD Q0xheWVySW1wbDo6c2V0Q29udGVudEJvdW5kcyhjb25zdCBJbnRTaXplJiBjb250ZW50Qm91bmRz KQogewotICAgIGlmIChtX2NvbnRlbnRCb3VuZHMgIT0gY29udGVudEJvdW5kcykgewotICAgICAg ICBtX2NvbnRlbnRCb3VuZHMgPSBjb250ZW50Qm91bmRzOwotICAgICAgICBtX2xheWVyUHJvcGVy dHlDaGFuZ2VkID0gdHJ1ZTsKLSAgICB9CisgICAgaWYgKG1fY29udGVudEJvdW5kcyA9PSBjb250 ZW50Qm91bmRzKQorICAgICAgICByZXR1cm47CisKKyAgICBtX2NvbnRlbnRCb3VuZHMgPSBjb250 ZW50Qm91bmRzOworICAgIG1fbGF5ZXJQcm9wZXJ0eUNoYW5nZWQgPSB0cnVlOwogfQogCiB2b2lk IENDTGF5ZXJJbXBsOjpzZXRTY3JvbGxQb3NpdGlvbihjb25zdCBJbnRQb2ludCYgc2Nyb2xsUG9z aXRpb24pCiB7Ci0gICAgaWYgKG1fc2Nyb2xsUG9zaXRpb24gIT0gc2Nyb2xsUG9zaXRpb24pIHsK LSAgICAgICAgbV9zY3JvbGxQb3NpdGlvbiA9IHNjcm9sbFBvc2l0aW9uOwotICAgICAgICBub3Rl TGF5ZXJQcm9wZXJ0eUNoYW5nZWRGb3JTdWJ0cmVlKCk7Ci0gICAgfQorICAgIGlmIChtX3Njcm9s bFBvc2l0aW9uID09IHNjcm9sbFBvc2l0aW9uKQorICAgICAgICByZXR1cm47CisKKyAgICBtX3Nj cm9sbFBvc2l0aW9uID0gc2Nyb2xsUG9zaXRpb247CisgICAgbm90ZUxheWVyUHJvcGVydHlDaGFu Z2VkRm9yU3VidHJlZSgpOwogfQogCiB2b2lkIENDTGF5ZXJJbXBsOjpzZXRTY3JvbGxEZWx0YShj b25zdCBJbnRTaXplJiBzY3JvbGxEZWx0YSkKIHsKLSAgICBpZiAobV9zY3JvbGxEZWx0YSAhPSBz Y3JvbGxEZWx0YSkgewotICAgICAgICBtX3Njcm9sbERlbHRhID0gc2Nyb2xsRGVsdGE7Ci0gICAg ICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKLSAgICB9CisgICAgaWYg KG1fc2Nyb2xsRGVsdGEgPT0gc2Nyb2xsRGVsdGEpCisgICAgICAgIHJldHVybjsKKworICAgIG1f c2Nyb2xsRGVsdGEgPSBzY3JvbGxEZWx0YTsKKyAgICBub3RlTGF5ZXJQcm9wZXJ0eUNoYW5nZWRG b3JTdWJ0cmVlKCk7CiB9CiAKIHZvaWQgQ0NMYXllckltcGw6OnNldFBhZ2VTY2FsZURlbHRhKGZs b2F0IHBhZ2VTY2FsZURlbHRhKQogewotICAgIGlmIChtX3BhZ2VTY2FsZURlbHRhICE9IHBhZ2VT Y2FsZURlbHRhKSB7Ci0gICAgICAgIG1fcGFnZVNjYWxlRGVsdGEgPSBwYWdlU2NhbGVEZWx0YTsK LSAgICAgICAgbm90ZUxheWVyUHJvcGVydHlDaGFuZ2VkRm9yU3VidHJlZSgpOwotICAgIH0KKyAg ICBpZiAobV9wYWdlU2NhbGVEZWx0YSA9PSBwYWdlU2NhbGVEZWx0YSkKKyAgICAgICAgcmV0dXJu OworCisgICAgbV9wYWdlU2NhbGVEZWx0YSA9IHBhZ2VTY2FsZURlbHRhOworICAgIG5vdGVMYXll clByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKIH0KIAogdm9pZCBDQ0xheWVySW1wbDo6c2V0 RG91YmxlU2lkZWQoYm9vbCBkb3VibGVTaWRlZCkKIHsKLSAgICBpZiAobV9kb3VibGVTaWRlZCAh PSBkb3VibGVTaWRlZCkgewotICAgICAgICBtX2RvdWJsZVNpZGVkID0gZG91YmxlU2lkZWQ7Ci0g ICAgICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZEZvclN1YnRyZWUoKTsKLSAgICB9CisgICAg aWYgKG1fZG91YmxlU2lkZWQgPT0gZG91YmxlU2lkZWQpCisgICAgICAgIHJldHVybjsKKworICAg IG1fZG91YmxlU2lkZWQgPSBkb3VibGVTaWRlZDsKKyAgICBub3RlTGF5ZXJQcm9wZXJ0eUNoYW5n ZWRGb3JTdWJ0cmVlKCk7CiB9CiAKIH0K