125921 2013-12-18 04:41:48 -0800 RenderElement-ize adjustForAbsoluteZoom() and friends. 2013-12-18 06:59:30 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue oldest_to_newest 960896 0 kling 2013-12-18 04:41:48 -0800 RenderElement-ize adjustForAbsoluteZoom() and friends. 960899 1 219524 kling 2013-12-18 04:46:47 -0800 Created attachment 219524 Patch 960923 2 219524 commit-queue 2013-12-18 06:59:28 -0800 Comment on attachment 219524 Patch Clearing flags on attachment: 219524 Committed r160763: <http://trac.webkit.org/changeset/160763> 960924 3 commit-queue 2013-12-18 06:59:30 -0800 All reviewed patches have been landed. Closing bug. 219524 2013-12-18 04:46:47 -0800 2013-12-18 06:59:28 -0800 Patch bug-125921.diff text/plain 14076 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyMTBkMjZjLi5hZjk0MDVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTMtMTItMTggIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFJlbmRlckVsZW1lbnQtaXplIGFkanVzdEZvckFic29sdXRlWm9vbSgpIGFuZCBmcmllbmRz LgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTI1OTIxPgorCisgICAgICAgIE1ha2Ug YWRqdXN0Rm9yQWJzb2x1dGVab29tKCkgdGFrZSBhIGNvbnN0IFJlbmRlckVsZW1lbnQmIGluc3Rl YWQKKyAgICAgICAgb2YgYSBSZW5kZXJPYmplY3QqIHNvIHdlIGNhbiBhdm9pZCB0aGUgZXh0cmEg YnJhbmNoIGluIHN0eWxlKCkuCisgICAgICAgIEFsbCBjYWxsIHNpdGVzIGFscmVhZHkgaGFkIFJl bmRlckVsZW1lbnRzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAy MDEzLTEyLTE4ICBEw6FuaWVsIELDoXR5YWkgIDxkYmF0eWFpLnUtc3plZ2VkQHBhcnRuZXIuc2Ft c3VuZy5jb20+CiAKICAgICAgICAgW3NvdXBdIEZpeCB1bnVzZWQgcGFyYW1ldGVyIHdhcm5pbmdz IGluIFJlc291cmNlSGFuZGxlU291cC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9N ZWRpYVF1ZXJ5RXZhbHVhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9NZWRpYVF1ZXJ5RXZh bHVhdG9yLmNwcAppbmRleCBlOGE1NDc3Li5iYmU2MDU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvTWVkaWFRdWVyeUV2YWx1YXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nz L01lZGlhUXVlcnlFdmFsdWF0b3IuY3BwCkBAIC0zOTYsNyArMzk2LDcgQEAgc3RhdGljIGJvb2wg aGVpZ2h0TWVkaWFGZWF0dXJlRXZhbChDU1NWYWx1ZSogdmFsdWUsIFJlbmRlclN0eWxlKiBzdHls ZSwgRnJhbWUqIGYKICAgICBpZiAodmFsdWUpIHsKICAgICAgICAgaW50IGhlaWdodCA9IHZpZXct PmxheW91dEhlaWdodCgpOwogICAgICAgICBpZiAoUmVuZGVyVmlldyogcmVuZGVyVmlldyA9IGZy YW1lLT5kb2N1bWVudCgpLT5yZW5kZXJWaWV3KCkpCi0gICAgICAgICAgICBoZWlnaHQgPSBhZGp1 c3RGb3JBYnNvbHV0ZVpvb20oaGVpZ2h0LCByZW5kZXJWaWV3KTsKKyAgICAgICAgICAgIGhlaWdo dCA9IGFkanVzdEZvckFic29sdXRlWm9vbShoZWlnaHQsICpyZW5kZXJWaWV3KTsKICAgICAgICAg UmVuZGVyU3R5bGUqIHJvb3RTdHlsZSA9IGZyYW1lLT5kb2N1bWVudCgpLT5kb2N1bWVudEVsZW1l bnQoKS0+cmVuZGVyU3R5bGUoKTsKICAgICAgICAgaW50IGxlbmd0aDsKICAgICAgICAgcmV0dXJu IGNvbXB1dGVMZW5ndGgodmFsdWUsICFmcmFtZS0+ZG9jdW1lbnQoKS0+aW5RdWlya3NNb2RlKCks IHN0eWxlLCByb290U3R5bGUsIGxlbmd0aCkgJiYgY29tcGFyZVZhbHVlKGhlaWdodCwgbGVuZ3Ro LCBvcCk7CkBAIC00MTQsNyArNDE0LDcgQEAgc3RhdGljIGJvb2wgd2lkdGhNZWRpYUZlYXR1cmVF dmFsKENTU1ZhbHVlKiB2YWx1ZSwgUmVuZGVyU3R5bGUqIHN0eWxlLCBGcmFtZSogZnIKICAgICBp ZiAodmFsdWUpIHsKICAgICAgICAgaW50IHdpZHRoID0gdmlldy0+bGF5b3V0V2lkdGgoKTsKICAg ICAgICAgaWYgKFJlbmRlclZpZXcqIHJlbmRlclZpZXcgPSBmcmFtZS0+ZG9jdW1lbnQoKS0+cmVu ZGVyVmlldygpKQotICAgICAgICAgICAgd2lkdGggPSBhZGp1c3RGb3JBYnNvbHV0ZVpvb20od2lk dGgsIHJlbmRlclZpZXcpOworICAgICAgICAgICAgd2lkdGggPSBhZGp1c3RGb3JBYnNvbHV0ZVpv b20od2lkdGgsICpyZW5kZXJWaWV3KTsKICAgICAgICAgUmVuZGVyU3R5bGUqIHJvb3RTdHlsZSA9 IGZyYW1lLT5kb2N1bWVudCgpLT5kb2N1bWVudEVsZW1lbnQoKS0+cmVuZGVyU3R5bGUoKTsKICAg ICAgICAgaW50IGxlbmd0aDsKICAgICAgICAgcmV0dXJuIGNvbXB1dGVMZW5ndGgodmFsdWUsICFm cmFtZS0+ZG9jdW1lbnQoKS0+aW5RdWlya3NNb2RlKCksIHN0eWxlLCByb290U3R5bGUsIGxlbmd0 aCkgJiYgY29tcGFyZVZhbHVlKHdpZHRoLCBsZW5ndGgsIG9wKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNw cAppbmRleCAwYzM4MjA3Li43OWY0ZTA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCkBAIC03MDEs OSArNzAxLDkgQEAgaW50IEVsZW1lbnQ6Om9mZnNldFdpZHRoKCkKICAgICBkb2N1bWVudCgpLnVw ZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwogICAgIGlmIChSZW5kZXJCb3hN b2RlbE9iamVjdCogcmVuZGVyZXIgPSByZW5kZXJCb3hNb2RlbE9iamVjdCgpKQogI2lmIEVOQUJM RShTVUJQSVhFTF9MQVlPVVQpCi0gICAgICAgIHJldHVybiBhZGp1c3RMYXlvdXRVbml0Rm9yQWJz b2x1dGVab29tKHJlbmRlcmVyLT5waXhlbFNuYXBwZWRPZmZzZXRXaWR0aCgpLCByZW5kZXJlciku cm91bmQoKTsKKyAgICAgICAgcmV0dXJuIGFkanVzdExheW91dFVuaXRGb3JBYnNvbHV0ZVpvb20o cmVuZGVyZXItPnBpeGVsU25hcHBlZE9mZnNldFdpZHRoKCksICpyZW5kZXJlcikucm91bmQoKTsK ICNlbHNlCi0gICAgICAgIHJldHVybiBhZGp1c3RGb3JBYnNvbHV0ZVpvb20ocmVuZGVyZXItPnBp eGVsU25hcHBlZE9mZnNldFdpZHRoKCksIHJlbmRlcmVyKTsKKyAgICAgICAgcmV0dXJuIGFkanVz dEZvckFic29sdXRlWm9vbShyZW5kZXJlci0+cGl4ZWxTbmFwcGVkT2Zmc2V0V2lkdGgoKSwgKnJl bmRlcmVyKTsKICNlbmRpZgogICAgIHJldHVybiAwOwogfQpAQCAtNzEzLDkgKzcxMyw5IEBAIGlu dCBFbGVtZW50OjpvZmZzZXRIZWlnaHQoKQogICAgIGRvY3VtZW50KCkudXBkYXRlTGF5b3V0SWdu b3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7CiAgICAgaWYgKFJlbmRlckJveE1vZGVsT2JqZWN0KiBy ZW5kZXJlciA9IHJlbmRlckJveE1vZGVsT2JqZWN0KCkpCiAjaWYgRU5BQkxFKFNVQlBJWEVMX0xB WU9VVCkKLSAgICAgICAgcmV0dXJuIGFkanVzdExheW91dFVuaXRGb3JBYnNvbHV0ZVpvb20ocmVu ZGVyZXItPnBpeGVsU25hcHBlZE9mZnNldEhlaWdodCgpLCByZW5kZXJlcikucm91bmQoKTsKKyAg ICAgICAgcmV0dXJuIGFkanVzdExheW91dFVuaXRGb3JBYnNvbHV0ZVpvb20ocmVuZGVyZXItPnBp eGVsU25hcHBlZE9mZnNldEhlaWdodCgpLCAqcmVuZGVyZXIpLnJvdW5kKCk7CiAjZWxzZQotICAg ICAgICByZXR1cm4gYWRqdXN0Rm9yQWJzb2x1dGVab29tKHJlbmRlcmVyLT5waXhlbFNuYXBwZWRP ZmZzZXRIZWlnaHQoKSwgcmVuZGVyZXIpOworICAgICAgICByZXR1cm4gYWRqdXN0Rm9yQWJzb2x1 dGVab29tKHJlbmRlcmVyLT5waXhlbFNuYXBwZWRPZmZzZXRIZWlnaHQoKSwgKnJlbmRlcmVyKTsK ICNlbmRpZgogICAgIHJldHVybiAwOwogfQpAQCAtNzQ1LDcgKzc0NSw3IEBAIGludCBFbGVtZW50 OjpjbGllbnRMZWZ0KCkKICAgICBkb2N1bWVudCgpLnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdT dHlsZXNoZWV0cygpOwogCiAgICAgaWYgKFJlbmRlckJveCogcmVuZGVyZXIgPSByZW5kZXJCb3go KSkKLSAgICAgICAgcmV0dXJuIGFkanVzdEZvckFic29sdXRlWm9vbShyb3VuZFRvSW50KHJlbmRl cmVyLT5jbGllbnRMZWZ0KCkpLCByZW5kZXJlcik7CisgICAgICAgIHJldHVybiBhZGp1c3RGb3JB YnNvbHV0ZVpvb20ocm91bmRUb0ludChyZW5kZXJlci0+Y2xpZW50TGVmdCgpKSwgKnJlbmRlcmVy KTsKICAgICByZXR1cm4gMDsKIH0KIApAQCAtNzU0LDcgKzc1NCw3IEBAIGludCBFbGVtZW50Ojpj bGllbnRUb3AoKQogICAgIGRvY3VtZW50KCkudXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxl c2hlZXRzKCk7CiAKICAgICBpZiAoUmVuZGVyQm94KiByZW5kZXJlciA9IHJlbmRlckJveCgpKQot ICAgICAgICByZXR1cm4gYWRqdXN0Rm9yQWJzb2x1dGVab29tKHJvdW5kVG9JbnQocmVuZGVyZXIt PmNsaWVudFRvcCgpKSwgcmVuZGVyZXIpOworICAgICAgICByZXR1cm4gYWRqdXN0Rm9yQWJzb2x1 dGVab29tKHJvdW5kVG9JbnQocmVuZGVyZXItPmNsaWVudFRvcCgpKSwgKnJlbmRlcmVyKTsKICAg ICByZXR1cm4gMDsKIH0KIApAQCAtNzcwLDEzICs3NzAsMTMgQEAgaW50IEVsZW1lbnQ6OmNsaWVu dFdpZHRoKCkKICAgICAvLyBXaGVuIGluIHF1aXJrcyBtb2RlLCBjbGllbnRXaWR0aCBmb3IgdGhl IGJvZHkgZWxlbWVudCBzaG91bGQgcmV0dXJuIHRoZSB3aWR0aCBvZiB0aGUgY29udGFpbmluZyBm cmFtZS4KICAgICBib29sIGluUXVpcmtzTW9kZSA9IGRvY3VtZW50KCkuaW5RdWlya3NNb2RlKCk7 CiAgICAgaWYgKCghaW5RdWlya3NNb2RlICYmIGRvY3VtZW50KCkuZG9jdW1lbnRFbGVtZW50KCkg PT0gdGhpcykgfHwgKGluUXVpcmtzTW9kZSAmJiBpc0hUTUxFbGVtZW50KCkgJiYgZG9jdW1lbnQo KS5ib2R5KCkgPT0gdGhpcykpCi0gICAgICAgIHJldHVybiBhZGp1c3RGb3JBYnNvbHV0ZVpvb20o cmVuZGVyVmlldy5mcmFtZVZpZXcoKS5sYXlvdXRXaWR0aCgpLCAmcmVuZGVyVmlldyk7CisgICAg ICAgIHJldHVybiBhZGp1c3RGb3JBYnNvbHV0ZVpvb20ocmVuZGVyVmlldy5mcmFtZVZpZXcoKS5s YXlvdXRXaWR0aCgpLCByZW5kZXJWaWV3KTsKICAgICAKICAgICBpZiAoUmVuZGVyQm94KiByZW5k ZXJlciA9IHJlbmRlckJveCgpKQogI2lmIEVOQUJMRShTVUJQSVhFTF9MQVlPVVQpCi0gICAgICAg IHJldHVybiBhZGp1c3RMYXlvdXRVbml0Rm9yQWJzb2x1dGVab29tKHJlbmRlcmVyLT5waXhlbFNu YXBwZWRDbGllbnRXaWR0aCgpLCByZW5kZXJlcikucm91bmQoKTsKKyAgICAgICAgcmV0dXJuIGFk anVzdExheW91dFVuaXRGb3JBYnNvbHV0ZVpvb20ocmVuZGVyZXItPnBpeGVsU25hcHBlZENsaWVu dFdpZHRoKCksICpyZW5kZXJlcikucm91bmQoKTsKICNlbHNlCi0gICAgICAgIHJldHVybiBhZGp1 c3RGb3JBYnNvbHV0ZVpvb20ocmVuZGVyZXItPnBpeGVsU25hcHBlZENsaWVudFdpZHRoKCksIHJl bmRlcmVyKTsKKyAgICAgICAgcmV0dXJuIGFkanVzdEZvckFic29sdXRlWm9vbShyZW5kZXJlci0+ cGl4ZWxTbmFwcGVkQ2xpZW50V2lkdGgoKSwgKnJlbmRlcmVyKTsKICNlbmRpZgogICAgIHJldHVy biAwOwogfQpAQCAtNzkzLDEzICs3OTMsMTMgQEAgaW50IEVsZW1lbnQ6OmNsaWVudEhlaWdodCgp CiAgICAgLy8gV2hlbiBpbiBxdWlya3MgbW9kZSwgY2xpZW50SGVpZ2h0IGZvciB0aGUgYm9keSBl bGVtZW50IHNob3VsZCByZXR1cm4gdGhlIGhlaWdodCBvZiB0aGUgY29udGFpbmluZyBmcmFtZS4K ICAgICBib29sIGluUXVpcmtzTW9kZSA9IGRvY3VtZW50KCkuaW5RdWlya3NNb2RlKCk7CiAgICAg aWYgKCghaW5RdWlya3NNb2RlICYmIGRvY3VtZW50KCkuZG9jdW1lbnRFbGVtZW50KCkgPT0gdGhp cykgfHwgKGluUXVpcmtzTW9kZSAmJiBpc0hUTUxFbGVtZW50KCkgJiYgZG9jdW1lbnQoKS5ib2R5 KCkgPT0gdGhpcykpCi0gICAgICAgIHJldHVybiBhZGp1c3RGb3JBYnNvbHV0ZVpvb20ocmVuZGVy Vmlldy5mcmFtZVZpZXcoKS5sYXlvdXRIZWlnaHQoKSwgJnJlbmRlclZpZXcpOworICAgICAgICBy ZXR1cm4gYWRqdXN0Rm9yQWJzb2x1dGVab29tKHJlbmRlclZpZXcuZnJhbWVWaWV3KCkubGF5b3V0 SGVpZ2h0KCksIHJlbmRlclZpZXcpOwogCiAgICAgaWYgKFJlbmRlckJveCogcmVuZGVyZXIgPSBy ZW5kZXJCb3goKSkKICNpZiBFTkFCTEUoU1VCUElYRUxfTEFZT1VUKQotICAgICAgICByZXR1cm4g YWRqdXN0TGF5b3V0VW5pdEZvckFic29sdXRlWm9vbShyZW5kZXJlci0+cGl4ZWxTbmFwcGVkQ2xp ZW50SGVpZ2h0KCksIHJlbmRlcmVyKS5yb3VuZCgpOworICAgICAgICByZXR1cm4gYWRqdXN0TGF5 b3V0VW5pdEZvckFic29sdXRlWm9vbShyZW5kZXJlci0+cGl4ZWxTbmFwcGVkQ2xpZW50SGVpZ2h0 KCksICpyZW5kZXJlcikucm91bmQoKTsKICNlbHNlCi0gICAgICAgIHJldHVybiBhZGp1c3RGb3JB YnNvbHV0ZVpvb20ocmVuZGVyZXItPnBpeGVsU25hcHBlZENsaWVudEhlaWdodCgpLCByZW5kZXJl cik7CisgICAgICAgIHJldHVybiBhZGp1c3RGb3JBYnNvbHV0ZVpvb20ocmVuZGVyZXItPnBpeGVs U25hcHBlZENsaWVudEhlaWdodCgpLCAqcmVuZGVyZXIpOwogI2VuZGlmCiAgICAgcmV0dXJuIDA7 CiB9CkBAIC04MTYsMTAgKzgxNiwxMCBAQCBpbnQgRWxlbWVudDo6c2Nyb2xsTGVmdCgpCiAgICAg UmVuZGVyVmlldyYgcmVuZGVyVmlldyA9ICpkb2N1bWVudCgpLnJlbmRlclZpZXcoKTsKIAogICAg IGlmIChkb2N1bWVudCgpLmRvY3VtZW50RWxlbWVudCgpID09IHRoaXMpCi0gICAgICAgIHJldHVy biBhZGp1c3RGb3JBYnNvbHV0ZVpvb20ocmVuZGVyVmlldy5mcmFtZVZpZXcoKS5zY3JvbGxYKCks ICZyZW5kZXJWaWV3KTsKKyAgICAgICAgcmV0dXJuIGFkanVzdEZvckFic29sdXRlWm9vbShyZW5k ZXJWaWV3LmZyYW1lVmlldygpLnNjcm9sbFgoKSwgcmVuZGVyVmlldyk7CiAKICAgICBpZiAoUmVu ZGVyQm94KiByZW5kID0gcmVuZGVyQm94KCkpCi0gICAgICAgIHJldHVybiBhZGp1c3RGb3JBYnNv bHV0ZVpvb20ocmVuZC0+c2Nyb2xsTGVmdCgpLCByZW5kKTsKKyAgICAgICAgcmV0dXJuIGFkanVz dEZvckFic29sdXRlWm9vbShyZW5kLT5zY3JvbGxMZWZ0KCksICpyZW5kKTsKICAgICByZXR1cm4g MDsKIH0KIApAQCAtODM1LDEwICs4MzUsMTAgQEAgaW50IEVsZW1lbnQ6OnNjcm9sbFRvcCgpCiAg ICAgUmVuZGVyVmlldyYgcmVuZGVyVmlldyA9ICpkb2N1bWVudCgpLnJlbmRlclZpZXcoKTsKIAog ICAgIGlmIChkb2N1bWVudCgpLmRvY3VtZW50RWxlbWVudCgpID09IHRoaXMpCi0gICAgICAgIHJl dHVybiBhZGp1c3RGb3JBYnNvbHV0ZVpvb20ocmVuZGVyVmlldy5mcmFtZVZpZXcoKS5zY3JvbGxZ KCksICZyZW5kZXJWaWV3KTsKKyAgICAgICAgcmV0dXJuIGFkanVzdEZvckFic29sdXRlWm9vbShy ZW5kZXJWaWV3LmZyYW1lVmlldygpLnNjcm9sbFkoKSwgcmVuZGVyVmlldyk7CiAKICAgICBpZiAo UmVuZGVyQm94KiByZW5kID0gcmVuZGVyQm94KCkpCi0gICAgICAgIHJldHVybiBhZGp1c3RGb3JB YnNvbHV0ZVpvb20ocmVuZC0+c2Nyb2xsVG9wKCksIHJlbmQpOworICAgICAgICByZXR1cm4gYWRq dXN0Rm9yQWJzb2x1dGVab29tKHJlbmQtPnNjcm9sbFRvcCgpLCAqcmVuZCk7CiAgICAgcmV0dXJu IDA7CiB9CiAKQEAgLTg4OCw3ICs4ODgsNyBAQCBpbnQgRWxlbWVudDo6c2Nyb2xsV2lkdGgoKQog ewogICAgIGRvY3VtZW50KCkudXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7 CiAgICAgaWYgKFJlbmRlckJveCogcmVuZCA9IHJlbmRlckJveCgpKQotICAgICAgICByZXR1cm4g YWRqdXN0Rm9yQWJzb2x1dGVab29tKHJlbmQtPnNjcm9sbFdpZHRoKCksIHJlbmQpOworICAgICAg ICByZXR1cm4gYWRqdXN0Rm9yQWJzb2x1dGVab29tKHJlbmQtPnNjcm9sbFdpZHRoKCksICpyZW5k KTsKICAgICByZXR1cm4gMDsKIH0KIApAQCAtODk2LDcgKzg5Niw3IEBAIGludCBFbGVtZW50Ojpz Y3JvbGxIZWlnaHQoKQogewogICAgIGRvY3VtZW50KCkudXBkYXRlTGF5b3V0SWdub3JlUGVuZGlu Z1N0eWxlc2hlZXRzKCk7CiAgICAgaWYgKFJlbmRlckJveCogcmVuZCA9IHJlbmRlckJveCgpKQot ICAgICAgICByZXR1cm4gYWRqdXN0Rm9yQWJzb2x1dGVab29tKHJlbmQtPnNjcm9sbEhlaWdodCgp LCByZW5kKTsKKyAgICAgICAgcmV0dXJuIGFkanVzdEZvckFic29sdXRlWm9vbShyZW5kLT5zY3Jv bGxIZWlnaHQoKSwgKnJlbmQpOwogICAgIHJldHVybiAwOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MSW1hZ2VFbGVtZW50LmNwcAppbmRleCBjMDhhYTFjLi5iNTU5NjBkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAKQEAgLTI2NSw3ICsyNjUsNyBAQCBpbnQg SFRNTEltYWdlRWxlbWVudDo6d2lkdGgoYm9vbCBpZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMpCiAg ICAgICAgIGRvY3VtZW50KCkudXBkYXRlTGF5b3V0KCk7CiAKICAgICBSZW5kZXJCb3gqIGJveCA9 IHJlbmRlckJveCgpOwotICAgIHJldHVybiBib3ggPyBhZGp1c3RGb3JBYnNvbHV0ZVpvb20oYm94 LT5jb250ZW50Qm94UmVjdCgpLnBpeGVsU25hcHBlZFdpZHRoKCksIGJveCkgOiAwOworICAgIHJl dHVybiBib3ggPyBhZGp1c3RGb3JBYnNvbHV0ZVpvb20oYm94LT5jb250ZW50Qm94UmVjdCgpLnBp eGVsU25hcHBlZFdpZHRoKCksICpib3gpIDogMDsKIH0KIAogaW50IEhUTUxJbWFnZUVsZW1lbnQ6 OmhlaWdodChib29sIGlnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cykKQEAgLTI4OCw3ICsyODgsNyBA QCBpbnQgSFRNTEltYWdlRWxlbWVudDo6aGVpZ2h0KGJvb2wgaWdub3JlUGVuZGluZ1N0eWxlc2hl ZXRzKQogICAgICAgICBkb2N1bWVudCgpLnVwZGF0ZUxheW91dCgpOwogCiAgICAgUmVuZGVyQm94 KiBib3ggPSByZW5kZXJCb3goKTsKLSAgICByZXR1cm4gYm94ID8gYWRqdXN0Rm9yQWJzb2x1dGVa b29tKGJveC0+Y29udGVudEJveFJlY3QoKS5waXhlbFNuYXBwZWRIZWlnaHQoKSwgYm94KSA6IDA7 CisgICAgcmV0dXJuIGJveCA/IGFkanVzdEZvckFic29sdXRlWm9vbShib3gtPmNvbnRlbnRCb3hS ZWN0KCkucGl4ZWxTbmFwcGVkSGVpZ2h0KCksICpib3gpIDogMDsKIH0KIAogaW50IEhUTUxJbWFn ZUVsZW1lbnQ6Om5hdHVyYWxXaWR0aCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL0ltYWdlSW5wdXRUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VJbnB1 dFR5cGUuY3BwCmluZGV4IDg2MmIyNjYuLjg4YzI0ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvSW1hZ2VJbnB1dFR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSW1h Z2VJbnB1dFR5cGUuY3BwCkBAIC0xOTIsNyArMTkyLDcgQEAgdW5zaWduZWQgSW1hZ2VJbnB1dFR5 cGU6OmhlaWdodCgpIGNvbnN0CiAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS51cGRhdGVMYXlvdXQo KTsKIAogICAgIFJlbmRlckJveCogYm94ID0gZWxlbWVudC0+cmVuZGVyQm94KCk7Ci0gICAgcmV0 dXJuIGJveCA/IGFkanVzdEZvckFic29sdXRlWm9vbShib3gtPmNvbnRlbnRIZWlnaHQoKSwgYm94 KSA6IDA7CisgICAgcmV0dXJuIGJveCA/IGFkanVzdEZvckFic29sdXRlWm9vbShib3gtPmNvbnRl bnRIZWlnaHQoKSwgKmJveCkgOiAwOwogfQogCiB1bnNpZ25lZCBJbWFnZUlucHV0VHlwZTo6d2lk dGgoKSBjb25zdApAQCAtMjE2LDcgKzIxNiw3IEBAIHVuc2lnbmVkIEltYWdlSW5wdXRUeXBlOjp3 aWR0aCgpIGNvbnN0CiAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS51cGRhdGVMYXlvdXQoKTsKIAog ICAgIFJlbmRlckJveCogYm94ID0gZWxlbWVudC0+cmVuZGVyQm94KCk7Ci0gICAgcmV0dXJuIGJv eCA/IGFkanVzdEZvckFic29sdXRlWm9vbShib3gtPmNvbnRlbnRXaWR0aCgpLCBib3gpIDogMDsK KyAgICByZXR1cm4gYm94ID8gYWRqdXN0Rm9yQWJzb2x1dGVab29tKGJveC0+Y29udGVudFdpZHRo KCksICpib3gpIDogMDsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwCmluZGV4IDA1ZWFhMTIuLmYxNWUy MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAK QEAgLTY2MSw4ICs2NjEsOCBAQCBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1 aWxkT2JqZWN0Rm9yRWxlbWVudEluZm8oTm9kZSogbm9kZSkKICAgICBGcmFtZVZpZXcqIGNvbnRh aW5pbmdWaWV3ID0gY29udGFpbmluZ0ZyYW1lLT52aWV3KCk7CiAgICAgSW50UmVjdCBib3VuZGlu Z0JveCA9IHBpeGVsU25hcHBlZEludFJlY3QoY29udGFpbmluZ1ZpZXctPmNvbnRlbnRzVG9Sb290 VmlldyhyZW5kZXJlci0+YWJzb2x1dGVCb3VuZGluZ0JveFJlY3QoKSkpOwogICAgIFJlbmRlckJv eE1vZGVsT2JqZWN0KiBtb2RlbE9iamVjdCA9IHJlbmRlcmVyLT5pc0JveE1vZGVsT2JqZWN0KCkg PyB0b1JlbmRlckJveE1vZGVsT2JqZWN0KHJlbmRlcmVyKSA6IDA7Ci0gICAgZWxlbWVudEluZm8t PnNldFN0cmluZygibm9kZVdpZHRoIiwgU3RyaW5nOjpudW1iZXIobW9kZWxPYmplY3QgPyBhZGp1 c3RGb3JBYnNvbHV0ZVpvb20obW9kZWxPYmplY3QtPnBpeGVsU25hcHBlZE9mZnNldFdpZHRoKCks IG1vZGVsT2JqZWN0KSA6IGJvdW5kaW5nQm94LndpZHRoKCkpKTsKLSAgICBlbGVtZW50SW5mby0+ c2V0U3RyaW5nKCJub2RlSGVpZ2h0IiwgU3RyaW5nOjpudW1iZXIobW9kZWxPYmplY3QgPyBhZGp1 c3RGb3JBYnNvbHV0ZVpvb20obW9kZWxPYmplY3QtPnBpeGVsU25hcHBlZE9mZnNldEhlaWdodCgp LCBtb2RlbE9iamVjdCkgOiBib3VuZGluZ0JveC5oZWlnaHQoKSkpOworICAgIGVsZW1lbnRJbmZv LT5zZXRTdHJpbmcoIm5vZGVXaWR0aCIsIFN0cmluZzo6bnVtYmVyKG1vZGVsT2JqZWN0ID8gYWRq dXN0Rm9yQWJzb2x1dGVab29tKG1vZGVsT2JqZWN0LT5waXhlbFNuYXBwZWRPZmZzZXRXaWR0aCgp LCAqbW9kZWxPYmplY3QpIDogYm91bmRpbmdCb3gud2lkdGgoKSkpOworICAgIGVsZW1lbnRJbmZv LT5zZXRTdHJpbmcoIm5vZGVIZWlnaHQiLCBTdHJpbmc6Om51bWJlcihtb2RlbE9iamVjdCA/IGFk anVzdEZvckFic29sdXRlWm9vbShtb2RlbE9iamVjdC0+cGl4ZWxTbmFwcGVkT2Zmc2V0SGVpZ2h0 KCksICptb2RlbE9iamVjdCkgOiBib3VuZGluZ0JveC5oZWlnaHQoKSkpOwogICAgIAogICAgIGlm IChyZW5kZXJlci0+aXNSZW5kZXJOYW1lZEZsb3dGcmFnbWVudENvbnRhaW5lcigpKSB7CiAgICAg ICAgIFJlbmRlck5hbWVkRmxvd0ZyYWdtZW50KiByZWdpb24gPSB0b1JlbmRlckJsb2NrRmxvdyhy ZW5kZXJlciktPnJlbmRlck5hbWVkRmxvd0ZyYWdtZW50KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckVsZW1lbnQuaAppbmRleCBmM2YxNmU3Li5mMGFhMmEwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKQEAgLTMzNCw2ICszMzQsMTggQEAgaW5saW5l IFJlbmRlckVsZW1lbnQqIENvbnRhaW5lck5vZGU6OnJlbmRlcmVyKCkgY29uc3QKICAgICByZXR1 cm4gdG9SZW5kZXJFbGVtZW50KE5vZGU6OnJlbmRlcmVyKCkpOwogfQogCitpbmxpbmUgaW50IGFk anVzdEZvckFic29sdXRlWm9vbShpbnQgdmFsdWUsIGNvbnN0IFJlbmRlckVsZW1lbnQmIHJlbmRl cmVyKQoreworICAgIHJldHVybiBhZGp1c3RGb3JBYnNvbHV0ZVpvb20odmFsdWUsIHJlbmRlcmVy LnN0eWxlKCkpOworfQorCisjaWYgRU5BQkxFKFNVQlBJWEVMX0xBWU9VVCkKK2lubGluZSBMYXlv dXRVbml0IGFkanVzdExheW91dFVuaXRGb3JBYnNvbHV0ZVpvb20oTGF5b3V0VW5pdCB2YWx1ZSwg Y29uc3QgUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIpCit7CisgICAgcmV0dXJuIGFkanVzdExheW91 dFVuaXRGb3JBYnNvbHV0ZVpvb20odmFsdWUsIHJlbmRlcmVyLnN0eWxlKCkpOworfQorI2VuZGlm CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIFJlbmRlckVsZW1lbnRfaApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCmluZGV4IDMwMGZmZTQuLjU3NmUy N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKQEAgLTExNDksMTgg KzExNDksNiBAQCBpbmxpbmUgYm9vbCBSZW5kZXJPYmplY3Q6OmJhY2tncm91bmRJc0tub3duVG9C ZU9ic2N1cmVkKCkKICAgICByZXR1cm4gbV9iaXRmaWVsZHMuYm94RGVjb3JhdGlvblN0YXRlKCkg PT0gSGFzQm94RGVjb3JhdGlvbnNBbmRCYWNrZ3JvdW5kSXNLbm93blRvQmVPYnNjdXJlZDsKIH0K IAotaW5saW5lIGludCBhZGp1c3RGb3JBYnNvbHV0ZVpvb20oaW50IHZhbHVlLCBSZW5kZXJPYmpl Y3QqIHJlbmRlcmVyKQotewotICAgIHJldHVybiBhZGp1c3RGb3JBYnNvbHV0ZVpvb20odmFsdWUs ICZyZW5kZXJlci0+c3R5bGUoKSk7Ci19Ci0KLSNpZiBFTkFCTEUoU1VCUElYRUxfTEFZT1VUKQot aW5saW5lIExheW91dFVuaXQgYWRqdXN0TGF5b3V0VW5pdEZvckFic29sdXRlWm9vbShMYXlvdXRV bml0IHZhbHVlLCBSZW5kZXJPYmplY3QqIHJlbmRlcmVyKQotewotICAgIHJldHVybiBhZGp1c3RM YXlvdXRVbml0Rm9yQWJzb2x1dGVab29tKHZhbHVlLCAmcmVuZGVyZXItPnN0eWxlKCkpOwotfQot I2VuZGlmCi0KICNkZWZpbmUgUkVOREVSX09CSkVDVF9UWVBFX0NBU1RTKFRvVmFsdWVUeXBlTmFt ZSwgcHJlZGljYXRlKSBcCiAgICAgVFlQRV9DQVNUU19CQVNFKFRvVmFsdWVUeXBlTmFtZSwgUmVu ZGVyT2JqZWN0LCBvYmplY3QsIG9iamVjdC0+cHJlZGljYXRlLCBvYmplY3QucHJlZGljYXRlKQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUu aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCmluZGV4IGZk N2UxOGQuLjE1MTc5OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZS5oCkBAIC0xOTI2LDkgKzE5MjYsOSBAQCBwcml2YXRlOgogICAgIHZvaWQgYXBwZW5k Q29udGVudChzdGQ6OnVuaXF1ZV9wdHI8Q29udGVudERhdGE+KTsKIH07CiAKLWlubGluZSBpbnQg YWRqdXN0Rm9yQWJzb2x1dGVab29tKGludCB2YWx1ZSwgY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxl KQoraW5saW5lIGludCBhZGp1c3RGb3JBYnNvbHV0ZVpvb20oaW50IHZhbHVlLCBjb25zdCBSZW5k ZXJTdHlsZSYgc3R5bGUpCiB7Ci0gICAgZG91YmxlIHpvb21GYWN0b3IgPSBzdHlsZS0+ZWZmZWN0 aXZlWm9vbSgpOworICAgIGRvdWJsZSB6b29tRmFjdG9yID0gc3R5bGUuZWZmZWN0aXZlWm9vbSgp OwogICAgIGlmICh6b29tRmFjdG9yID09IDEpCiAgICAgICAgIHJldHVybiB2YWx1ZTsKICAgICAv LyBOZWVkZWQgYmVjYXVzZSBjb21wdXRlTGVuZ3RoSW50IHRydW5jYXRlcyAocmF0aGVyIHRoYW4g cm91bmRzKSB3aGVuIHNjYWxpbmcgdXAuCkBAIC0xOTQ4LDkgKzE5NDgsOSBAQCBpbmxpbmUgZmxv YXQgYWRqdXN0RmxvYXRGb3JBYnNvbHV0ZVpvb20oZmxvYXQgdmFsdWUsIGNvbnN0IFJlbmRlclN0 eWxlKiBzdHlsZSkKIH0KIAogI2lmIEVOQUJMRShTVUJQSVhFTF9MQVlPVVQpCi1pbmxpbmUgTGF5 b3V0VW5pdCBhZGp1c3RMYXlvdXRVbml0Rm9yQWJzb2x1dGVab29tKExheW91dFVuaXQgdmFsdWUs IGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSkKK2lubGluZSBMYXlvdXRVbml0IGFkanVzdExheW91 dFVuaXRGb3JBYnNvbHV0ZVpvb20oTGF5b3V0VW5pdCB2YWx1ZSwgY29uc3QgUmVuZGVyU3R5bGUm IHN0eWxlKQogewotICAgIHJldHVybiB2YWx1ZSAvIHN0eWxlLT5lZmZlY3RpdmVab29tKCk7Cisg ICAgcmV0dXJuIHZhbHVlIC8gc3R5bGUuZWZmZWN0aXZlWm9vbSgpOwogfQogI2VuZGlmCiAK