119411 2013-08-01 14:59:31 -0700 Remove pageOverlayShouldApplyFadeWhenPainting() and adopt composited fade for the Mac port 2013-08-03 17:31:38 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca cmarcelo commit-queue luiz noam sam simon.fraser zeno oldest_to_newest 913887 0 thorton 2013-08-01 14:59:31 -0700 Mac is the only holdout that performs non-composited fades of page overlays. We should adopt that mechanism (as a precursor to doing a CA-accelerated fade) and remove the now-unnecessary property. 913896 1 207960 thorton 2013-08-01 15:09:38 -0700 Created attachment 207960 patch 914022 2 207985 thorton 2013-08-01 23:26:47 -0700 Created attachment 207985 patch We also need to make WKBundlePageOverlayFractionFadedIn return 1 always, to prevent clients from attempting to bake the fade opacity in. And, make the find-in-page overlay not bake the opacity in as well. In doing this I also removed PageOverlay::fractionFadedIn so nobody tries to use it for anything (since it is not useful with composited fade, and will be totally wrong with CA-accelerated fade). 914401 3 thorton 2013-08-03 17:31:38 -0700 http://trac.webkit.org/changeset/153692 207960 2013-08-01 15:09:38 -0700 2013-08-01 15:16:40 -0700 patch pageoverlay-fade.diff text/plain 12157 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2NWYxZWM4Li41ZDlmNTFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEg QEAKKzIwMTMtMDgtMDEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgUmVtb3ZlIHBhZ2VPdmVybGF5U2hvdWxkQXBwbHlGYWRlV2hlblBhaW50aW5nKCkg YW5kIGFkb3B0IGNvbXBvc2l0ZWQgZmFkZSBmb3IgdGhlIE1hYyBwb3J0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTk0MTEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWMgaXMgdGhlIG9ubHkgaG9sZG91 dCB0aGF0IHBlcmZvcm1zIG5vbi1jb21wb3NpdGVkIGZhZGVzIG9mIHBhZ2UKKyAgICAgICAgb3Zl cmxheXMuIFdlIHNob3VsZCBhZG9wdCB0aGF0IG1lY2hhbmlzbSAoYXMgYSBwcmVjdXJzb3IgdG8g ZG9pbmcgYQorICAgICAgICBDQS1hY2NlbGVyYXRlZCBmYWRlKSBhbmQgcmVtb3ZlIHRoZSBub3ct dW5uZWNlc3NhcnkgcHJvcGVydHkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29v cmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZExheWVyVHJlZUhvc3QuaDoKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNwcDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv RHJhd2luZ0FyZWFJbXBsLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJl ZUhvc3QuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92ZXJsYXkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpQYWdlT3ZlcmxheTo6UGFnZU92ZXJsYXkpOgorICAgICAgICAoV2Vi S2l0OjpQYWdlT3ZlcmxheTo6c2V0UGFnZSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VPdmVybGF5 OjpzZXROZWVkc0Rpc3BsYXkpOgorICAgICAgICAoV2ViS2l0OjpQYWdlT3ZlcmxheTo6ZmFkZUFu aW1hdGlvblRpbWVyRmlyZWQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3Zl cmxheS5oOgorICAgICAgICBSZW1vdmUgcGFnZU92ZXJsYXlTaG91bGRBcHBseUZhZGVXaGVuUGFp bnRpbmcuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvVGFwSGlnaGxpZ2h0Q29udHJv bGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlRhcEhpZ2hsaWdodENvbnRyb2xsZXI6OmRyYXdS ZWN0KToKKyAgICAgICAgUmVtb3ZlIHBhZ2VPdmVybGF5U2hvdWxkQXBwbHlGYWRlV2hlblBhaW50 aW5nLiBTaW5jZSBpdCdzIGFsd2F5cworICAgICAgICAiZmFsc2UiIGZvciBhbGwgcG9ydHMgbm93 LCB0YWtlIHRoZSBzZWNvbmQgcGF0aCBoZXJlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQ YWdlL21hYy9MYXllclRyZWVIb3N0TWFjLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9MYXllclRyZWVIb3N0TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpMYXllclRyZWVIb3N0 TWFjOjpzZXRQYWdlT3ZlcmxheU9wYWNpdHkpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaDoKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tOgorICAgICAg ICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2V0UGFnZU92ZXJsYXlP cGFjaXR5KToKKyAgICAgICAgSW1wbGVtZW50IHNldFBhZ2VPdmVybGF5T3BhY2l0eSBmb3IgRHJh d2luZ0FyZWFJbXBsCisgICAgICAgIGFuZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS4K KwogMjAxMy0wOC0wMSAgTWlsaWFuIFdvbGZmICA8bWlsaWFuLndvbGZmQGtkYWIuY29tPgogCiAg ICAgICAgIFtRdF0gRW5hYmxlIFFNTCBoYW5kbGluZyBvZiBjcmFzaGVkL3VucmVzcG9uc2l2ZSBR dFdlYlByb2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdC5oIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0 ZWRMYXllclRyZWVIb3N0LmgKaW5kZXggZTY5MzhkNi4uZWYxMTkzMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRp bmF0ZWRMYXllclRyZWVIb3N0LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0LmgKQEAgLTY4 LDcgKzY4LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkaWRVbmluc3RhbGxQYWdlT3Zl cmxheShQYWdlT3ZlcmxheSopOwogICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlT3ZlcmxheU5lZWRz RGlzcGxheShQYWdlT3ZlcmxheSosIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKICAgICB2aXJ0 dWFsIHZvaWQgc2V0UGFnZU92ZXJsYXlPcGFjaXR5KFBhZ2VPdmVybGF5KiwgZmxvYXQpOwotICAg IHZpcnR1YWwgYm9vbCBwYWdlT3ZlcmxheVNob3VsZEFwcGx5RmFkZVdoZW5QYWludGluZygpIGNv bnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAKICAgICB2aXJ0dWFsIHZvaWQgcGF1c2VSZW5kZXJpbmco KSB7IG1faXNTdXNwZW5kZWQgPSB0cnVlOyB9CiAgICAgdmlydHVhbCB2b2lkIHJlc3VtZVJlbmRl cmluZygpIHsgbV9pc1N1c3BlbmRlZCA9IGZhbHNlOyBzY2hlZHVsZUxheWVyRmx1c2goKTsgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVh LmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaAppbmRl eCBjM2ZkNDhmLi41ODZjMzZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvRHJhd2luZ0FyZWEuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvRHJhd2luZ0FyZWEuaApAQCAtNzcsOCArNzcsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCB2b2lkIGRpZFVuaW5zdGFsbFBhZ2VPdmVybGF5KFBhZ2VPdmVybGF5KikgeyB9CiAgICAgdmly dHVhbCB2b2lkIHNldFBhZ2VPdmVybGF5TmVlZHNEaXNwbGF5KFBhZ2VPdmVybGF5KiwgY29uc3Qg V2ViQ29yZTo6SW50UmVjdCYpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlT3ZlcmxheU9w YWNpdHkoUGFnZU92ZXJsYXkqLCBmbG9hdCkgeyB9Ci0gICAgLy8gSWYgdGhpcyBmdW5jdGlvbiBy ZXR1cm5zIGZhbHNlLCBQYWdlT3ZlcmxheSBzaG91bGQgYXBwbHkgb3BhY2l0eSB3aGVuIHBhaW50 aW5nLgotICAgIHZpcnR1YWwgYm9vbCBwYWdlT3ZlcmxheVNob3VsZEFwcGx5RmFkZVdoZW5QYWlu dGluZygpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBzZXRQYWlu dGluZ0VuYWJsZWQoYm9vbCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVByZWZlcmVuY2Vz KGNvbnN0IFdlYlByZWZlcmVuY2VzU3RvcmUmKSB7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAKaW5kZXggYmMxOGE3Ni4u MzI2MjE1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Ry YXdpbmdBcmVhSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L0RyYXdpbmdBcmVhSW1wbC5jcHAKQEAgLTI1MywxNCArMjUzLDYgQEAgdm9pZCBEcmF3aW5nQXJl YUltcGw6OnNldFBhZ2VPdmVybGF5T3BhY2l0eShQYWdlT3ZlcmxheSogcGFnZU92ZXJsYXksIGZs b2F0IHZhbHUKICAgICAgICAgbV9sYXllclRyZWVIb3N0LT5zZXRQYWdlT3ZlcmxheU9wYWNpdHko cGFnZU92ZXJsYXksIHZhbHVlKTsKIH0KIAotYm9vbCBEcmF3aW5nQXJlYUltcGw6OnBhZ2VPdmVy bGF5U2hvdWxkQXBwbHlGYWRlV2hlblBhaW50aW5nKCkgY29uc3QKLXsKLSAgICBpZiAobV9sYXll clRyZWVIb3N0ICYmICFtX2xheWVyVHJlZUhvc3QtPnBhZ2VPdmVybGF5U2hvdWxkQXBwbHlGYWRl V2hlblBhaW50aW5nKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiB0cnVl OwotfQotCiB2b2lkIERyYXdpbmdBcmVhSW1wbDo6c2V0UGFpbnRpbmdFbmFibGVkKGJvb2wgcGFp bnRpbmdFbmFibGVkKQogewogICAgIG1faXNQYWludGluZ0VuYWJsZWQgPSBwYWludGluZ0VuYWJs ZWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2lu Z0FyZWFJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0Fy ZWFJbXBsLmgKaW5kZXggMWE1NjE0ZS4uM2IwM2M3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuaApAQCAtNjUsNyArNjUsNiBA QCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBkaWRVbmluc3RhbGxQYWdlT3ZlcmxheShQYWdl T3ZlcmxheSopOwogICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlT3ZlcmxheU5lZWRzRGlzcGxheShQ YWdlT3ZlcmxheSosIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKICAgICB2aXJ0dWFsIHZvaWQg c2V0UGFnZU92ZXJsYXlPcGFjaXR5KFBhZ2VPdmVybGF5KiwgZmxvYXQpOwotICAgIHZpcnR1YWwg Ym9vbCBwYWdlT3ZlcmxheVNob3VsZEFwcGx5RmFkZVdoZW5QYWludGluZygpIGNvbnN0OwogCiAg ICAgdmlydHVhbCB2b2lkIHNldFBhaW50aW5nRW5hYmxlZChib29sKTsKICAgICB2aXJ0dWFsIHZv aWQgdXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYpIE9WRVJSSURF OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJl ZUhvc3QuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVIb3N0 LmgKaW5kZXggMGUxOGJjYi4uZDkxOWM0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUhvc3QuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9zdC5oCkBAIC03OCw3ICs3OCw2IEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIHZvaWQgZGlkVW5pbnN0YWxsUGFnZU92ZXJsYXkoUGFnZU92ZXJsYXkqKSA9 IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldFBhZ2VPdmVybGF5TmVlZHNEaXNwbGF5KFBhZ2VPdmVy bGF5KiwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0 UGFnZU92ZXJsYXlPcGFjaXR5KFBhZ2VPdmVybGF5KiwgZmxvYXQpIHsgfQotICAgIHZpcnR1YWwg Ym9vbCBwYWdlT3ZlcmxheVNob3VsZEFwcGx5RmFkZVdoZW5QYWludGluZygpIGNvbnN0IHsgcmV0 dXJuIHRydWU7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBwYXVzZVJlbmRlcmluZygpIHsgfQogICAg IHZpcnR1YWwgdm9pZCByZXN1bWVSZW5kZXJpbmcoKSB7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92ZXJsYXkuY3BwCmluZGV4IDU4N2I1ZjMuLmRjM2Ey MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3Zl cmxheS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVy bGF5LmNwcApAQCAtNTUsNyArNTUsNiBAQCBQYWdlT3ZlcmxheTo6UGFnZU92ZXJsYXkoQ2xpZW50 KiBjbGllbnQpCiAgICAgLCBtX2ZhZGVBbmltYXRpb25EdXJhdGlvbihmYWRlQW5pbWF0aW9uRHVy YXRpb24pCiAgICAgLCBtX2ZhZGVBbmltYXRpb25UeXBlKE5vQW5pbWF0aW9uKQogICAgICwgbV9m cmFjdGlvbkZhZGVkSW4oMS4wKQotICAgICwgbV9wYWdlT3ZlcmxheVNob3VsZEFwcGx5RmFkZVdo ZW5QYWludGluZyh0cnVlKQogewogfQogCkBAIC04NSwxNyArODQsMTMgQEAgdm9pZCBQYWdlT3Zl cmxheTo6c2V0UGFnZShXZWJQYWdlKiB3ZWJQYWdlKQogICAgIG1fd2ViUGFnZSA9IHdlYlBhZ2U7 CiAgICAgbV9jbGllbnQtPmRpZE1vdmVUb1dlYlBhZ2UodGhpcywgd2ViUGFnZSk7CiAKLSAgICBp ZiAobV93ZWJQYWdlKQotICAgICAgICBtX3BhZ2VPdmVybGF5U2hvdWxkQXBwbHlGYWRlV2hlblBh aW50aW5nID0gbV93ZWJQYWdlLT5kcmF3aW5nQXJlYSgpLT5wYWdlT3ZlcmxheVNob3VsZEFwcGx5 RmFkZVdoZW5QYWludGluZygpOwotCiAgICAgbV9mYWRlQW5pbWF0aW9uVGltZXIuc3RvcCgpOwog fQogCiB2b2lkIFBhZ2VPdmVybGF5OjpzZXROZWVkc0Rpc3BsYXkoY29uc3QgSW50UmVjdCYgZGly dHlSZWN0KQogewogICAgIGlmIChtX3dlYlBhZ2UpIHsKLSAgICAgICAgaWYgKCFtX3BhZ2VPdmVy bGF5U2hvdWxkQXBwbHlGYWRlV2hlblBhaW50aW5nKQotICAgICAgICAgICAgbV93ZWJQYWdlLT5k cmF3aW5nQXJlYSgpLT5zZXRQYWdlT3ZlcmxheU9wYWNpdHkodGhpcywgbV9mcmFjdGlvbkZhZGVk SW4pOworICAgICAgICBtX3dlYlBhZ2UtPmRyYXdpbmdBcmVhKCktPnNldFBhZ2VPdmVybGF5T3Bh Y2l0eSh0aGlzLCBtX2ZyYWN0aW9uRmFkZWRJbik7CiAgICAgICAgIG1fd2ViUGFnZS0+ZHJhd2lu Z0FyZWEoKS0+c2V0UGFnZU92ZXJsYXlOZWVkc0Rpc3BsYXkodGhpcywgZGlydHlSZWN0KTsKICAg ICB9CiB9CkBAIC0xODEsMTEgKzE3Niw3IEBAIHZvaWQgUGFnZU92ZXJsYXk6OmZhZGVBbmltYXRp b25UaW1lckZpcmVkKCkKICAgICBmbG9hdCBmYWRlQW5pbWF0aW9uVmFsdWUgPSBzaW5lICogc2lu ZTsKIAogICAgIG1fZnJhY3Rpb25GYWRlZEluID0gKG1fZmFkZUFuaW1hdGlvblR5cGUgPT0gRmFk ZUluQW5pbWF0aW9uKSA/IGZhZGVBbmltYXRpb25WYWx1ZSA6IDEgLSBmYWRlQW5pbWF0aW9uVmFs dWU7Ci0KLSAgICBpZiAobV9wYWdlT3ZlcmxheVNob3VsZEFwcGx5RmFkZVdoZW5QYWludGluZykK LSAgICAgICAgc2V0TmVlZHNEaXNwbGF5KCk7Ci0gICAgZWxzZQotICAgICAgICBtX3dlYlBhZ2Ut PmRyYXdpbmdBcmVhKCktPnNldFBhZ2VPdmVybGF5T3BhY2l0eSh0aGlzLCBtX2ZyYWN0aW9uRmFk ZWRJbik7CisgICAgbV93ZWJQYWdlLT5kcmF3aW5nQXJlYSgpLT5zZXRQYWdlT3ZlcmxheU9wYWNp dHkodGhpcywgbV9mcmFjdGlvbkZhZGVkSW4pOwogCiAgICAgaWYgKGFuaW1hdGlvblByb2dyZXNz ID09IDEuMCkgewogICAgICAgICBtX2ZhZGVBbmltYXRpb25UaW1lci5zdG9wKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92ZXJsYXkuaCBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheS5oCmluZGV4IDcwZDU0 ZjAuLjc4YTU4NmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9QYWdlT3ZlcmxheS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Q YWdlT3ZlcmxheS5oCkBAIC0xMDMsNyArMTAzLDYgQEAgcHJpdmF0ZToKIAogICAgIEZhZGVBbmlt YXRpb25UeXBlIG1fZmFkZUFuaW1hdGlvblR5cGU7CiAgICAgZmxvYXQgbV9mcmFjdGlvbkZhZGVk SW47Ci0gICAgYm9vbCBtX3BhZ2VPdmVybGF5U2hvdWxkQXBwbHlGYWRlV2hlblBhaW50aW5nOwog fTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvVGFwSGlnaGxpZ2h0Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvVGFwSGlnaGxpZ2h0Q29udHJvbGxlci5jcHAKaW5kZXgg MDM5ZjMxMC4uODI5MzVhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1RhcEhpZ2hsaWdodENvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9UYXBIaWdobGlnaHRDb250cm9sbGVyLmNwcApAQCAtMTA0LDEwICsx MDQsNyBAQCB2b2lkIFRhcEhpZ2hsaWdodENvbnRyb2xsZXI6OmRyYXdSZWN0KFBhZ2VPdmVybGF5 KiBwYWdlT3ZlcmxheSwgR3JhcGhpY3NDb250ZXh0JgogCiAgICAgewogICAgICAgICBHcmFwaGlj c0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoY29udGV4dCk7Ci0gICAgICAgIGlmIChtX3dl YlBhZ2UtPmRyYXdpbmdBcmVhKCktPnBhZ2VPdmVybGF5U2hvdWxkQXBwbHlGYWRlV2hlblBhaW50 aW5nKCkpCi0gICAgICAgICAgICBjb250ZXh0LnNldEZpbGxDb2xvcihoaWdobGlnaHRDb2xvciht X2NvbG9yLCBwYWdlT3ZlcmxheS0+ZnJhY3Rpb25GYWRlZEluKCkgKiAwLjVmKSwgQ29sb3JTcGFj ZVNSR0IpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBjb250ZXh0LnNldEZpbGxDb2xvciho aWdobGlnaHRDb2xvcihtX2NvbG9yLCAwLjVmKSwgQ29sb3JTcGFjZVNSR0IpOworICAgICAgICBj b250ZXh0LnNldEZpbGxDb2xvcihoaWdobGlnaHRDb2xvcihtX2NvbG9yLCAwLjVmKSwgQ29sb3JT cGFjZVNSR0IpOwogICAgICAgICBjb250ZXh0LmZpbGxQYXRoKG1fcGF0aCk7CiAgICAgfQogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9MYXllclRy ZWVIb3N0TWFjLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0xheWVy VHJlZUhvc3RNYWMuaAppbmRleCBkYjU4N2U1Li4zNzQ3Y2I3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0xheWVyVHJlZUhvc3RNYWMuaAorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0xheWVyVHJlZUhvc3RNYWMuaApA QCAtNjMsNiArNjMsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBkaWRJbnN0YWxsUGFn ZU92ZXJsYXkoUGFnZU92ZXJsYXkqKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkVW5p bnN0YWxsUGFnZU92ZXJsYXkoUGFnZU92ZXJsYXkqKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZv aWQgc2V0UGFnZU92ZXJsYXlOZWVkc0Rpc3BsYXkoUGFnZU92ZXJsYXkqLCBjb25zdCBXZWJDb3Jl OjpJbnRSZWN0JikgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIHNldFBhZ2VPdmVybGF5T3Bh Y2l0eShQYWdlT3ZlcmxheSosIGZsb2F0KSBPVkVSUklERTsKIAogICAgIHZpcnR1YWwgdm9pZCBw YXVzZVJlbmRlcmluZygpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCByZXN1bWVSZW5kZXJp bmcoKSBPVkVSUklERTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9tYWMvTGF5ZXJUcmVlSG9zdE1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9tYWMvTGF5ZXJUcmVlSG9zdE1hYy5tbQppbmRleCAxYmVhMzdhLi5hNGQzZTVjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0xheWVyVHJl ZUhvc3RNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9M YXllclRyZWVIb3N0TWFjLm1tCkBAIC0yMTAsNiArMjEwLDE3IEBAIHZvaWQgTGF5ZXJUcmVlSG9z dE1hYzo6c2V0UGFnZU92ZXJsYXlOZWVkc0Rpc3BsYXkoUGFnZU92ZXJsYXkqIHBhZ2VPdmVybGF5 LCBjb25zCiAgICAgc2NoZWR1bGVMYXllckZsdXNoKCk7CiB9CiAKK3ZvaWQgTGF5ZXJUcmVlSG9z dE1hYzo6c2V0UGFnZU92ZXJsYXlPcGFjaXR5KFBhZ2VPdmVybGF5KiBwYWdlT3ZlcmxheSwgZmxv YXQgb3BhY2l0eSkKK3sKKyAgICBHcmFwaGljc0xheWVyKiBsYXllciA9IG1fcGFnZU92ZXJsYXlM YXllcnMuZ2V0KHBhZ2VPdmVybGF5KTsKKworICAgIGlmICghbGF5ZXIpCisgICAgICAgIHJldHVy bjsKKworICAgIGxheWVyLT5zZXRPcGFjaXR5KG9wYWNpdHkpOworICAgIHNjaGVkdWxlTGF5ZXJG bHVzaCgpOworfQorCiB2b2lkIExheWVyVHJlZUhvc3RNYWM6OnBhdXNlUmVuZGVyaW5nKCkKIHsK ICAgICBDQUxheWVyKiByb290ID0gbV9yb290TGF5ZXItPnBsYXRmb3JtTGF5ZXIoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5p bWF0aW9uRHJhd2luZ0FyZWEuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9t YWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaAppbmRleCBlNDQwYWY4Li43MzAwYTdl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCkBAIC03Miw2ICs3 Miw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRpZEluc3RhbGxQYWdlT3ZlcmxheShQ YWdlT3ZlcmxheSopIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBkaWRVbmluc3RhbGxQYWdl T3ZlcmxheShQYWdlT3ZlcmxheSopIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdl T3ZlcmxheU5lZWRzRGlzcGxheShQYWdlT3ZlcmxheSosIGNvbnN0IFdlYkNvcmU6OkludFJlY3Qm KSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0UGFnZU92ZXJsYXlPcGFjaXR5KFBhZ2VP dmVybGF5KiwgZmxvYXQpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVQcmVmZXJl bmNlcyhjb25zdCBXZWJQcmVmZXJlbmNlc1N0b3JlJikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2 b2lkIG1haW5GcmFtZUNvbnRlbnRTaXplQ2hhbmdlZChjb25zdCBXZWJDb3JlOjpJbnRTaXplJikg T1ZFUlJJREU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0gYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCmlu ZGV4IDUzNTQ3ZjYuLjk1MDZjNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYS5tbQpAQCAtMjI1LDYgKzIyNSwxNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhOjpzZXRQYWdlT3ZlcmxheU5lZWRzRGlzcGxheShQYWdlT3ZlcmxheSogcGFnZQog ICAgIHNjaGVkdWxlQ29tcG9zaXRpbmdMYXllckZsdXNoKCk7CiB9CiAKK3ZvaWQgVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNldFBhZ2VPdmVybGF5T3BhY2l0eShQYWdlT3ZlcmxheSog cGFnZU92ZXJsYXksIGZsb2F0IG9wYWNpdHkpCit7CisgICAgR3JhcGhpY3NMYXllciogbGF5ZXIg PSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmdldChwYWdlT3ZlcmxheSk7CisKKyAgICBpZiAoIWxheWVy KQorICAgICAgICByZXR1cm47CisKKyAgICBsYXllci0+c2V0T3BhY2l0eShvcGFjaXR5KTsKKyAg ICBzY2hlZHVsZUNvbXBvc2l0aW5nTGF5ZXJGbHVzaCgpOworfQorCiB2b2lkIFRpbGVkQ29yZUFu aW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBXZWJQcmVmZXJlbmNl c1N0b3JlJikKIHsKICAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBtX3dlYlBhZ2UtPmNvcmVQYWdl KCktPnNldHRpbmdzKCk7Cg== 207985 2013-08-01 23:26:47 -0700 2013-08-02 11:45:45 -0700 patch overlay.diff text/plain 15760 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyYWY5ZmFlLi5jZDM2N2JhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTEg QEAKKzIwMTMtMDgtMDEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgUmVtb3ZlIHBhZ2VPdmVybGF5U2hvdWxkQXBwbHlGYWRlV2hlblBhaW50aW5nKCkg YW5kIGFkb3B0IGNvbXBvc2l0ZWQgZmFkZSBmb3IgdGhlIE1hYyBwb3J0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTk0MTEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWMgaXMgdGhlIG9ubHkgaG9sZG91 dCB0aGF0IHBlcmZvcm1zIG5vbi1jb21wb3NpdGVkIGZhZGVzIG9mIHBhZ2UKKyAgICAgICAgb3Zl cmxheXMuIFdlIHNob3VsZCBhZG9wdCB0aGF0IG1lY2hhbmlzbSAoYXMgYSBwcmVjdXJzb3IgdG8g ZG9pbmcgYQorICAgICAgICBDQS1hY2NlbGVyYXRlZCBmYWRlKSBhbmQgcmVtb3ZlIHRoZSBub3ct dW5uZWNlc3NhcnkgcHJvcGVydHkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVu ZGxlL0FQSS9jL1dLQnVuZGxlUGFnZU92ZXJsYXkuY3BwOgorICAgICAgICAoV0tCdW5kbGVQYWdl T3ZlcmxheUZyYWN0aW9uRmFkZWRJbik6CisgICAgICAgIEFsd2F5cyByZXR1cm4gMSAoZnVsbHkt ZmFkZWQtaW4pIHNvIHRoYXQgY2xpZW50cyB3aG8gYXR0ZW1wdCB0byB1c2UgdGhpcworICAgICAg ICB0byBiYWtlIHRoZSBmYWRlIG9wYWNpdHkgaW50byB0aGVpciBwYWludGluZyB3aWxsIHBhaW50 IGF0IGZ1bGwgb3BhY2l0eSwKKyAgICAgICAgYWxsb3dpbmcgdXMgdG8gZG8gdGhlIGNvbXBvc2l0 ZWQgZmFkZSBzZXBhcmF0ZWx5LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3Jk aW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRMYXllclRyZWVIb3N0Lmg6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQ YWdlL0RyYXdpbmdBcmVhSW1wbC5jcHA6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0Ry YXdpbmdBcmVhSW1wbC5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVI b3N0Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6UGFnZU92ZXJsYXk6OlBhZ2VPdmVybGF5KToKKyAgICAgICAgKFdlYktp dDo6UGFnZU92ZXJsYXk6OnNldFBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpQYWdlT3ZlcmxheTo6 c2V0TmVlZHNEaXNwbGF5KToKKyAgICAgICAgKFdlYktpdDo6UGFnZU92ZXJsYXk6OmZhZGVBbmlt YXRpb25UaW1lckZpcmVkKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92ZXJs YXkuaDoKKyAgICAgICAgUmVtb3ZlIHBhZ2VPdmVybGF5U2hvdWxkQXBwbHlGYWRlV2hlblBhaW50 aW5nIGFuZCBmcmFjdGlvbkZhZGVkSW4oKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9GaW5kQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZpbmRDb250cm9sbGVyOjpk cmF3UmVjdCk6CisgICAgICAgIERyYXcgdGhlIGZpbmQgb3ZlcmxheSB3aXRob3V0IHRha2luZyB0 aGUgUGFnZU92ZXJsYXkncyBmYWRlIGludG8gYWNjb3VudC4KKworICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9UYXBIaWdobGlnaHRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 VGFwSGlnaGxpZ2h0Q29udHJvbGxlcjo6ZHJhd1JlY3QpOgorICAgICAgICBSZW1vdmUgcGFnZU92 ZXJsYXlTaG91bGRBcHBseUZhZGVXaGVuUGFpbnRpbmcuIFNpbmNlIGl0J3MgYWx3YXlzCisgICAg ICAgICJmYWxzZSIgZm9yIGFsbCBwb3J0cyBub3csIHRha2UgdGhlIHNlY29uZCBwYXRoIGhlcmUu CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0xheWVyVHJlZUhvc3RNYWMuaDoK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0xheWVyVHJlZUhvc3RNYWMubW06Cisg ICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RNYWM6OnNldFBhZ2VPdmVybGF5T3BhY2l0eSk6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5p bWF0aW9uRHJhd2luZ0FyZWEubW06CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhOjpzZXRQYWdlT3ZlcmxheU9wYWNpdHkpOgorICAgICAgICBJbXBsZW1lbnQg c2V0UGFnZU92ZXJsYXlPcGFjaXR5IGZvciBEcmF3aW5nQXJlYUltcGwKKyAgICAgICAgYW5kIFRp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLgorCiAyMDEzLTA4LTAxICBSdXRoIEZvbmcgIDxy dXRoX2ZvbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFtGb3JtczogY29sb3JdIDxpbnB1dCB0eXBl PSdjb2xvcic+IHBvcG92ZXIgY29sb3Igd2VsbCBpbXBsZW1lbnRhdGlvbgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBh Z2VPdmVybGF5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUv QVBJL2MvV0tCdW5kbGVQYWdlT3ZlcmxheS5jcHAKaW5kZXggNTVlYzU4OC4uZTQzNmY1NSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9X S0J1bmRsZVBhZ2VPdmVybGF5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZU92ZXJsYXkuY3BwCkBAIC0xNjksNSArMTY5 LDkgQEAgdm9pZCBXS0J1bmRsZVBhZ2VPdmVybGF5U2V0TmVlZHNEaXNwbGF5KFdLQnVuZGxlUGFn ZU92ZXJsYXlSZWYgYnVuZGxlUGFnZU92ZXJsYXkKIAogZmxvYXQgV0tCdW5kbGVQYWdlT3Zlcmxh eUZyYWN0aW9uRmFkZWRJbihXS0J1bmRsZVBhZ2VPdmVybGF5UmVmIGJ1bmRsZVBhZ2VPdmVybGF5 UmVmKQogewotICAgIHJldHVybiB0b0ltcGwoYnVuZGxlUGFnZU92ZXJsYXlSZWYpLT5mcmFjdGlv bkZhZGVkSW4oKTsKKyAgICAvLyBDbGllbnRzIHdobyBpbmNsdWRlIHRoZSBmYWRlIG9wYWNpdHkg ZHVyaW5nIHBhaW50aW5nIGludGVyZmVyZQorICAgIC8vIHdpdGggY29tcG9zaXRlZCBmYWRlLCBz byB3ZSdsbCBwcmV0ZW5kIHdlJ3JlIG9wYXF1ZSBhbmQgZG8gdGhlCisgICAgLy8gZmFkZSBvbiBv dXIgb3duLgorCisgICAgcmV0dXJuIDE7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZExheWVyVHJl ZUhvc3QuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdy YXBoaWNzL0Nvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdC5oCmluZGV4IGU2OTM4ZDYuLmVmMTE5MzEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRl ZEdyYXBoaWNzL0Nvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkTGF5ZXJU cmVlSG9zdC5oCkBAIC02OCw3ICs2OCw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlk VW5pbnN0YWxsUGFnZU92ZXJsYXkoUGFnZU92ZXJsYXkqKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0 UGFnZU92ZXJsYXlOZWVkc0Rpc3BsYXkoUGFnZU92ZXJsYXkqLCBjb25zdCBXZWJDb3JlOjpJbnRS ZWN0Jik7CiAgICAgdmlydHVhbCB2b2lkIHNldFBhZ2VPdmVybGF5T3BhY2l0eShQYWdlT3Zlcmxh eSosIGZsb2F0KTsKLSAgICB2aXJ0dWFsIGJvb2wgcGFnZU92ZXJsYXlTaG91bGRBcHBseUZhZGVX aGVuUGFpbnRpbmcoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogCiAgICAgdmlydHVhbCB2b2lk IHBhdXNlUmVuZGVyaW5nKCkgeyBtX2lzU3VzcGVuZGVkID0gdHJ1ZTsgfQogICAgIHZpcnR1YWwg dm9pZCByZXN1bWVSZW5kZXJpbmcoKSB7IG1faXNTdXNwZW5kZWQgPSBmYWxzZTsgc2NoZWR1bGVM YXllckZsdXNoKCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9EcmF3aW5nQXJlYS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Ry YXdpbmdBcmVhLmgKaW5kZXggYzNmZDQ4Zi4uNTg2YzM2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgKQEAgLTc3LDggKzc3LDYgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgdm9pZCBkaWRVbmluc3RhbGxQYWdlT3ZlcmxheShQYWdlT3Zlcmxh eSopIHsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlT3ZlcmxheU5lZWRzRGlzcGxheShQYWdl T3ZlcmxheSosIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQg c2V0UGFnZU92ZXJsYXlPcGFjaXR5KFBhZ2VPdmVybGF5KiwgZmxvYXQpIHsgfQotICAgIC8vIElm IHRoaXMgZnVuY3Rpb24gcmV0dXJucyBmYWxzZSwgUGFnZU92ZXJsYXkgc2hvdWxkIGFwcGx5IG9w YWNpdHkgd2hlbiBwYWludGluZy4KLSAgICB2aXJ0dWFsIGJvb2wgcGFnZU92ZXJsYXlTaG91bGRB cHBseUZhZGVXaGVuUGFpbnRpbmcoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAKICAgICB2aXJ0 dWFsIHZvaWQgc2V0UGFpbnRpbmdFbmFibGVkKGJvb2wpIHsgfQogICAgIHZpcnR1YWwgdm9pZCB1 cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBXZWJQcmVmZXJlbmNlc1N0b3JlJikgeyB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3Bw CmluZGV4IGJjMThhNzYuLjMyNjIxNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCkBAIC0yNTMsMTQgKzI1Myw2IEBA IHZvaWQgRHJhd2luZ0FyZWFJbXBsOjpzZXRQYWdlT3ZlcmxheU9wYWNpdHkoUGFnZU92ZXJsYXkq IHBhZ2VPdmVybGF5LCBmbG9hdCB2YWx1CiAgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+c2V0UGFn ZU92ZXJsYXlPcGFjaXR5KHBhZ2VPdmVybGF5LCB2YWx1ZSk7CiB9CiAKLWJvb2wgRHJhd2luZ0Fy ZWFJbXBsOjpwYWdlT3ZlcmxheVNob3VsZEFwcGx5RmFkZVdoZW5QYWludGluZygpIGNvbnN0Ci17 Ci0gICAgaWYgKG1fbGF5ZXJUcmVlSG9zdCAmJiAhbV9sYXllclRyZWVIb3N0LT5wYWdlT3Zlcmxh eVNob3VsZEFwcGx5RmFkZVdoZW5QYWludGluZygpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0K LSAgICByZXR1cm4gdHJ1ZTsKLX0KLQogdm9pZCBEcmF3aW5nQXJlYUltcGw6OnNldFBhaW50aW5n RW5hYmxlZChib29sIHBhaW50aW5nRW5hYmxlZCkKIHsKICAgICBtX2lzUGFpbnRpbmdFbmFibGVk ID0gcGFpbnRpbmdFbmFibGVkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5oCmluZGV4IDFhNTYxNGUuLjNiMDNjN2YgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmgK QEAgLTY1LDcgKzY1LDYgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgZGlkVW5pbnN0YWxs UGFnZU92ZXJsYXkoUGFnZU92ZXJsYXkqKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0UGFnZU92ZXJs YXlOZWVkc0Rpc3BsYXkoUGFnZU92ZXJsYXkqLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAg ICAgdmlydHVhbCB2b2lkIHNldFBhZ2VPdmVybGF5T3BhY2l0eShQYWdlT3ZlcmxheSosIGZsb2F0 KTsKLSAgICB2aXJ0dWFsIGJvb2wgcGFnZU92ZXJsYXlTaG91bGRBcHBseUZhZGVXaGVuUGFpbnRp bmcoKSBjb25zdDsKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRQYWludGluZ0VuYWJsZWQoYm9vbCk7 CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVByZWZlcmVuY2VzKGNvbnN0IFdlYlByZWZlcmVuY2Vz U3RvcmUmKSBPVkVSUklERTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwCmluZGV4IDk3NzNjZWUuLmU4YzZmYzQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNw cApAQCAtMzk3LDM1ICszOTcsMjAgQEAgc3RhdGljIGNvbnN0IGZsb2F0IG92ZXJsYXlCYWNrZ3Jv dW5kR3JlZW4gPSAwLjE7CiBzdGF0aWMgY29uc3QgZmxvYXQgb3ZlcmxheUJhY2tncm91bmRCbHVl ID0gMC4xOwogc3RhdGljIGNvbnN0IGZsb2F0IG92ZXJsYXlCYWNrZ3JvdW5kQWxwaGEgPSAwLjI1 OwogCi1zdGF0aWMgQ29sb3Igb3ZlcmxheUJhY2tncm91bmRDb2xvcihmbG9hdCBmcmFjdGlvbkZh ZGVkSW4pCi17Ci0gICAgcmV0dXJuIENvbG9yKG92ZXJsYXlCYWNrZ3JvdW5kUmVkLCBvdmVybGF5 QmFja2dyb3VuZEdyZWVuLCBvdmVybGF5QmFja2dyb3VuZEJsdWUsIG92ZXJsYXlCYWNrZ3JvdW5k QWxwaGEgKiBmcmFjdGlvbkZhZGVkSW4pOwotfQotCi1zdGF0aWMgQ29sb3IgaG9sZVNoYWRvd0Nv bG9yKGZsb2F0IGZyYWN0aW9uRmFkZWRJbikKLXsKLSAgICByZXR1cm4gQ29sb3IoMC4wZiwgMC4w ZiwgMC4wZiwgZnJhY3Rpb25GYWRlZEluKTsKLX0KLQotc3RhdGljIENvbG9yIGhvbGVGaWxsQ29s b3IoZmxvYXQgZnJhY3Rpb25GYWRlZEluKQotewotICAgIHJldHVybiBDb2xvcigxLjBmLCAxLjBm LCAxLjBmLCBmcmFjdGlvbkZhZGVkSW4pOwotfQotCiB2b2lkIEZpbmRDb250cm9sbGVyOjpkcmF3 UmVjdChQYWdlT3ZlcmxheSogcGFnZU92ZXJsYXksIEdyYXBoaWNzQ29udGV4dCYgZ3JhcGhpY3ND b250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpCiB7Ci0gICAgZmxvYXQgZnJhY3Rpb25G YWRlZEluID0gcGFnZU92ZXJsYXktPmZyYWN0aW9uRmFkZWRJbigpOworICAgIENvbG9yIG92ZXJs YXlCYWNrZ3JvdW5kQ29sb3Iob3ZlcmxheUJhY2tncm91bmRSZWQsIG92ZXJsYXlCYWNrZ3JvdW5k R3JlZW4sIG92ZXJsYXlCYWNrZ3JvdW5kQmx1ZSwgb3ZlcmxheUJhY2tncm91bmRBbHBoYSk7CiAK ICAgICBWZWN0b3I8SW50UmVjdD4gcmVjdHMgPSByZWN0c0ZvclRleHRNYXRjaGVzKCk7CiAKICAg ICAvLyBEcmF3IHRoZSBiYWNrZ3JvdW5kLgotICAgIGdyYXBoaWNzQ29udGV4dC5maWxsUmVjdChk aXJ0eVJlY3QsIG92ZXJsYXlCYWNrZ3JvdW5kQ29sb3IoZnJhY3Rpb25GYWRlZEluKSwgQ29sb3JT cGFjZVNSR0IpOworICAgIGdyYXBoaWNzQ29udGV4dC5maWxsUmVjdChkaXJ0eVJlY3QsIG92ZXJs YXlCYWNrZ3JvdW5kQ29sb3IsIENvbG9yU3BhY2VTUkdCKTsKIAogICAgIHsKICAgICAgICAgR3Jh cGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKGdyYXBoaWNzQ29udGV4dCk7CiAKLSAg ICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldFNoYWRvdyhGbG9hdFNpemUoc2hhZG93T2Zmc2V0WCwg c2hhZG93T2Zmc2V0WSksIHNoYWRvd0JsdXJSYWRpdXMsIGhvbGVTaGFkb3dDb2xvcihmcmFjdGlv bkZhZGVkSW4pLCBDb2xvclNwYWNlU1JHQik7Ci0gICAgICAgIGdyYXBoaWNzQ29udGV4dC5zZXRG aWxsQ29sb3IoaG9sZUZpbGxDb2xvcihmcmFjdGlvbkZhZGVkSW4pLCBDb2xvclNwYWNlU1JHQik7 CisgICAgICAgIGdyYXBoaWNzQ29udGV4dC5zZXRTaGFkb3coRmxvYXRTaXplKHNoYWRvd09mZnNl dFgsIHNoYWRvd09mZnNldFkpLCBzaGFkb3dCbHVyUmFkaXVzLCBDb2xvcjo6YmxhY2ssIENvbG9y U3BhY2VTUkdCKTsKKyAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldEZpbGxDb2xvcihDb2xvcjo6 d2hpdGUsIENvbG9yU3BhY2VTUkdCKTsKIAogICAgICAgICAvLyBEcmF3IHdoaXRlIGZyYW1lcyBh cm91bmQgdGhlIGhvbGVzLgogICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHJlY3RzLnNp emUoKTsgKytpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvTGF5ZXJUcmVlSG9zdC5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xh eWVyVHJlZUhvc3QuaAppbmRleCAwZTE4YmNiLi5kOTE5YzRjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9zdC5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVIb3N0LmgKQEAgLTc4LDcgKzc4LDYg QEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkaWRVbmluc3RhbGxQYWdlT3ZlcmxheShQYWdl T3ZlcmxheSopID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0UGFnZU92ZXJsYXlOZWVkc0Rpc3Bs YXkoUGFnZU92ZXJsYXkqLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JikgPSAwOwogICAgIHZpcnR1 YWwgdm9pZCBzZXRQYWdlT3ZlcmxheU9wYWNpdHkoUGFnZU92ZXJsYXkqLCBmbG9hdCkgeyB9Ci0g ICAgdmlydHVhbCBib29sIHBhZ2VPdmVybGF5U2hvdWxkQXBwbHlGYWRlV2hlblBhaW50aW5nKCkg Y29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogCiAgICAgdmlydHVhbCB2b2lkIHBhdXNlUmVuZGVyaW5n KCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHJlc3VtZVJlbmRlcmluZygpIHsgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5LmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheS5jcHAKaW5kZXggNTg3 YjVmMy4uZGMzYTIwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1BhZ2VPdmVybGF5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvUGFnZU92ZXJsYXkuY3BwCkBAIC01NSw3ICs1NSw2IEBAIFBhZ2VPdmVybGF5OjpQYWdlT3Zl cmxheShDbGllbnQqIGNsaWVudCkKICAgICAsIG1fZmFkZUFuaW1hdGlvbkR1cmF0aW9uKGZhZGVB bmltYXRpb25EdXJhdGlvbikKICAgICAsIG1fZmFkZUFuaW1hdGlvblR5cGUoTm9BbmltYXRpb24p CiAgICAgLCBtX2ZyYWN0aW9uRmFkZWRJbigxLjApCi0gICAgLCBtX3BhZ2VPdmVybGF5U2hvdWxk QXBwbHlGYWRlV2hlblBhaW50aW5nKHRydWUpCiB7CiB9CiAKQEAgLTg1LDE3ICs4NCwxMyBAQCB2 b2lkIFBhZ2VPdmVybGF5OjpzZXRQYWdlKFdlYlBhZ2UqIHdlYlBhZ2UpCiAgICAgbV93ZWJQYWdl ID0gd2ViUGFnZTsKICAgICBtX2NsaWVudC0+ZGlkTW92ZVRvV2ViUGFnZSh0aGlzLCB3ZWJQYWdl KTsKIAotICAgIGlmIChtX3dlYlBhZ2UpCi0gICAgICAgIG1fcGFnZU92ZXJsYXlTaG91bGRBcHBs eUZhZGVXaGVuUGFpbnRpbmcgPSBtX3dlYlBhZ2UtPmRyYXdpbmdBcmVhKCktPnBhZ2VPdmVybGF5 U2hvdWxkQXBwbHlGYWRlV2hlblBhaW50aW5nKCk7Ci0KICAgICBtX2ZhZGVBbmltYXRpb25UaW1l ci5zdG9wKCk7CiB9CiAKIHZvaWQgUGFnZU92ZXJsYXk6OnNldE5lZWRzRGlzcGxheShjb25zdCBJ bnRSZWN0JiBkaXJ0eVJlY3QpCiB7CiAgICAgaWYgKG1fd2ViUGFnZSkgewotICAgICAgICBpZiAo IW1fcGFnZU92ZXJsYXlTaG91bGRBcHBseUZhZGVXaGVuUGFpbnRpbmcpCi0gICAgICAgICAgICBt X3dlYlBhZ2UtPmRyYXdpbmdBcmVhKCktPnNldFBhZ2VPdmVybGF5T3BhY2l0eSh0aGlzLCBtX2Zy YWN0aW9uRmFkZWRJbik7CisgICAgICAgIG1fd2ViUGFnZS0+ZHJhd2luZ0FyZWEoKS0+c2V0UGFn ZU92ZXJsYXlPcGFjaXR5KHRoaXMsIG1fZnJhY3Rpb25GYWRlZEluKTsKICAgICAgICAgbV93ZWJQ YWdlLT5kcmF3aW5nQXJlYSgpLT5zZXRQYWdlT3ZlcmxheU5lZWRzRGlzcGxheSh0aGlzLCBkaXJ0 eVJlY3QpOwogICAgIH0KIH0KQEAgLTE4MSwxMSArMTc2LDcgQEAgdm9pZCBQYWdlT3ZlcmxheTo6 ZmFkZUFuaW1hdGlvblRpbWVyRmlyZWQoKQogICAgIGZsb2F0IGZhZGVBbmltYXRpb25WYWx1ZSA9 IHNpbmUgKiBzaW5lOwogCiAgICAgbV9mcmFjdGlvbkZhZGVkSW4gPSAobV9mYWRlQW5pbWF0aW9u VHlwZSA9PSBGYWRlSW5BbmltYXRpb24pID8gZmFkZUFuaW1hdGlvblZhbHVlIDogMSAtIGZhZGVB bmltYXRpb25WYWx1ZTsKLQotICAgIGlmIChtX3BhZ2VPdmVybGF5U2hvdWxkQXBwbHlGYWRlV2hl blBhaW50aW5nKQotICAgICAgICBzZXROZWVkc0Rpc3BsYXkoKTsKLSAgICBlbHNlCi0gICAgICAg IG1fd2ViUGFnZS0+ZHJhd2luZ0FyZWEoKS0+c2V0UGFnZU92ZXJsYXlPcGFjaXR5KHRoaXMsIG1f ZnJhY3Rpb25GYWRlZEluKTsKKyAgICBtX3dlYlBhZ2UtPmRyYXdpbmdBcmVhKCktPnNldFBhZ2VP dmVybGF5T3BhY2l0eSh0aGlzLCBtX2ZyYWN0aW9uRmFkZWRJbik7CiAKICAgICBpZiAoYW5pbWF0 aW9uUHJvZ3Jlc3MgPT0gMS4wKSB7CiAgICAgICAgIG1fZmFkZUFuaW1hdGlvblRpbWVyLnN0b3Ao KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3Zl cmxheS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5LmgK aW5kZXggNzBkNTRmMC4uNTQyNDFmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1BhZ2VPdmVybGF5LmgKQEAgLTc2LDcgKzc2LDYgQEAgcHVibGljOgogICAgIHZv aWQgc3RhcnRGYWRlT3V0QW5pbWF0aW9uKCk7CiAgICAgdm9pZCBzdG9wRmFkZU91dEFuaW1hdGlv bigpOwogCi0gICAgZmxvYXQgZnJhY3Rpb25GYWRlZEluKCkgY29uc3QgeyByZXR1cm4gbV9mcmFj dGlvbkZhZGVkSW47IH0KICAgICBDbGllbnQqIGNsaWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fY2xp ZW50OyB9CiAgICAgCiBwcm90ZWN0ZWQ6CkBAIC0xMDMsNyArMTAyLDYgQEAgcHJpdmF0ZToKIAog ICAgIEZhZGVBbmltYXRpb25UeXBlIG1fZmFkZUFuaW1hdGlvblR5cGU7CiAgICAgZmxvYXQgbV9m cmFjdGlvbkZhZGVkSW47Ci0gICAgYm9vbCBtX3BhZ2VPdmVybGF5U2hvdWxkQXBwbHlGYWRlV2hl blBhaW50aW5nOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvVGFwSGlnaGxpZ2h0Q29udHJvbGxlci5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvVGFwSGlnaGxpZ2h0Q29udHJvbGxl ci5jcHAKaW5kZXggMDM5ZjMxMC4uODI5MzVhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1RhcEhpZ2hsaWdodENvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9UYXBIaWdobGlnaHRDb250cm9sbGVyLmNwcApA QCAtMTA0LDEwICsxMDQsNyBAQCB2b2lkIFRhcEhpZ2hsaWdodENvbnRyb2xsZXI6OmRyYXdSZWN0 KFBhZ2VPdmVybGF5KiBwYWdlT3ZlcmxheSwgR3JhcGhpY3NDb250ZXh0JgogCiAgICAgewogICAg ICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoY29udGV4dCk7Ci0gICAg ICAgIGlmIChtX3dlYlBhZ2UtPmRyYXdpbmdBcmVhKCktPnBhZ2VPdmVybGF5U2hvdWxkQXBwbHlG YWRlV2hlblBhaW50aW5nKCkpCi0gICAgICAgICAgICBjb250ZXh0LnNldEZpbGxDb2xvcihoaWdo bGlnaHRDb2xvcihtX2NvbG9yLCBwYWdlT3ZlcmxheS0+ZnJhY3Rpb25GYWRlZEluKCkgKiAwLjVm KSwgQ29sb3JTcGFjZVNSR0IpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBjb250ZXh0LnNl dEZpbGxDb2xvcihoaWdobGlnaHRDb2xvcihtX2NvbG9yLCAwLjVmKSwgQ29sb3JTcGFjZVNSR0Ip OworICAgICAgICBjb250ZXh0LnNldEZpbGxDb2xvcihoaWdobGlnaHRDb2xvcihtX2NvbG9yLCAw LjVmKSwgQ29sb3JTcGFjZVNSR0IpOwogICAgICAgICBjb250ZXh0LmZpbGxQYXRoKG1fcGF0aCk7 CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9MYXllclRyZWVIb3N0TWFjLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL0xheWVyVHJlZUhvc3RNYWMuaAppbmRleCBkYjU4N2U1Li4zNzQ3Y2I3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0xheWVyVHJlZUhvc3RN YWMuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0xheWVyVHJl ZUhvc3RNYWMuaApAQCAtNjMsNiArNjMsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBk aWRJbnN0YWxsUGFnZU92ZXJsYXkoUGFnZU92ZXJsYXkqKSBPVkVSUklERTsKICAgICB2aXJ0dWFs IHZvaWQgZGlkVW5pbnN0YWxsUGFnZU92ZXJsYXkoUGFnZU92ZXJsYXkqKSBPVkVSUklERTsKICAg ICB2aXJ0dWFsIHZvaWQgc2V0UGFnZU92ZXJsYXlOZWVkc0Rpc3BsYXkoUGFnZU92ZXJsYXkqLCBj b25zdCBXZWJDb3JlOjpJbnRSZWN0JikgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIHNldFBh Z2VPdmVybGF5T3BhY2l0eShQYWdlT3ZlcmxheSosIGZsb2F0KSBPVkVSUklERTsKIAogICAgIHZp cnR1YWwgdm9pZCBwYXVzZVJlbmRlcmluZygpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBy ZXN1bWVSZW5kZXJpbmcoKSBPVkVSUklERTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvTGF5ZXJUcmVlSG9zdE1hYy5tbSBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvTGF5ZXJUcmVlSG9zdE1hYy5tbQppbmRleCAxYmVhMzdh Li5hNGQzZTVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv bWFjL0xheWVyVHJlZUhvc3RNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL21hYy9MYXllclRyZWVIb3N0TWFjLm1tCkBAIC0yMTAsNiArMjEwLDE3IEBAIHZvaWQg TGF5ZXJUcmVlSG9zdE1hYzo6c2V0UGFnZU92ZXJsYXlOZWVkc0Rpc3BsYXkoUGFnZU92ZXJsYXkq IHBhZ2VPdmVybGF5LCBjb25zCiAgICAgc2NoZWR1bGVMYXllckZsdXNoKCk7CiB9CiAKK3ZvaWQg TGF5ZXJUcmVlSG9zdE1hYzo6c2V0UGFnZU92ZXJsYXlPcGFjaXR5KFBhZ2VPdmVybGF5KiBwYWdl T3ZlcmxheSwgZmxvYXQgb3BhY2l0eSkKK3sKKyAgICBHcmFwaGljc0xheWVyKiBsYXllciA9IG1f cGFnZU92ZXJsYXlMYXllcnMuZ2V0KHBhZ2VPdmVybGF5KTsKKworICAgIGlmICghbGF5ZXIpCisg ICAgICAgIHJldHVybjsKKworICAgIGxheWVyLT5zZXRPcGFjaXR5KG9wYWNpdHkpOworICAgIHNj aGVkdWxlTGF5ZXJGbHVzaCgpOworfQorCiB2b2lkIExheWVyVHJlZUhvc3RNYWM6OnBhdXNlUmVu ZGVyaW5nKCkKIHsKICAgICBDQUxheWVyKiByb290ID0gbV9yb290TGF5ZXItPnBsYXRmb3JtTGF5 ZXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMv VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaAppbmRleCBlNDQw YWY4Li43MzAwYTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmgKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5o CkBAIC03Miw2ICs3Miw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRpZEluc3RhbGxQ YWdlT3ZlcmxheShQYWdlT3ZlcmxheSopIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBkaWRV bmluc3RhbGxQYWdlT3ZlcmxheShQYWdlT3ZlcmxheSopIE9WRVJSSURFOwogICAgIHZpcnR1YWwg dm9pZCBzZXRQYWdlT3ZlcmxheU5lZWRzRGlzcGxheShQYWdlT3ZlcmxheSosIGNvbnN0IFdlYkNv cmU6OkludFJlY3QmKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0UGFnZU92ZXJsYXlP cGFjaXR5KFBhZ2VPdmVybGF5KiwgZmxvYXQpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCB1 cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBXZWJQcmVmZXJlbmNlc1N0b3JlJikgT1ZFUlJJREU7CiAg ICAgdmlydHVhbCB2b2lkIG1haW5GcmFtZUNvbnRlbnRTaXplQ2hhbmdlZChjb25zdCBXZWJDb3Jl OjpJbnRTaXplJikgT1ZFUlJJREU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0gYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhLm1tCmluZGV4IDUzNTQ3ZjYuLjk1MDZjNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEu bW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVB bmltYXRpb25EcmF3aW5nQXJlYS5tbQpAQCAtMjI1LDYgKzIyNSwxNyBAQCB2b2lkIFRpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpzZXRQYWdlT3ZlcmxheU5lZWRzRGlzcGxheShQYWdlT3Zl cmxheSogcGFnZQogICAgIHNjaGVkdWxlQ29tcG9zaXRpbmdMYXllckZsdXNoKCk7CiB9CiAKK3Zv aWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNldFBhZ2VPdmVybGF5T3BhY2l0eShQ YWdlT3ZlcmxheSogcGFnZU92ZXJsYXksIGZsb2F0IG9wYWNpdHkpCit7CisgICAgR3JhcGhpY3NM YXllciogbGF5ZXIgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmdldChwYWdlT3ZlcmxheSk7CisKKyAg ICBpZiAoIWxheWVyKQorICAgICAgICByZXR1cm47CisKKyAgICBsYXllci0+c2V0T3BhY2l0eShv cGFjaXR5KTsKKyAgICBzY2hlZHVsZUNvbXBvc2l0aW5nTGF5ZXJGbHVzaCgpOworfQorCiB2b2lk IFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBX ZWJQcmVmZXJlbmNlc1N0b3JlJikKIHsKICAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBtX3dlYlBh Z2UtPmNvcmVQYWdlKCktPnNldHRpbmdzKCk7Cg==