138085 2014-10-26 13:43:15 -0700 Move some RenderObject member functions to RenderElement. 2014-10-26 15:24:56 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue esprehn+autocc glenn kling kondapallykalyan oldest_to_newest 1044193 0 kling 2014-10-26 13:43:15 -0700 Minor cleanup patch coming. 1044194 1 240468 kling 2014-10-26 13:43:40 -0700 Created attachment 240468 Patch 1044195 2 commit-queue 2014-10-26 13:45:27 -0700 Attachment 240468 did not pass style-queue: ERROR: Source/WebCore/rendering/RenderElement.cpp:903: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] ERROR: Source/WebCore/rendering/RenderElement.h:221: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] ERROR: Source/WebCore/ChangeLog:16: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 3 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1044202 3 240468 cdumez 2014-10-26 14:57:23 -0700 Comment on attachment 240468 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240468&action=review r=me > Source/WebCore/ChangeLog:16 > + No new tests (OOPS!). OOPS 1044204 4 kling 2014-10-26 15:24:56 -0700 Committed r175211: <http://trac.webkit.org/changeset/175211> 240468 2014-10-26 13:43:40 -0700 2014-10-26 14:57:23 -0700 Patch bug-138085.diff text/plain 12853 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkY2Q0NTkwLi41YzYwZWYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzkg QEAKIDIwMTQtMTAtMjYgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIE1vdmUgc29tZSBSZW5kZXJPYmplY3QgbWVtYmVyIGZ1bmN0aW9ucyB0byBSZW5kZXJFbGVt ZW50LgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTM4MDg1PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgdGhlc2UgdHdvIGZ1bmN0 aW9ucyB0byBSZW5kZXJFbGVtZW50OgorCisgICAgICAgICAgICAtIGhhbmRsZUR5bmFtaWNGbG9h dFBvc2l0aW9uQ2hhbmdlKCkKKyAgICAgICAgICAgIC0gcmVtb3ZlQW5vbnltb3VzV3JhcHBlcnNG b3JJbmxpbmVzSWZOZWNlc3NhcnkoKQorCisgICAgICAgIEFsc28gbWFrZSBjaGlsZEJlY2FtZU5v bklubGluZSgpIHRha2UgYSBSZW5kZXJFbGVtZW50JiBzaW5jZQorICAgICAgICB0aGF0J3MgYWxs IHdlIGV2ZXIgcGFzcyB0byBpdC4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKwor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCbG9jazo6Y2hpbGRCZWNhbWVOb25JbmxpbmUpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJCbG9jay5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5o OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OmNoaWxkQmVjYW1lTm9u SW5saW5lKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjpoYW5kbGVEeW5hbWljRmxvYXRQb3NpdGlvbkNoYW5n ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjpyZW1vdmVBbm9ueW1vdXNXcmFw cGVyc0ZvcklubGluZXNJZk5lY2Vzc2FyeSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVs ZW1lbnQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlcklubGluZTo6Y2hpbGRCZWNhbWVOb25JbmxpbmUpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJJbmxpbmUuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6aGFuZGxlRHluYW1pY0Zs b2F0UG9zaXRpb25DaGFuZ2UpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2Jq ZWN0OjpyZW1vdmVBbm9ueW1vdXNXcmFwcGVyc0ZvcklubGluZXNJZk5lY2Vzc2FyeSk6IERlbGV0 ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorCisyMDE0LTEwLTI2ICBB bmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KKwogICAgICAgICBNb3ZlIGNvbnRpbnVh dGlvbiB0ZWFyZG93biBmcm9tIHN1YmNsYXNzZXMgdG8gUmVuZGVyQm94TW9kZWxPYmplY3QuCiAg ICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMzgwODE+CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IGZlNTBlOTQuLjU0NzZkYWIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcApAQCAtMzM5Nyw3ICszMzk3LDcgQEAgY29u c3QgUmVuZGVyU3R5bGUmIFJlbmRlckJsb2NrOjpvdXRsaW5lU3R5bGVGb3JSZXBhaW50KCkgY29u c3QKICAgICByZXR1cm4gaXNBbm9ueW1vdXNCbG9ja0NvbnRpbnVhdGlvbigpID8gY29udGludWF0 aW9uKCktPnN0eWxlKCkgOiBzdHlsZSgpOwogfQogCi12b2lkIFJlbmRlckJsb2NrOjpjaGlsZEJl Y2FtZU5vbklubGluZShSZW5kZXJPYmplY3QqKQordm9pZCBSZW5kZXJCbG9jazo6Y2hpbGRCZWNh bWVOb25JbmxpbmUoUmVuZGVyRWxlbWVudCYpCiB7CiAgICAgbWFrZUNoaWxkcmVuTm9uSW5saW5l KCk7CiAgICAgaWYgKGlzQW5vbnltb3VzQmxvY2soKSAmJiBpczxSZW5kZXJCbG9jaz4ocGFyZW50 KCkpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAppbmRleCBlNDUwM2Q3Li40 OTMyNDgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaApAQCAtNDU3LDcg KzQ1Nyw3IEBAIHByaXZhdGU6CiAKICAgICB2aXJ0dWFsIFJlbmRlckVsZW1lbnQqIGhvdmVyQW5j ZXN0b3IoKSBjb25zdCBvdmVycmlkZSBmaW5hbDsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlRHJh Z1N0YXRlKGJvb2wgZHJhZ09uKSBvdmVycmlkZSBmaW5hbDsKLSAgICB2aXJ0dWFsIHZvaWQgY2hp bGRCZWNhbWVOb25JbmxpbmUoUmVuZGVyT2JqZWN0KiBjaGlsZCkgb3ZlcnJpZGUgZmluYWw7Cisg ICAgdmlydHVhbCB2b2lkIGNoaWxkQmVjYW1lTm9uSW5saW5lKFJlbmRlckVsZW1lbnQmKSBvdmVy cmlkZSBmaW5hbDsKIAogICAgIHZpcnR1YWwgTGF5b3V0UmVjdCBzZWxlY3Rpb25SZWN0Rm9yUmVw YWludChjb25zdCBSZW5kZXJMYXllck1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyLCBib29s IC8qY2xpcFRvVmlzaWJsZUNvbnRlbnQqLykgb3ZlcnJpZGUgZmluYWwKICAgICB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCmluZGV4IDAzYWY4 NjEuLjE5NTU4YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3hNb2RlbE9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hN b2RlbE9iamVjdC5oCkBAIC0xNzEsNyArMTcxLDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBM YXlvdXRVbml0IGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnQoKSBjb25zdDsK IAotICAgIHZpcnR1YWwgdm9pZCBjaGlsZEJlY2FtZU5vbklubGluZShSZW5kZXJPYmplY3QqIC8q Y2hpbGQqLykgeyB9CisgICAgdmlydHVhbCB2b2lkIGNoaWxkQmVjYW1lTm9uSW5saW5lKFJlbmRl ckVsZW1lbnQmKSB7IH0KIAogICAgIHZvaWQgcGFpbnRCb3JkZXIoY29uc3QgUGFpbnRJbmZvJiwg Y29uc3QgTGF5b3V0UmVjdCYsIGNvbnN0IFJlbmRlclN0eWxlJiwgQmFja2dyb3VuZEJsZWVkQXZv aWRhbmNlID0gQmFja2dyb3VuZEJsZWVkTm9uZSwgYm9vbCBpbmNsdWRlTG9naWNhbExlZnRFZGdl ID0gdHJ1ZSwgYm9vbCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSA9IHRydWUpOwogICAgIGJvb2wg cGFpbnROaW5lUGllY2VJbWFnZShHcmFwaGljc0NvbnRleHQqLCBjb25zdCBMYXlvdXRSZWN0Jiwg Y29uc3QgUmVuZGVyU3R5bGUmLCBjb25zdCBOaW5lUGllY2VJbWFnZSYsIENvbXBvc2l0ZU9wZXJh dG9yID0gQ29tcG9zaXRlU291cmNlT3Zlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRWxlbWVudC5jcHAKaW5kZXggZGVhODEzZi4uNDg1YTQ3MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcApAQCAtODk3LDYgKzg5Nyw1MSBAQCB2b2lkIFJl bmRlckVsZW1lbnQ6OnN0eWxlV2lsbENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3Qg UmVuZGVyU3R5bGUmIG5ldwogICAgICAgICB2aWV3KCkuZnJhbWVWaWV3KCkudXBkYXRlRXh0ZW5k QmFja2dyb3VuZElmTmVjZXNzYXJ5KCk7CiB9CiAKK3ZvaWQgUmVuZGVyRWxlbWVudDo6aGFuZGxl RHluYW1pY0Zsb2F0UG9zaXRpb25DaGFuZ2UoKQoreworICAgIC8vIFdlIGhhdmUgZ29uZSBmcm9t IG5vdCBhZmZlY3RpbmcgdGhlIGlubGluZSBzdGF0dXMgb2YgdGhlIHBhcmVudCBmbG93IHRvIHN1 ZGRlbmx5CisgICAgLy8gaGF2aW5nIGFuIGltcGFjdC4gIFNlZSBpZiB0aGVyZSBpcyBhIG1pc21h dGNoIGJldHdlZW4gdGhlIHBhcmVudCBmbG93J3MKKyAgICAvLyBjaGlsZHJlbklubGluZSgpIHN0 YXRlIGFuZCBvdXIgc3RhdGUuCisgICAgc2V0SW5saW5lKHN0eWxlKCkuaXNEaXNwbGF5SW5saW5l VHlwZSgpKTsKKyAgICBpZiAoaXNJbmxpbmUoKSAhPSBwYXJlbnQoKS0+Y2hpbGRyZW5JbmxpbmUo KSkgeworICAgICAgICBpZiAoIWlzSW5saW5lKCkpCisgICAgICAgICAgICBkb3duY2FzdDxSZW5k ZXJCb3hNb2RlbE9iamVjdD4oKnBhcmVudCgpKS5jaGlsZEJlY2FtZU5vbklubGluZSgqdGhpcyk7 CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgLy8gQW4gYW5vbnltb3VzIGJsb2NrIG11c3Qg YmUgbWFkZSB0byB3cmFwIHRoaXMgaW5saW5lLgorICAgICAgICAgICAgUmVuZGVyQmxvY2sqIGJs b2NrID0gZG93bmNhc3Q8UmVuZGVyQmxvY2s+KCpwYXJlbnQoKSkuY3JlYXRlQW5vbnltb3VzQmxv Y2soKTsKKyAgICAgICAgICAgIHBhcmVudCgpLT5pbnNlcnRDaGlsZEludGVybmFsKGJsb2NrLCB0 aGlzLCBSZW5kZXJFbGVtZW50OjpOb3RpZnlDaGlsZHJlbik7CisgICAgICAgICAgICBwYXJlbnQo KS0+cmVtb3ZlQ2hpbGRJbnRlcm5hbCgqdGhpcywgUmVuZGVyRWxlbWVudDo6Tm90aWZ5Q2hpbGRy ZW4pOworICAgICAgICAgICAgYmxvY2stPmluc2VydENoaWxkSW50ZXJuYWwodGhpcywgbnVsbHB0 ciwgUmVuZGVyRWxlbWVudDo6Tm90aWZ5Q2hpbGRyZW4pOworICAgICAgICB9CisgICAgfQorfQor Cit2b2lkIFJlbmRlckVsZW1lbnQ6OnJlbW92ZUFub255bW91c1dyYXBwZXJzRm9ySW5saW5lc0lm TmVjZXNzYXJ5KCkKK3sKKyAgICBSZW5kZXJCbG9jayYgcGFyZW50QmxvY2sgPSBkb3duY2FzdDxS ZW5kZXJCbG9jaz4oKnBhcmVudCgpKTsKKyAgICBpZiAoIXBhcmVudEJsb2NrLmNhbkNvbGxhcHNl QW5vbnltb3VzQmxvY2tDaGlsZCgpKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBXZSBoYXZl IGNoYW5nZWQgdG8gZmxvYXRlZCBvciBvdXQtb2YtZmxvdyBwb3NpdGlvbmluZyBzbyBtYXliZSBh bGwgb3VyIHBhcmVudCdzCisgICAgLy8gY2hpbGRyZW4gY2FuIGJlIGlubGluZSBub3cuIEJhaWwg aWYgdGhlcmUgYXJlIGFueSBibG9jayBjaGlsZHJlbiBsZWZ0IG9uIHRoZSBsaW5lLAorICAgIC8v IG90aGVyd2lzZSB3ZSBjYW4gcHJvY2VlZCB0byBzdHJpcHBpbmcgc29saXRhcnkgYW5vbnltb3Vz IHdyYXBwZXJzIGZyb20gdGhlIGlubGluZXMuCisgICAgLy8gRklYTUU6IFdlIHNob3VsZCBhbHNv IGhhbmRsZSBzcGxpdCBpbmxpbmVzIGhlcmUgLSB3ZSBleGNsdWRlIHRoZW0gYXQgdGhlIG1vbWVu dCBieSByZXR1cm5pbmcKKyAgICAvLyBpZiB3ZSBmaW5kIGEgY29udGludWF0aW9uLgorICAgIFJl bmRlck9iamVjdCogY3VycmVudCA9IHBhcmVudCgpLT5maXJzdENoaWxkKCk7CisgICAgd2hpbGUg KGN1cnJlbnQgJiYgKChjdXJyZW50LT5pc0Fub255bW91c0Jsb2NrKCkgJiYgIWRvd25jYXN0PFJl bmRlckJsb2NrPigqY3VycmVudCkuaXNBbm9ueW1vdXNCbG9ja0NvbnRpbnVhdGlvbigpKSB8fCBj dXJyZW50LT5zdHlsZSgpLmlzRmxvYXRpbmcoKSB8fCBjdXJyZW50LT5zdHlsZSgpLmhhc091dE9m Rmxvd1Bvc2l0aW9uKCkpKQorICAgICAgICBjdXJyZW50ID0gY3VycmVudC0+bmV4dFNpYmxpbmco KTsKKworICAgIGlmIChjdXJyZW50KQorICAgICAgICByZXR1cm47CisKKyAgICBSZW5kZXJPYmpl Y3QqIG5leHQ7CisgICAgZm9yIChjdXJyZW50ID0gcGFyZW50KCktPmZpcnN0Q2hpbGQoKTsgY3Vy cmVudDsgY3VycmVudCA9IG5leHQpIHsKKyAgICAgICAgbmV4dCA9IGN1cnJlbnQtPm5leHRTaWJs aW5nKCk7CisgICAgICAgIGlmIChjdXJyZW50LT5pc0Fub255bW91c0Jsb2NrKCkpCisgICAgICAg ICAgICBwYXJlbnRCbG9jay5jb2xsYXBzZUFub255bW91c0JveENoaWxkKHBhcmVudEJsb2NrLCBk b3duY2FzdDxSZW5kZXJCbG9jaz4oY3VycmVudCkpOworICAgIH0KK30KKwogI2lmICFQTEFURk9S TShJT1MpCiBzdGF0aWMgYm9vbCBhcmVOb25JZGVudGljYWxDdXJzb3JMaXN0c0VxdWFsKGNvbnN0 IFJlbmRlclN0eWxlKiBhLCBjb25zdCBSZW5kZXJTdHlsZSogYikKIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oCmluZGV4IDcwNTI4NjMuLjA1MzBhMGEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaApAQCAtMjE3LDYgKzIxNywxMiBAQCBw cml2YXRlOgogICAgIHZpcnR1YWwgUmVuZGVyT2JqZWN0KiBmaXJzdENoaWxkU2xvdygpIGNvbnN0 IG92ZXJyaWRlIGZpbmFsIHsgcmV0dXJuIGZpcnN0Q2hpbGQoKTsgfQogICAgIHZpcnR1YWwgUmVu ZGVyT2JqZWN0KiBsYXN0Q2hpbGRTbG93KCkgY29uc3Qgb3ZlcnJpZGUgZmluYWwgeyByZXR1cm4g bGFzdENoaWxkKCk7IH0KIAorICAgIC8vIENhbGxlZCB3aGVuIGFuIG9iamVjdCB0aGF0IHdhcyBm bG9hdGluZyBvciBwb3NpdGlvbmVkIGJlY29tZXMgYSBub3JtYWwgZmxvdyBvYmplY3QKKyAgICAv LyBhZ2Fpbi4gIFdlIGhhdmUgdG8gbWFrZSBzdXJlIHRoZSByZW5kZXIgdHJlZSB1cGRhdGVzIGFz IG5lZWRlZCB0byBhY2NvbW1vZGF0ZSB0aGUgbmV3CisgICAgLy8gbm9ybWFsIGZsb3cgb2JqZWN0 LgorICAgIHZvaWQgaGFuZGxlRHluYW1pY0Zsb2F0UG9zaXRpb25DaGFuZ2UoKTsKKyAgICB2b2lk IHJlbW92ZUFub255bW91c1dyYXBwZXJzRm9ySW5saW5lc0lmTmVjZXNzYXJ5KCk7CisKICAgICBi b29sIHNob3VsZFJlcGFpbnRGb3JTdHlsZURpZmZlcmVuY2UoU3R5bGVEaWZmZXJlbmNlKSBjb25z dDsKICAgICBib29sIGhhc0ltbWVkaWF0ZU5vbldoaXRlc3BhY2VUZXh0Q2hpbGRPckJvcmRlck9y T3V0bGluZSgpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVySW5saW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUu Y3BwCmluZGV4IDk0NGUwYTQuLmY4MDY0NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJJbmxpbmUuY3BwCkBAIC0xMjk3LDE1ICsxMjk3LDE1IEBAIHZvaWQgUmVuZGVySW5saW5l Ojp1cGRhdGVEcmFnU3RhdGUoYm9vbCBkcmFnT24pCiAgICAgICAgIGNvbnRpbnVhdGlvbi0+dXBk YXRlRHJhZ1N0YXRlKGRyYWdPbik7CiB9CiAKLXZvaWQgUmVuZGVySW5saW5lOjpjaGlsZEJlY2Ft ZU5vbklubGluZShSZW5kZXJPYmplY3QqIGNoaWxkKQordm9pZCBSZW5kZXJJbmxpbmU6OmNoaWxk QmVjYW1lTm9uSW5saW5lKFJlbmRlckVsZW1lbnQmIGNoaWxkKQogewogICAgIC8vIFdlIGhhdmUg dG8gc3BsaXQgdGhlIHBhcmVudCBmbG93LgogICAgIFJlbmRlckJsb2NrKiBuZXdCb3ggPSBjb250 YWluaW5nQmxvY2soKS0+Y3JlYXRlQW5vbnltb3VzQmxvY2soKTsKICAgICBSZW5kZXJCb3hNb2Rl bE9iamVjdCogb2xkQ29udGludWF0aW9uID0gY29udGludWF0aW9uKCk7CiAgICAgc2V0Q29udGlu dWF0aW9uKG5ld0JveCk7Ci0gICAgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IGNoaWxkLT5u ZXh0U2libGluZygpOwotICAgIHJlbW92ZUNoaWxkSW50ZXJuYWwoKmNoaWxkLCBOb3RpZnlDaGls ZHJlbik7Ci0gICAgc3BsaXRGbG93KGJlZm9yZUNoaWxkLCBuZXdCb3gsIGNoaWxkLCBvbGRDb250 aW51YXRpb24pOworICAgIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQgPSBjaGlsZC5uZXh0U2li bGluZygpOworICAgIHJlbW92ZUNoaWxkSW50ZXJuYWwoY2hpbGQsIE5vdGlmeUNoaWxkcmVuKTsK KyAgICBzcGxpdEZsb3coYmVmb3JlQ2hpbGQsIG5ld0JveCwgJmNoaWxkLCBvbGRDb250aW51YXRp b24pOwogfQogCiB2b2lkIFJlbmRlcklubGluZTo6dXBkYXRlSGl0VGVzdFJlc3VsdChIaXRUZXN0 UmVzdWx0JiByZXN1bHQsIGNvbnN0IExheW91dFBvaW50JiBwb2ludCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJJbmxpbmUuaAppbmRleCBhNGZlYmQwLi5jNGIzYmIxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5oCkBAIC0xNjEsNyArMTYxLDcgQEAgcHJpdmF0 ZToKICAgICB2aXJ0dWFsIExheW91dFVuaXQgbGluZUhlaWdodChib29sIGZpcnN0TGluZSwgTGlu ZURpcmVjdGlvbk1vZGUsIExpbmVQb3NpdGlvbk1vZGUgPSBQb3NpdGlvbk9uQ29udGFpbmluZ0xp bmUpIGNvbnN0IG92ZXJyaWRlIGZpbmFsOwogICAgIHZpcnR1YWwgaW50IGJhc2VsaW5lUG9zaXRp b24oRm9udEJhc2VsaW5lLCBib29sIGZpcnN0TGluZSwgTGluZURpcmVjdGlvbk1vZGUsIExpbmVQ b3NpdGlvbk1vZGUgPSBQb3NpdGlvbk9uQ29udGFpbmluZ0xpbmUpIGNvbnN0IG92ZXJyaWRlIGZp bmFsOwogICAgIAotICAgIHZpcnR1YWwgdm9pZCBjaGlsZEJlY2FtZU5vbklubGluZShSZW5kZXJP YmplY3QqIGNoaWxkKSBvdmVycmlkZSBmaW5hbDsKKyAgICB2aXJ0dWFsIHZvaWQgY2hpbGRCZWNh bWVOb25JbmxpbmUoUmVuZGVyRWxlbWVudCYpIG92ZXJyaWRlIGZpbmFsOwogCiAgICAgdmlydHVh bCB2b2lkIHVwZGF0ZUhpdFRlc3RSZXN1bHQoSGl0VGVzdFJlc3VsdCYsIGNvbnN0IExheW91dFBv aW50Jikgb3ZlcnJpZGUgZmluYWw7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9i amVjdC5jcHAKaW5kZXggYWJiYzJiNC4uNjNkZWM4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck9iamVjdC5jcHAKQEAgLTE2MzUsNTEgKzE2MzUsNiBAQCB2b2lkIFJlbmRlck9i amVjdDo6c2VsZWN0aW9uU3RhcnRFbmQoaW50JiBzcG9zLCBpbnQmIGVwb3MpIGNvbnN0CiAgICAg c2VsZWN0aW9uUm9vdCgpLnNlbGVjdGlvblN0YXJ0RW5kUG9zaXRpb25zKHNwb3MsIGVwb3MpOwog fQogCi12b2lkIFJlbmRlck9iamVjdDo6aGFuZGxlRHluYW1pY0Zsb2F0UG9zaXRpb25DaGFuZ2Uo KQotewotICAgIC8vIFdlIGhhdmUgZ29uZSBmcm9tIG5vdCBhZmZlY3RpbmcgdGhlIGlubGluZSBz dGF0dXMgb2YgdGhlIHBhcmVudCBmbG93IHRvIHN1ZGRlbmx5Ci0gICAgLy8gaGF2aW5nIGFuIGlt cGFjdC4gIFNlZSBpZiB0aGVyZSBpcyBhIG1pc21hdGNoIGJldHdlZW4gdGhlIHBhcmVudCBmbG93 J3MKLSAgICAvLyBjaGlsZHJlbklubGluZSgpIHN0YXRlIGFuZCBvdXIgc3RhdGUuCi0gICAgc2V0 SW5saW5lKHN0eWxlKCkuaXNEaXNwbGF5SW5saW5lVHlwZSgpKTsKLSAgICBpZiAoaXNJbmxpbmUo KSAhPSBwYXJlbnQoKS0+Y2hpbGRyZW5JbmxpbmUoKSkgewotICAgICAgICBpZiAoIWlzSW5saW5l KCkpCi0gICAgICAgICAgICBkb3duY2FzdDxSZW5kZXJCb3hNb2RlbE9iamVjdD4oKnBhcmVudCgp KS5jaGlsZEJlY2FtZU5vbklubGluZSh0aGlzKTsKLSAgICAgICAgZWxzZSB7Ci0gICAgICAgICAg ICAvLyBBbiBhbm9ueW1vdXMgYmxvY2sgbXVzdCBiZSBtYWRlIHRvIHdyYXAgdGhpcyBpbmxpbmUu Ci0gICAgICAgICAgICBSZW5kZXJCbG9jayogYmxvY2sgPSBkb3duY2FzdDxSZW5kZXJCbG9jaz4o KnBhcmVudCgpKS5jcmVhdGVBbm9ueW1vdXNCbG9jaygpOwotICAgICAgICAgICAgcGFyZW50KCkt Pmluc2VydENoaWxkSW50ZXJuYWwoYmxvY2ssIHRoaXMsIFJlbmRlckVsZW1lbnQ6Ok5vdGlmeUNo aWxkcmVuKTsKLSAgICAgICAgICAgIHBhcmVudCgpLT5yZW1vdmVDaGlsZEludGVybmFsKCp0aGlz LCBSZW5kZXJFbGVtZW50OjpOb3RpZnlDaGlsZHJlbik7Ci0gICAgICAgICAgICBibG9jay0+aW5z ZXJ0Q2hpbGRJbnRlcm5hbCh0aGlzLCBudWxscHRyLCBSZW5kZXJFbGVtZW50OjpOb3RpZnlDaGls ZHJlbik7Ci0gICAgICAgIH0KLSAgICB9Ci19Ci0KLXZvaWQgUmVuZGVyT2JqZWN0OjpyZW1vdmVB bm9ueW1vdXNXcmFwcGVyc0ZvcklubGluZXNJZk5lY2Vzc2FyeSgpCi17Ci0gICAgUmVuZGVyQmxv Y2smIHBhcmVudEJsb2NrID0gZG93bmNhc3Q8UmVuZGVyQmxvY2s+KCpwYXJlbnQoKSk7Ci0gICAg aWYgKCFwYXJlbnRCbG9jay5jYW5Db2xsYXBzZUFub255bW91c0Jsb2NrQ2hpbGQoKSkKLSAgICAg ICAgcmV0dXJuOwotCi0gICAgLy8gV2UgaGF2ZSBjaGFuZ2VkIHRvIGZsb2F0ZWQgb3Igb3V0LW9m LWZsb3cgcG9zaXRpb25pbmcgc28gbWF5YmUgYWxsIG91ciBwYXJlbnQncwotICAgIC8vIGNoaWxk cmVuIGNhbiBiZSBpbmxpbmUgbm93LiBCYWlsIGlmIHRoZXJlIGFyZSBhbnkgYmxvY2sgY2hpbGRy ZW4gbGVmdCBvbiB0aGUgbGluZSwKLSAgICAvLyBvdGhlcndpc2Ugd2UgY2FuIHByb2NlZWQgdG8g c3RyaXBwaW5nIHNvbGl0YXJ5IGFub255bW91cyB3cmFwcGVycyBmcm9tIHRoZSBpbmxpbmVzLgot ICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgYWxzbyBoYW5kbGUgc3BsaXQgaW5saW5lcyBoZXJlIC0g d2UgZXhjbHVkZSB0aGVtIGF0IHRoZSBtb21lbnQgYnkgcmV0dXJuaW5nCi0gICAgLy8gaWYgd2Ug ZmluZCBhIGNvbnRpbnVhdGlvbi4KLSAgICBSZW5kZXJPYmplY3QqIGN1cnJlbnQgPSBwYXJlbnQo KS0+Zmlyc3RDaGlsZCgpOwotICAgIHdoaWxlIChjdXJyZW50ICYmICgoY3VycmVudC0+aXNBbm9u eW1vdXNCbG9jaygpICYmICFkb3duY2FzdDxSZW5kZXJCbG9jaz4oKmN1cnJlbnQpLmlzQW5vbnlt b3VzQmxvY2tDb250aW51YXRpb24oKSkgfHwgY3VycmVudC0+c3R5bGUoKS5pc0Zsb2F0aW5nKCkg fHwgY3VycmVudC0+c3R5bGUoKS5oYXNPdXRPZkZsb3dQb3NpdGlvbigpKSkKLSAgICAgICAgY3Vy cmVudCA9IGN1cnJlbnQtPm5leHRTaWJsaW5nKCk7Ci0KLSAgICBpZiAoY3VycmVudCkKLSAgICAg ICAgcmV0dXJuOwotCi0gICAgUmVuZGVyT2JqZWN0KiBuZXh0OwotICAgIGZvciAoY3VycmVudCA9 IHBhcmVudCgpLT5maXJzdENoaWxkKCk7IGN1cnJlbnQ7IGN1cnJlbnQgPSBuZXh0KSB7Ci0gICAg ICAgIG5leHQgPSBjdXJyZW50LT5uZXh0U2libGluZygpOwotICAgICAgICBpZiAoY3VycmVudC0+ aXNBbm9ueW1vdXNCbG9jaygpKQotICAgICAgICAgICAgcGFyZW50QmxvY2suY29sbGFwc2VBbm9u eW1vdXNCb3hDaGlsZChwYXJlbnRCbG9jaywgZG93bmNhc3Q8UmVuZGVyQmxvY2s+KGN1cnJlbnQp KTsKLSAgICB9Ci19Ci0KIEZsb2F0UG9pbnQgUmVuZGVyT2JqZWN0Ojpsb2NhbFRvQWJzb2x1dGUo Y29uc3QgRmxvYXRQb2ludCYgbG9jYWxQb2ludCwgTWFwQ29vcmRpbmF0ZXNGbGFncyBtb2RlKSBj b25zdAogewogICAgIFRyYW5zZm9ybVN0YXRlIHRyYW5zZm9ybVN0YXRlKFRyYW5zZm9ybVN0YXRl OjpBcHBseVRyYW5zZm9ybURpcmVjdGlvbiwgbG9jYWxQb2ludCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyT2JqZWN0LmgKaW5kZXggZDdkMzE5OC4uZDFkODUyMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaApAQCAtMjQ1LDEyICsyNDUsNiBAQCBwdWJsaWM6 CiAgICAgLy8gT2J0YWlucyB0aGUgbmVhcmVzdCBlbmNsb3NpbmcgYmxvY2sgKGluY2x1ZGluZyB0 aGlzIGJsb2NrKSB0aGF0IGNvbnRyaWJ1dGVzIGEgZmlyc3QtbGluZSBzdHlsZSB0byBvdXIgaW5s aW5lCiAgICAgLy8gY2hpbGRyZW4uCiAgICAgdmlydHVhbCBSZW5kZXJCbG9jayogZmlyc3RMaW5l QmxvY2soKSBjb25zdDsKLQotICAgIC8vIENhbGxlZCB3aGVuIGFuIG9iamVjdCB0aGF0IHdhcyBm bG9hdGluZyBvciBwb3NpdGlvbmVkIGJlY29tZXMgYSBub3JtYWwgZmxvdyBvYmplY3QKLSAgICAv LyBhZ2Fpbi4gIFdlIGhhdmUgdG8gbWFrZSBzdXJlIHRoZSByZW5kZXIgdHJlZSB1cGRhdGVzIGFz IG5lZWRlZCB0byBhY2NvbW1vZGF0ZSB0aGUgbmV3Ci0gICAgLy8gbm9ybWFsIGZsb3cgb2JqZWN0 LgotICAgIHZvaWQgaGFuZGxlRHluYW1pY0Zsb2F0UG9zaXRpb25DaGFuZ2UoKTsKLSAgICB2b2lk IHJlbW92ZUFub255bW91c1dyYXBwZXJzRm9ySW5saW5lc0lmTmVjZXNzYXJ5KCk7CiAgICAgCiAg ICAgLy8gUmVuZGVyT2JqZWN0IHRyZWUgbWFuaXB1bGF0aW9uCiAgICAgLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCg==