64009 2011-07-06 11:28:35 -0700 [chromium] Add compositor texture manager soft limits and lost focus reclaiming 2011-07-06 15:33:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enne enne enne jamesr nduca vangelis oldest_to_newest 432891 0 enne 2011-07-06 11:28:35 -0700 [chromium] Add compositor texture manager soft limits and lost focus reclaiming 432894 1 99855 enne 2011-07-06 11:33:24 -0700 Created attachment 99855 Patch 432976 2 99855 jamesr 2011-07-06 13:27:07 -0700 Comment on attachment 99855 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=99855&action=review Looks good. > Source/WebCore/platform/graphics/chromium/TextureManager.h:66 > + bool reduceMemoryToLimit(size_t); the return value is never used, can you change it to be void? 432986 3 enne 2011-07-06 13:34:34 -0700 (In reply to comment #2) > (From update of attachment 99855 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=99855&action=review > > > Source/WebCore/platform/graphics/chromium/TextureManager.h:66 > > + bool reduceMemoryToLimit(size_t); > > the return value is never used, can you change it to be void? Good catch. Can do. 433074 4 enne 2011-07-06 15:33:36 -0700 Committed r90505: <http://trac.webkit.org/changeset/90505> 99855 2011-07-06 11:33:24 -0700 2011-07-06 13:27:07 -0700 Patch bug-64009-20110706113323.patch text/plain 12868 enne U3VidmVyc2lvbiBSZXZpc2lvbjogOTA0NjcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0OTgxMTk5ZjU5NmIxM2Yy Y2ExNzIwMzVjOTdjYWU2ZjY3OTI0YjkzLi4yZTA5NWNmYjQ4ZWM5ZWIzYmYxMDRhM2MyMGY2YzAy MDExZmQ1N2Q1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDctMDYgIEFkcmll bm5lIFdhbGtlciAgPGVubmVAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIEFkZCBj b21wb3NpdG9yIHRleHR1cmUgbWFuYWdlciBzb2Z0IGxpbWl0cyBhbmQgbG9zdCBmb2N1cyByZWNs YWltaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02 NDAwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZCBhIHNvZnQgbGltaXQgZm9yIHRleHR1cmUgbWVtb3J5LiBVbnByb3RlY3RlZCB0ZXh0dXJlcyB3 aWxsIGdldAorICAgICAgICByZWNsYWltZWQgd2hlbiBhYm92ZSB0aGlzIGxpbWl0LiBJbmNyZWFz ZSB0aGUgaGFyZCBsaW1pdCBmb3IgbWF4aW11bQorICAgICAgICB0ZXh0dXJlIG1lbW9yeSBhcyB3 ZWxsLCBub3cgdGhhdCB0aGVyZSBpcyBhIGJldHRlciBoZXVyaXN0aWMgYW5kCisgICAgICAgIHRl eHR1cmVzIGFyZSByZWNsYWltZWQgZnJvbSB0YWJzIHdpdGhvdXQgZm9jdXMuCisKKyAgICAgICAg TGFuZGluZyB0aGlzIGZvciB2YW5nZWxpc0BjaHJvbWl1bS5vcmcuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjpyZWxlYXNlVGV4dHVyZXMpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjppbml0aWFsaXplU2hhcmVkT2Jq ZWN0cyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJl ckNocm9taXVtLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJU aWxlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyVGlsZXJDaHJvbWl1bTo6 cHJvdGVjdFRpbGVUZXh0dXJlcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vTGF5ZXJUaWxlckNocm9taXVtLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vVGV4dHVyZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hbmFn ZXI6OlRleHR1cmVNYW5hZ2VyKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYW5hZ2VyOjpy ZXF1ZXN0VGV4dHVyZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGV4 dHVyZU1hbmFnZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYW5hZ2VyOjpjcmVhdGUp OgorCiAyMDExLTA3LTA2ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBpbXBsZW1lbnQgZHJhZyduJ2Ryb3AgaW4gdGhlIGVsZW1l bnRzIHBhbmVsIGZvciByZW9yZGVyaW5nIG5vZGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJD aHJvbWl1bS5jcHAKaW5kZXggZTkyYWM0MzNmYzUwZTJkYjdhZDc3ZWUyMTViYTMzZjIwNzUxZjll Mi4uYjhmNmUxNTE3NDRkYTQ2ZjU4ZjA5NzA1ODgyMWI4NDJlZWI5OWQ2MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNo cm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCkBAIC02NSw3ICs2NSwxMyBAQAogbmFtZXNwYWNl IFdlYkNvcmUgewogCiAvLyBGSVhNRTogTWFrZSB0aGlzIGxpbWl0IGFkanVzdGFibGUgYW5kIGdp dmUgaXQgYSB1c2VmdWwgdmFsdWUuCi1zdGF0aWMgc2l6ZV90IHRleHR1cmVNZW1vcnlMaW1pdEJ5 dGVzID0gNjQgKiAxMDI0ICogMTAyNDsKKworLy8gQWJzb2x1dGUgbWF4aW11bSBsaW1pdCBmb3Ig dGV4dHVyZSBhbGxvY2F0aW9ucyBmb3IgdGhpcyBpbnN0YW5jZS4KK3N0YXRpYyBzaXplX3QgdGV4 dHVyZU1lbW9yeUhpZ2hMaW1pdEJ5dGVzID0gMTI4ICogMTAyNCAqIDEwMjQ7CisvLyBQcmVmZXJy ZWQgdGV4dHVyZSBzaXplIGxpbWl0LiBDYW4gYmUgZXhjZWVkZWQgaWYgbmVlZGVkLgorc3RhdGlj IHNpemVfdCB0ZXh0dXJlTWVtb3J5UmVjbGFpbUxpbWl0Qnl0ZXMgPSA2NCAqIDEwMjQgKiAxMDI0 OworLy8gVGhlIG1heGltdW0gdGV4dHVyZSBtZW1vcnkgdXNhZ2Ugd2hlbiBhc2tlZCB0byByZWxl YXNlIHRleHR1cmVzLgorc3RhdGljIHNpemVfdCB0ZXh0dXJlTWVtb3J5TG93TGltaXRCeXRlcyA9 IDMgKiAxMDI0ICogMTAyNDsKIAogI2lmbmRlZiBOREVCVUcKIGJvb2wgTGF5ZXJSZW5kZXJlckNo cm9taXVtOjpzX2luUGFpbnRMYXllckNvbnRlbnRzID0gZmFsc2U7CkBAIC0yMDEsNiArMjA3LDE1 IEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjppbnZhbGlkYXRlUm9vdExheWVyUmVjdChj b25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpCiAgICAgbV9yb290TGF5ZXJDb250ZW50VGlsZXItPmlu dmFsaWRhdGVSZWN0KGRpcnR5UmVjdCk7CiB9CiAKK3ZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVt OjpyZWxlYXNlVGV4dHVyZXMoKQoreworICAgIC8vIFJlZHVjZXMgdGV4dHVyZSBtZW1vcnkgdXNh Z2UgdG8gdGV4dHVyZU1lbW9yeUxvd0xpbWl0Qnl0ZXMgYnkgZGVsZXRpbmcgbm9uIHJvb3QgbGF5 ZXIKKyAgICAvLyB0ZXh0dXJlcy4KKyAgICBtX3Jvb3RMYXllckNvbnRlbnRUaWxlci0+cHJvdGVj dFRpbGVUZXh0dXJlcyhtX3ZpZXdwb3J0VmlzaWJsZVJlY3QpOworICAgIG1fdGV4dHVyZU1hbmFn ZXItPnJlZHVjZU1lbW9yeVRvTGltaXQodGV4dHVyZU1lbW9yeUxvd0xpbWl0Qnl0ZXMpOworICAg IG1fdGV4dHVyZU1hbmFnZXItPnVucHJvdGVjdEFsbFRleHR1cmVzKCk7Cit9CisKIHZvaWQgTGF5 ZXJSZW5kZXJlckNocm9taXVtOjp1cGRhdGVSb290TGF5ZXJDb250ZW50cygpCiB7CiAgICAgVFJB Q0VfRVZFTlQoIkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBkYXRlUm9vdExheWVyQ29udGVudHMi LCB0aGlzLCAwKTsKQEAgLTEwNjcsNyArMTA4MiwxMCBAQCBib29sIExheWVyUmVuZGVyZXJDaHJv bWl1bTo6aW5pdGlhbGl6ZVNoYXJlZE9iamVjdHMoKQogCiAgICAgR0xDKG1fY29udGV4dC5nZXQo KSwgbV9jb250ZXh0LT5mbHVzaCgpKTsKIAotICAgIG1fdGV4dHVyZU1hbmFnZXIgPSBUZXh0dXJl TWFuYWdlcjo6Y3JlYXRlKG1fY29udGV4dC5nZXQoKSwgdGV4dHVyZU1lbW9yeUxpbWl0Qnl0ZXMs IG1fbWF4VGV4dHVyZVNpemUpOworICAgIFRleHR1cmVNYW5hZ2VyOjpUZXh0dXJlTWVtb3J5TGlt aXRzIGxpbWl0czsKKyAgICBsaW1pdHMudXBwZXJMaW1pdCA9IHRleHR1cmVNZW1vcnlIaWdoTGlt aXRCeXRlczsKKyAgICBsaW1pdHMucmVjbGFpbUxpbWl0ID0gdGV4dHVyZU1lbW9yeVJlY2xhaW1M aW1pdEJ5dGVzOworICAgIG1fdGV4dHVyZU1hbmFnZXIgPSBUZXh0dXJlTWFuYWdlcjo6Y3JlYXRl KG1fY29udGV4dC5nZXQoKSwgbGltaXRzLCBtX21heFRleHR1cmVTaXplKTsKICAgICByZXR1cm4g dHJ1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uaAppbmRleCBjOTQ4NWM4 NzU4MDNhYzU5ZmM4ZTkwNmUwYjg3ZGIzNTBjOTI1NTg1Li5hMGM4NWNiOGRmMzJiYWY4Mjc1NDA0 MzRlYzQzNWNlZmFiN2NmMTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uaApA QCAtMTU2LDYgKzE1Niw4IEBAIHB1YmxpYzoKICAgICAvLyBSZXR1cm4gdHJ1ZSBpZiB0aGUgY29t cG9zaXRvciBjb250ZXh0IGhhcyBhbiBlcnJvci4KICAgICBib29sIGlzQ29tcG9zaXRvckNvbnRl eHRMb3N0KCk7CiAKKyAgICB2b2lkIHJlbGVhc2VUZXh0dXJlcygpOworCiAjaWZuZGVmIE5ERUJV RwogICAgIHN0YXRpYyBib29sIHNfaW5QYWludExheWVyQ29udGVudHM7CiAjZW5kaWYKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyVGls ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9MYXllclRpbGVyQ2hyb21pdW0uY3BwCmluZGV4IDc0ODg1Njk1ZTc5MGM4MmVmY2M3YWQ0ZmFi N2UyYmI2N2M1ZjM5ZTkuLmE3N2EyZjc3MmIzMWIwNTgxOGUzYWIzZDE4NWVmYTViNGU0OGQxYjgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xh eWVyVGlsZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF5ZXJUaWxlckNocm9taXVtLmNwcApAQCAtMjI2LDYgKzIyNiwyNSBAQCB2 b2lkIExheWVyVGlsZXJDaHJvbWl1bTo6aW52YWxpZGF0ZUVudGlyZUxheWVyKCkKICAgICBtX3Rp bGluZ0RhdGEuc2V0VG90YWxTaXplKDAsIDApOwogfQogCit2b2lkIExheWVyVGlsZXJDaHJvbWl1 bTo6cHJvdGVjdFRpbGVUZXh0dXJlcyhjb25zdCBJbnRSZWN0JiBjb250ZW50UmVjdCkKK3sKKyAg ICBpZiAoY29udGVudFJlY3QuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisKKyAgICBpbnQg bGVmdCwgdG9wLCByaWdodCwgYm90dG9tOworICAgIGNvbnRlbnRSZWN0VG9UaWxlSW5kaWNlcyhj b250ZW50UmVjdCwgbGVmdCwgdG9wLCByaWdodCwgYm90dG9tKTsKKworICAgIGZvciAoaW50IGog PSB0b3A7IGogPD0gYm90dG9tOyArK2opIHsKKyAgICAgICAgZm9yIChpbnQgaSA9IGxlZnQ7IGkg PD0gcmlnaHQ7ICsraSkgeworICAgICAgICAgICAgVGlsZSogdGlsZSA9IHRpbGVBdChpLCBqKTsK KyAgICAgICAgICAgIGlmICghdGlsZSB8fCAhdGlsZS0+dGV4dHVyZSgpLT5pc1ZhbGlkKG1fdGls ZVNpemUsIEdyYXBoaWNzQ29udGV4dDNEOjpSR0JBKSkKKyAgICAgICAgICAgICAgICBjb250aW51 ZTsKKworICAgICAgICAgICAgdGlsZS0+dGV4dHVyZSgpLT5yZXNlcnZlKG1fdGlsZVNpemUsIEdy YXBoaWNzQ29udGV4dDNEOjpSR0JBKTsKKyAgICAgICAgfQorICAgIH0KK30KKwogdm9pZCBMYXll clRpbGVyQ2hyb21pdW06OnByZXBhcmVUb1VwZGF0ZShjb25zdCBJbnRSZWN0JiBjb250ZW50UmVj dCwgTGF5ZXJUZXh0dXJlVXBkYXRlciogdGV4dHVyZVVwZGF0ZXIpCiB7CiAgICAgbV9za2lwc0Ry YXcgPSBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0xheWVyVGlsZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUaWxlckNocm9taXVtLmgKaW5kZXggNGEyNmM5Zjc4MzZj NjIwMGExNzFkYzA3OWI2YjZjM2E5MjljZDU0Mi4uYzk3YWQ2YjFjY2NiZjUyZTU4ZjRmY2NkOTE0 OWY5NWRhNjQzNDJjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF5ZXJUaWxlckNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUaWxlckNocm9taXVtLmgKQEAgLTcwLDYgKzcw LDEwIEBAIHB1YmxpYzoKIAogICAgIGJvb2wgc2tpcHNEcmF3KCkgY29uc3QgeyByZXR1cm4gbV9z a2lwc0RyYXc7IH0KIAorICAgIC8vIFJlc2VydmVzIGFsbCBleGlzdGluZyBhbmQgdmFsaWQgdGls ZSB0ZXh0dXJlcyB0byBwcm90ZWN0IHRoZW0gZnJvbSBiZWluZworICAgIC8vIHJlY3ljbGVkIGJ5 IHRoZSB0ZXh0dXJlIG1hbmFnZXIuCisgICAgdm9pZCBwcm90ZWN0VGlsZVRleHR1cmVzKGNvbnN0 IEludFJlY3QmIGNvbnRlbnRSZWN0KTsKKwogICAgIHR5cGVkZWYgUHJvZ3JhbUJpbmRpbmc8VmVy dGV4U2hhZGVyUG9zVGV4VHJhbnNmb3JtLCBGcmFnbWVudFNoYWRlclJHQkFUZXhBbHBoYT4gUHJv Z3JhbTsKICAgICAvLyBTaGFkZXIgcHJvZ3JhbSB0aGF0IHN3YXBzIHJlZCBhbmQgYmx1ZSBjb21w b25lbnRzIG9mIHRleHR1cmUuCiAgICAgLy8gVXNlZCB3aGVuIHRleHR1cmUgZm9ybWF0IGRvZXMg bm90IG1hdGNoIG5hdGl2ZSBjb2xvciBmb3JtYXQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UZXh0dXJlTWFuYWdlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UZXh0dXJlTWFuYWdlci5jcHAKaW5k ZXggZDYzZDNiOTlhOGY0ZTQxMDMzYWMwMWRkOTE2MmM0ZDRjMzY2ZWM4MS4uYjk1OTZiODJjMWIy ODEwNjMwNjk4NGFkY2I0ZmY1ZGVlNzBjMGYyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGV4dHVyZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RleHR1cmVNYW5hZ2VyLmNwcApA QCAtMzgsOSArMzgsOSBAQCBzdGF0aWMgc2l6ZV90IG1lbW9yeVVzZUJ5dGVzKEludFNpemUgc2l6 ZSwgdW5zaWduZWQgdGV4dHVyZUZvcm1hdCkKICAgICByZXR1cm4gc2l6ZS53aWR0aCgpICogc2l6 ZS5oZWlnaHQoKSAqIDQ7CiB9CiAKLVRleHR1cmVNYW5hZ2VyOjpUZXh0dXJlTWFuYWdlcihHcmFw aGljc0NvbnRleHQzRCogY29udGV4dCwgc2l6ZV90IG1lbW9yeUxpbWl0Qnl0ZXMsIGludCBtYXhU ZXh0dXJlU2l6ZSkKK1RleHR1cmVNYW5hZ2VyOjpUZXh0dXJlTWFuYWdlcihHcmFwaGljc0NvbnRl eHQzRCogY29udGV4dCwgY29uc3QgVGV4dHVyZU1lbW9yeUxpbWl0cyYgbWVtb3J5TGltaXRzLCBp bnQgbWF4VGV4dHVyZVNpemUpCiAgICAgOiBtX2NvbnRleHQoY29udGV4dCkKLSAgICAsIG1fbWVt b3J5TGltaXRCeXRlcyhtZW1vcnlMaW1pdEJ5dGVzKQorICAgICwgbV9tZW1vcnlMaW1pdHMobWVt b3J5TGltaXRzKQogICAgICwgbV9tZW1vcnlVc2VCeXRlcygwKQogICAgICwgbV9tYXhUZXh0dXJl U2l6ZShtYXhUZXh0dXJlU2l6ZSkKICAgICAsIG1fbmV4dFRva2VuKDEpCkBAIC0xMzcsNyArMTM3 LDcgQEAgdm9pZCBUZXh0dXJlTWFuYWdlcjo6cmVtb3ZlVGV4dHVyZShUZXh0dXJlVG9rZW4gdG9r ZW4sIFRleHR1cmVJbmZvIGluZm8pCiAgICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0 LT5kZWxldGVUZXh0dXJlKGluZm8udGV4dHVyZUlkKSk7CiB9CiAKLXVuc2lnbmVkIFRleHR1cmVN YW5hZ2VyOjpyZXF1ZXN0VGV4dHVyZShUZXh0dXJlVG9rZW4gdG9rZW4sIEludFNpemUgc2l6ZSwg dW5zaWduZWQgZm9ybWF0LCBib29sKiBuZXdUZXh0dXJlKQordW5zaWduZWQgVGV4dHVyZU1hbmFn ZXI6OnJlcXVlc3RUZXh0dXJlKFRleHR1cmVUb2tlbiB0b2tlbiwgSW50U2l6ZSBzaXplLCB1bnNp Z25lZCBmb3JtYXQpCiB7CiAgICAgaWYgKHNpemUud2lkdGgoKSA+IG1fbWF4VGV4dHVyZVNpemUg fHwgc2l6ZS5oZWlnaHQoKSA+IG1fbWF4VGV4dHVyZVNpemUpCiAgICAgICAgIHJldHVybiAwOwpA QCAtMTQ5LDcgKzE0OSwxMCBAQCB1bnNpZ25lZCBUZXh0dXJlTWFuYWdlcjo6cmVxdWVzdFRleHR1 cmUoVGV4dHVyZVRva2VuIHRva2VuLCBJbnRTaXplIHNpemUsIHVuc2lnbgogICAgIH0KIAogICAg IHNpemVfdCBtZW1vcnlSZXF1aXJlZEJ5dGVzID0gbWVtb3J5VXNlQnl0ZXMoc2l6ZSwgZm9ybWF0 KTsKLSAgICBpZiAobWVtb3J5UmVxdWlyZWRCeXRlcyA+IG1fbWVtb3J5TGltaXRCeXRlcyB8fCAh cmVkdWNlTWVtb3J5VG9MaW1pdChtX21lbW9yeUxpbWl0Qnl0ZXMgLSBtZW1vcnlSZXF1aXJlZEJ5 dGVzKSkKKworICAgIC8vIFJlY2xhaW0gZXhpc3RpbmcgdW5yZXNlcnZlZCB0ZXh0dXJlcyB0byB0 cnkgdG8gc3RheSBiZWxvdyB0aGUgcmVjbGFpbSBsaW1pdC4KKyAgICByZWR1Y2VNZW1vcnlUb0xp bWl0KHN0ZDo6bWF4KG1fbWVtb3J5TGltaXRzLnJlY2xhaW1MaW1pdCAtIG1lbW9yeVJlcXVpcmVk Qnl0ZXMsIHN0YXRpY19jYXN0PHNpemVfdD4oMCkpKTsKKyAgICBpZiAobV9tZW1vcnlVc2VCeXRl cyArIG1lbW9yeVJlcXVpcmVkQnl0ZXMgPiBtX21lbW9yeUxpbWl0cy51cHBlckxpbWl0KQogICAg ICAgICByZXR1cm4gMDsKIAogICAgIHVuc2lnbmVkIHRleHR1cmVJZDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RleHR1cmVNYW5hZ2VyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UZXh0dXJlTWFuYWdl ci5oCmluZGV4IGRlYjRkM2RlZjBiYzNhYmIyZmFkODUwYmM1MmZhN2M4MGI5NzBjNmUuLmE1OTUz NDJkMTMxZGQxMTlkMTA1NTU2MmZiNjJmNDljN2NmMDRhZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RleHR1cmVNYW5hZ2VyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGV4dHVyZU1hbmFnZXIu aApAQCAtNDAsMjQgKzQwLDMzIEBAIHR5cGVkZWYgaW50IFRleHR1cmVUb2tlbjsKIGNsYXNzIFRl eHR1cmVNYW5hZ2VyIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShUZXh0dXJlTWFuYWdlcik7 CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8VGV4dHVyZU1hbmFnZXI+IGNyZWF0ZShH cmFwaGljc0NvbnRleHQzRCogY29udGV4dCwgc2l6ZV90IG1lbW9yeUxpbWl0Qnl0ZXMsIGludCBt YXhUZXh0dXJlU2l6ZSkKKyAgICBzdHJ1Y3QgVGV4dHVyZU1lbW9yeUxpbWl0cyB7CisgICAgICAg IC8vIE1heGltdW0gdGV4dHVyZSBhbGxvY2F0aW9uIHNpemUuCisgICAgICAgIHNpemVfdCB1cHBl ckxpbWl0OworICAgICAgICAvLyBMaW1pdCBvdmVyIHdoaWNoIGV4aXN0aW5nIHVucmVzZXJ2ZWQg dGV4dHVyZXMgd2lsbCBiZSByZWNsYWltZWQuCisgICAgICAgIHNpemVfdCByZWNsYWltTGltaXQ7 CisgICAgfTsKKworICAgIHN0YXRpYyBQYXNzT3duUHRyPFRleHR1cmVNYW5hZ2VyPiBjcmVhdGUo R3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQsIGNvbnN0IFRleHR1cmVNZW1vcnlMaW1pdHMmIG1l bW9yeUxpbWl0cywgaW50IG1heFRleHR1cmVTaXplKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFk b3B0UHRyKG5ldyBUZXh0dXJlTWFuYWdlcihjb250ZXh0LCBtZW1vcnlMaW1pdEJ5dGVzLCBtYXhU ZXh0dXJlU2l6ZSkpOworICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IFRleHR1cmVNYW5hZ2Vy KGNvbnRleHQsIG1lbW9yeUxpbWl0cywgbWF4VGV4dHVyZVNpemUpKTsKICAgICB9CiAKICAgICBU ZXh0dXJlVG9rZW4gZ2V0VG9rZW4oKTsKICAgICB2b2lkIHJlbGVhc2VUb2tlbihUZXh0dXJlVG9r ZW4pOwogICAgIGJvb2wgaGFzVGV4dHVyZShUZXh0dXJlVG9rZW4pOwogCi0gICAgdW5zaWduZWQg cmVxdWVzdFRleHR1cmUoVGV4dHVyZVRva2VuLCBJbnRTaXplLCB1bnNpZ25lZCB0ZXh0dXJlRm9y bWF0LCBib29sKiBuZXdUZXh0dXJlID0gMCk7CisgICAgdW5zaWduZWQgcmVxdWVzdFRleHR1cmUo VGV4dHVyZVRva2VuLCBJbnRTaXplLCB1bnNpZ25lZCB0ZXh0dXJlRm9ybWF0KTsKIAogICAgIHZv aWQgcHJvdGVjdFRleHR1cmUoVGV4dHVyZVRva2VuKTsKICAgICB2b2lkIHVucHJvdGVjdFRleHR1 cmUoVGV4dHVyZVRva2VuKTsKICAgICB2b2lkIHVucHJvdGVjdEFsbFRleHR1cmVzKCk7CiAgICAg Ym9vbCBpc1Byb3RlY3RlZChUZXh0dXJlVG9rZW4pOwogCisgICAgYm9vbCByZWR1Y2VNZW1vcnlU b0xpbWl0KHNpemVfdCk7CisKIHByaXZhdGU6Ci0gICAgVGV4dHVyZU1hbmFnZXIoR3JhcGhpY3ND b250ZXh0M0QqLCBzaXplX3QgbWVtb3J5TGltaXRCeXRlcywgaW50IG1heFRleHR1cmVTaXplKTsK KyAgICBUZXh0dXJlTWFuYWdlcihHcmFwaGljc0NvbnRleHQzRCosIGNvbnN0IFRleHR1cmVNZW1v cnlMaW1pdHMmLCBpbnQgbWF4VGV4dHVyZVNpemUpOwogCiAgICAgc3RydWN0IFRleHR1cmVJbmZv IHsKICAgICAgICAgSW50U2l6ZSBzaXplOwpAQCAtNjYsNyArNzUsNiBAQCBwcml2YXRlOgogICAg ICAgICBib29sIGlzUHJvdGVjdGVkOwogICAgIH07CiAKLSAgICBib29sIHJlZHVjZU1lbW9yeVRv TGltaXQoc2l6ZV90KTsKICAgICB2b2lkIGFkZFRleHR1cmUoVGV4dHVyZVRva2VuLCBUZXh0dXJl SW5mbyk7CiAgICAgdm9pZCByZW1vdmVUZXh0dXJlKFRleHR1cmVUb2tlbiwgVGV4dHVyZUluZm8p OwogCkBAIC03Niw3ICs4NCw3IEBAIHByaXZhdGU6CiAgICAgVGV4dHVyZU1hcCBtX3RleHR1cmVz OwogICAgIExpc3RIYXNoU2V0PFRleHR1cmVUb2tlbj4gbV90ZXh0dXJlTFJVU2V0OwogCi0gICAg c2l6ZV90IG1fbWVtb3J5TGltaXRCeXRlczsKKyAgICBUZXh0dXJlTWVtb3J5TGltaXRzIG1fbWVt b3J5TGltaXRzOwogICAgIHNpemVfdCBtX21lbW9yeVVzZUJ5dGVzOwogICAgIGludCBtX21heFRl eHR1cmVTaXplOwogICAgIFRleHR1cmVUb2tlbiBtX25leHRUb2tlbjsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKaW5kZXggZGI5ZWM2ZmQ2YWVjYjRiYTRlMjY2NDE0MDAwMWNmNjc4NmQ5Y2U3OS4u ODgxNGQxOWVlZWIxNGY5MTMzN2Y3NGI5ODg3YzM1YzJlYjkwOWEzZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0wNy0wNiAgQWRyaWVubmUgV2Fsa2Vy ICA8ZW5uZUBnb29nbGUuY29tPgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRkIGNvbXBvc2l0b3Ig dGV4dHVyZSBtYW5hZ2VyIHNvZnQgbGltaXRzIGFuZCBsb3N0IGZvY3VzIHJlY2xhaW1pbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MDA5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVjbGFpbSB0ZXh0 dXJlcyB3aGVuIHRoZSB0YWIgbG9zZXMgZm9jdXMuCisKKyAgICAgICAgKiBzcmMvV2ViVmlld0lt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2V0VmlzaWJpbGl0eVN0YXRl KToKKwogMjAxMS0wNy0wNSAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4K IAogICAgICAgICBbQ2hyb21pdW1dIFdlYiBJbnNwZWN0b3I6IGV4dGVuZCBXZWJTaGFyZWRXb3Jr ZXIgd2l0aCBpbnNwZWN0b3IgdHJhbnNwb3J0IG1ldGhvZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCA5ZWNkZTI5MWJhM2U1OGEyZjQ3YjMzMjljYTlk ZGQyNWY2ZGE4MjliLi4yNDk3MzM0YjQ5YTUwMjRiZTY2ZWIwY2IyN2JkYjY5YWM4MWFkNDUyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0yNjUxLDE1 ICsyNjUxLDIwIEBAIFdlYkdyYXBoaWNzQ29udGV4dDNEKiBXZWJWaWV3SW1wbDo6Z3JhcGhpY3ND b250ZXh0M0QoKQogCiB2b2lkIFdlYlZpZXdJbXBsOjpzZXRWaXNpYmlsaXR5U3RhdGUoV2ViUGFn ZVZpc2liaWxpdHlTdGF0ZSB2aXNpYmlsaXR5U3RhdGUsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYm9vbCBpc0luaXRpYWxTdGF0ZSkgewotI2lmIEVOQUJMRShQQUdFX1ZJ U0lCSUxJVFlfQVBJKQogICAgIGlmICghcGFnZSgpKQogICAgICAgICByZXR1cm47CiAKKyNpZiBF TkFCTEUoUEFHRV9WSVNJQklMSVRZX0FQSSkKICAgICBBU1NFUlQodmlzaWJpbGl0eVN0YXRlID09 IFdlYlBhZ2VWaXNpYmlsaXR5U3RhdGVWaXNpYmxlCiAgICAgICAgICAgIHx8IHZpc2liaWxpdHlT dGF0ZSA9PSBXZWJQYWdlVmlzaWJpbGl0eVN0YXRlSGlkZGVuCiAgICAgICAgICAgIHx8IHZpc2li aWxpdHlTdGF0ZSA9PSBXZWJQYWdlVmlzaWJpbGl0eVN0YXRlUHJlcmVuZGVyKTsKICAgICBtX3Bh Z2UtPnNldFZpc2liaWxpdHlTdGF0ZShzdGF0aWNfY2FzdDxQYWdlVmlzaWJpbGl0eVN0YXRlPihz dGF0aWNfY2FzdDxpbnQ+KHZpc2liaWxpdHlTdGF0ZSkpLCBpc0luaXRpYWxTdGF0ZSk7CiAjZW5k aWYKKworI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAgICBpZiAoaXNBY2NlbGVy YXRlZENvbXBvc2l0aW5nQWN0aXZlKCkgJiYgdmlzaWJpbGl0eVN0YXRlID09IFdlYlBhZ2VWaXNp YmlsaXR5U3RhdGVIaWRkZW4pCisgICAgICAgIG1fbGF5ZXJSZW5kZXJlci0+cmVsZWFzZVRleHR1 cmVzKCk7CisjZW5kaWYKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==