112911 2013-03-21 06:58:51 -0700 Web Inspector: generalize InspectorDOMAgent::highlightRect() to highlightQuad() 2013-03-29 02:25:09 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 112919 1 caseq caseq apavlov graouts joepeck keishi loislo pfeldman pmuellr timothy vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 860302 0 caseq 2013-03-21 06:58:51 -0700 We need to highlight paint in transformed layers, so paint rectangles would become quads. This generalizes existing highlight for rectangles to handle quads. 860304 1 194255 caseq 2013-03-21 07:05:14 -0700 Created attachment 194255 Patch 860357 2 194255 timothy 2013-03-21 08:16:17 -0700 Comment on attachment 194255 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=194255&action=review > Source/WebCore/inspector/Inspector.json:1779 > + "id": "Quad", > + "type": "array", > + "items": { "type": "number" }, > + "minItems": 8, > + "maxItems": 8, > + "description": "An array of quad vertices, x immediately followed by y for each point, points clock-wise." An 4 item array of point objects with x and y properties would be more clear. 865381 3 194255 pfeldman 2013-03-28 05:33:54 -0700 Comment on attachment 194255 Patch As per Timothy's comment. 865396 4 194255 caseq 2013-03-28 05:51:08 -0700 Comment on attachment 194255 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=194255&action=review >> Source/WebCore/inspector/Inspector.json:1779 >> + "description": "An array of quad vertices, x immediately followed by y for each point, points clock-wise." > > An 4 item array of point objects with x and y properties would be more clear. This is used in entries that are quite frequent (and will perhaps be used even more), so we're trying to save a few bytes on both protocol message and timeline log sizes, as well as use representation that would hopefully be marginally cheaper for VM. On the other hand, there will be almost no access to Quad member in the front-end code, except for length/width calculation, so most of the time it will be treated as opaque object passed to highlightQuad. 865398 5 caseq 2013-03-28 05:51:50 -0700 (In reply to comment #3) > (From update of attachment 194255 [details]) > As per Timothy's comment. As discussed offline, this is motivated mostly by performance concerns. 866040 6 caseq 2013-03-29 02:25:09 -0700 Committed r147202: <http://trac.webkit.org/changeset/147202> 194255 2013-03-21 07:05:14 -0700 2013-03-28 10:48:51 -0700 Patch bug-112911-20130321180101.patch text/plain 14783 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTA1ZWMzMTg4ZTRhZGIz ZWE0Yzk0MjYxYzdjOGRkODc4NmY2ODBhNC4uNmY2NmI1ZjAwZjU4NTE3ZGUxZjMzODE3ZjAzNjVl NzlhODQ5MmQxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEzLTAzLTIxICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogZ2VuZXJhbGl6ZSBJbnNwZWN0b3JET01BZ2VudDo6aGlnaGxpZ2h0UmVjdCgpIHRvIGhpZ2hs aWdodFF1YWQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTEyOTExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgLSBhZGRlZCBRdWFkIHR5cGUgYW5kIERPTUFnZW50LmhpZ2hsaWdodFF1YWQoKSB0byBwcm90 b2NvbDsKKyAgICAgICAgLSByZXRhaW5lZCBET01BZ2VudC5oaWdobGlnaHRSZWN0KCksIGJ1dCBp bXBsZW1lbnQgaXQgdmlhIGhpZ2hsaWdodFF1YWQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OnBhcnNlUXVhZCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpoaWdobGlnaHRSZWN0KToKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpoaWdobGlnaHRRdWFkKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckRPTUFnZW50Ojppbm5lckhpZ2hsaWdodFF1YWQpOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oOgorICAgICAgICAoSW5zcGVjdG9yRE9NQWdl bnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcDogTW9zdGx5IGp1 c3QgcmVuYW1lcyBvZiByZWN0IHRvIHF1YWQuCisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JP dmVybGF5OjpwYWludCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JPdmVybGF5OjpnZXRI aWdobGlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6aGlkZUhpZ2hs aWdodCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JPdmVybGF5OjpoaWdobGlnaHRRdWFk KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvck92ZXJsYXk6OnVwZGF0ZSk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JPdmVybGF5OjpkcmF3UXVhZEhpZ2hsaWdodCk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JPdmVybGF5OjpyZXBvcnRNZW1vcnlVc2FnZSk6CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuaDoKKyAgICAgICAgKEluc3BlY3Rvck92ZXJs YXkpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5UGFnZS5odG1sOiBEaXR0 by4KKwogMjAxMy0wMy0yMCAgQWxleGVpIEZpbGlwcG92ICA8YWxwaEBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogQWxsb3cgdG9vbGJhciBjdXN0b21pemF0aW9uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggYjI1MmU2ZGNmM2FlNGY4MTNl YTRhNzk3YTFjYTc5ZWE5NWIwZmQzMy4uOGZkOTI2NjZkODAxMTljODVhNjU1NjQ3MzA0ZjI1MzE3 YWRiMTRiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5q c29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMTc3 MSw2ICsxNzcxLDE0IEBACiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkEgc3RydWN0 dXJlIGhvbGRpbmcgYW4gUkdCQSBjb2xvci4iCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAg eworICAgICAgICAgICAgICAgICJpZCI6ICJRdWFkIiwKKyAgICAgICAgICAgICAgICAidHlwZSI6 ICJhcnJheSIsCisgICAgICAgICAgICAgICAgIml0ZW1zIjogeyAidHlwZSI6ICJudW1iZXIiIH0s CisgICAgICAgICAgICAgICAgIm1pbkl0ZW1zIjogOCwKKyAgICAgICAgICAgICAgICAibWF4SXRl bXMiOiA4LAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJBbiBhcnJheSBvZiBxdWFk IHZlcnRpY2VzLCB4IGltbWVkaWF0ZWx5IGZvbGxvd2VkIGJ5IHkgZm9yIGVhY2ggcG9pbnQsIHBv aW50cyBjbG9jay13aXNlLiIKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICB7CiAgICAgICAg ICAgICAgICAgImlkIjogIkhpZ2hsaWdodENvbmZpZyIsCiAgICAgICAgICAgICAgICAgInR5cGUi OiAib2JqZWN0IiwKICAgICAgICAgICAgICAgICAicHJvcGVydGllcyI6IFsKQEAgLTE5NjgsNiAr MTk3NiwxNSBAQAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJIaWdobGlnaHRzIGdp dmVuIHJlY3RhbmdsZS4gQ29vcmRpbmF0ZXMgYXJlIGFic29sdXRlIHdpdGggcmVzcGVjdCB0byB0 aGUgbWFpbiBmcmFtZSB2aWV3cG9ydC4iCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgICJuYW1lIjogImhpZ2hsaWdodFF1YWQiLAorICAgICAgICAgICAgICAg ICJwYXJhbWV0ZXJzIjogWworICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInF1YWQiLCAi JHJlZiI6ICJRdWFkIiwgImRlc2NyaXB0aW9uIjogIlF1YWQgdG8gaGlnaGxpZ2h0IiB9LAorICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImNvbG9yIiwgIiRyZWYiOiAiUkdCQSIsICJvcHRp b25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJUaGUgaGlnaGxpZ2h0IGZpbGwgY29sb3IgKGRl ZmF1bHQ6IHRyYW5zcGFyZW50KS4iIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi b3V0bGluZUNvbG9yIiwgIiRyZWYiOiAiUkdCQSIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlw dGlvbiI6ICJUaGUgaGlnaGxpZ2h0IG91dGxpbmUgY29sb3IgKGRlZmF1bHQ6IHRyYW5zcGFyZW50 KS4iIH0KKyAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6 ICJIaWdobGlnaHRzIGdpdmVuIHF1YWQuIENvb3JkaW5hdGVzIGFyZSBhYnNvbHV0ZSB3aXRoIHJl c3BlY3QgdG8gdGhlIG1haW4gZnJhbWUgdmlld3BvcnQuIgorICAgICAgICAgICAgfSwKKyAgICAg ICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJoaWdobGlnaHROb2RlIiwKICAgICAg ICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJoaWdobGlnaHRDb25maWciLCAiJHJlZiI6ICJIaWdobGlnaHRDb25maWciLCAgImRlc2NyaXB0 aW9uIjogIkEgZGVzY3JpcHRvciBmb3IgdGhlIGhpZ2hsaWdodCBhcHBlYXJhbmNlLiIgfSwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCmluZGV4IDUw MTY0OWU5NzFlYTJlYWQxMTcxMjZlODllZDZhYjI4OGZjOGNjNTQuLjUxNDg0NzUwMzFkOGNiMzQ5 ZTBiYjg4YTIxZTFkODM5MDc0MmQwYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckRPTUFnZW50LmNwcApAQCAtMTUxLDYgKzE1MSwyNiBAQCBzdGF0aWMgQ29sb3Ig cGFyc2VDb25maWdDb2xvcihjb25zdCBTdHJpbmcmIGZpZWxkTmFtZSwgSW5zcGVjdG9yT2JqZWN0 KiBjb25maWdPYgogICAgIHJldHVybiBwYXJzZUNvbG9yKCZjb2xvck9iamVjdCk7CiB9CiAKK3N0 YXRpYyBib29sIHBhcnNlUXVhZChjb25zdCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+JiBxdWFkQXJy YXksIEZsb2F0UXVhZCogcXVhZCkKK3sKKyAgICBpZiAoIXF1YWRBcnJheSkKKyAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgIGNvbnN0IHNpemVfdCBjb29yZGluYXRlc0luUXVhZCA9IDg7CisgICAg ZG91YmxlIGNvb3JkaW5hdGVzW2Nvb3JkaW5hdGVzSW5RdWFkXTsKKyAgICBpZiAocXVhZEFycmF5 LT5sZW5ndGgoKSAhPSBjb29yZGluYXRlc0luUXVhZCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY29vcmRpbmF0ZXNJblF1YWQ7ICsraSkgeworICAg ICAgICBpZiAoIXF1YWRBcnJheS0+Z2V0KGkpLT5hc051bWJlcihjb29yZGluYXRlcyArIGkpKQor ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICBxdWFkLT5zZXRQMShGbG9hdFBv aW50KGNvb3JkaW5hdGVzWzBdLCBjb29yZGluYXRlc1sxXSkpOworICAgIHF1YWQtPnNldFAyKEZs b2F0UG9pbnQoY29vcmRpbmF0ZXNbMl0sIGNvb3JkaW5hdGVzWzNdKSk7CisgICAgcXVhZC0+c2V0 UDMoRmxvYXRQb2ludChjb29yZGluYXRlc1s0XSwgY29vcmRpbmF0ZXNbNV0pKTsKKyAgICBxdWFk LT5zZXRQNChGbG9hdFBvaW50KGNvb3JkaW5hdGVzWzZdLCBjb29yZGluYXRlc1s3XSkpOworCisg ICAgcmV0dXJuIHRydWU7Cit9CisKIGNsYXNzIFJldmFsaWRhdGVTdHlsZUF0dHJpYnV0ZVRhc2sg ewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgpAQCAtMTA5OSwxMCArMTEx OSwyNiBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpzZXRJbnNwZWN0TW9kZUVuYWJsZWQoRXJy b3JTdHJpbmcqIGVycm9yU3RyaW5nLCBib29sIGVuYQogCiB2b2lkIEluc3BlY3RvckRPTUFnZW50 OjpoaWdobGlnaHRSZWN0KEVycm9yU3RyaW5nKiwgaW50IHgsIGludCB5LCBpbnQgd2lkdGgsIGlu dCBoZWlnaHQsIGNvbnN0IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBjb2xvciwgY29uc3QgUmVm UHRyPEluc3BlY3Rvck9iamVjdD4qIG91dGxpbmVDb2xvcikKIHsKKyAgICBPd25QdHI8RmxvYXRR dWFkPiBxdWFkID0gYWRvcHRQdHIobmV3IEZsb2F0UXVhZChGbG9hdFJlY3QoeCwgeSwgd2lkdGgs IGhlaWdodCkpKTsKKyAgICBpbm5lckhpZ2hsaWdodFF1YWQocXVhZC5yZWxlYXNlKCksIGNvbG9y LCBvdXRsaW5lQ29sb3IpOworfQorCit2b2lkIEluc3BlY3RvckRPTUFnZW50OjpoaWdobGlnaHRR dWFkKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29uc3QgUmVmUHRyPEluc3BlY3RvckFycmF5 PiYgcXVhZEFycmF5LCBjb25zdCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogY29sb3IsIGNvbnN0 IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBvdXRsaW5lQ29sb3IpCit7CisgICAgT3duUHRyPEZs b2F0UXVhZD4gcXVhZCA9IGFkb3B0UHRyKG5ldyBGbG9hdFF1YWQoKSk7CisgICAgaWYgKCFwYXJz ZVF1YWQocXVhZEFycmF5LCBxdWFkLmdldCgpKSkgeworICAgICAgICAqZXJyb3JTdHJpbmcgPSAi SW52YWxpZCBRdWFkIGZvcm1hdCI7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgaW5uZXJI aWdobGlnaHRRdWFkKHF1YWQucmVsZWFzZSgpLCBjb2xvciwgb3V0bGluZUNvbG9yKTsKK30KKwor dm9pZCBJbnNwZWN0b3JET01BZ2VudDo6aW5uZXJIaWdobGlnaHRRdWFkKFBhc3NPd25QdHI8Rmxv YXRRdWFkPiBxdWFkLCBjb25zdCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogY29sb3IsIGNvbnN0 IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBvdXRsaW5lQ29sb3IpCit7CiAgICAgT3duUHRyPEhp Z2hsaWdodENvbmZpZz4gaGlnaGxpZ2h0Q29uZmlnID0gYWRvcHRQdHIobmV3IEhpZ2hsaWdodENv bmZpZygpKTsKICAgICBoaWdobGlnaHRDb25maWctPmNvbnRlbnQgPSBwYXJzZUNvbG9yKGNvbG9y KTsKICAgICBoaWdobGlnaHRDb25maWctPmNvbnRlbnRPdXRsaW5lID0gcGFyc2VDb2xvcihvdXRs aW5lQ29sb3IpOwotICAgIG1fb3ZlcmxheS0+aGlnaGxpZ2h0UmVjdChhZG9wdFB0cihuZXcgSW50 UmVjdCh4LCB5LCB3aWR0aCwgaGVpZ2h0KSksICpoaWdobGlnaHRDb25maWcpOworICAgIG1fb3Zl cmxheS0+aGlnaGxpZ2h0UXVhZChxdWFkLCAqaGlnaGxpZ2h0Q29uZmlnKTsKIH0KIAogdm9pZCBJ bnNwZWN0b3JET01BZ2VudDo6aGlnaGxpZ2h0Tm9kZShFcnJvclN0cmluZyogZXJyb3JTdHJpbmcs IGNvbnN0IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+JiBoaWdobGlnaHRJbnNwZWN0b3JPYmplY3Qs IGNvbnN0IGludCogbm9kZUlkLCBjb25zdCBTdHJpbmcqIG9iamVjdElkKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmggYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaAppbmRleCAxNzU4ZTZkZTM1ZGI0ZGJj ZWQwYjlhODE0ODRjYTIzZmRhMWNhOTNhLi45OWM0OTQzNGI1NmU2ZjA0ODFiY2RjMmEwYjA1MmFi NDQ4YjU0NjVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RE9NQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdl bnQuaApAQCAtMTQzLDggKzE0MywxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHB1c2hO b2RlQnlQYXRoVG9Gcm9udGVuZChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgcGF0aCwgaW50 KiBub2RlSWQpOwogICAgIHZpcnR1YWwgdm9pZCBoaWRlSGlnaGxpZ2h0KEVycm9yU3RyaW5nKik7 CiAgICAgdmlydHVhbCB2b2lkIGhpZ2hsaWdodFJlY3QoRXJyb3JTdHJpbmcqLCBpbnQgeCwgaW50 IHksIGludCB3aWR0aCwgaW50IGhlaWdodCwgY29uc3QgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4q IGNvbG9yLCBjb25zdCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0Piogb3V0bGluZUNvbG9yKTsKKyAg ICB2aXJ0dWFsIHZvaWQgaGlnaGxpZ2h0UXVhZChFcnJvclN0cmluZyosIGNvbnN0IFJlZlB0cjxJ bnNwZWN0b3JBcnJheT4mIHF1YWQsIGNvbnN0IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBjb2xv ciwgY29uc3QgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIG91dGxpbmVDb2xvcik7CiAgICAgdmly dHVhbCB2b2lkIGhpZ2hsaWdodE5vZGUoRXJyb3JTdHJpbmcqLCBjb25zdCBSZWZQdHI8SW5zcGVj dG9yT2JqZWN0PiYgaGlnaGxpZ2h0Q29uZmlnLCBjb25zdCBpbnQqIG5vZGVJZCwgY29uc3QgU3Ry aW5nKiBvYmplY3RJZCk7CiAgICAgdmlydHVhbCB2b2lkIGhpZ2hsaWdodEZyYW1lKEVycm9yU3Ry aW5nKiwgY29uc3QgU3RyaW5nJiBmcmFtZUlkLCBjb25zdCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0 PiogY29sb3IsIGNvbnN0IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBvdXRsaW5lQ29sb3IpOwor CiAgICAgdmlydHVhbCB2b2lkIG1vdmVUbyhFcnJvclN0cmluZyosIGludCBub2RlSWQsIGludCB0 YXJnZXROb2RlSWQsIGNvbnN0IGludCogYW5jaG9yTm9kZUlkLCBpbnQqIG5ld05vZGVJZCk7CiAg ICAgdmlydHVhbCB2b2lkIHVuZG8oRXJyb3JTdHJpbmcqKTsKICAgICB2aXJ0dWFsIHZvaWQgcmVk byhFcnJvclN0cmluZyopOwpAQCAtMjM1LDYgKzIzNyw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lk IGRpc2NhcmRCaW5kaW5ncygpOwogCisgICAgdm9pZCBpbm5lckhpZ2hsaWdodFF1YWQoUGFzc093 blB0cjxGbG9hdFF1YWQ+LCBjb25zdCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiogY29sb3IsIGNv bnN0IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBvdXRsaW5lQ29sb3IpOworCiAgICAgSW5zcGVj dG9yUGFnZUFnZW50KiBtX3BhZ2VBZ2VudDsKICAgICBJbmplY3RlZFNjcmlwdE1hbmFnZXIqIG1f aW5qZWN0ZWRTY3JpcHRNYW5hZ2VyOwogICAgIEluc3BlY3Rvck92ZXJsYXkqIG1fb3ZlcmxheTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcAppbmRleCAz MDQ4OTYyZTNkMGY4MTljYmYzNTg2Yzk0YzgzYmQ5ZDg0ZDgwOTU5Li40YjdlMGM0OWYwMTRlMDli ZTNkZTA1ZjNkM2IwZGI0MjkzMjlkZmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvck92ZXJsYXkuY3BwCkBAIC0xODIsMTQgKzE4MiwxMyBAQCBzdGF0aWMgdm9pZCBi dWlsZE5vZGVIaWdobGlnaHQoTm9kZSogbm9kZSwgY29uc3QgSGlnaGxpZ2h0Q29uZmlnJiBoaWdo bGlnaHRDb25maQogICAgIH0KIH0KIAotc3RhdGljIHZvaWQgYnVpbGRSZWN0SGlnaGxpZ2h0KFBh Z2UqIHBhZ2UsIEludFJlY3QqIHJlY3QsIGNvbnN0IEhpZ2hsaWdodENvbmZpZyYgaGlnaGxpZ2h0 Q29uZmlnLCBIaWdobGlnaHQgKmhpZ2hsaWdodCkKK3N0YXRpYyB2b2lkIGJ1aWxkUXVhZEhpZ2hs aWdodChQYWdlKiBwYWdlLCBjb25zdCBGbG9hdFF1YWQmIHF1YWQsIGNvbnN0IEhpZ2hsaWdodENv bmZpZyYgaGlnaGxpZ2h0Q29uZmlnLCBIaWdobGlnaHQgKmhpZ2hsaWdodCkKIHsKICAgICBpZiAo IXBhZ2UpCiAgICAgICAgIHJldHVybjsKICAgICBoaWdobGlnaHQtPnNldERhdGFGcm9tQ29uZmln KGhpZ2hsaWdodENvbmZpZyk7Ci0gICAgRmxvYXRSZWN0IGhpZ2hsaWdodFJlY3QoKnJlY3QpOwog ICAgIGhpZ2hsaWdodC0+dHlwZSA9IEhpZ2hsaWdodFR5cGVSZWN0czsKLSAgICBoaWdobGlnaHQt PnF1YWRzLmFwcGVuZChoaWdobGlnaHRSZWN0KTsKKyAgICBoaWdobGlnaHQtPnF1YWRzLmFwcGVu ZChxdWFkKTsKIH0KIAogfSAvLyBhbm9ueW1vdXMgbmFtZXNwYWNlCkBAIC0yMDYsNyArMjA1LDcg QEAgSW5zcGVjdG9yT3ZlcmxheTo6fkluc3BlY3Rvck92ZXJsYXkoKQogCiB2b2lkIEluc3BlY3Rv ck92ZXJsYXk6OnBhaW50KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCkKIHsKLSAgICBpZiAobV9w YXVzZWRJbkRlYnVnZ2VyTWVzc2FnZS5pc051bGwoKSAmJiAhbV9oaWdobGlnaHROb2RlICYmICFt X2hpZ2hsaWdodFJlY3QgJiYgbV9zaXplLmlzRW1wdHkoKSkKKyAgICBpZiAobV9wYXVzZWRJbkRl YnVnZ2VyTWVzc2FnZS5pc051bGwoKSAmJiAhbV9oaWdobGlnaHROb2RlICYmICFtX2hpZ2hsaWdo dFF1YWQgJiYgbV9zaXplLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogICAgIEdyYXBoaWNz Q29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihjb250ZXh0KTsKICAgICBGcmFtZVZpZXcqIHZp ZXcgPSBvdmVybGF5UGFnZSgpLT5tYWluRnJhbWUoKS0+dmlldygpOwpAQCAtMjIyLDE0ICsyMjEs MTQgQEAgdm9pZCBJbnNwZWN0b3JPdmVybGF5OjpkcmF3T3V0bGluZShHcmFwaGljc0NvbnRleHQq IGNvbnRleHQsIGNvbnN0IExheW91dFJlY3QmIHIKIAogdm9pZCBJbnNwZWN0b3JPdmVybGF5Ojpn ZXRIaWdobGlnaHQoSGlnaGxpZ2h0KiBoaWdobGlnaHQpIGNvbnN0CiB7Ci0gICAgaWYgKCFtX2hp Z2hsaWdodE5vZGUgJiYgIW1faGlnaGxpZ2h0UmVjdCkKKyAgICBpZiAoIW1faGlnaGxpZ2h0Tm9k ZSAmJiAhbV9oaWdobGlnaHRRdWFkKQogICAgICAgICByZXR1cm47CiAKICAgICBoaWdobGlnaHQt PnR5cGUgPSBIaWdobGlnaHRUeXBlUmVjdHM7CiAgICAgaWYgKG1faGlnaGxpZ2h0Tm9kZSkKICAg ICAgICAgYnVpbGROb2RlSGlnaGxpZ2h0KG1faGlnaGxpZ2h0Tm9kZS5nZXQoKSwgbV9ub2RlSGln aGxpZ2h0Q29uZmlnLCBoaWdobGlnaHQpOwogICAgIGVsc2UKLSAgICAgICAgYnVpbGRSZWN0SGln aGxpZ2h0KG1fcGFnZSwgbV9oaWdobGlnaHRSZWN0LmdldCgpLCBtX3JlY3RIaWdobGlnaHRDb25m aWcsIGhpZ2hsaWdodCk7CisgICAgICAgIGJ1aWxkUXVhZEhpZ2hsaWdodChtX3BhZ2UsICptX2hp Z2hsaWdodFF1YWQsIG1fcXVhZEhpZ2hsaWdodENvbmZpZywgaGlnaGxpZ2h0KTsKIH0KIAogdm9p ZCBJbnNwZWN0b3JPdmVybGF5OjpyZXNpemUoY29uc3QgSW50U2l6ZSYgc2l6ZSkKQEAgLTI0Nyw3 ICsyNDYsNyBAQCB2b2lkIEluc3BlY3Rvck92ZXJsYXk6OnNldFBhdXNlZEluRGVidWdnZXJNZXNz YWdlKGNvbnN0IFN0cmluZyogbWVzc2FnZSkKIHZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6aGlkZUhp Z2hsaWdodCgpCiB7CiAgICAgbV9oaWdobGlnaHROb2RlLmNsZWFyKCk7Ci0gICAgbV9oaWdobGln aHRSZWN0LmNsZWFyKCk7CisgICAgbV9oaWdobGlnaHRRdWFkLmNsZWFyKCk7CiAgICAgdXBkYXRl KCk7CiB9CiAKQEAgLTI1OCwxMCArMjU3LDEwIEBAIHZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6aGln aGxpZ2h0Tm9kZShOb2RlKiBub2RlLCBjb25zdCBIaWdobGlnaHRDb25maWcmIGhpZ2hsaWdoCiAg ICAgdXBkYXRlKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6aGlnaGxpZ2h0UmVjdChQ YXNzT3duUHRyPEludFJlY3Q+IHJlY3QsIGNvbnN0IEhpZ2hsaWdodENvbmZpZyYgaGlnaGxpZ2h0 Q29uZmlnKQordm9pZCBJbnNwZWN0b3JPdmVybGF5OjpoaWdobGlnaHRRdWFkKFBhc3NPd25QdHI8 RmxvYXRRdWFkPiBxdWFkLCBjb25zdCBIaWdobGlnaHRDb25maWcmIGhpZ2hsaWdodENvbmZpZykK IHsKLSAgICBtX3JlY3RIaWdobGlnaHRDb25maWcgPSBoaWdobGlnaHRDb25maWc7Ci0gICAgbV9o aWdobGlnaHRSZWN0ID0gcmVjdDsKKyAgICBtX3F1YWRIaWdobGlnaHRDb25maWcgPSBoaWdobGln aHRDb25maWc7CisgICAgbV9oaWdobGlnaHRRdWFkID0gcXVhZDsKICAgICB1cGRhdGUoKTsKIH0K IApAQCAtMjcyLDcgKzI3MSw3IEBAIE5vZGUqIEluc3BlY3Rvck92ZXJsYXk6OmhpZ2hsaWdodGVk Tm9kZSgpIGNvbnN0CiAKIHZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6dXBkYXRlKCkKIHsKLSAgICBp ZiAoIW1faGlnaGxpZ2h0Tm9kZSAmJiAhbV9oaWdobGlnaHRSZWN0ICYmIG1fcGF1c2VkSW5EZWJ1 Z2dlck1lc3NhZ2UuaXNOdWxsKCkgJiYgbV9zaXplLmlzRW1wdHkoKSkgeworICAgIGlmICghbV9o aWdobGlnaHROb2RlICYmICFtX2hpZ2hsaWdodFF1YWQgJiYgbV9wYXVzZWRJbkRlYnVnZ2VyTWVz c2FnZS5pc051bGwoKSAmJiBtX3NpemUuaXNFbXB0eSgpKSB7CiAgICAgICAgIG1fY2xpZW50LT5o aWRlSGlnaGxpZ2h0KCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yOTUsNyArMjk0LDcg QEAgdm9pZCBJbnNwZWN0b3JPdmVybGF5Ojp1cGRhdGUoKQogICAgIC8vIEluY2x1ZGUgc2Nyb2xs YmFycyB0byBhdm9pZCBtYXNraW5nIHRoZW0gYnkgdGhlIGd1dHRlci4KICAgICBkcmF3R3V0dGVy KCk7CiAgICAgZHJhd05vZGVIaWdobGlnaHQoKTsKLSAgICBkcmF3UmVjdEhpZ2hsaWdodCgpOwor ICAgIGRyYXdRdWFkSGlnaGxpZ2h0KCk7CiAgICAgZHJhd1BhdXNlZEluRGVidWdnZXJNZXNzYWdl KCk7CiAKICAgICAvLyBQb3NpdGlvbiBET00gZWxlbWVudHMuCkBAIC00MDgsMTQgKzQwNywxNCBA QCB2b2lkIEluc3BlY3Rvck92ZXJsYXk6OmRyYXdOb2RlSGlnaGxpZ2h0KCkKICAgICBldmFsdWF0 ZUluT3ZlcmxheSgiZHJhd05vZGVIaWdobGlnaHQiLCBoaWdobGlnaHRPYmplY3QpOwogfQogCi12 b2lkIEluc3BlY3Rvck92ZXJsYXk6OmRyYXdSZWN0SGlnaGxpZ2h0KCkKK3ZvaWQgSW5zcGVjdG9y T3ZlcmxheTo6ZHJhd1F1YWRIaWdobGlnaHQoKQogewotICAgIGlmICghbV9oaWdobGlnaHRSZWN0 KQorICAgIGlmICghbV9oaWdobGlnaHRRdWFkKQogICAgICAgICByZXR1cm47CiAKICAgICBIaWdo bGlnaHQgaGlnaGxpZ2h0OwotICAgIGJ1aWxkUmVjdEhpZ2hsaWdodChtX3BhZ2UsIG1faGlnaGxp Z2h0UmVjdC5nZXQoKSwgbV9yZWN0SGlnaGxpZ2h0Q29uZmlnLCAmaGlnaGxpZ2h0KTsKLSAgICBl dmFsdWF0ZUluT3ZlcmxheSgiZHJhd1JlY3RIaWdobGlnaHQiLCBidWlsZE9iamVjdEZvckhpZ2hs aWdodChtX3BhZ2UtPm1haW5GcmFtZSgpLT52aWV3KCksIGhpZ2hsaWdodCkpOworICAgIGJ1aWxk UXVhZEhpZ2hsaWdodChtX3BhZ2UsICptX2hpZ2hsaWdodFF1YWQsIG1fcXVhZEhpZ2hsaWdodENv bmZpZywgJmhpZ2hsaWdodCk7CisgICAgZXZhbHVhdGVJbk92ZXJsYXkoImRyYXdRdWFkSGlnaGxp Z2h0IiwgYnVpbGRPYmplY3RGb3JIaWdobGlnaHQobV9wYWdlLT5tYWluRnJhbWUoKS0+dmlldygp LCBoaWdobGlnaHQpKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JPdmVybGF5OjpkcmF3UGF1c2VkSW5E ZWJ1Z2dlck1lc3NhZ2UoKQpAQCAtNTA1LDkgKzUwNCw5IEBAIHZvaWQgSW5zcGVjdG9yT3Zlcmxh eTo6cmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykg Y29uCiAgICAgaW5mby5hZGRNZW1iZXIobV9wYXVzZWRJbkRlYnVnZ2VyTWVzc2FnZSwgInBhdXNl ZEluRGVidWdnZXJNZXNzYWdlIik7CiAgICAgaW5mby5hZGRNZW1iZXIobV9oaWdobGlnaHROb2Rl LCAiaGlnaGxpZ2h0Tm9kZSIpOwogICAgIGluZm8uYWRkTWVtYmVyKG1fbm9kZUhpZ2hsaWdodENv bmZpZywgIm5vZGVIaWdobGlnaHRDb25maWciKTsKLSAgICBpbmZvLmFkZE1lbWJlcihtX2hpZ2hs aWdodFJlY3QsICJoaWdobGlnaHRSZWN0Iik7CisgICAgaW5mby5hZGRNZW1iZXIobV9oaWdobGln aHRRdWFkLCAiaGlnaGxpZ2h0UXVhZCIpOwogICAgIGluZm8uYWRkTWVtYmVyKG1fb3ZlcmxheVBh Z2UsICJvdmVybGF5UGFnZSIpOwotICAgIGluZm8uYWRkTWVtYmVyKG1fcmVjdEhpZ2hsaWdodENv bmZpZywgInJlY3RIaWdobGlnaHRDb25maWciKTsKKyAgICBpbmZvLmFkZE1lbWJlcihtX3F1YWRI aWdobGlnaHRDb25maWcsICJxdWFkSGlnaGxpZ2h0Q29uZmlnIik7CiAgICAgaW5mby5hZGRNZW1i ZXIobV9zaXplLCAic2l6ZSIpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvck92ZXJsYXkuaAppbmRleCAyYWM4YjY2N2I3ODJkYmVmMmJkNmZlN2JmZGViMTQyNmExMDUx YWY5Li45OGUzNmFhMmZlNWE4Yjk2ZmM0ZWY4YWYwYjdjZDRiNGIzZGEzZTViIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmgKQEAgLTExNSw3ICsxMTUsNyBA QCBwdWJsaWM6CiAKICAgICB2b2lkIGhpZGVIaWdobGlnaHQoKTsKICAgICB2b2lkIGhpZ2hsaWdo dE5vZGUoTm9kZSosIGNvbnN0IEhpZ2hsaWdodENvbmZpZyYpOwotICAgIHZvaWQgaGlnaGxpZ2h0 UmVjdChQYXNzT3duUHRyPEludFJlY3Q+LCBjb25zdCBIaWdobGlnaHRDb25maWcmKTsKKyAgICB2 b2lkIGhpZ2hsaWdodFF1YWQoUGFzc093blB0cjxGbG9hdFF1YWQ+LCBjb25zdCBIaWdobGlnaHRD b25maWcmKTsKIAogICAgIE5vZGUqIGhpZ2hsaWdodGVkTm9kZSgpIGNvbnN0OwogCkBAIC0xMjcs NyArMTI3LDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgZHJhd0d1dHRlcigpOwogICAgIHZvaWQg ZHJhd05vZGVIaWdobGlnaHQoKTsKLSAgICB2b2lkIGRyYXdSZWN0SGlnaGxpZ2h0KCk7CisgICAg dm9pZCBkcmF3UXVhZEhpZ2hsaWdodCgpOwogICAgIHZvaWQgZHJhd1BhdXNlZEluRGVidWdnZXJN ZXNzYWdlKCk7CiAgICAgUGFnZSogb3ZlcmxheVBhZ2UoKTsKICAgICB2b2lkIHJlc2V0KGNvbnN0 IEludFNpemUmIHZpZXdwb3J0U2l6ZSwgY29uc3QgSW50U2l6ZSYgZnJhbWVWaWV3RnVsbFNpemUp OwpAQCAtMTM5LDkgKzEzOSw5IEBAIHByaXZhdGU6CiAgICAgU3RyaW5nIG1fcGF1c2VkSW5EZWJ1 Z2dlck1lc3NhZ2U7CiAgICAgUmVmUHRyPE5vZGU+IG1faGlnaGxpZ2h0Tm9kZTsKICAgICBIaWdo bGlnaHRDb25maWcgbV9ub2RlSGlnaGxpZ2h0Q29uZmlnOwotICAgIE93blB0cjxJbnRSZWN0PiBt X2hpZ2hsaWdodFJlY3Q7CisgICAgT3duUHRyPEZsb2F0UXVhZD4gbV9oaWdobGlnaHRRdWFkOwog ICAgIE93blB0cjxQYWdlPiBtX292ZXJsYXlQYWdlOwotICAgIEhpZ2hsaWdodENvbmZpZyBtX3Jl Y3RIaWdobGlnaHRDb25maWc7CisgICAgSGlnaGxpZ2h0Q29uZmlnIG1fcXVhZEhpZ2hsaWdodENv bmZpZzsKICAgICBJbnRTaXplIG1fc2l6ZTsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5UGFnZS5odG1sIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXlQYWdlLmh0bWwKaW5kZXggZjk4NDIyNjg4MTRmOTNh MjYzZjk3NTNhYWRlOGY5YjhiZmJkYzRjZi4uYzc2ZmJhOGQ1OTljYzRjYTUyY2YxODA0NmNkNDll OGE0YTNjOTY4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ck92ZXJsYXlQYWdlLmh0bWwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ck92ZXJsYXlQYWdlLmh0bWwKQEAgLTU0MSw3ICs1NDEsNyBAQCBmdW5jdGlvbiBkcmF3Tm9kZUhp Z2hsaWdodChoaWdobGlnaHQpCiAgICAgY29udGV4dC5yZXN0b3JlKCk7CiB9CiAKLWZ1bmN0aW9u IGRyYXdSZWN0SGlnaGxpZ2h0KGhpZ2hsaWdodCkKK2Z1bmN0aW9uIGRyYXdRdWFkSGlnaGxpZ2h0 KGhpZ2hsaWdodCkKIHsKICAgICBjb250ZXh0LnNhdmUoKTsKICAgICBkcmF3T3V0bGluZWRRdWFk KGhpZ2hsaWdodC5xdWFkc1swXSwgaGlnaGxpZ2h0LmNvbnRlbnRDb2xvciwgaGlnaGxpZ2h0LmNv bnRlbnRPdXRsaW5lQ29sb3IpOwo=