125208 2013-12-03 20:49:07 -0800 bgColor, setBgColor, alinkColor, setAlinkColor, and etc... on HTMLBodyElement are useless 2013-12-04 19:54:17 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 1 rniwa rniwa andersca benjamin commit-queue esprehn+autocc gyuyoung.kim kling koivisto oldest_to_newest 956266 0 rniwa 2013-12-03 20:49:07 -0800 Merge https://chromium.googlesource.com/chromium/blink/+/49b1eeabbbf573d5271288c66d2b566cf33a09cf No one should ever use the vlink/link/text/alink and other color attribute methods on HTMLBodyElement in C++ code, and the bindings for HTMLBodyElement are set to Reflect so they never go through these methods anyway. They only existed to support the code in HTMLDocument.cpp. Instead we can contain all the logic there and also simplify these methods greatly letting us delete a bunch of code. 956267 1 218380 rniwa 2013-12-03 20:53:07 -0800 Created attachment 218380 Removes the member functions 956290 2 218380 commit-queue 2013-12-03 23:41:53 -0800 Comment on attachment 218380 Removes the member functions Clearing flags on attachment: 218380 Committed r160072: <http://trac.webkit.org/changeset/160072> 956291 3 commit-queue 2013-12-03 23:41:55 -0800 All reviewed patches have been landed. Closing bug. 956501 4 218380 darin 2013-12-04 11:52:35 -0800 Comment on attachment 218380 Removes the member functions View in context: https://bugs.webkit.org/attachment.cgi?id=218380&action=review > Source/WebCore/html/HTMLDocument.cpp:166 > + return bodyElement->getAttribute(bgcolorAttr); Could be fastGetAttribute. > Source/WebCore/html/HTMLDocument.cpp:182 > + return bodyElement->getAttribute(textAttr); Could be fastGetAttribute. > Source/WebCore/html/HTMLDocument.cpp:198 > + return bodyElement->getAttribute(alinkAttr); Could be fastGetAttribute. > Source/WebCore/html/HTMLDocument.cpp:214 > + return bodyElement->getAttribute(linkAttr); Could be fastGetAttribute. > Source/WebCore/html/HTMLDocument.cpp:230 > + return bodyElement->getAttribute(vlinkAttr); Could be fastGetAttribute. 956761 5 rniwa 2013-12-04 19:54:17 -0800 Committed r160157: <http://trac.webkit.org/changeset/160157> 218380 2013-12-03 20:53:07 -0800 2013-12-04 11:52:35 -0800 Removes the member functions bug-125208-20131203205307.patch text/plain 10457 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDA2NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEzLTEyLTAzICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIGJnQ29sb3IsIHNldEJnQ29sb3Is IGFsaW5rQ29sb3IsIHNldEFsaW5rQ29sb3IsIGFuZCBldGMuLi4gb24gSFRNTEJvZHlFbGVtZW50 IGFyZSB1c2VsZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjUyMDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBNZXJnZSBodHRwczovL2Nocm9taXVtLmdvb2dsZXNvdXJjZS5jb20vY2hyb21pdW0vYmxp bmsvKy80OWIxZWVhYmJiZjU3M2Q1MjcxMjg4YzY2ZDJiNTY2Y2YzM2EwOWNmCisKKyAgICAgICAg VGhlc2UgbWVtYmVyIGZ1bmN0aW9ucyBvZiBIVE1MQm9keUVsZW1lbnQgd2VyZSBvbmx5IHVzZWQg YnkgY29ycmVzcG9uZGluZyBmdW5jdGlvbnMgaW4gSFRNTERvY3VtZW50CisgICAgICAgIHNpbmNl IHRoZXkgaGFkIHRoZSBSZWZsZWN0IG9wdGlvbiBzcGVjaWZpZWQgaW4gSFRNTEJvZHlFbGVtZW50 LmlkbC4KKworICAgICAgICBSZW1vdmVkIHRoZSBmdW5jdGlvbnMgYW5kIGRpcmVjdGx5IGNhbGxl ZCBnZXRBdHRyaWJ1dGUgYW5kIHNldEF0dHJpYnV0ZSBpbiByZWxldmFudCBmdW5jdGlvbnMgaW4K KyAgICAgICAgSFRNTERvY3VtZW50LiBUaGUgb3B0aW1pemF0aW9uIHRvIGF2b2lkIGFzc2lnbm1l bnQgaXMgbm8gbG9uZ2VyIG5lZWRlZCBoZXJlIHNpbmNlIHdlJ3ZlIGFkZGVkIHRoYXQKKyAgICAg ICAgb3B0aW1pemF0aW9uIHRvIHNldEF0dHJpYnV0ZUludGVybmFsIGEgd2hpbGUgYWdvLgorCisg ICAgICAgICogaHRtbC9IVE1MQm9keUVsZW1lbnQuY3BwOgorICAgICAgICAqIGh0bWwvSFRNTEJv ZHlFbGVtZW50Lmg6CisgICAgICAgICogaHRtbC9IVE1MRG9jdW1lbnQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SFRNTERvY3VtZW50OjpiZ0NvbG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxE b2N1bWVudDo6c2V0QmdDb2xvcik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1lbnQ6OmZn Q29sb3IpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTERvY3VtZW50OjpzZXRGZ0NvbG9yKToKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxEb2N1bWVudDo6YWxpbmtDb2xvcik6CisgICAgICAgIChXZWJD b3JlOjpIVE1MRG9jdW1lbnQ6OnNldEFsaW5rQ29sb3IpOgorICAgICAgICAoV2ViQ29yZTo6SFRN TERvY3VtZW50OjpsaW5rQ29sb3IpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTERvY3VtZW50Ojpz ZXRMaW5rQ29sb3IpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTERvY3VtZW50Ojp2bGlua0NvbG9y KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxEb2N1bWVudDo6c2V0VmxpbmtDb2xvcik6CisgICAg ICAgICogaHRtbC9IVE1MRG9jdW1lbnQuaDoKKwogMjAxMy0xMi0wMyAgUnlvc3VrZSBOaXdhICA8 cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBQb3RlbnRpYWwgY3Jhc2ggaW4gUmVuZGVyVmll dzo6c2VsZWN0aW9uQm91bmRzIGFuZCBSZW5kZXJWaWV3OjpyZXBhaW50U2VsZWN0aW9uCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxCb2R5RWxlbWVudC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQm9keUVsZW1lbnQuY3BwCShyZXZpc2lvbiAxNjAwNjQp CisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxCb2R5RWxlbWVudC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE4OCw1NiArMTg4LDYgQEAgYm9vbCBIVE1MQm9keUVsZW1lbnQ6OnN1cHBvcnRzRm9j dXMoKSBjbwogICAgIHJldHVybiByZW5kZXJlcklzRWRpdGFibGUoKSB8fCBIVE1MRWxlbWVudDo6 c3VwcG9ydHNGb2N1cygpOwogfQogCi1TdHJpbmcgSFRNTEJvZHlFbGVtZW50OjphTGluaygpIGNv bnN0Ci17Ci0gICAgcmV0dXJuIGdldEF0dHJpYnV0ZShhbGlua0F0dHIpOwotfQotCi12b2lkIEhU TUxCb2R5RWxlbWVudDo6c2V0QUxpbmsoY29uc3QgU3RyaW5nJiB2YWx1ZSkKLXsKLSAgICBzZXRB dHRyaWJ1dGUoYWxpbmtBdHRyLCB2YWx1ZSk7Ci19Ci0KLVN0cmluZyBIVE1MQm9keUVsZW1lbnQ6 OmJnQ29sb3IoKSBjb25zdAotewotICAgIHJldHVybiBnZXRBdHRyaWJ1dGUoYmdjb2xvckF0dHIp OwotfQotCi12b2lkIEhUTUxCb2R5RWxlbWVudDo6c2V0QmdDb2xvcihjb25zdCBTdHJpbmcmIHZh bHVlKQotewotICAgIHNldEF0dHJpYnV0ZShiZ2NvbG9yQXR0ciwgdmFsdWUpOwotfQotCi1TdHJp bmcgSFRNTEJvZHlFbGVtZW50OjpsaW5rKCkgY29uc3QKLXsKLSAgICByZXR1cm4gZ2V0QXR0cmli dXRlKGxpbmtBdHRyKTsKLX0KLQotdm9pZCBIVE1MQm9keUVsZW1lbnQ6OnNldExpbmsoY29uc3Qg U3RyaW5nJiB2YWx1ZSkKLXsKLSAgICBzZXRBdHRyaWJ1dGUobGlua0F0dHIsIHZhbHVlKTsKLX0K LQotU3RyaW5nIEhUTUxCb2R5RWxlbWVudDo6dGV4dCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIGdl dEF0dHJpYnV0ZSh0ZXh0QXR0cik7Ci19Ci0KLXZvaWQgSFRNTEJvZHlFbGVtZW50OjpzZXRUZXh0 KGNvbnN0IFN0cmluZyYgdmFsdWUpCi17Ci0gICAgc2V0QXR0cmlidXRlKHRleHRBdHRyLCB2YWx1 ZSk7Ci19Ci0KLVN0cmluZyBIVE1MQm9keUVsZW1lbnQ6OnZMaW5rKCkgY29uc3QKLXsKLSAgICBy ZXR1cm4gZ2V0QXR0cmlidXRlKHZsaW5rQXR0cik7Ci19Ci0KLXZvaWQgSFRNTEJvZHlFbGVtZW50 OjpzZXRWTGluayhjb25zdCBTdHJpbmcmIHZhbHVlKQotewotICAgIHNldEF0dHJpYnV0ZSh2bGlu a0F0dHIsIHZhbHVlKTsKLX0KLQogc3RhdGljIGludCBhZGp1c3RGb3Jab29tKGludCB2YWx1ZSwg RnJhbWUmIGZyYW1lKQogewogICAgIGZsb2F0IHpvb21GYWN0b3IgPSBmcmFtZS5wYWdlWm9vbUZh Y3RvcigpICogZnJhbWUuZnJhbWVTY2FsZUZhY3RvcigpOwpJbmRleDogU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MQm9keUVsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxCb2R5RWxlbWVudC5oCShyZXZpc2lvbiAxNjAwNjQpCisrKyBTb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxCb2R5RWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiwxNyArMzYsNiBAQCBw dWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8SFRNTEJvZHlFbGVtZW50PiBjcmVhdGUoY29u c3QgUXVhbGlmaWVkTmFtZSYsIERvY3VtZW50Jik7CiAgICAgdmlydHVhbCB+SFRNTEJvZHlFbGVt ZW50KCk7CiAKLSAgICBTdHJpbmcgYUxpbmsoKSBjb25zdDsKLSAgICB2b2lkIHNldEFMaW5rKGNv bnN0IFN0cmluZyYpOwotICAgIFN0cmluZyBiZ0NvbG9yKCkgY29uc3Q7Ci0gICAgdm9pZCBzZXRC Z0NvbG9yKGNvbnN0IFN0cmluZyYpOwotICAgIFN0cmluZyBsaW5rKCkgY29uc3Q7Ci0gICAgdm9p ZCBzZXRMaW5rKGNvbnN0IFN0cmluZyYpOwotICAgIFN0cmluZyB0ZXh0KCkgY29uc3Q7Ci0gICAg dm9pZCBzZXRUZXh0KGNvbnN0IFN0cmluZyYpOwotICAgIFN0cmluZyB2TGluaygpIGNvbnN0Owot ICAgIHZvaWQgc2V0VkxpbmsoY29uc3QgU3RyaW5nJik7Ci0KICAgICAvLyBEZWNsYXJlZCB2aXJ0 dWFsIGluIEVsZW1lbnQKICAgICBERUZJTkVfV0lORE9XX0FUVFJJQlVURV9FVkVOVF9MSVNURU5F UihibHVyKTsKICAgICBERUZJTkVfV0lORE9XX0FUVFJJQlVURV9FVkVOVF9MSVNURU5FUihlcnJv cik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxEb2N1bWVudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRG9jdW1lbnQuY3BwCShyZXZpc2lvbiAxNjAw NjQpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxEb2N1bWVudC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE1OCwxMTQgKzE1OCw4NCBAQCBib29sIEhUTUxEb2N1bWVudDo6aGFzRm9jdXMoKQog ICAgIHJldHVybiBmYWxzZTsKIH0KIAotU3RyaW5nIEhUTUxEb2N1bWVudDo6YmdDb2xvcigpCitj b25zdCBBdG9taWNTdHJpbmcmIEhUTUxEb2N1bWVudDo6YmdDb2xvcigpIGNvbnN0CiB7Ci0gICAg SFRNTEVsZW1lbnQqIGIgPSBib2R5KCk7Ci0gICAgSFRNTEJvZHlFbGVtZW50KiBib2R5RWxlbWVu dCA9IChiICYmIGItPmhhc1RhZ05hbWUoYm9keVRhZykpID8gdG9IVE1MQm9keUVsZW1lbnQoYikg OiAwOwotCi0gICAgaWYgKCFib2R5RWxlbWVudCkKLSAgICAgICAgcmV0dXJuIFN0cmluZygpOwot ICAgIHJldHVybiBib2R5RWxlbWVudC0+YmdDb2xvcigpOworICAgIEhUTUxFbGVtZW50KiBib2R5 RWxlbWVudCA9IGJvZHkoKTsKKyAgICBpZiAoIWJvZHlFbGVtZW50IHx8ICFpc0hUTUxCb2R5RWxl bWVudChib2R5RWxlbWVudCkpCisgICAgICAgIHJldHVybiBlbXB0eUF0b207CisgICAgcmV0dXJu IGJvZHlFbGVtZW50LT5nZXRBdHRyaWJ1dGUoYmdjb2xvckF0dHIpOwogfQogCiB2b2lkIEhUTUxE b2N1bWVudDo6c2V0QmdDb2xvcihjb25zdCBTdHJpbmcmIHZhbHVlKQogewotICAgIEhUTUxFbGVt ZW50KiBiID0gYm9keSgpOwotICAgIEhUTUxCb2R5RWxlbWVudCogYm9keUVsZW1lbnQgPSAoYiAm JiBiLT5oYXNUYWdOYW1lKGJvZHlUYWcpKSA/IHRvSFRNTEJvZHlFbGVtZW50KGIpIDogMDsKLQot ICAgIGlmIChib2R5RWxlbWVudCkKLSAgICAgICAgYm9keUVsZW1lbnQtPnNldEJnQ29sb3IodmFs dWUpOworICAgIEhUTUxFbGVtZW50KiBib2R5RWxlbWVudCA9IGJvZHkoKTsKKyAgICBpZiAoIWJv ZHlFbGVtZW50IHx8ICFpc0hUTUxCb2R5RWxlbWVudChib2R5RWxlbWVudCkpCisgICAgICAgIHJl dHVybjsKKyAgICBib2R5RWxlbWVudC0+c2V0QXR0cmlidXRlKGJnY29sb3JBdHRyLCB2YWx1ZSk7 CiB9CiAKLVN0cmluZyBIVE1MRG9jdW1lbnQ6OmZnQ29sb3IoKQorY29uc3QgQXRvbWljU3RyaW5n JiBIVE1MRG9jdW1lbnQ6OmZnQ29sb3IoKSBjb25zdAogewotICAgIEhUTUxFbGVtZW50KiBiID0g Ym9keSgpOwotICAgIEhUTUxCb2R5RWxlbWVudCogYm9keUVsZW1lbnQgPSAoYiAmJiBiLT5oYXNU YWdOYW1lKGJvZHlUYWcpKSA/IHRvSFRNTEJvZHlFbGVtZW50KGIpIDogMDsKLQotICAgIGlmICgh Ym9keUVsZW1lbnQpCi0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKLSAgICByZXR1cm4gYm9keUVs ZW1lbnQtPnRleHQoKTsKKyAgICBIVE1MRWxlbWVudCogYm9keUVsZW1lbnQgPSBib2R5KCk7Cisg ICAgaWYgKCFib2R5RWxlbWVudCB8fCAhaXNIVE1MQm9keUVsZW1lbnQoYm9keUVsZW1lbnQpKQor ICAgICAgICByZXR1cm4gZW1wdHlBdG9tOworICAgIHJldHVybiBib2R5RWxlbWVudC0+Z2V0QXR0 cmlidXRlKHRleHRBdHRyKTsKIH0KIAogdm9pZCBIVE1MRG9jdW1lbnQ6OnNldEZnQ29sb3IoY29u c3QgU3RyaW5nJiB2YWx1ZSkKIHsKLSAgICBIVE1MRWxlbWVudCogYiA9IGJvZHkoKTsKLSAgICBI VE1MQm9keUVsZW1lbnQqIGJvZHlFbGVtZW50ID0gKGIgJiYgYi0+aGFzVGFnTmFtZShib2R5VGFn KSkgPyB0b0hUTUxCb2R5RWxlbWVudChiKSA6IDA7Ci0KLSAgICBpZiAoYm9keUVsZW1lbnQpCi0g ICAgICAgIGJvZHlFbGVtZW50LT5zZXRUZXh0KHZhbHVlKTsKKyAgICBIVE1MRWxlbWVudCogYm9k eUVsZW1lbnQgPSBib2R5KCk7CisgICAgaWYgKCFib2R5RWxlbWVudCB8fCAhaXNIVE1MQm9keUVs ZW1lbnQoYm9keUVsZW1lbnQpKQorICAgICAgICByZXR1cm47CisgICAgYm9keUVsZW1lbnQtPnNl dEF0dHJpYnV0ZSh0ZXh0QXR0ciwgdmFsdWUpOwogfQogCi1TdHJpbmcgSFRNTERvY3VtZW50Ojph bGlua0NvbG9yKCkKK2NvbnN0IEF0b21pY1N0cmluZyYgSFRNTERvY3VtZW50OjphbGlua0NvbG9y KCkgY29uc3QKIHsKLSAgICBIVE1MRWxlbWVudCogYiA9IGJvZHkoKTsKLSAgICBIVE1MQm9keUVs ZW1lbnQqIGJvZHlFbGVtZW50ID0gKGIgJiYgYi0+aGFzVGFnTmFtZShib2R5VGFnKSkgPyB0b0hU TUxCb2R5RWxlbWVudChiKSA6IDA7Ci0KLSAgICBpZiAoIWJvZHlFbGVtZW50KQotICAgICAgICBy ZXR1cm4gU3RyaW5nKCk7Ci0gICAgcmV0dXJuIGJvZHlFbGVtZW50LT5hTGluaygpOworICAgIEhU TUxFbGVtZW50KiBib2R5RWxlbWVudCA9IGJvZHkoKTsKKyAgICBpZiAoIWJvZHlFbGVtZW50IHx8 ICFpc0hUTUxCb2R5RWxlbWVudChib2R5RWxlbWVudCkpCisgICAgICAgIHJldHVybiBlbXB0eUF0 b207CisgICAgcmV0dXJuIGJvZHlFbGVtZW50LT5nZXRBdHRyaWJ1dGUoYWxpbmtBdHRyKTsKIH0K IAogdm9pZCBIVE1MRG9jdW1lbnQ6OnNldEFsaW5rQ29sb3IoY29uc3QgU3RyaW5nJiB2YWx1ZSkK IHsKLSAgICBIVE1MRWxlbWVudCogYiA9IGJvZHkoKTsKLSAgICBIVE1MQm9keUVsZW1lbnQqIGJv ZHlFbGVtZW50ID0gKGIgJiYgYi0+aGFzVGFnTmFtZShib2R5VGFnKSkgPyB0b0hUTUxCb2R5RWxl bWVudChiKSA6IDA7Ci0KLSAgICBpZiAoYm9keUVsZW1lbnQpIHsKLSAgICAgICAgLy8gVGhpcyBj aGVjayBpcyBhIGJpdCBzaWxseSwgYnV0IHNvbWUgYmVuY2htYXJrcyBsaWtlIHRvIHNldCB0aGUK LSAgICAgICAgLy8gZG9jdW1lbnQncyBsaW5rIGNvbG9ycyBvdmVyIGFuZCBvdmVyIHRvIHRoZSBz YW1lIHZhbHVlIGFuZCB3ZQotICAgICAgICAvLyBkb24ndCB3YW50IHRvIGluY3VyIGEgc3R5bGUg dXBkYXRlIGVhY2ggdGltZS4KLSAgICAgICAgaWYgKGJvZHlFbGVtZW50LT5hTGluaygpICE9IHZh bHVlKQotICAgICAgICAgICAgYm9keUVsZW1lbnQtPnNldEFMaW5rKHZhbHVlKTsKLSAgICB9Cisg ICAgSFRNTEVsZW1lbnQqIGJvZHlFbGVtZW50ID0gYm9keSgpOworICAgIGlmICghYm9keUVsZW1l bnQgfHwgIWlzSFRNTEJvZHlFbGVtZW50KGJvZHlFbGVtZW50KSkKKyAgICAgICAgcmV0dXJuOwor ICAgIGJvZHlFbGVtZW50LT5zZXRBdHRyaWJ1dGUoYWxpbmtBdHRyLCB2YWx1ZSk7CiB9CiAKLVN0 cmluZyBIVE1MRG9jdW1lbnQ6OmxpbmtDb2xvcigpCitjb25zdCBBdG9taWNTdHJpbmcmIEhUTUxE b2N1bWVudDo6bGlua0NvbG9yKCkgY29uc3QKIHsKLSAgICBIVE1MRWxlbWVudCogYiA9IGJvZHko KTsKLSAgICBIVE1MQm9keUVsZW1lbnQqIGJvZHlFbGVtZW50ID0gKGIgJiYgYi0+aGFzVGFnTmFt ZShib2R5VGFnKSkgPyB0b0hUTUxCb2R5RWxlbWVudChiKSA6IDA7Ci0KLSAgICBpZiAoIWJvZHlF bGVtZW50KQotICAgICAgICByZXR1cm4gU3RyaW5nKCk7Ci0gICAgcmV0dXJuIGJvZHlFbGVtZW50 LT5saW5rKCk7CisgICAgSFRNTEVsZW1lbnQqIGJvZHlFbGVtZW50ID0gYm9keSgpOworICAgIGlm ICghYm9keUVsZW1lbnQgfHwgIWlzSFRNTEJvZHlFbGVtZW50KGJvZHlFbGVtZW50KSkKKyAgICAg ICAgcmV0dXJuIGVtcHR5QXRvbTsKKyAgICByZXR1cm4gYm9keUVsZW1lbnQtPmdldEF0dHJpYnV0 ZShsaW5rQXR0cik7CiB9CiAKIHZvaWQgSFRNTERvY3VtZW50OjpzZXRMaW5rQ29sb3IoY29uc3Qg U3RyaW5nJiB2YWx1ZSkKIHsKLSAgICBIVE1MRWxlbWVudCogYiA9IGJvZHkoKTsKLSAgICBIVE1M Qm9keUVsZW1lbnQqIGJvZHlFbGVtZW50ID0gKGIgJiYgYi0+aGFzVGFnTmFtZShib2R5VGFnKSkg PyB0b0hUTUxCb2R5RWxlbWVudChiKSA6IDA7Ci0KLSAgICBpZiAoYm9keUVsZW1lbnQpIHsKLSAg ICAgICAgLy8gVGhpcyBjaGVjayBpcyBhIGJpdCBzaWxseSwgYnV0IHNvbWUgYmVuY2htYXJrcyBs aWtlIHRvIHNldCB0aGUKLSAgICAgICAgLy8gZG9jdW1lbnQncyBsaW5rIGNvbG9ycyBvdmVyIGFu ZCBvdmVyIHRvIHRoZSBzYW1lIHZhbHVlIGFuZCB3ZQotICAgICAgICAvLyBkb24ndCB3YW50IHRv IGluY3VyIGEgc3R5bGUgdXBkYXRlIGVhY2ggdGltZS4KLSAgICAgICAgaWYgKGJvZHlFbGVtZW50 LT5saW5rKCkgIT0gdmFsdWUpCi0gICAgICAgICAgICBib2R5RWxlbWVudC0+c2V0TGluayh2YWx1 ZSk7Ci0gICAgfQorICAgIEhUTUxFbGVtZW50KiBib2R5RWxlbWVudCA9IGJvZHkoKTsKKyAgICBp ZiAoIWJvZHlFbGVtZW50IHx8ICFpc0hUTUxCb2R5RWxlbWVudChib2R5RWxlbWVudCkpCisgICAg ICAgIHJldHVybjsKKyAgICByZXR1cm4gYm9keUVsZW1lbnQtPnNldEF0dHJpYnV0ZShsaW5rQXR0 ciwgdmFsdWUpOwogfQogCi1TdHJpbmcgSFRNTERvY3VtZW50Ojp2bGlua0NvbG9yKCkKK2NvbnN0 IEF0b21pY1N0cmluZyYgSFRNTERvY3VtZW50Ojp2bGlua0NvbG9yKCkgY29uc3QKIHsKLSAgICBI VE1MRWxlbWVudCogYiA9IGJvZHkoKTsKLSAgICBIVE1MQm9keUVsZW1lbnQqIGJvZHlFbGVtZW50 ID0gKGIgJiYgYi0+aGFzVGFnTmFtZShib2R5VGFnKSkgPyB0b0hUTUxCb2R5RWxlbWVudChiKSA6 IDA7Ci0KLSAgICBpZiAoIWJvZHlFbGVtZW50KQotICAgICAgICByZXR1cm4gU3RyaW5nKCk7Ci0g ICAgcmV0dXJuIGJvZHlFbGVtZW50LT52TGluaygpOworICAgIEhUTUxFbGVtZW50KiBib2R5RWxl bWVudCA9IGJvZHkoKTsKKyAgICBpZiAoIWJvZHlFbGVtZW50IHx8ICFpc0hUTUxCb2R5RWxlbWVu dChib2R5RWxlbWVudCkpCisgICAgICAgIHJldHVybiBlbXB0eUF0b207CisgICAgcmV0dXJuIGJv ZHlFbGVtZW50LT5nZXRBdHRyaWJ1dGUodmxpbmtBdHRyKTsKIH0KIAogdm9pZCBIVE1MRG9jdW1l bnQ6OnNldFZsaW5rQ29sb3IoY29uc3QgU3RyaW5nJiB2YWx1ZSkKIHsKLSAgICBIVE1MRWxlbWVu dCogYiA9IGJvZHkoKTsKLSAgICBIVE1MQm9keUVsZW1lbnQqIGJvZHlFbGVtZW50ID0gKGIgJiYg Yi0+aGFzVGFnTmFtZShib2R5VGFnKSkgPyB0b0hUTUxCb2R5RWxlbWVudChiKSA6IDA7Ci0KLSAg ICBpZiAoYm9keUVsZW1lbnQpIHsKLSAgICAgICAgLy8gVGhpcyBjaGVjayBpcyBhIGJpdCBzaWxs eSwgYnV0IHNvbWUgYmVuY2htYXJrcyBsaWtlIHRvIHNldCB0aGUKLSAgICAgICAgLy8gZG9jdW1l bnQncyBsaW5rIGNvbG9ycyBvdmVyIGFuZCBvdmVyIHRvIHRoZSBzYW1lIHZhbHVlIGFuZCB3ZQot ICAgICAgICAvLyBkb24ndCB3YW50IHRvIGluY3VyIGEgc3R5bGUgdXBkYXRlIGVhY2ggdGltZS4K LSAgICAgICAgaWYgKGJvZHlFbGVtZW50LT52TGluaygpICE9IHZhbHVlKQotICAgICAgICAgICAg Ym9keUVsZW1lbnQtPnNldFZMaW5rKHZhbHVlKTsKLSAgICB9CisgICAgSFRNTEVsZW1lbnQqIGJv ZHlFbGVtZW50ID0gYm9keSgpOworICAgIGlmICghYm9keUVsZW1lbnQgfHwgIWlzSFRNTEJvZHlF bGVtZW50KGJvZHlFbGVtZW50KSkKKyAgICAgICAgcmV0dXJuOworICAgIHJldHVybiBib2R5RWxl bWVudC0+c2V0QXR0cmlidXRlKHZsaW5rQXR0ciwgdmFsdWUpOwogfQogCiB2b2lkIEhUTUxEb2N1 bWVudDo6Y2FwdHVyZUV2ZW50cygpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxEb2N1 bWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTERvY3VtZW50LmgJ KHJldmlzaW9uIDE2MDA2NCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTERvY3VtZW50LmgJ KHdvcmtpbmcgY29weSkKQEAgLTQ5LDE1ICs0OSwxNSBAQCBwdWJsaWM6CiAgICAgRWxlbWVudCog YWN0aXZlRWxlbWVudCgpOwogICAgIGJvb2wgaGFzRm9jdXMoKTsKIAotICAgIFN0cmluZyBiZ0Nv bG9yKCk7CisgICAgY29uc3QgQXRvbWljU3RyaW5nJiBiZ0NvbG9yKCkgY29uc3Q7CiAgICAgdm9p ZCBzZXRCZ0NvbG9yKGNvbnN0IFN0cmluZyYpOwotICAgIFN0cmluZyBmZ0NvbG9yKCk7CisgICAg Y29uc3QgQXRvbWljU3RyaW5nJiBmZ0NvbG9yKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRGZ0NvbG9y KGNvbnN0IFN0cmluZyYpOwotICAgIFN0cmluZyBhbGlua0NvbG9yKCk7CisgICAgY29uc3QgQXRv bWljU3RyaW5nJiBhbGlua0NvbG9yKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRBbGlua0NvbG9yKGNv bnN0IFN0cmluZyYpOwotICAgIFN0cmluZyBsaW5rQ29sb3IoKTsKKyAgICBjb25zdCBBdG9taWNT dHJpbmcmIGxpbmtDb2xvcigpIGNvbnN0OwogICAgIHZvaWQgc2V0TGlua0NvbG9yKGNvbnN0IFN0 cmluZyYpOwotICAgIFN0cmluZyB2bGlua0NvbG9yKCk7CisgICAgY29uc3QgQXRvbWljU3RyaW5n JiB2bGlua0NvbG9yKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRWbGlua0NvbG9yKGNvbnN0IFN0cmlu ZyYpOwogCiAgICAgdm9pZCBjbGVhcigpOwo=