126537 2014-01-06 13:42:00 -0800 Add {IntRect, FloatRect}::infiniteRect() and ::isInfinite() 2014-01-06 15:47:20 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 126536 1 thorton thorton andersca commit-queue d-r esprehn+autocc fmalita glenn gyuyoung.kim kondapallykalyan pdr sam schenney simon.fraser WebkitBugTracker oldest_to_newest 964738 0 thorton 2014-01-06 13:42:00 -0800 It's more generally useful and shouldn't be hidden away. 964776 1 220461 thorton 2014-01-06 15:16:37 -0800 Created attachment 220461 patch 964777 2 220462 thorton 2014-01-06 15:16:37 -0800 Created attachment 220462 964787 3 thorton 2014-01-06 15:47:20 -0800 http://trac.webkit.org/changeset/161381 220461 2014-01-06 15:16:37 -0800 2014-01-06 15:43:16 -0800 patch infinite.diff text/plain 13446 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3N2VhYjQ3Li5lMDdiN2ViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYg QEAKKzIwMTQtMDEtMDYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgQWRkIHtJbnRSZWN0LCBGbG9hdFJlY3R9OjppbmZpbml0ZVJlY3QoKSBhbmQgOjpp c0luZmluaXRlKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyNjUzNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRSZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpG bG9hdFJlY3Q6OmluZmluaXRlUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpGbG9hdFJlY3Q6Omlz SW5maW5pdGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ludFJlY3QuaDoKKyAgICAg ICAgKFdlYkNvcmU6OkludFJlY3Q6OmluZmluaXRlUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpJ bnRSZWN0Ojppc0luZmluaXRlKToKKyAgICAgICAgQWRkIGluZmluaXRlUmVjdCgpIGFuZCBpc0lu ZmluaXRlKCkgdG8gRmxvYXRSZWN0IGFuZCBJbnRSZWN0LgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzTGF5ZXJDQTo6c2V0TmVlZHNEaXNwbGF5KToKKyAgICAgICAgKiByZW5kZXJpbmcvUGFpbnRJ bmZvLmg6CisgICAgICAgIChXZWJDb3JlOjpQYWludEluZm86OmFwcGx5VHJhbnNmb3JtKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJGbG93VGhyZWFkOjpmcmFnbWVudHNCb3VuZGluZ0JveCk6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpj b2xsZWN0RnJhZ21lbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjYWxjdWxh dGVDbGlwUmVjdHMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Y2xpcEJveCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSk6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllckNvbXBvc2l0b3I6OmNsaXBwZWRCeUFuY2VzdG9yKToKKyAgICAgICAgKiByZW5kZXJp bmcvc3ZnL1NWR1JlbmRlcmluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHUmVu ZGVyaW5nQ29udGV4dDo6cmVuZGVyU3VidHJlZVRvSW1hZ2VCdWZmZXIpOgorICAgICAgICBBZG9w dCB0aGUgbmV3IGZ1bmN0aW9ucy4KKwogMjAxNC0wMS0wNiAgTWFydGluIFJvYmluc29uICA8bXJv Ymluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0NNYWtlXSBbR1RLXSBGaXggdGhlIGJ1aWxk IGZvciB0aGUgV2ViS2l0R1RLKyBkZXZlbG9wZXIgY29uZmlndXJhdGlvbgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRSZWN0LmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJlY3QuaAppbmRleCAwNDNlNTc0Li4xY2UyMzll IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJlY3Qu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJlY3QuaApAQCAt MTkzLDYgKzE5Myw5IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZHVtcChQcmludFN0cmVhbSYgb3V0 KSBjb25zdDsKIAorICAgIHN0YXRpYyBGbG9hdFJlY3QgaW5maW5pdGVSZWN0KCk7CisgICAgYm9v bCBpc0luZmluaXRlKCkgY29uc3Q7CisKIHByaXZhdGU6CiAgICAgRmxvYXRQb2ludCBtX2xvY2F0 aW9uOwogICAgIEZsb2F0U2l6ZSBtX3NpemU7CkBAIC0yNDYsNiArMjQ5LDE3IEBAIGlubGluZSBi b29sIG9wZXJhdG9yIT0oY29uc3QgRmxvYXRSZWN0JiBhLCBjb25zdCBGbG9hdFJlY3QmIGIpCiAg ICAgcmV0dXJuIGEubG9jYXRpb24oKSAhPSBiLmxvY2F0aW9uKCkgfHwgYS5zaXplKCkgIT0gYi5z aXplKCk7CiB9CiAKK2lubGluZSBGbG9hdFJlY3QgRmxvYXRSZWN0OjppbmZpbml0ZVJlY3QoKQor eworICAgIHN0YXRpYyBGbG9hdFJlY3QgaW5maW5pdGVSZWN0KC1zdGQ6Om51bWVyaWNfbGltaXRz PGZsb2F0Pjo6bWF4KCkgLyAyLCAtc3RkOjpudW1lcmljX2xpbWl0czxmbG9hdD46Om1heCgpIC8g Miwgc3RkOjpudW1lcmljX2xpbWl0czxmbG9hdD46Om1heCgpLCBzdGQ6Om51bWVyaWNfbGltaXRz PGZsb2F0Pjo6bWF4KCkpOworICAgIHJldHVybiBpbmZpbml0ZVJlY3Q7Cit9CisKK2lubGluZSBi b29sIEZsb2F0UmVjdDo6aXNJbmZpbml0ZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuICp0aGlzID09 IGluZmluaXRlUmVjdCgpOworfQorCiBJbnRSZWN0IGVuY2xvc2luZ0ludFJlY3QoY29uc3QgRmxv YXRSZWN0Jik7CiAKIC8vIFJldHVybnMgYSB2YWxpZCBJbnRSZWN0IGNvbnRhaW5lZCB3aXRoaW4g dGhlIGdpdmVuIEZsb2F0UmVjdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ludFJlY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0lu dFJlY3QuaAppbmRleCBiNzc4YzRjLi41NjlhOTA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9JbnRSZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvSW50UmVjdC5oCkBAIC0yMDMsNiArMjAzLDkgQEAgcHVibGljOgogCiAgICAg dm9pZCBkdW1wKFByaW50U3RyZWFtJiBvdXQpIGNvbnN0OwogCisgICAgc3RhdGljIEludFJlY3Qg aW5maW5pdGVSZWN0KCk7CisgICAgYm9vbCBpc0luZmluaXRlKCkgY29uc3Q7CisKIHByaXZhdGU6 CiAgICAgSW50UG9pbnQgbV9sb2NhdGlvbjsKICAgICBJbnRTaXplIG1fc2l6ZTsKQEAgLTIzNCw2 ICsyMzcsMTcgQEAgaW5saW5lIGJvb2wgb3BlcmF0b3IhPShjb25zdCBJbnRSZWN0JiBhLCBjb25z dCBJbnRSZWN0JiBiKQogICAgIHJldHVybiBhLmxvY2F0aW9uKCkgIT0gYi5sb2NhdGlvbigpIHx8 IGEuc2l6ZSgpICE9IGIuc2l6ZSgpOwogfQogCitpbmxpbmUgSW50UmVjdCBJbnRSZWN0OjppbmZp bml0ZVJlY3QoKQoreworICAgIHN0YXRpYyBJbnRSZWN0IGluZmluaXRlUmVjdCgtc3RkOjpudW1l cmljX2xpbWl0czxpbnQ+OjptYXgoKSAvIDIsIC1zdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1h eCgpIC8gMiwgc3RkOjpudW1lcmljX2xpbWl0czxpbnQ+OjptYXgoKSwgc3RkOjpudW1lcmljX2xp bWl0czxpbnQ+OjptYXgoKSk7CisgICAgcmV0dXJuIGluZmluaXRlUmVjdDsKK30KKworaW5saW5l IGJvb2wgSW50UmVjdDo6aXNJbmZpbml0ZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuICp0aGlzID09 IGluZmluaXRlUmVjdCgpOworfQorCiAjaWYgVVNFKENHKQogSW50UmVjdCBlbmNsb3NpbmdJbnRS ZWN0KGNvbnN0IENHUmVjdCYpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcAppbmRleCAzZWJkZWY1Li42 MjU5ZDMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9H cmFwaGljc0xheWVyQ0EuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAKQEAgLTcwNSwxMCArNzA1LDcgQEAgYm9vbCBHcmFwaGlj c0xheWVyQ0E6OnNldEZpbHRlcnMoY29uc3QgRmlsdGVyT3BlcmF0aW9ucyYgZmlsdGVyT3BlcmF0 aW9ucykKIAogdm9pZCBHcmFwaGljc0xheWVyQ0E6OnNldE5lZWRzRGlzcGxheSgpCiB7Ci0gICAg RmxvYXRSZWN0IGh1Z2VSZWN0KC1zdGQ6Om51bWVyaWNfbGltaXRzPGZsb2F0Pjo6bWF4KCkgLyAy LCAtc3RkOjpudW1lcmljX2xpbWl0czxmbG9hdD46Om1heCgpIC8gMiwKLSAgICAgICAgICAgICAg ICAgICAgICAgc3RkOjpudW1lcmljX2xpbWl0czxmbG9hdD46Om1heCgpLCBzdGQ6Om51bWVyaWNf bGltaXRzPGZsb2F0Pjo6bWF4KCkpOwotCi0gICAgc2V0TmVlZHNEaXNwbGF5SW5SZWN0KGh1Z2VS ZWN0KTsKKyAgICBzZXROZWVkc0Rpc3BsYXlJblJlY3QoRmxvYXRSZWN0OjppbmZpbml0ZVJlY3Qo KSk7CiB9CiAKIHZvaWQgR3JhcGhpY3NMYXllckNBOjpzZXROZWVkc0Rpc3BsYXlJblJlY3QoY29u c3QgRmxvYXRSZWN0JiByKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Bh aW50SW5mby5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1BhaW50SW5mby5oCmluZGV4IDBh ZWI4ODkuLjE0ZTkzYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9QYWlu dEluZm8uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUGFpbnRJbmZvLmgKQEAgLTk4 LDE1ICs5OCwxMyBAQCBzdHJ1Y3QgUGFpbnRJbmZvIHsKIAogICAgICAgICBjb250ZXh0LT5jb25j YXRDVE0obG9jYWxUb0FuY2VzdG9yVHJhbnNmb3JtKTsKIAotICAgICAgICBpZiAocmVjdCA9PSBp bmZpbml0ZVJlY3QoKSkKKyAgICAgICAgaWYgKHJlY3QuaXNJbmZpbml0ZSgpKQogICAgICAgICAg ICAgcmV0dXJuOwogCiAgICAgICAgIHJlY3QgPSBsb2NhbFRvQW5jZXN0b3JUcmFuc2Zvcm0uaW52 ZXJzZSgpLm1hcFJlY3QocmVjdCk7CiAgICAgfQogI2VuZGlmCiAKLSAgICBzdGF0aWMgSW50UmVj dCBpbmZpbml0ZVJlY3QoKSB7IHJldHVybiBJbnRSZWN0KExheW91dFJlY3Q6OmluZmluaXRlUmVj dCgpKTsgfQotCiAgICAgR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0OwogICAgIEludFJlY3QgcmVj dDsKICAgICBQYWludFBoYXNlIHBoYXNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsb3dUaHJlYWQuY3BwCmluZGV4IDBiYTE5OTMuLjVmNzhlOGEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHAKQEAgLTEwODksNyArMTA4OSw3 IEBAIExheW91dFJlY3QgUmVuZGVyRmxvd1RocmVhZDo6ZnJhZ21lbnRzQm91bmRpbmdCb3goY29u c3QgTGF5b3V0UmVjdCYgbGF5ZXJCb3VuZGluCiAgICAgZm9yIChhdXRvIGl0ZXIgPSBtX3JlZ2lv bkxpc3QuYmVnaW4oKSwgZW5kID0gbV9yZWdpb25MaXN0LmVuZCgpOyBpdGVyICE9IGVuZDsgKytp dGVyKSB7CiAgICAgICAgIFJlbmRlclJlZ2lvbiogcmVnaW9uID0gKml0ZXI7CiAgICAgICAgIExh eWVyRnJhZ21lbnRzIGZyYWdtZW50czsKLSAgICAgICAgcmVnaW9uLT5jb2xsZWN0TGF5ZXJGcmFn bWVudHMoZnJhZ21lbnRzLCBsYXllckJvdW5kaW5nQm94LCBQYWludEluZm86OmluZmluaXRlUmVj dCgpKTsKKyAgICAgICAgcmVnaW9uLT5jb2xsZWN0TGF5ZXJGcmFnbWVudHMoZnJhZ21lbnRzLCBs YXllckJvdW5kaW5nQm94LCBJbnRSZWN0OjppbmZpbml0ZVJlY3QoKSk7CiAgICAgICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgZnJhZ21lbnRzLnNpemUoKTsgKytpKSB7CiAgICAgICAgICAgICBj b25zdCBMYXllckZyYWdtZW50JiBmcmFnbWVudCA9IGZyYWdtZW50cy5hdChpKTsKICAgICAgICAg ICAgIExheW91dFJlY3QgZnJhZ21lbnRSZWN0KGxheWVyQm91bmRpbmdCb3gpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggYjg5OTE3ZC4uNTRjOTFiYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC00MjgwLDcgKzQyODAs NyBAQCB2b2lkIFJlbmRlckxheWVyOjpjb2xsZWN0RnJhZ21lbnRzKExheWVyRnJhZ21lbnRzJiBm cmFnbWVudHMsIGNvbnN0IFJlbmRlckxheWVyKgogICAgIENsaXBSZWN0IGJhY2tncm91bmRSZWN0 SW5GbG93VGhyZWFkOwogICAgIENsaXBSZWN0IGZvcmVncm91bmRSZWN0SW5GbG93VGhyZWFkOwog ICAgIENsaXBSZWN0IG91dGxpbmVSZWN0SW5GbG93VGhyZWFkOwotICAgIGNhbGN1bGF0ZVJlY3Rz KHBhZ2luYXRpb25DbGlwUmVjdHNDb250ZXh0LCBQYWludEluZm86OmluZmluaXRlUmVjdCgpLCBs YXllckJvdW5kc0luRmxvd1RocmVhZCwgYmFja2dyb3VuZFJlY3RJbkZsb3dUaHJlYWQsIGZvcmVn cm91bmRSZWN0SW5GbG93VGhyZWFkLAorICAgIGNhbGN1bGF0ZVJlY3RzKHBhZ2luYXRpb25DbGlw UmVjdHNDb250ZXh0LCBJbnRSZWN0OjppbmZpbml0ZVJlY3QoKSwgbGF5ZXJCb3VuZHNJbkZsb3dU aHJlYWQsIGJhY2tncm91bmRSZWN0SW5GbG93VGhyZWFkLCBmb3JlZ3JvdW5kUmVjdEluRmxvd1Ro cmVhZCwKICAgICAgICAgb3V0bGluZVJlY3RJbkZsb3dUaHJlYWQsICZvZmZzZXRXaXRoaW5QYWdp bmF0ZWRMYXllcik7CiAgICAgCiAgICAgLy8gVGFrZSBvdXIgYm91bmRpbmcgYm94IHdpdGhpbiB0 aGUgZmxvdyB0aHJlYWQgYW5kIGNsaXAgaXQuCkBAIC01MzQ2LDcgKzUzNDYsNyBAQCB2b2lkIFJl bmRlckxheWVyOjpjYWxjdWxhdGVDbGlwUmVjdHMoY29uc3QgQ2xpcFJlY3RzQ29udGV4dCYgY2xp cFJlY3RzQ29udGV4dCwgQwogewogICAgIGlmICghcGFyZW50KCkpIHsKICAgICAgICAgLy8gVGhl IHJvb3QgbGF5ZXIncyBjbGlwIHJlY3QgaXMgYWx3YXlzIGluZmluaXRlLgotICAgICAgICBjbGlw UmVjdHMucmVzZXQoUGFpbnRJbmZvOjppbmZpbml0ZVJlY3QoKSk7CisgICAgICAgIGNsaXBSZWN0 cy5yZXNldChJbnRSZWN0OjppbmZpbml0ZVJlY3QoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CiAgICAgCkBAIC01MzcyLDcgKzUzNzIsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpjYWxjdWxhdGVD bGlwUmVjdHMoY29uc3QgQ2xpcFJlY3RzQ29udGV4dCYgY2xpcFJlY3RzQ29udGV4dCwgQwogICAg ICAgICAgICAgcGFyZW50TGF5ZXItPmNhbGN1bGF0ZUNsaXBSZWN0cyhwYXJlbnRDb250ZXh0LCBj bGlwUmVjdHMpOwogICAgICAgICB9CiAgICAgfSBlbHNlCi0gICAgICAgIGNsaXBSZWN0cy5yZXNl dChQYWludEluZm86OmluZmluaXRlUmVjdCgpKTsKKyAgICAgICAgY2xpcFJlY3RzLnJlc2V0KElu dFJlY3Q6OmluZmluaXRlUmVjdCgpKTsKIAogICAgIC8vIEEgZml4ZWQgb2JqZWN0IGlzIGVzc2Vu dGlhbGx5IHRoZSByb290IG9mIGl0cyBjb250YWluaW5nIGJsb2NrIGhpZXJhcmNoeSwgc28gd2hl bgogICAgIC8vIHdlIGVuY291bnRlciBzdWNoIGFuIG9iamVjdCwgd2UgcmVzZXQgb3VyIGNsaXAg cmVjdHMgdG8gdGhlIGZpeGVkQ2xpcFJlY3QuCkBAIC01NDY1LDcgKzU0NjUsNyBAQCBDbGlwUmVj dCBSZW5kZXJMYXllcjo6YmFja2dyb3VuZENsaXBSZWN0KGNvbnN0IENsaXBSZWN0c0NvbnRleHQm IGNsaXBSZWN0c0NvbnRleAogICAgIFJlbmRlclZpZXcmIHZpZXcgPSByZW5kZXJlcigpLnZpZXco KTsKIAogICAgIC8vIE5vdGU6IGluZmluaXRlIGNsaXBSZWN0cyBzaG91bGQgbm90IGJlIHNjcm9s bGVkIGhlcmUsIG90aGVyd2lzZSB0aGV5IHdpbGwgYWNjaWRlbnRhbGx5IG5vIGxvbmdlciBiZSBj b25zaWRlcmVkIGluZmluaXRlLgotICAgIGlmIChwYXJlbnRSZWN0cy5maXhlZCgpICYmICZjbGlw UmVjdHNDb250ZXh0LnJvb3RMYXllci0+cmVuZGVyZXIoKSA9PSAmdmlldyAmJiBiYWNrZ3JvdW5k Q2xpcFJlY3QgIT0gUGFpbnRJbmZvOjppbmZpbml0ZVJlY3QoKSkKKyAgICBpZiAocGFyZW50UmVj dHMuZml4ZWQoKSAmJiAmY2xpcFJlY3RzQ29udGV4dC5yb290TGF5ZXItPnJlbmRlcmVyKCkgPT0g JnZpZXcgJiYgYmFja2dyb3VuZENsaXBSZWN0ICE9IEludFJlY3Q6OmluZmluaXRlUmVjdCgpKQog ICAgICAgICBiYWNrZ3JvdW5kQ2xpcFJlY3QubW92ZSh2aWV3LmZyYW1lVmlldygpLnNjcm9sbE9m ZnNldEZvckZpeGVkUG9zaXRpb24oKSk7CiAKICAgICByZXR1cm4gYmFja2dyb3VuZENsaXBSZWN0 OwpAQCAtNTU5NiwxMCArNTU5NiwxMCBAQCBMYXlvdXRSZWN0IFJlbmRlckxheWVyOjpsb2NhbENs aXBSZWN0KCkgY29uc3QKICAgICBMYXlvdXRSZWN0IGxheWVyQm91bmRzOwogICAgIENsaXBSZWN0 IGJhY2tncm91bmRSZWN0LCBmb3JlZ3JvdW5kUmVjdCwgb3V0bGluZVJlY3Q7CiAgICAgQ2xpcFJl Y3RzQ29udGV4dCBjbGlwUmVjdHNDb250ZXh0KGNsaXBwaW5nUm9vdExheWVyLCAwLCBQYWludGlu Z0NsaXBSZWN0cyk7Ci0gICAgY2FsY3VsYXRlUmVjdHMoY2xpcFJlY3RzQ29udGV4dCwgUGFpbnRJ bmZvOjppbmZpbml0ZVJlY3QoKSwgbGF5ZXJCb3VuZHMsIGJhY2tncm91bmRSZWN0LCBmb3JlZ3Jv dW5kUmVjdCwgb3V0bGluZVJlY3QpOworICAgIGNhbGN1bGF0ZVJlY3RzKGNsaXBSZWN0c0NvbnRl eHQsIEludFJlY3Q6OmluZmluaXRlUmVjdCgpLCBsYXllckJvdW5kcywgYmFja2dyb3VuZFJlY3Qs IGZvcmVncm91bmRSZWN0LCBvdXRsaW5lUmVjdCk7CiAKICAgICBMYXlvdXRSZWN0IGNsaXBSZWN0 ID0gYmFja2dyb3VuZFJlY3QucmVjdCgpOwotICAgIGlmIChjbGlwUmVjdCA9PSBQYWludEluZm86 OmluZmluaXRlUmVjdCgpKQorICAgIGlmIChjbGlwUmVjdCA9PSBJbnRSZWN0OjppbmZpbml0ZVJl Y3QoKSkKICAgICAgICAgcmV0dXJuIGNsaXBSZWN0OwogCiAgICAgTGF5b3V0UG9pbnQgY2xpcHBp bmdSb290T2Zmc2V0OwpAQCAtNTc5Miw3ICs1NzkyLDcgQEAgTGF5b3V0UmVjdCBSZW5kZXJMYXll cjo6Y2FsY3VsYXRlTGF5ZXJCb3VuZHMoY29uc3QgUmVuZGVyTGF5ZXIqIGFuY2VzdG9yTGF5ZXIs IGMKIAogICAgIGlmIChmbGFncyAmIFVzZUxvY2FsQ2xpcFJlY3RJZlBvc3NpYmxlKSB7CiAgICAg ICAgIExheW91dFJlY3QgbG9jYWxDbGlwUmVjdCA9IHRoaXMtPmxvY2FsQ2xpcFJlY3QoKTsKLSAg ICAgICAgaWYgKGxvY2FsQ2xpcFJlY3QgIT0gUGFpbnRJbmZvOjppbmZpbml0ZVJlY3QoKSkgewor ICAgICAgICBpZiAobG9jYWxDbGlwUmVjdCAhPSBJbnRSZWN0OjppbmZpbml0ZVJlY3QoKSkgewog ICAgICAgICAgICAgaWYgKChmbGFncyAmIEluY2x1ZGVTZWxmVHJhbnNmb3JtKSAmJiBwYWludHNX aXRoVHJhbnNmb3JtKFBhaW50QmVoYXZpb3JOb3JtYWwpKQogICAgICAgICAgICAgICAgIGxvY2Fs Q2xpcFJlY3QgPSB0cmFuc2Zvcm0oKS0+bWFwUmVjdChsb2NhbENsaXBSZWN0KTsKIApAQCAtNjk1 NSwxMiArNjk1NSwxMiBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludEZsb3dUaHJlYWRJZlJlZ2lv bihHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IExheWVyUAogICAgIH0KIAogICAgIC8v IE9wdGltaXplIGNsaXBwaW5nIGZvciB0aGUgc2luZ2xlIGZyYWdtZW50IGNhc2UuCi0gICAgaWYg KCFyZWdpb25DbGlwUmVjdC5pc0VtcHR5KCkgJiYgcmVnaW9uQ2xpcFJlY3QgIT0gUGFpbnRJbmZv OjppbmZpbml0ZVJlY3QoKSkKKyAgICBpZiAoIXJlZ2lvbkNsaXBSZWN0LmlzRW1wdHkoKSAmJiBy ZWdpb25DbGlwUmVjdCAhPSBJbnRSZWN0OjppbmZpbml0ZVJlY3QoKSkKICAgICAgICAgY2xpcFRv UmVjdChwYWludGluZ0luZm8ucm9vdExheWVyLCBjb250ZXh0LCBwYWludGluZ0luZm8ucGFpbnRE aXJ0eVJlY3QsIHJlZ2lvbkNsaXBSZWN0KTsKIAogICAgIGZsb3dUaHJlYWRMYXllci0+cGFpbnRO YW1lZEZsb3dUaHJlYWRJbnNpZGVSZWdpb24oY29udGV4dCwgcmVnaW9uLCBwYWludGluZ0luZm8u cGFpbnREaXJ0eVJlY3QsIHBhaW50T2Zmc2V0LCBwYWludGluZ0luZm8ucGFpbnRCZWhhdmlvciwg cGFpbnRGbGFncyk7CiAKLSAgICBpZiAoIXJlZ2lvbkNsaXBSZWN0LmlzRW1wdHkoKSAmJiByZWdp b25DbGlwUmVjdCAhPSBQYWludEluZm86OmluZmluaXRlUmVjdCgpKQorICAgIGlmICghcmVnaW9u Q2xpcFJlY3QuaXNFbXB0eSgpICYmIHJlZ2lvbkNsaXBSZWN0ICE9IEludFJlY3Q6OmluZmluaXRl UmVjdCgpKQogICAgICAgICByZXN0b3JlQ2xpcChjb250ZXh0LCBwYWludGluZ0luZm8ucGFpbnRE aXJ0eVJlY3QsIHJlZ2lvbkNsaXBSZWN0KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCBhNzFhNGJjLi45NDBlZTEzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAt NjQ2LDcgKzY0Niw3IEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xh eWVyQ29uZmlndXJhdGlvbigpCiAKIHN0YXRpYyBJbnRSZWN0IGNsaXBCb3goUmVuZGVyQm94JiBy ZW5kZXJlcikKIHsKLSAgICBMYXlvdXRSZWN0IHJlc3VsdCA9IFBhaW50SW5mbzo6aW5maW5pdGVS ZWN0KCk7CisgICAgTGF5b3V0UmVjdCByZXN1bHQgPSBJbnRSZWN0OjppbmZpbml0ZVJlY3QoKTsK ICAgICBpZiAocmVuZGVyZXIuaGFzT3ZlcmZsb3dDbGlwKCkpCiAgICAgICAgIHJlc3VsdCA9IHJl bmRlcmVyLm92ZXJmbG93Q2xpcFJlY3QoTGF5b3V0UG9pbnQoKSwgMCk7IC8vIEZJWE1FOiBJbmNv cnJlY3QgZm9yIENTUyByZWdpb25zLgogCkBAIC03NTMsNyArNzUzLDcgQEAgdm9pZCBSZW5kZXJM YXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgpCiAgICAgICAgIC8vIGZv ciBhIGNvbXBvc2l0aW5nIGxheWVyLCByb290TGF5ZXIgaXMgdGhlIGxheWVyIGl0c2VsZi4KICAg ICAgICAgUmVuZGVyTGF5ZXI6OkNsaXBSZWN0c0NvbnRleHQgY2xpcFJlY3RzQ29udGV4dChjb21w QW5jZXN0b3IsIDAsIFRlbXBvcmFyeUNsaXBSZWN0cywgSWdub3JlT3ZlcmxheVNjcm9sbGJhclNp emUsIElnbm9yZU92ZXJmbG93Q2xpcCk7CiAgICAgICAgIEludFJlY3QgcGFyZW50Q2xpcFJlY3Qg PSBwaXhlbFNuYXBwZWRJbnRSZWN0KG1fb3duaW5nTGF5ZXIuYmFja2dyb3VuZENsaXBSZWN0KGNs aXBSZWN0c0NvbnRleHQpLnJlY3QoKSk7IC8vIEZJWE1FOiBJbmNvcnJlY3QgZm9yIENTUyByZWdp b25zLgotICAgICAgICBBU1NFUlQocGFyZW50Q2xpcFJlY3QgIT0gUGFpbnRJbmZvOjppbmZpbml0 ZVJlY3QoKSk7CisgICAgICAgIEFTU0VSVChwYXJlbnRDbGlwUmVjdCAhPSBJbnRSZWN0OjppbmZp bml0ZVJlY3QoKSk7CiAgICAgICAgIG1fYW5jZXN0b3JDbGlwcGluZ0xheWVyLT5zZXRQb3NpdGlv bihGbG9hdFBvaW50KHBhcmVudENsaXBSZWN0LmxvY2F0aW9uKCkgLSBncmFwaGljc0xheWVyUGFy ZW50TG9jYXRpb24pKTsKICAgICAgICAgbV9hbmNlc3RvckNsaXBwaW5nTGF5ZXItPnNldFNpemUo cGFyZW50Q2xpcFJlY3Quc2l6ZSgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCA3YjEyNWRhLi5jMmY2YjZkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNw cApAQCAtMjE5NSw3ICsyMTk1LDcgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNsaXBw ZWRCeUFuY2VzdG9yKFJlbmRlckxheWVyJiBsYXllcikgY29uc3QKICAgICBpZiAoIWNvbXB1dGVD bGlwUm9vdCB8fCBjb21wdXRlQ2xpcFJvb3QgPT0gJmxheWVyKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICByZXR1cm4gbGF5ZXIuYmFja2dyb3VuZENsaXBSZWN0KFJlbmRlckxheWVyOjpD bGlwUmVjdHNDb250ZXh0KGNvbXB1dGVDbGlwUm9vdCwgMCwgVGVtcG9yYXJ5Q2xpcFJlY3RzKSku cmVjdCgpICE9IFBhaW50SW5mbzo6aW5maW5pdGVSZWN0KCk7IC8vIEZJWE1FOiBJbmNvcnJlY3Qg Zm9yIENTUyByZWdpb25zLgorICAgIHJldHVybiBsYXllci5iYWNrZ3JvdW5kQ2xpcFJlY3QoUmVu ZGVyTGF5ZXI6OkNsaXBSZWN0c0NvbnRleHQoY29tcHV0ZUNsaXBSb290LCAwLCBUZW1wb3JhcnlD bGlwUmVjdHMpKS5yZWN0KCkgIT0gSW50UmVjdDo6aW5maW5pdGVSZWN0KCk7IC8vIEZJWE1FOiBJ bmNvcnJlY3QgZm9yIENTUyByZWdpb25zLgogfQogCiAvLyBSZXR1cm4gdHJ1ZSBpZiB0aGUgZ2l2 ZW4gbGF5ZXIgaXMgYSBzdGFja2luZyBjb250ZXh0IGFuZCBoYXMgY29tcG9zaXRpbmcgY2hpbGQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVuZGVyaW5nQ29u dGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRlcmluZ0NvbnRl eHQuY3BwCmluZGV4IDM2ZDk1YzEuLjQ4MTU0NWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdmcvU1ZHUmVuZGVyaW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJpbmdDb250ZXh0LmNwcApAQCAtMjc1LDcgKzI3NSw3 IEBAIHZvaWQgU1ZHUmVuZGVyaW5nQ29udGV4dDo6cmVuZGVyU3VidHJlZVRvSW1hZ2VCdWZmZXIo SW1hZ2VCdWZmZXIqIGltYWdlLCBSZW5kZXJFCiAgICAgQVNTRVJUKGltYWdlKTsKICAgICBBU1NF UlQoaW1hZ2UtPmNvbnRleHQoKSk7CiAKLSAgICBQYWludEluZm8gaW5mbyhpbWFnZS0+Y29udGV4 dCgpLCBQYWludEluZm86OmluZmluaXRlUmVjdCgpLCBQYWludFBoYXNlRm9yZWdyb3VuZCwgUGFp bnRCZWhhdmlvck5vcm1hbCk7CisgICAgUGFpbnRJbmZvIGluZm8oaW1hZ2UtPmNvbnRleHQoKSwg SW50UmVjdDo6aW5maW5pdGVSZWN0KCksIFBhaW50UGhhc2VGb3JlZ3JvdW5kLCBQYWludEJlaGF2 aW9yTm9ybWFsKTsKIAogICAgIEFmZmluZVRyYW5zZm9ybSYgY29udGVudFRyYW5zZm9ybWF0aW9u ID0gY3VycmVudENvbnRlbnRUcmFuc2Zvcm1hdGlvbigpOwogICAgIEFmZmluZVRyYW5zZm9ybSBz YXZlZENvbnRlbnRUcmFuc2Zvcm1hdGlvbiA9IGNvbnRlbnRUcmFuc2Zvcm1hdGlvbjsK