64993 2011-07-21 16:32:21 -0700 Concentrate RenderLayer repaint rects updates 2011-08-25 16:40:18 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jchaffraix jchaffraix hyatt jamesr simon.fraser webkit.review.bot oldest_to_newest 440710 0 jchaffraix 2011-07-21 16:32:21 -0700 This refactoring makes it easier to see where the 2 repaint rectangles are updated. It also needs us to add more ASSERT and underline a potential optimization. 440714 1 101664 jchaffraix 2011-07-21 16:43:09 -0700 Created attachment 101664 Proposed refactoring. 457082 2 101664 hyatt 2011-08-25 13:06:44 -0700 Comment on attachment 101664 Proposed refactoring. r=me 457101 3 101664 webkit.review.bot 2011-08-25 13:22:55 -0700 Comment on attachment 101664 Proposed refactoring. Rejecting attachment 101664 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-02', '--port..." exit_code: 2 Last 500 characters of output: RenderLayer.cpp Hunk #1 FAILED at 309. Hunk #2 FAILED at 370. Hunk #3 succeeded at 514 (offset 9 lines). 2 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/rendering/RenderLayer.cpp.rej patching file Source/WebCore/rendering/RenderLayer.h Hunk #1 FAILED at 403. 1 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/rendering/RenderLayer.h.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'David Hyatt', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/9507516 457112 4 105238 jchaffraix 2011-08-25 13:47:31 -0700 Created attachment 105238 Patch for landing 457255 5 105238 webkit.review.bot 2011-08-25 16:40:12 -0700 Comment on attachment 105238 Patch for landing Clearing flags on attachment: 105238 Committed r93837: <http://trac.webkit.org/changeset/93837> 457256 6 webkit.review.bot 2011-08-25 16:40:18 -0700 All reviewed patches have been landed. Closing bug. 101664 2011-07-21 16:43:09 -0700 2011-08-25 13:47:28 -0700 Proposed refactoring. bug-64993-20110721164308.patch text/plain 6995 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogOTEzNzQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhYWE5N2JkMDJmMDg0NDdi YzFhMTMwNzA2Nzg3MmE1NzgwODQzYjM1Li42MjIyYjg1ZjE2ZjJhNjU3MjcyOTRjYTQ4NzZhMTgx ODVlM2I4NzIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDctMjEgIEp1bGll biBDaGFmZnJhaXggIDxqY2hhZmZyYWl4QHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ29uY2VudHJh dGUgUmVuZGVyTGF5ZXIgcmVwYWludCByZWN0cyB1cGRhdGVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDk5MworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjaGFuZ2UgbW92ZXMgdGhlIHVwZGF0ZSBv ZiB0aGUgcmVwYWludCByZWN0cyB0byAyIG1ldGhvZHMKKyAgICAgICAgKGNvbXB1dGVSZXBhaW50 UmVjdHMgYW5kIGNsZWFyUmVwYWludFJlY3RzKSB0byBiZXR0ZXIgdHJhY2sKKyAgICAgICAgdGhv c2UgY2hhbmdlcy4KKworICAgICAgICBObyBuZXcgdGVzdCwgcmVmYWN0b3JpbmcgY292ZXJlZCBi eSB0aGUgZXhpc3RpbmcgdGVzdCBjYXNlcy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJM YXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dXBkYXRlTGF5ZXJQb3Np dGlvbnMpOiBSZXZlcnNlIHRoZSBsb2dpYyBhbmQKKyAgICAgICAgY2FsY3VsYXRlIHRoZSBuZXcg Ym91bmRzIHVwZnJvbnQuIFRoaXMgc2hvdWxkIGhhdmUgbm8gaW1wYWN0IGFzIG5vbmUKKyAgICAg ICAgb2YgdGhlIG1ldGhvZHMgcmVseSBvbiB0aGUgaW50ZXJuYWwgdmFsdWUuCisKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxheWVyOjpjb21wdXRlUmVwYWludFJlY3RzKTogQWRkZWQgdGhlIGNh Y2hlZE9mZnNldCBwYXJhbWV0ZXIKKyAgICAgICAgdG8gYXZvaWQgYnJlYWtpbmcgdGhlIHBlcmZv cm1hbmNlIG9wdGltaXphdGlvbiBpbiB1cGRhdGVMYXllclBvc2l0aW9ucy4gQWRkZWQKKyAgICAg ICAgc29tZSBBU1NFUlRTLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2xlYXJS ZXBhaW50UmVjdHMpOiBBZGRlZCBzb21lIEFTU0VSVHMgaGVyZS4KKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckxheWVyOjp1cGRhdGVSZXBhaW50UmVjdHNBZnRlclNjcm9sbCk6IEFkZGVkIGEgRklY TUUgYXMgdGhpcworICAgICAgICBtZXRob2QgY291bGQgdXNlIHRoZSBjYWNoZWRPZmZzZXQgdHJp Y2sgdG9vLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2V0SGFzVmlzaWJsZUNv bnRlbnQpOiBDaGFuZ2VkIHRoZSBjb2RlIHRvIHVzZQorICAgICAgICBjb21wdXRlUmVwYWludFJl Y3RzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmg6IFVwZGF0ZWQgdGhlIHNp Z25hdHVyZSBvZiBjb21wdXRlUmVwYWludFJlY3RzIGFuZCBtb3ZlZAorICAgICAgICB0aG9zZSAy IG1ldGhvZHMgaW50byB0aGUgcHJpdmF0ZSBzZWN0aW9uIG9mIHRoZSBjbGFzcy4KKwogMjAxMS0w Ny0yMCAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogYWRkIGtleWJvYXJkIHNob3J0Y3V0cyB0byBsb2FkL3NhdmUgb3BlcmF0 aW9ucyBpbiBUaW1lbGluZSBwYW5lbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuY3BwCmluZGV4IDdjMGNmNDk5NjNkNjFiMTkyZjFkNGJiZjA0NzIxNzViZmQwZTFkNzQuLjQ3 NTIxZTFjOGI0N2NlMzczNGI0ZjEyMGFjMjFkNDkzMDg2NTQzZTMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMzA5LDI2ICszMDksMjMgQEAgdm9pZCBSZW5k ZXJMYXllcjo6dXBkYXRlTGF5ZXJQb3NpdGlvbnMoVXBkYXRlTGF5ZXJQb3NpdGlvbnNGbGFncyBm bGFncywgSW50UG9pbnQKICAgICAgICAgQVNTRVJUKCF2aWV3LT5sYXlvdXRTdGF0ZUVuYWJsZWQo KSk7CiAKICAgICAgICAgUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIgPSBy ZW5kZXJlcigpLT5jb250YWluZXJGb3JSZXBhaW50KCk7Ci0gICAgICAgIEludFJlY3QgbmV3UmVj dCA9IHJlbmRlcmVyKCktPmNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBhaW50KHJlcGFpbnRDb250 YWluZXIpOwotICAgICAgICBJbnRSZWN0IG5ld091dGxpbmVCb3ggPSByZW5kZXJlcigpLT5vdXRs aW5lQm91bmRzRm9yUmVwYWludChyZXBhaW50Q29udGFpbmVyLCBjYWNoZWRPZmZzZXQpOwotICAg ICAgICAvLyBGSVhNRTogU2hvdWxkIEFTU0VSVCB0aGF0IHZhbHVlIGNhbGN1bGF0ZWQgZm9yIG5l d091dGxpbmVCb3ggdXNpbmcgdGhlIGNhY2hlZCBvZmZzZXQgaXMgdGhlIHNhbWUKKyAgICAgICAg SW50UmVjdCBvbGRSZXBhaW50UmVjdCA9IG1fcmVwYWludFJlY3Q7CisgICAgICAgIEludFJlY3Qg b2xkT3V0bGluZUJveCA9IG1fb3V0bGluZUJveDsKKyAgICAgICAgY29tcHV0ZVJlcGFpbnRSZWN0 cygpOworICAgICAgICAvLyBGSVhNRTogU2hvdWxkIEFTU0VSVCB0aGF0IHZhbHVlIGNhbGN1bGF0 ZWQgZm9yIG1fb3V0bGluZUJveCB1c2luZyB0aGUgY2FjaGVkIG9mZnNldCBpcyB0aGUgc2FtZQog ICAgICAgICAvLyBhcyB0aGUgdmFsdWUgbm90IHVzaW5nIHRoZSBjYWNoZWQgb2Zmc2V0LCBidXQg d2UgY2FuJ3QgZHVlIHRvIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z NzA0OAogICAgICAgICBpZiAoZmxhZ3MgJiBDaGVja0ZvclJlcGFpbnQpIHsKICAgICAgICAgICAg IGlmICh2aWV3ICYmICF2aWV3LT5wcmludGluZygpKSB7CiAgICAgICAgICAgICAgICAgaWYgKG1f bmVlZHNGdWxsUmVwYWludCkgewotICAgICAgICAgICAgICAgICAgICByZW5kZXJlcigpLT5yZXBh aW50VXNpbmdDb250YWluZXIocmVwYWludENvbnRhaW5lciwgbV9yZXBhaW50UmVjdCk7Ci0gICAg ICAgICAgICAgICAgICAgIGlmIChuZXdSZWN0ICE9IG1fcmVwYWludFJlY3QpCi0gICAgICAgICAg ICAgICAgICAgICAgICByZW5kZXJlcigpLT5yZXBhaW50VXNpbmdDb250YWluZXIocmVwYWludENv bnRhaW5lciwgbmV3UmVjdCk7CisgICAgICAgICAgICAgICAgICAgIHJlbmRlcmVyKCktPnJlcGFp bnRVc2luZ0NvbnRhaW5lcihyZXBhaW50Q29udGFpbmVyLCBvbGRSZXBhaW50UmVjdCk7CisgICAg ICAgICAgICAgICAgICAgIGlmIChtX3JlcGFpbnRSZWN0ICE9IG9sZFJlcGFpbnRSZWN0KQorICAg ICAgICAgICAgICAgICAgICAgICAgcmVuZGVyZXIoKS0+cmVwYWludFVzaW5nQ29udGFpbmVyKHJl cGFpbnRDb250YWluZXIsIG1fcmVwYWludFJlY3QpOwogICAgICAgICAgICAgICAgIH0gZWxzZQot ICAgICAgICAgICAgICAgICAgICByZW5kZXJlcigpLT5yZXBhaW50QWZ0ZXJMYXlvdXRJZk5lZWRl ZChyZXBhaW50Q29udGFpbmVyLCBtX3JlcGFpbnRSZWN0LCBtX291dGxpbmVCb3gsICZuZXdSZWN0 LCAmbmV3T3V0bGluZUJveCk7CisgICAgICAgICAgICAgICAgICAgIHJlbmRlcmVyKCktPnJlcGFp bnRBZnRlckxheW91dElmTmVlZGVkKHJlcGFpbnRDb250YWluZXIsIG9sZFJlcGFpbnRSZWN0LCBv bGRPdXRsaW5lQm94LCAmbV9yZXBhaW50UmVjdCwgJm1fb3V0bGluZUJveCk7CiAgICAgICAgICAg ICB9CiAgICAgICAgIH0KLSAgICAgICAgbV9yZXBhaW50UmVjdCA9IG5ld1JlY3Q7Ci0gICAgICAg IG1fb3V0bGluZUJveCA9IG5ld091dGxpbmVCb3g7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgbV9y ZXBhaW50UmVjdCA9IEludFJlY3QoKTsKLSAgICAgICAgbV9vdXRsaW5lQm94ID0gSW50UmVjdCgp OwotICAgIH0KKyAgICB9IGVsc2UKKyAgICAgICAgY2xlYXJSZXBhaW50UmVjdHMoKTsKIAogICAg IG1fbmVlZHNGdWxsUmVwYWludCA9IGZhbHNlOwogCkBAIC0zNzAsMTYgKzM2NywyOSBAQCBJbnRS ZWN0IFJlbmRlckxheWVyOjpyZXBhaW50UmVjdEluY2x1ZGluZ0Rlc2NlbmRhbnRzKCkgY29uc3QK ICAgICByZXR1cm4gcmVwYWludFJlY3Q7CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXI6OmNvbXB1dGVS ZXBhaW50UmVjdHMoKQordm9pZCBSZW5kZXJMYXllcjo6Y29tcHV0ZVJlcGFpbnRSZWN0cyhJbnRQ b2ludCogY2FjaGVkT2Zmc2V0KQogeworICAgIEFTU0VSVChtX2hhc1Zpc2libGVDb250ZW50KTsK KyAgICBBU1NFUlQoIW1fdmlzaWJsZUNvbnRlbnRTdGF0dXNEaXJ0eSk7CisKICAgICBSZW5kZXJC b3hNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciA9IHJlbmRlcmVyKCktPmNvbnRhaW5lckZv clJlcGFpbnQoKTsKICAgICBtX3JlcGFpbnRSZWN0ID0gcmVuZGVyZXIoKS0+Y2xpcHBlZE92ZXJm bG93UmVjdEZvclJlcGFpbnQocmVwYWludENvbnRhaW5lcik7Ci0gICAgbV9vdXRsaW5lQm94ID0g cmVuZGVyZXIoKS0+b3V0bGluZUJvdW5kc0ZvclJlcGFpbnQocmVwYWludENvbnRhaW5lcik7Cisg ICAgbV9vdXRsaW5lQm94ID0gcmVuZGVyZXIoKS0+b3V0bGluZUJvdW5kc0ZvclJlcGFpbnQocmVw YWludENvbnRhaW5lciwgY2FjaGVkT2Zmc2V0KTsKK30KKwordm9pZCBSZW5kZXJMYXllcjo6Y2xl YXJSZXBhaW50UmVjdHMoKQoreworICAgIEFTU0VSVCghbV9oYXNWaXNpYmxlQ29udGVudCk7Cisg ICAgQVNTRVJUKCFtX3Zpc2libGVDb250ZW50U3RhdHVzRGlydHkpOworCisgICAgbV9yZXBhaW50 UmVjdCA9IEludFJlY3QoKTsKKyAgICBtX291dGxpbmVCb3ggPSBJbnRSZWN0KCk7CiB9CiAKIHZv aWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZVJlcGFpbnRSZWN0c0FmdGVyU2Nyb2xsKGJvb2wgZml4ZWQp CiB7CiAgICAgaWYgKGZpeGVkIHx8IHJlbmRlcmVyKCktPnN0eWxlKCktPnBvc2l0aW9uKCkgPT0g Rml4ZWRQb3NpdGlvbikgeworICAgICAgICAvLyBGSVhNRTogSXMgaXQgd29ydGggcGFzc2luZyB0 aGUgY2FjaGVkT2Zmc2V0IGFyb3VuZCBsaWtlIGluIHVwZGF0ZUxheWVyUG9zaXRpb25zPwogICAg ICAgICBjb21wdXRlUmVwYWludFJlY3RzKCk7CiAgICAgICAgIGZpeGVkID0gdHJ1ZTsKICAgICB9 IGVsc2UgaWYgKHJlbmRlcmVyKCktPmhhc1RyYW5zZm9ybSgpICYmICFyZW5kZXJlcigpLT5pc1Jl bmRlclZpZXcoKSkgewpAQCAtNTA1LDkgKzUxNSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnNldEhh c1Zpc2libGVDb250ZW50KGJvb2wgYikKICAgICBtX3Zpc2libGVDb250ZW50U3RhdHVzRGlydHkg PSBmYWxzZTsgCiAgICAgbV9oYXNWaXNpYmxlQ29udGVudCA9IGI7CiAgICAgaWYgKG1faGFzVmlz aWJsZUNvbnRlbnQpIHsKLSAgICAgICAgUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlcGFpbnRDb250 YWluZXIgPSByZW5kZXJlcigpLT5jb250YWluZXJGb3JSZXBhaW50KCk7Ci0gICAgICAgIG1fcmVw YWludFJlY3QgPSByZW5kZXJlcigpLT5jbGlwcGVkT3ZlcmZsb3dSZWN0Rm9yUmVwYWludChyZXBh aW50Q29udGFpbmVyKTsKLSAgICAgICAgbV9vdXRsaW5lQm94ID0gcmVuZGVyZXIoKS0+b3V0bGlu ZUJvdW5kc0ZvclJlcGFpbnQocmVwYWludENvbnRhaW5lcik7CisgICAgICAgIGNvbXB1dGVSZXBh aW50UmVjdHMoKTsKICAgICAgICAgaWYgKCFpc05vcm1hbEZsb3dPbmx5KCkpIHsKICAgICAgICAg ICAgIGZvciAoUmVuZGVyTGF5ZXIqIHNjID0gc3RhY2tpbmdDb250ZXh0KCk7IHNjOyBzYyA9IHNj LT5zdGFja2luZ0NvbnRleHQoKSkgewogICAgICAgICAgICAgICAgIHNjLT5kaXJ0eVpPcmRlckxp c3RzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4IDdjODNjMDFl ZDE3ZGI4ZTlhNzhiZDhjNWNkZmQwMWRjZWMyOTAwNDkuLmYxZmFiNzhlMzVhOTViOTA1M2QyZDRh ZTg2MDc2YmQyYTgzNTFiYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5o CkBAIC00MDMsNyArNDAzLDYgQEAgcHVibGljOgogICAgIC8vIFJldHVybiBhIGNhY2hlZCByZXBh aW50IHJlY3QsIGNvbXB1dGVkIHJlbGF0aXZlIHRvIHRoZSBsYXllciByZW5kZXJlcidzIGNvbnRh aW5lckZvclJlcGFpbnQuCiAgICAgSW50UmVjdCByZXBhaW50UmVjdCgpIGNvbnN0IHsgcmV0dXJu IG1fcmVwYWludFJlY3Q7IH0KICAgICBJbnRSZWN0IHJlcGFpbnRSZWN0SW5jbHVkaW5nRGVzY2Vu ZGFudHMoKSBjb25zdDsKLSAgICB2b2lkIGNvbXB1dGVSZXBhaW50UmVjdHMoKTsKICAgICB2b2lk IHVwZGF0ZVJlcGFpbnRSZWN0c0FmdGVyU2Nyb2xsKGJvb2wgZml4ZWQgPSBmYWxzZSk7CiAgICAg dm9pZCBzZXROZWVkc0Z1bGxSZXBhaW50KGJvb2wgZiA9IHRydWUpIHsgbV9uZWVkc0Z1bGxSZXBh aW50ID0gZjsgfQogICAgIApAQCAtNDYxLDYgKzQ2MCw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHNl dENvbnRhaW5zRGlydHlPdmVybGF5U2Nyb2xsYmFycyhib29sIGRpcnR5U2Nyb2xsYmFycykgeyBt X2NvbnRhaW5zRGlydHlPdmVybGF5U2Nyb2xsYmFycyA9IGRpcnR5U2Nyb2xsYmFyczsgfQogCiBw cml2YXRlOgorICAgIHZvaWQgY29tcHV0ZVJlcGFpbnRSZWN0cyhJbnRQb2ludCogY2FjaGVkT2Zm c2V0ID0gMCk7CisgICAgdm9pZCBjbGVhclJlcGFpbnRSZWN0cygpOworCiAgICAgLy8gVGhlIG5v cm1hbCBvcGVyYXRvciBuZXcgaXMgZGlzYWxsb3dlZCBvbiBhbGwgcmVuZGVyIG9iamVjdHMuCiAg ICAgdm9pZCogb3BlcmF0b3IgbmV3KHNpemVfdCkgdGhyb3coKTsKIAo= 105238 2011-08-25 13:47:31 -0700 2011-08-25 16:40:12 -0700 Patch for landing bug-64993-20110825134730.patch text/plain 7268 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogOTM4MTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4NGFiYWUyOGExNzQ0Zjhh OWUxNjg2ZTQ1ZGY3YWM2NTg4NDZiY2E2Li4zOWJhNjdkMzA3ODFlNTVkZGI4NzFlNjZlNzlhYTVj YWJkZGVmOTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDgtMjUgIEp1bGll biBDaGFmZnJhaXggIDxqY2hhZmZyYWl4QHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ29uY2VudHJh dGUgUmVuZGVyTGF5ZXIgcmVwYWludCByZWN0cyB1cGRhdGVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDk5MworCisgICAgICAgIFJldmlld2VkIGJ5 IERhdmlkIEh5YXR0LgorCisgICAgICAgIFRoZSBjaGFuZ2UgbW92ZXMgdGhlIHVwZGF0ZSBvZiB0 aGUgcmVwYWludCByZWN0cyB0byAyIG1ldGhvZHMKKyAgICAgICAgKGNvbXB1dGVSZXBhaW50UmVj dHMgYW5kIGNsZWFyUmVwYWludFJlY3RzKSB0byBiZXR0ZXIgdHJhY2sKKyAgICAgICAgdGhvc2Ug Y2hhbmdlcy4KKworICAgICAgICBObyBuZXcgdGVzdCwgcmVmYWN0b3JpbmcgY292ZXJlZCBieSB0 aGUgZXhpc3RpbmcgdGVzdCBjYXNlcy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXll ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dXBkYXRlTGF5ZXJQb3NpdGlv bnMpOiBSZXZlcnNlIHRoZSBsb2dpYyBhbmQKKyAgICAgICAgY2FsY3VsYXRlIHRoZSBuZXcgYm91 bmRzIHVwZnJvbnQuIFRoaXMgc2hvdWxkIGhhdmUgbm8gaW1wYWN0IGFzIG5vbmUKKyAgICAgICAg b2YgdGhlIG1ldGhvZHMgcmVseSBvbiB0aGUgaW50ZXJuYWwgdmFsdWUuCisKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyOjpjb21wdXRlUmVwYWludFJlY3RzKTogQWRkZWQgdGhlIGNhY2hl ZE9mZnNldCBwYXJhbWV0ZXIKKyAgICAgICAgdG8gYXZvaWQgYnJlYWtpbmcgdGhlIHBlcmZvcm1h bmNlIG9wdGltaXphdGlvbiBpbiB1cGRhdGVMYXllclBvc2l0aW9ucy4gQWRkZWQKKyAgICAgICAg c29tZSBBU1NFUlRTLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2xlYXJSZXBh aW50UmVjdHMpOiBBZGRlZCBzb21lIEFTU0VSVHMgaGVyZS4KKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckxheWVyOjp1cGRhdGVSZXBhaW50UmVjdHNBZnRlclNjcm9sbCk6IEFkZGVkIGEgRklYTUUg YXMgdGhpcworICAgICAgICBtZXRob2QgY291bGQgdXNlIHRoZSBjYWNoZWRPZmZzZXQgdHJpY2sg dG9vLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2V0SGFzVmlzaWJsZUNvbnRl bnQpOiBDaGFuZ2VkIHRoZSBjb2RlIHRvIHVzZQorICAgICAgICBjb21wdXRlUmVwYWludFJlY3Rz LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmg6IFVwZGF0ZWQgdGhlIHNpZ25h dHVyZSBvZiBjb21wdXRlUmVwYWludFJlY3RzIGFuZCBtb3ZlZAorICAgICAgICB0aG9zZSAyIG1l dGhvZHMgaW50byB0aGUgcHJpdmF0ZSBzZWN0aW9uIG9mIHRoZSBjbGFzcy4KKwogMjAxMS0wOC0y NSAgQWRlbWFyIGRlIFNvdXphIFJlaXMgSnIuICA8YWRlbWFyLnJlaXNAb3BlbmJvc3NhLm9yZz4K IAogICAgICAgICBbUXRdIEVuYWJsZSBwYXNzd29yZCBlY2hvIG9uIFN5bWJpYW4gYnVpbGRzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCA1YzBhMTkwZDZjYjZm MDUzNGFkN2UzMjQ5NGJmYjk0MTZhYTRhMWRmLi44ZjAzNDgzMzAwOWFjNGZkN2ZjODM4YmViZjA2 ZGJlOWQ5Zjk3YjQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAK QEAgLTMwOSwyNiArMzA5LDIzIEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRp b25zKFVwZGF0ZUxheWVyUG9zaXRpb25zRmxhZ3MgZmxhZ3MsIExheW91dFBvCiAgICAgICAgIEFT U0VSVCghdmlldy0+bGF5b3V0U3RhdGVFbmFibGVkKCkpOwogCiAgICAgICAgIFJlbmRlckJveE1v ZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyID0gcmVuZGVyZXIoKS0+Y29udGFpbmVyRm9yUmVw YWludCgpOwotICAgICAgICBMYXlvdXRSZWN0IG5ld1JlY3QgPSByZW5kZXJlcigpLT5jbGlwcGVk T3ZlcmZsb3dSZWN0Rm9yUmVwYWludChyZXBhaW50Q29udGFpbmVyKTsKLSAgICAgICAgTGF5b3V0 UmVjdCBuZXdPdXRsaW5lQm94ID0gcmVuZGVyZXIoKS0+b3V0bGluZUJvdW5kc0ZvclJlcGFpbnQo cmVwYWludENvbnRhaW5lciwgY2FjaGVkT2Zmc2V0KTsKLSAgICAgICAgLy8gRklYTUU6IFNob3Vs ZCBBU1NFUlQgdGhhdCB2YWx1ZSBjYWxjdWxhdGVkIGZvciBuZXdPdXRsaW5lQm94IHVzaW5nIHRo ZSBjYWNoZWQgb2Zmc2V0IGlzIHRoZSBzYW1lCisgICAgICAgIEludFJlY3Qgb2xkUmVwYWludFJl Y3QgPSBtX3JlcGFpbnRSZWN0OworICAgICAgICBJbnRSZWN0IG9sZE91dGxpbmVCb3ggPSBtX291 dGxpbmVCb3g7CisgICAgICAgIGNvbXB1dGVSZXBhaW50UmVjdHMoKTsKKyAgICAgICAgLy8gRklY TUU6IFNob3VsZCBBU1NFUlQgdGhhdCB2YWx1ZSBjYWxjdWxhdGVkIGZvciBtX291dGxpbmVCb3gg dXNpbmcgdGhlIGNhY2hlZCBvZmZzZXQgaXMgdGhlIHNhbWUKICAgICAgICAgLy8gYXMgdGhlIHZh bHVlIG5vdCB1c2luZyB0aGUgY2FjaGVkIG9mZnNldCwgYnV0IHdlIGNhbid0IGR1ZSB0byBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzcwNDgKICAgICAgICAgaWYgKGZs YWdzICYgQ2hlY2tGb3JSZXBhaW50KSB7CiAgICAgICAgICAgICBpZiAodmlldyAmJiAhdmlldy0+ cHJpbnRpbmcoKSkgewogICAgICAgICAgICAgICAgIGlmIChtX25lZWRzRnVsbFJlcGFpbnQpIHsK LSAgICAgICAgICAgICAgICAgICAgcmVuZGVyZXIoKS0+cmVwYWludFVzaW5nQ29udGFpbmVyKHJl cGFpbnRDb250YWluZXIsIG1fcmVwYWludFJlY3QpOwotICAgICAgICAgICAgICAgICAgICBpZiAo bmV3UmVjdCAhPSBtX3JlcGFpbnRSZWN0KQotICAgICAgICAgICAgICAgICAgICAgICAgcmVuZGVy ZXIoKS0+cmVwYWludFVzaW5nQ29udGFpbmVyKHJlcGFpbnRDb250YWluZXIsIG5ld1JlY3QpOwor ICAgICAgICAgICAgICAgICAgICByZW5kZXJlcigpLT5yZXBhaW50VXNpbmdDb250YWluZXIocmVw YWludENvbnRhaW5lciwgb2xkUmVwYWludFJlY3QpOworICAgICAgICAgICAgICAgICAgICBpZiAo bV9yZXBhaW50UmVjdCAhPSBvbGRSZXBhaW50UmVjdCkKKyAgICAgICAgICAgICAgICAgICAgICAg IHJlbmRlcmVyKCktPnJlcGFpbnRVc2luZ0NvbnRhaW5lcihyZXBhaW50Q29udGFpbmVyLCBtX3Jl cGFpbnRSZWN0KTsKICAgICAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICAgICAg cmVuZGVyZXIoKS0+cmVwYWludEFmdGVyTGF5b3V0SWZOZWVkZWQocmVwYWludENvbnRhaW5lciwg bV9yZXBhaW50UmVjdCwgbV9vdXRsaW5lQm94LCAmbmV3UmVjdCwgJm5ld091dGxpbmVCb3gpOwor ICAgICAgICAgICAgICAgICAgICByZW5kZXJlcigpLT5yZXBhaW50QWZ0ZXJMYXlvdXRJZk5lZWRl ZChyZXBhaW50Q29udGFpbmVyLCBvbGRSZXBhaW50UmVjdCwgb2xkT3V0bGluZUJveCwgJm1fcmVw YWludFJlY3QsICZtX291dGxpbmVCb3gpOwogICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAg ICAgIG1fcmVwYWludFJlY3QgPSBuZXdSZWN0OwotICAgICAgICBtX291dGxpbmVCb3ggPSBuZXdP dXRsaW5lQm94OwotICAgIH0gZWxzZSB7Ci0gICAgICAgIG1fcmVwYWludFJlY3QgPSBMYXlvdXRS ZWN0KCk7Ci0gICAgICAgIG1fb3V0bGluZUJveCA9IExheW91dFJlY3QoKTsKLSAgICB9CisgICAg fSBlbHNlCisgICAgICAgIGNsZWFyUmVwYWludFJlY3RzKCk7CiAKICAgICBtX25lZWRzRnVsbFJl cGFpbnQgPSBmYWxzZTsKIApAQCAtMzcwLDExICszNjcsMjMgQEAgTGF5b3V0UmVjdCBSZW5kZXJM YXllcjo6cmVwYWludFJlY3RJbmNsdWRpbmdEZXNjZW5kYW50cygpIGNvbnN0CiAgICAgcmV0dXJu IHJlcGFpbnRSZWN0OwogfQogCi12b2lkIFJlbmRlckxheWVyOjpjb21wdXRlUmVwYWludFJlY3Rz KCkKK3ZvaWQgUmVuZGVyTGF5ZXI6OmNvbXB1dGVSZXBhaW50UmVjdHMoSW50UG9pbnQqIGNhY2hl ZE9mZnNldCkKIHsKLSAgICBSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciA9 IHJlbmRlcmVyKCktPmNvbnRhaW5lckZvclJlcGFpbnQoKTsKLSAgICBtX3JlcGFpbnRSZWN0ID0g cmVuZGVyZXIoKS0+Y2xpcHBlZE92ZXJmbG93UmVjdEZvclJlcGFpbnQocmVwYWludENvbnRhaW5l cik7Ci0gICAgbV9vdXRsaW5lQm94ID0gcmVuZGVyZXIoKS0+b3V0bGluZUJvdW5kc0ZvclJlcGFp bnQocmVwYWludENvbnRhaW5lcik7CisgICAgQVNTRVJUKG1faGFzVmlzaWJsZUNvbnRlbnQpOwor ICAgIEFTU0VSVCghbV92aXNpYmxlQ29udGVudFN0YXR1c0RpcnR5KTsKKworICAgICBSZW5kZXJC b3hNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciA9IHJlbmRlcmVyKCktPmNvbnRhaW5lckZv clJlcGFpbnQoKTsKKyAgICAgbV9yZXBhaW50UmVjdCA9IHJlbmRlcmVyKCktPmNsaXBwZWRPdmVy Zmxvd1JlY3RGb3JSZXBhaW50KHJlcGFpbnRDb250YWluZXIpOworICAgIG1fb3V0bGluZUJveCA9 IHJlbmRlcmVyKCktPm91dGxpbmVCb3VuZHNGb3JSZXBhaW50KHJlcGFpbnRDb250YWluZXIsIGNh Y2hlZE9mZnNldCk7Cit9CisKK3ZvaWQgUmVuZGVyTGF5ZXI6OmNsZWFyUmVwYWludFJlY3RzKCkK K3sKKyAgICBBU1NFUlQoIW1faGFzVmlzaWJsZUNvbnRlbnQpOworICAgIEFTU0VSVCghbV92aXNp YmxlQ29udGVudFN0YXR1c0RpcnR5KTsKKworICAgIG1fcmVwYWludFJlY3QgPSBJbnRSZWN0KCk7 CisgICAgbV9vdXRsaW5lQm94ID0gSW50UmVjdCgpOwogfQogCiB2b2lkIFJlbmRlckxheWVyOjp1 cGRhdGVMYXllclBvc2l0aW9uc0FmdGVyU2Nyb2xsKGJvb2wgZml4ZWQpCkBAIC0zODIsNiArMzkx LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlTGF5ZXJQb3NpdGlvbnNBZnRlclNjcm9sbChi b29sIGZpeGVkKQogICAgIHVwZGF0ZUxheWVyUG9zaXRpb24oKTsKIAogICAgIGlmIChmaXhlZCB8 fCByZW5kZXJlcigpLT5zdHlsZSgpLT5wb3NpdGlvbigpID09IEZpeGVkUG9zaXRpb24pIHsKKyAg ICAgICAgLy8gRklYTUU6IElzIGl0IHdvcnRoIHBhc3NpbmcgdGhlIGNhY2hlZE9mZnNldCBhcm91 bmQgbGlrZSBpbiB1cGRhdGVMYXllclBvc2l0aW9ucz8KICAgICAgICAgY29tcHV0ZVJlcGFpbnRS ZWN0cygpOwogICAgICAgICBmaXhlZCA9IHRydWU7CiAgICAgfSBlbHNlIGlmIChyZW5kZXJlcigp LT5oYXNUcmFuc2Zvcm0oKSAmJiAhcmVuZGVyZXIoKS0+aXNSZW5kZXJWaWV3KCkpIHsKQEAgLTUx NCw5ICs1MjQsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpzZXRIYXNWaXNpYmxlQ29udGVudChib29s IGIpCiAgICAgbV92aXNpYmxlQ29udGVudFN0YXR1c0RpcnR5ID0gZmFsc2U7IAogICAgIG1faGFz VmlzaWJsZUNvbnRlbnQgPSBiOwogICAgIGlmIChtX2hhc1Zpc2libGVDb250ZW50KSB7Ci0gICAg ICAgIFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyID0gcmVuZGVyZXIoKS0+ Y29udGFpbmVyRm9yUmVwYWludCgpOwotICAgICAgICBtX3JlcGFpbnRSZWN0ID0gcmVuZGVyZXIo KS0+Y2xpcHBlZE92ZXJmbG93UmVjdEZvclJlcGFpbnQocmVwYWludENvbnRhaW5lcik7Ci0gICAg ICAgIG1fb3V0bGluZUJveCA9IHJlbmRlcmVyKCktPm91dGxpbmVCb3VuZHNGb3JSZXBhaW50KHJl cGFpbnRDb250YWluZXIpOworICAgICAgICBjb21wdXRlUmVwYWludFJlY3RzKCk7CiAgICAgICAg IGlmICghaXNOb3JtYWxGbG93T25seSgpKSB7CiAgICAgICAgICAgICBmb3IgKFJlbmRlckxheWVy KiBzYyA9IHN0YWNraW5nQ29udGV4dCgpOyBzYzsgc2MgPSBzYy0+c3RhY2tpbmdDb250ZXh0KCkp IHsKICAgICAgICAgICAgICAgICBzYy0+ZGlydHlaT3JkZXJMaXN0cygpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAppbmRleCBkOTJjMzI0YjdhMTM3MjhkMDhkZWIxZjQzNjcw YjNhYjAxN2FlNTA3Li5lYjdkNzY3MDBkODAwMWUzZjcxM2UzNGViMzkxYTE2YWM2Y2U3NTlhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtNDAzLDcgKzQwMyw2IEBA IHB1YmxpYzoKICAgICAvLyBSZXR1cm4gYSBjYWNoZWQgcmVwYWludCByZWN0LCBjb21wdXRlZCBy ZWxhdGl2ZSB0byB0aGUgbGF5ZXIgcmVuZGVyZXIncyBjb250YWluZXJGb3JSZXBhaW50LgogICAg IExheW91dFJlY3QgcmVwYWludFJlY3QoKSBjb25zdCB7IHJldHVybiBtX3JlcGFpbnRSZWN0OyB9 CiAgICAgTGF5b3V0UmVjdCByZXBhaW50UmVjdEluY2x1ZGluZ0Rlc2NlbmRhbnRzKCkgY29uc3Q7 Ci0gICAgdm9pZCBjb21wdXRlUmVwYWludFJlY3RzKCk7CiAgICAgdm9pZCB1cGRhdGVMYXllclBv c2l0aW9uc0FmdGVyU2Nyb2xsKGJvb2wgZml4ZWQgPSBmYWxzZSk7CiAgICAgdm9pZCBzZXROZWVk c0Z1bGxSZXBhaW50KGJvb2wgZiA9IHRydWUpIHsgbV9uZWVkc0Z1bGxSZXBhaW50ID0gZjsgfQog ICAgIApAQCAtNDYxLDYgKzQ2MCw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldENvbnRhaW5zRGly dHlPdmVybGF5U2Nyb2xsYmFycyhib29sIGRpcnR5U2Nyb2xsYmFycykgeyBtX2NvbnRhaW5zRGly dHlPdmVybGF5U2Nyb2xsYmFycyA9IGRpcnR5U2Nyb2xsYmFyczsgfQogCiBwcml2YXRlOgorICAg IHZvaWQgY29tcHV0ZVJlcGFpbnRSZWN0cyhJbnRQb2ludCogY2FjaGVkT2Zmc2V0ID0gMCk7Cisg ICAgdm9pZCBjbGVhclJlcGFpbnRSZWN0cygpOworCiAgICAgLy8gVGhlIG5vcm1hbCBvcGVyYXRv ciBuZXcgaXMgZGlzYWxsb3dlZCBvbiBhbGwgcmVuZGVyIG9iamVjdHMuCiAgICAgdm9pZCogb3Bl cmF0b3IgbmV3KHNpemVfdCkgdGhyb3coKTsKIAo=