71046 2011-10-27 11:59:51 -0700 Overridden clippedOverflowRectForRepaint() still uses IntRects 2011-10-28 14:55:32 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser eae eae leviw simon.fraser webkit.review.bot oldest_to_newest 491791 0 simon.fraser 2011-10-27 11:59:51 -0700 c.f. IntRect RenderReplaced::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const and LayoutRect RenderBox::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const 492613 1 simon.fraser 2011-10-28 12:51:09 -0700 Was this intentional? It's really confusing to have virtual methods with apparently different signatures. 492624 2 eae 2011-10-28 13:08:43 -0700 No, it's not intentional. Thanks for pointing it out! I'll take care of it. 492641 3 112903 eae 2011-10-28 13:37:40 -0700 Created attachment 112903 Patch 492642 4 112903 simon.fraser 2011-10-28 13:40:47 -0700 Comment on attachment 112903 Patch Are there other methods that have the same issue? 492643 5 eae 2011-10-28 13:44:30 -0700 > Are there other methods that have the same issue? There might be, I'm looking into that now and will make sure to fix any occurrences I can find. Thanks again for bringing this to my attention. 492701 6 112903 webkit.review.bot 2011-10-28 14:55:27 -0700 Comment on attachment 112903 Patch Clearing flags on attachment: 112903 Committed r98767: <http://trac.webkit.org/changeset/98767> 492702 7 webkit.review.bot 2011-10-28 14:55:32 -0700 All reviewed patches have been landed. Closing bug. 112903 2011-10-28 13:37:40 -0700 2011-10-28 14:55:27 -0700 Patch bug-71046-20111028133739.patch text/plain 11272 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4NzU1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMTAtMjggIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE92ZXJyaWRkZW4gY2xpcHBlZE92 ZXJmbG93UmVjdEZvclJlcGFpbnQoKSBzdGlsbCB1c2VzIEludFJlY3RzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTA0NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSBhbGwgdmlydHVhbCBjbGlw cGVkT3ZlcmZsb3dSZWN0Rm9yUmVwYWludCBmdW5jdGlvbnMgdG8gdXNlIHRoZQorICAgICAgICBz YW1lIHNpZ25hdHVyZS4KKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6 cmVjdFdpdGhPdXRsaW5lRm9yUmVwYWludCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmpl Y3Q6OmNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBhaW50KToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyT2JqZWN0Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJlcGxhY2VkOjpjbGlwcGVkT3ZlcmZsb3dSZWN0Rm9y UmVwYWludCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmg6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUYWJsZUNlbGw6OmNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBhaW50KToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRh YmxlQ29sLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlQ29sOjpjbGlwcGVkT3Zl cmZsb3dSZWN0Rm9yUmVwYWludCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlQ29s Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlUm93LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclRhYmxlUm93OjpjbGlwcGVkT3ZlcmZsb3dSZWN0Rm9yUmVwYWludCk6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlUm93Lmg6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlclRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dDo6Y2xpcHBlZE92 ZXJmbG93UmVjdEZvclJlcGFpbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0Lmg6 CisKIDIwMTEtMTAtMjggIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAg ICBBdXRvZ2VuZXJhdGUgRXhjZXB0aW9uLWRvd25jYXN0IGNvZGUgaW4gYmluZGluZ3MKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCShyZXZpc2lvbiA5ODc1 NCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xNDUwLDE3ICsxNDUwLDE3IEBAIGJvb2wgUmVuZGVyT2JqZWN0OjpjaGVja0Zv clJlcGFpbnREdXJpbmcKICAgICByZXR1cm4gIWRvY3VtZW50KCktPnZpZXcoKS0+bmVlZHNGdWxs UmVwYWludCgpICYmICFoYXNMYXllcigpOwogfQogCi1JbnRSZWN0IFJlbmRlck9iamVjdDo6cmVj dFdpdGhPdXRsaW5lRm9yUmVwYWludChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVwYWludENvbnRh aW5lciwgaW50IG91dGxpbmVXaWR0aCkgY29uc3QKK0xheW91dFJlY3QgUmVuZGVyT2JqZWN0Ojpy ZWN0V2l0aE91dGxpbmVGb3JSZXBhaW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29u dGFpbmVyLCBMYXlvdXRVbml0IG91dGxpbmVXaWR0aCkgY29uc3QKIHsKLSAgICBJbnRSZWN0IHIo Y2xpcHBlZE92ZXJmbG93UmVjdEZvclJlcGFpbnQocmVwYWludENvbnRhaW5lcikpOworICAgIExh eW91dFJlY3QgcihjbGlwcGVkT3ZlcmZsb3dSZWN0Rm9yUmVwYWludChyZXBhaW50Q29udGFpbmVy KSk7CiAgICAgci5pbmZsYXRlKG91dGxpbmVXaWR0aCk7CiAgICAgcmV0dXJuIHI7CiB9CiAKLUlu dFJlY3QgUmVuZGVyT2JqZWN0OjpjbGlwcGVkT3ZlcmZsb3dSZWN0Rm9yUmVwYWludChSZW5kZXJC b3hNb2RlbE9iamVjdCopIGNvbnN0CitMYXlvdXRSZWN0IFJlbmRlck9iamVjdDo6Y2xpcHBlZE92 ZXJmbG93UmVjdEZvclJlcGFpbnQoUmVuZGVyQm94TW9kZWxPYmplY3QqKSBjb25zdAogewogICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiBJbnRSZWN0KCk7CisgICAgcmV0dXJu IExheW91dFJlY3QoKTsKIH0KIAogdm9pZCBSZW5kZXJPYmplY3Q6OmNvbXB1dGVSZWN0Rm9yUmVw YWludChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciwgSW50UmVjdCYgcmVj dCwgYm9vbCBmaXhlZCkgY29uc3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy T2JqZWN0LmgJKHJldmlzaW9uIDk4NzU0KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC03MDgsOCArNzA4LDggQEAgcHVibGljOgog ICAgIHsKICAgICAgICAgcmV0dXJuIGNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBhaW50KDApOwog ICAgIH0KLSAgICB2aXJ0dWFsIEludFJlY3QgY2xpcHBlZE92ZXJmbG93UmVjdEZvclJlcGFpbnQo UmVuZGVyQm94TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIpIGNvbnN0OwotICAgIHZpcnR1 YWwgSW50UmVjdCByZWN0V2l0aE91dGxpbmVGb3JSZXBhaW50KFJlbmRlckJveE1vZGVsT2JqZWN0 KiByZXBhaW50Q29udGFpbmVyLCBpbnQgb3V0bGluZVdpZHRoKSBjb25zdDsKKyAgICB2aXJ0dWFs IExheW91dFJlY3QgY2xpcHBlZE92ZXJmbG93UmVjdEZvclJlcGFpbnQoUmVuZGVyQm94TW9kZWxP YmplY3QqIHJlcGFpbnRDb250YWluZXIpIGNvbnN0OworICAgIHZpcnR1YWwgTGF5b3V0UmVjdCBy ZWN0V2l0aE91dGxpbmVGb3JSZXBhaW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29u dGFpbmVyLCBMYXlvdXRVbml0IG91dGxpbmVXaWR0aCkgY29uc3Q7CiAKICAgICAvLyBHaXZlbiBh IHJlY3QgaW4gdGhlIG9iamVjdCdzIGNvb3JkaW5hdGUgc3BhY2UsIGNvbXB1dGUgYSByZWN0IHN1 aXRhYmxlIGZvciByZXBhaW50aW5nCiAgICAgLy8gdGhhdCByZWN0IGluIHZpZXcgY29vcmRpbmF0 ZXMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAJ KHJldmlzaW9uIDk4NzU0KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxh Y2VkLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTEzLDE0ICs1MTMsMTQgQEAgdm9pZCBSZW5kZXJS ZXBsYWNlZDo6c2V0SW50cmluc2ljU2l6ZShjbwogICAgIG1faW50cmluc2ljU2l6ZSA9IHNpemU7 CiB9CiAKLUludFJlY3QgUmVuZGVyUmVwbGFjZWQ6OmNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBh aW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyKSBjb25zdAorTGF5b3V0 UmVjdCBSZW5kZXJSZXBsYWNlZDo6Y2xpcHBlZE92ZXJmbG93UmVjdEZvclJlcGFpbnQoUmVuZGVy Qm94TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIpIGNvbnN0CiB7CiAgICAgaWYgKHN0eWxl KCktPnZpc2liaWxpdHkoKSAhPSBWSVNJQkxFICYmICFlbmNsb3NpbmdMYXllcigpLT5oYXNWaXNp YmxlQ29udGVudCgpKQotICAgICAgICByZXR1cm4gSW50UmVjdCgpOworICAgICAgICByZXR1cm4g TGF5b3V0UmVjdCgpOwogCiAgICAgLy8gVGhlIHNlbGVjdGlvblJlY3QgY2FuIHByb2plY3Qgb3V0 c2lkZSBvZiB0aGUgb3ZlcmZsb3dSZWN0LCBzbyB0YWtlIHRoZWlyIHVuaW9uCiAgICAgLy8gZm9y IHJlcGFpbnRpbmcgdG8gYXZvaWQgc2VsZWN0aW9uIHBhaW50aW5nIGdsaXRjaGVzLgotICAgIElu dFJlY3QgciA9IHVuaW9uUmVjdChsb2NhbFNlbGVjdGlvblJlY3QoZmFsc2UpLCB2aXN1YWxPdmVy Zmxvd1JlY3QoKSk7CisgICAgTGF5b3V0UmVjdCByID0gdW5pb25SZWN0KGxvY2FsU2VsZWN0aW9u UmVjdChmYWxzZSksIHZpc3VhbE92ZXJmbG93UmVjdCgpKTsKIAogICAgIFJlbmRlclZpZXcqIHYg PSB2aWV3KCk7CiAgICAgaWYgKHYpIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJSZXBsYWNlZC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJSZXBsYWNlZC5oCShyZXZpc2lvbiA5ODc1NCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJSZXBsYWNlZC5oCSh3b3JraW5nIGNvcHkpCkBAIC03Niw3ICs3Niw3IEBAIHBy aXZhdGU6CiAKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRSZXBsYWNlZChQYWludEluZm8mLCBjb25z dCBMYXlvdXRQb2ludCYpIHsgfQogCi0gICAgdmlydHVhbCBJbnRSZWN0IGNsaXBwZWRPdmVyZmxv d1JlY3RGb3JSZXBhaW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyKSBj b25zdDsKKyAgICB2aXJ0dWFsIExheW91dFJlY3QgY2xpcHBlZE92ZXJmbG93UmVjdEZvclJlcGFp bnQoUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIpIGNvbnN0OwogCiAgICAg dmlydHVhbCBWaXNpYmxlUG9zaXRpb24gcG9zaXRpb25Gb3JQb2ludChjb25zdCBMYXlvdXRQb2lu dCYpOwogICAgIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2Vs bC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxl Q2VsbC5jcHAJKHJldmlzaW9uIDk4NzU0KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRhYmxlQ2VsbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzNiw3ICsyMzYsNyBAQCBMYXlv dXRTaXplIFJlbmRlclRhYmxlQ2VsbDo6b2Zmc2V0RnJvbUNvCiAgICAgcmV0dXJuIG9mZnNldDsK IH0KIAotSW50UmVjdCBSZW5kZXJUYWJsZUNlbGw6OmNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBh aW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyKSBjb25zdAorTGF5b3V0 UmVjdCBSZW5kZXJUYWJsZUNlbGw6OmNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBhaW50KFJlbmRl ckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyKSBjb25zdAogewogICAgIC8vIElmIHRo ZSB0YWJsZSBncmlkIGlzIGRpcnR5LCB3ZSBjYW5ub3QgZ2V0IHJlbGlhYmxlIGluZm9ybWF0aW9u IGFib3V0IGFkam9pbmluZyBjZWxscywKICAgICAvLyBzbyB3ZSBpZ25vcmUgb3V0c2lkZSBib3Jk ZXJzLiBUaGlzIHNob3VsZCBub3QgYmUgYSBwcm9ibGVtIGJlY2F1c2UgaXQgbWVhbnMgdGhhdApJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuaAkocmV2aXNp b24gOTg3NTQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmgJ KHdvcmtpbmcgY29weSkKQEAgLTE1NCw3ICsxNTQsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwg dm9pZCBwYWludE1hc2soUGFpbnRJbmZvJiwgY29uc3QgTGF5b3V0UG9pbnQmKTsKIAogICAgIHZp cnR1YWwgTGF5b3V0U2l6ZSBvZmZzZXRGcm9tQ29udGFpbmVyKFJlbmRlck9iamVjdCosIGNvbnN0 IExheW91dFBvaW50JikgY29uc3Q7Ci0gICAgdmlydHVhbCBJbnRSZWN0IGNsaXBwZWRPdmVyZmxv d1JlY3RGb3JSZXBhaW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyKSBj b25zdDsKKyAgICB2aXJ0dWFsIExheW91dFJlY3QgY2xpcHBlZE92ZXJmbG93UmVjdEZvclJlcGFp bnQoUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIpIGNvbnN0OwogICAgIHZp cnR1YWwgdm9pZCBjb21wdXRlUmVjdEZvclJlcGFpbnQoUmVuZGVyQm94TW9kZWxPYmplY3QqIHJl cGFpbnRDb250YWluZXIsIEludFJlY3QmLCBib29sIGZpeGVkID0gZmFsc2UpIGNvbnN0OwogCiAg ICAgdm9pZCBwYWludENvbGxhcHNlZEJvcmRlcihHcmFwaGljc0NvbnRleHQqLCBjb25zdCBMYXlv dXRSZWN0Jik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDb2wu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNv bC5jcHAJKHJldmlzaW9uIDk4NzU0KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRhYmxlQ29sLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODEsNyArODEsNyBAQCBib29sIFJlbmRl clRhYmxlQ29sOjpjYW5IYXZlQ2hpbGRyZW4oKSBjCiAgICAgcmV0dXJuIHN0eWxlKCktPmRpc3Bs YXkoKSA9PSBUQUJMRV9DT0xVTU5fR1JPVVA7CiB9CiAKLUludFJlY3QgUmVuZGVyVGFibGVDb2w6 OmNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBhaW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBh aW50Q29udGFpbmVyKSBjb25zdAorTGF5b3V0UmVjdCBSZW5kZXJUYWJsZUNvbDo6Y2xpcHBlZE92 ZXJmbG93UmVjdEZvclJlcGFpbnQoUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWlu ZXIpIGNvbnN0CiB7CiAgICAgLy8gRm9yIG5vdywganVzdCByZXBhaW50IHRoZSB3aG9sZSB0YWJs ZS4KICAgICAvLyBGSVhNRTogRmluZCBhIGJldHRlciB3YXkgdG8gZG8gdGhpcywgZS5nLiwgbmVl ZCB0byByZXBhaW50IGFsbCB0aGUgY2VsbHMgdGhhdCB3ZQpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRhYmxlQ29sLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRhYmxlQ29sLmgJKHJldmlzaW9uIDk4NzU0KQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlQ29sLmgJKHdvcmtpbmcgY29weSkKQEAgLTU2LDcg KzU2LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgY2FuSGF2ZUNoaWxkcmVuKCkgY29u c3Q7CiAgICAgdmlydHVhbCBib29sIHJlcXVpcmVzTGF5ZXIoKSBjb25zdCB7IHJldHVybiBmYWxz ZTsgfQogCi0gICAgdmlydHVhbCBJbnRSZWN0IGNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBhaW50 KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyKSBjb25zdDsKKyAgICB2aXJ0 dWFsIExheW91dFJlY3QgY2xpcHBlZE92ZXJmbG93UmVjdEZvclJlcGFpbnQoUmVuZGVyQm94TW9k ZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBpbWFn ZUNoYW5nZWQoV3JhcHBlZEltYWdlUHRyLCBjb25zdCBJbnRSZWN0KiA9IDApOwogCiAgICAgdmly dHVhbCB2b2lkIHN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSwgY29uc3QgUmVuZGVyU3R5 bGUqIG9sZFN0eWxlKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJs ZVJvdy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRh YmxlUm93LmNwcAkocmV2aXNpb24gOTg3NTQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGFibGVSb3cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODQsNyArMTg0LDcgQEAgdm9p ZCBSZW5kZXJUYWJsZVJvdzo6bGF5b3V0KCkKICAgICBzZXROZWVkc0xheW91dChmYWxzZSk7CiB9 CiAKLUludFJlY3QgUmVuZGVyVGFibGVSb3c6OmNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBhaW50 KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyKSBjb25zdAorTGF5b3V0UmVj dCBSZW5kZXJUYWJsZVJvdzo6Y2xpcHBlZE92ZXJmbG93UmVjdEZvclJlcGFpbnQoUmVuZGVyQm94 TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIpIGNvbnN0CiB7CiAgICAgQVNTRVJUKHBhcmVu dCgpKTsKIApAQCAtMTk4LDcgKzE5OCw3IEBAIEludFJlY3QgUmVuZGVyVGFibGVSb3c6OmNsaXBw ZWRPdmVyZmxvd1IKICAgICBpZiAoUmVuZGVyVGFibGUqIHBhcmVudFRhYmxlID0gdGFibGUoKSkK ICAgICAgICAgcmV0dXJuIHBhcmVudFRhYmxlLT5jbGlwcGVkT3ZlcmZsb3dSZWN0Rm9yUmVwYWlu dChyZXBhaW50Q29udGFpbmVyKTsKIAotICAgIHJldHVybiBJbnRSZWN0KCk7CisgICAgcmV0dXJu IExheW91dFJlY3QoKTsKIH0KIAogLy8gSGl0IFRlc3RpbmcKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5oCShyZXZpc2lvbiA5ODc1NCkKKysrIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5oCSh3b3JraW5nIGNvcHkpCkBAIC01Myw3 ICs1Myw3IEBAIHByaXZhdGU6CiAKICAgICB2aXJ0dWFsIHZvaWQgYWRkQ2hpbGQoUmVuZGVyT2Jq ZWN0KiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IDApOwogICAgIHZpcnR1YWwg dm9pZCBsYXlvdXQoKTsKLSAgICB2aXJ0dWFsIEludFJlY3QgY2xpcHBlZE92ZXJmbG93UmVjdEZv clJlcGFpbnQoUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIpIGNvbnN0Owor ICAgIHZpcnR1YWwgTGF5b3V0UmVjdCBjbGlwcGVkT3ZlcmZsb3dSZWN0Rm9yUmVwYWludChSZW5k ZXJCb3hNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lcikgY29uc3Q7CiAgICAgdmlydHVhbCBi b29sIG5vZGVBdFBvaW50KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNv bnN0IExheW91dFBvaW50JiBwb2ludEluQ29udGFpbmVyLCBjb25zdCBMYXlvdXRQb2ludCYgYWNj dW11bGF0ZWRPZmZzZXQsIEhpdFRlc3RBY3Rpb24pOwogCiAgICAgLy8gVGhlIG9ubHkgdGltZSBy b3dzIGdldCBhIGxheWVyIGlzIHdoZW4gdGhleSBoYXZlIHRyYW5zcGFyZW5jeS4KSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAJKHJldmlzaW9uIDk4NzU0KQorKysg U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xNTIwLDcgKzE1MjAsNyBAQCBJbnRSZWN0IFJlbmRlclRleHQ6OmxpbmVzVmlzdWFsT3ZlcmZs b3dCCiAgICAgcmV0dXJuIHJlY3Q7CiB9CiAKLUludFJlY3QgUmVuZGVyVGV4dDo6Y2xpcHBlZE92 ZXJmbG93UmVjdEZvclJlcGFpbnQoUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWlu ZXIpIGNvbnN0CitMYXlvdXRSZWN0IFJlbmRlclRleHQ6OmNsaXBwZWRPdmVyZmxvd1JlY3RGb3JS ZXBhaW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyKSBjb25zdAogewog ICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXJUb1JlcGFpbnQgPSBjb250YWluaW5nQmxvY2soKTsK IApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCShyZXZpc2lvbiA5ODc1 NCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmgJKHdvcmtpbmcgY29w eSkKQEAgLTEwMCw3ICsxMDAsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBMYXlvdXRVbml0IG1h cmdpbkxlZnQoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLT5tYXJnaW5MZWZ0KCkuY2FsY01pblZh bHVlKDApOyB9CiAgICAgdmlydHVhbCBMYXlvdXRVbml0IG1hcmdpblJpZ2h0KCkgY29uc3QgeyBy ZXR1cm4gc3R5bGUoKS0+bWFyZ2luUmlnaHQoKS5jYWxjTWluVmFsdWUoMCk7IH0KIAotICAgIHZp cnR1YWwgSW50UmVjdCBjbGlwcGVkT3ZlcmZsb3dSZWN0Rm9yUmVwYWludChSZW5kZXJCb3hNb2Rl bE9iamVjdCogcmVwYWludENvbnRhaW5lcikgY29uc3Q7CisgICAgdmlydHVhbCBMYXlvdXRSZWN0 IGNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBhaW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBh aW50Q29udGFpbmVyKSBjb25zdDsKIAogICAgIElubGluZVRleHRCb3gqIGZpcnN0VGV4dEJveCgp IGNvbnN0IHsgcmV0dXJuIG1fZmlyc3RUZXh0Qm94OyB9CiAgICAgSW5saW5lVGV4dEJveCogbGFz dFRleHRCb3goKSBjb25zdCB7IHJldHVybiBtX2xhc3RUZXh0Qm94OyB9Cg==