110267 2013-02-19 15:06:49 -0800 Separate constraining for overhang from fixed-position zooming behavior in scrollOffsetForFixedPosition() 2013-02-19 17:29:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser andersca bdakin cmarcelo jamesr luiz simon.fraser tonikitoo webkit.review.bot oldest_to_newest 836822 0 simon.fraser 2013-02-19 15:06:49 -0800 Separate constraining for overhang from fixed-position zooming behavior in scrollOffsetForFixedPosition() 836832 1 189177 simon.fraser 2013-02-19 15:11:35 -0800 Created attachment 189177 Patch 837008 2 simon.fraser 2013-02-19 17:29:40 -0800 http://trac.webkit.org/changeset/143404 189177 2013-02-19 15:11:35 -0800 2013-02-19 15:16:07 -0800 Patch bug-110267-20130219150759.patch text/plain 11890 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMzc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjZiMzk5ZWU5M2JkMDMz MWE0MjU4MjBjNmVkODZmYzc0ODM1MDU3MS4uZTdmNGM1YTNkNGQwODJjZTJmZGJhYjVkNzg4MGIz MmZkYjBmZTAxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEzLTAyLTE5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNlcGFyYXRlIGNv bnN0cmFpbmluZyBmb3Igb3ZlcmhhbmcgZnJvbSBmaXhlZC1wb3NpdGlvbiB6b29taW5nIGJlaGF2 aW9yIGluIHNjcm9sbE9mZnNldEZvckZpeGVkUG9zaXRpb24oKQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMjY3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHN0YXRpYyBzY3JvbGxPZmZzZXRGb3JG aXhlZFBvc2l0aW9uKCkgZnVuY3Rpb24gaW4gU2Nyb2xsaW5nQ29vcmRpbmF0b3IgZGlkIHR3byB0 aGluZ3M7CisgICAgICAgIGl0IGNvbnN0cmFpbmVkIHRoZSBzY3JvbGwgcG9zaXRpb24gd2hlbiBy dWJiZXItYmFuZGluZywgYW5kIGFwcGxpZWQgdGhlIHNwZWNpYWwgc2NhbGluZyBmb3IKKyAgICAg ICAgZml4ZWQgcG9zaXRpb24gd2hlbiB6b29tZWQuCisgICAgICAgIAorICAgICAgICBTZXBhcmF0 ZSB0aGVzZSBvdXQgc28gdGhhdCB3ZSBjYW4gdXNlIHRoZSBydWJiZXItYmFuZGluZyBjb25zdHJh aW5lZCBlbHNld2hlcmUuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZVZpZXc6OnNjcm9sbE9mZnNldEZvckZpeGVkUG9zaXRpb24pOiBUaGUg c3RhdGljIGZ1bmN0aW9uIGlzIGhlcmUgbm93LgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6 CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwOiBDb2Rl IG1vdmVkIHRvIEZyYW1lVmlldy4KKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdD b29yZGluYXRvci5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVl U2Nyb2xsaW5nTm9kZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVTY3Jv bGxpbmdOb2RlTWFjOjpzZXRTY3JvbGxMYXllclBvc2l0aW9uKTogc2Nyb2xsT2Zmc2V0Rm9yRml4 ZWRQb3NpdGlvbigpCisgICAgICAgIGlzIG5vdyBvbiBGcmFtZVZpZXcuCisgICAgICAgICogcGxh dGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29uc3RyYWluZWRT Y3JvbGxQb3NpdGlvbik6IEhlbHBlciB0byBjb25zdHJhaW4gb25lIGF4aXMgZm9yIG92ZXJoYW5n LgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6OmNvbnN0cmFpblNjcm9sbFBvc2l0 aW9uRm9yT3ZlcmhhbmcpOiBTdGF0aWMgZnVuY3Rpb24gdGhhdAorICAgICAgICBjYW4gYmUgY2Fs bGVkIGJ5IEZyYW1lVmlldzo6c2Nyb2xsT2Zmc2V0Rm9yRml4ZWRQb3NpdGlvbigpLgorICAgICAg ICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmg6IFN0YXRpYyBmdW5jdGlvbiBjb25zdHJhaW5T Y3JvbGxQb3NpdGlvbkZvck92ZXJoYW5nKCkKKyAgICAgICAgc28gd2UgY2FuIGNhbGwgaXQgZnJv bSBhbm90aGVyIHRocmVhZC4gQWxzbyBhIG1lbWJlciBmdWN0aW9uIG9mIHRoZSBzYW1lIG5hbWUs IHdoaWNoIHRha2VzCisgICAgICAgIHRoZSBzY3JvbGxQb3NpdGlvbiBhcyBpbnB1dCAoc28gd2Ug Y2FuIGZlZWQgaXQgYSBsYXllciBwb3NpdGlvbiBpbiBhIGxhdGVyIHBhdGNoKS4KKwogMjAxMy0w Mi0xOSAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5y ZXZpZXdlZC4gUmViYXNlbGluZWQgcnVuLWJpbmRpbmdzLXRlc3RzLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCmluZGV4IDZiNmI3MWZhMzkyNjc5YTEzODZiZDM0ZWZkYWM3NDg2NjM1NTE0ZWEu LjNlNmY4OGU0MjE0YjFkNTQwMDY3OGU4N2U1ODJlMjMxYzc0Mjk3YTcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5jcHAKQEAgLTE1MTIsNiArMTUxMiwxOCBAQCBMYXlvdXRSZWN0IEZyYW1lVmll dzo6dmlld3BvcnRDb25zdHJhaW5lZFZpc2libGVDb250ZW50UmVjdCgpIGNvbnN0CiAgICAgcmV0 dXJuIHZpZXdwb3J0UmVjdDsKIH0KIAorSW50U2l6ZSBGcmFtZVZpZXc6OnNjcm9sbE9mZnNldEZv ckZpeGVkUG9zaXRpb24oY29uc3QgSW50UmVjdCYgdmlzaWJsZUNvbnRlbnRSZWN0LCBjb25zdCBJ bnRTaXplJiBjb250ZW50c1NpemUsIGNvbnN0IEludFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgY29u c3QgSW50UG9pbnQmIHNjcm9sbE9yaWdpbiwgZmxvYXQgZnJhbWVTY2FsZUZhY3RvciwgYm9vbCBm aXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lKQoreworICAgIEludFBvaW50IGNvbnN0 cmFpbmVkUG9zaXRpb24gPSBTY3JvbGxhYmxlQXJlYTo6Y29uc3RyYWluU2Nyb2xsUG9zaXRpb25G b3JPdmVyaGFuZyh2aXNpYmxlQ29udGVudFJlY3QsIGNvbnRlbnRzU2l6ZSwgc2Nyb2xsUG9zaXRp b24sIHNjcm9sbE9yaWdpbik7CisKKyAgICBJbnRTaXplIG1heFNpemUgPSBjb250ZW50c1NpemUg LSB2aXNpYmxlQ29udGVudFJlY3Quc2l6ZSgpOworCisgICAgZmxvYXQgZHJhZ0ZhY3RvclggPSAo Zml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSB8fCAhbWF4U2l6ZS53aWR0aCgpKSA/ IDEgOiAoY29udGVudHNTaXplLndpZHRoKCkgLSB2aXNpYmxlQ29udGVudFJlY3Qud2lkdGgoKSAq IGZyYW1lU2NhbGVGYWN0b3IpIC8gbWF4U2l6ZS53aWR0aCgpOworICAgIGZsb2F0IGRyYWdGYWN0 b3JZID0gKGZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUgfHwgIW1heFNpemUuaGVp Z2h0KCkpID8gMSA6IChjb250ZW50c1NpemUuaGVpZ2h0KCkgLSB2aXNpYmxlQ29udGVudFJlY3Qu aGVpZ2h0KCkgKiBmcmFtZVNjYWxlRmFjdG9yKSAvIG1heFNpemUuaGVpZ2h0KCk7CisKKyAgICBy ZXR1cm4gSW50U2l6ZShjb25zdHJhaW5lZFBvc2l0aW9uLngoKSAqIGRyYWdGYWN0b3JYIC8gZnJh bWVTY2FsZUZhY3RvciwgY29uc3RyYWluZWRQb3NpdGlvbi55KCkgKiBkcmFnRmFjdG9yWSAvIGZy YW1lU2NhbGVGYWN0b3IpOworfQorCiBJbnRTaXplIEZyYW1lVmlldzo6c2Nyb2xsT2Zmc2V0Rm9y Rml4ZWRQb3NpdGlvbigpIGNvbnN0CiB7CiAgICAgSW50UmVjdCB2aXNpYmxlQ29udGVudFJlY3Qg PSB0aGlzLT52aXNpYmxlQ29udGVudFJlY3QoKTsKQEAgLTE1MTksNyArMTUzMSw3IEBAIEludFNp emUgRnJhbWVWaWV3OjpzY3JvbGxPZmZzZXRGb3JGaXhlZFBvc2l0aW9uKCkgY29uc3QKICAgICBJ bnRQb2ludCBzY3JvbGxQb3NpdGlvbiA9IHRoaXMtPnNjcm9sbFBvc2l0aW9uKCk7CiAgICAgSW50 UG9pbnQgc2Nyb2xsT3JpZ2luID0gdGhpcy0+c2Nyb2xsT3JpZ2luKCk7CiAgICAgZmxvYXQgZnJh bWVTY2FsZUZhY3RvciA9IG1fZnJhbWUgPyBtX2ZyYW1lLT5mcmFtZVNjYWxlRmFjdG9yKCkgOiAx OwotICAgIHJldHVybiBXZWJDb3JlOjpzY3JvbGxPZmZzZXRGb3JGaXhlZFBvc2l0aW9uKHZpc2li bGVDb250ZW50UmVjdCwgY29udGVudHNTaXplLCBzY3JvbGxQb3NpdGlvbiwgc2Nyb2xsT3JpZ2lu LCBmcmFtZVNjYWxlRmFjdG9yLCBmaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lKCkp OworICAgIHJldHVybiBzY3JvbGxPZmZzZXRGb3JGaXhlZFBvc2l0aW9uKHZpc2libGVDb250ZW50 UmVjdCwgY29udGVudHNTaXplLCBzY3JvbGxQb3NpdGlvbiwgc2Nyb2xsT3JpZ2luLCBmcmFtZVNj YWxlRmFjdG9yLCBmaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lKCkpOwogfQogCiBi b29sIEZyYW1lVmlldzo6Zml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSgpIGNvbnN0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oIGIvU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCAyYmFmZTYyMDRlN2Y3YjhjZTE5NGE5NTM0ODZl NzQ4ZTcxNjkxZDE3Li4zM2Q0ZTM5YmYyNmU2M2RhZjMxYmUyZjg0NmJjNjgxZTYxZGM0Mzk5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTIyMiw2ICsyMjIsOCBAQCBwdWJsaWM6CiAgICAg Ly8gRnVuY3Rpb25zIGZvciBxdWVyeWluZyB0aGUgY3VycmVudCBzY3JvbGxlZCBwb3NpdGlvbiwg bmVnYXRpbmcgdGhlIGVmZmVjdHMgb2Ygb3ZlcmhhbmcKICAgICAvLyBhbmQgYWRqdXN0aW5nIGZv ciBwYWdlIHNjYWxlLgogICAgIEludFNpemUgc2Nyb2xsT2Zmc2V0Rm9yRml4ZWRQb3NpdGlvbigp IGNvbnN0OworICAgIC8vIFN0YXRpYyBmdW5jdGlvbiBjYW4gYmUgY2FsbGVkIGZyb20gYW5vdGhl ciB0aHJlYWQuCisgICAgc3RhdGljIEludFNpemUgc2Nyb2xsT2Zmc2V0Rm9yRml4ZWRQb3NpdGlv bihjb25zdCBJbnRSZWN0JiB2aXNpYmxlQ29udGVudFJlY3QsIGNvbnN0IEludFNpemUmIGNvbnRl bnRzU2l6ZSwgY29uc3QgSW50UG9pbnQmIHNjcm9sbFBvc2l0aW9uLCBjb25zdCBJbnRQb2ludCYg c2Nyb2xsT3JpZ2luLCBmbG9hdCBmcmFtZVNjYWxlRmFjdG9yLCBib29sIGZpeGVkRWxlbWVudHNM YXlvdXRSZWxhdGl2ZVRvRnJhbWUpOwogCiAgICAgYm9vbCBmaXhlZEVsZW1lbnRzTGF5b3V0UmVs YXRpdmVUb0ZyYW1lKCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAppbmRleCAyZWM3MTY1NDg1ZTdjMWM1 MWFjZDQwZjUxMWY2YTFhN2VhOTA4ODk0Li4xNDQwZDljOTY5Y2ViMjdlOTdiY2FkZmIwZjU0NzU5 N2Q1ODhmZDAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdDb29yZGluYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCkBAIC03NSwzNSArNzUsNiBAQCBQYXNzUmVmUHRyPFNj cm9sbGluZ0Nvb3JkaW5hdG9yPiBTY3JvbGxpbmdDb29yZGluYXRvcjo6Y3JlYXRlKFBhZ2UqIHBh Z2UpCiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTY3JvbGxpbmdDb29yZGluYXRvcihwYWdlKSk7 CiB9CiAKLXN0YXRpYyBpbnQgZml4ZWRQb3NpdGlvblNjcm9sbE9mZnNldChpbnQgdmlzaWJsZUNv bnRlbnRTaXplLCBpbnQgY29udGVudHNTaXplLCBpbnQgc2Nyb2xsUG9zaXRpb24sIGludCBzY3Jv bGxPcmlnaW4sIGZsb2F0IGZyYW1lU2NhbGVGYWN0b3IsIGJvb2wgZml4ZWRFbGVtZW50c0xheW91 dFJlbGF0aXZlVG9GcmFtZSkKLXsKLSAgICBpbnQgbWF4VmFsdWUgPSBjb250ZW50c1NpemUgLSB2 aXNpYmxlQ29udGVudFNpemU7Ci0gICAgaWYgKG1heFZhbHVlIDw9IDApCi0gICAgICAgIHJldHVy biAwOwotCi0gICAgaWYgKCFzY3JvbGxPcmlnaW4pIHsKLSAgICAgICAgaWYgKHNjcm9sbFBvc2l0 aW9uIDw9IDApCi0gICAgICAgICAgICByZXR1cm4gMDsKLSAgICAgICAgaWYgKHNjcm9sbFBvc2l0 aW9uID4gbWF4VmFsdWUpCi0gICAgICAgICAgICBzY3JvbGxQb3NpdGlvbiA9IG1heFZhbHVlOwot ICAgIH0gZWxzZSB7Ci0gICAgICAgIGlmIChzY3JvbGxQb3NpdGlvbiA+PSAwKQotICAgICAgICAg ICAgcmV0dXJuIDA7Ci0gICAgICAgIGlmIChzY3JvbGxQb3NpdGlvbiA8IC1tYXhWYWx1ZSkKLSAg ICAgICAgICAgIHNjcm9sbFBvc2l0aW9uID0gLW1heFZhbHVlOwotICAgIH0KLQotICAgIGZsb2F0 IGRyYWdGYWN0b3IgPSBmaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lID8gMSA6IChj b250ZW50c1NpemUgLSB2aXNpYmxlQ29udGVudFNpemUgKiBmcmFtZVNjYWxlRmFjdG9yKSAvIG1h eFZhbHVlOwotICAgIHJldHVybiBzY3JvbGxQb3NpdGlvbiAqIGRyYWdGYWN0b3IgLyBmcmFtZVNj YWxlRmFjdG9yOwotfQotCi1JbnRTaXplIHNjcm9sbE9mZnNldEZvckZpeGVkUG9zaXRpb24oY29u c3QgSW50UmVjdCYgdmlzaWJsZUNvbnRlbnRSZWN0LCBjb25zdCBJbnRTaXplJiBjb250ZW50c1Np emUsIGNvbnN0IEludFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgY29uc3QgSW50UG9pbnQmIHNjcm9s bE9yaWdpbiwgZmxvYXQgZnJhbWVTY2FsZUZhY3RvciwgYm9vbCBmaXhlZEVsZW1lbnRzTGF5b3V0 UmVsYXRpdmVUb0ZyYW1lKQotewotICAgIGludCB4ID0gZml4ZWRQb3NpdGlvblNjcm9sbE9mZnNl dCh2aXNpYmxlQ29udGVudFJlY3Qud2lkdGgoKSwgY29udGVudHNTaXplLndpZHRoKCksIHNjcm9s bFBvc2l0aW9uLngoKSwgc2Nyb2xsT3JpZ2luLngoKSwgZnJhbWVTY2FsZUZhY3RvciwgZml4ZWRF bGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSk7Ci0gICAgaW50IHkgPSBmaXhlZFBvc2l0aW9u U2Nyb2xsT2Zmc2V0KHZpc2libGVDb250ZW50UmVjdC5oZWlnaHQoKSwgY29udGVudHNTaXplLmhl aWdodCgpLCBzY3JvbGxQb3NpdGlvbi55KCksIHNjcm9sbE9yaWdpbi55KCksIGZyYW1lU2NhbGVG YWN0b3IsIGZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUpOwotICAgIHJldHVybiBJ bnRTaXplKHgsIHkpOwotfQotCiBTY3JvbGxpbmdDb29yZGluYXRvcjo6U2Nyb2xsaW5nQ29vcmRp bmF0b3IoUGFnZSogcGFnZSkKICAgICA6IG1fcGFnZShwYWdlKQogICAgICwgbV91cGRhdGVNYWlu RnJhbWVTY3JvbGxQb3NpdGlvblRpbWVyKHRoaXMsICZTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBk YXRlTWFpbkZyYW1lU2Nyb2xsUG9zaXRpb25UaW1lckZpcmVkKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKaW5kZXggMGFhODg4 MDhhMThkYjI3NGMzZmIzYWMwMTRkNTMwZTMzZGRiMzFiOS4uZDg0ZmJkYmNkN2NlY2FlZWRjMGZj MjE0OThkYTgxNDZkOWY2MTdlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oCkBAIC02NCw5ICs2NCw2IEBAIGNsYXNzIFZp ZXdwb3J0Q29uc3RyYWludHM7CiBjbGFzcyBTY3JvbGxpbmdUcmVlOwogI2VuZGlmCiAKLUludFNp emUgc2Nyb2xsT2Zmc2V0Rm9yRml4ZWRQb3NpdGlvbihjb25zdCBJbnRSZWN0JiB2aXNpYmxlQ29u dGVudFJlY3QsIGNvbnN0IEludFNpemUmIGNvbnRlbnRzU2l6ZSwgY29uc3QgSW50UG9pbnQmIHNj cm9sbFBvc2l0aW9uLAotICAgIGNvbnN0IEludFBvaW50JiBzY3JvbGxPcmlnaW4sIGZsb2F0IGZy YW1lU2NhbGVGYWN0b3IsIGJvb2wgZml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSk7 Ci0KIGVudW0gU2V0T3JTeW5jU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbiB7CiAgICAgU2V0U2Nyb2xs aW5nTGF5ZXJQb3NpdGlvbiwKICAgICBTeW5jU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTY3Jv bGxpbmdOb2RlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9s bGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFjLm1tCmluZGV4IDdjNzIyY2NhMzNmZTlmYjc1ODdkYzg2 ZjMxNWUzYmQyMThhZDFiMTguLmU3OWVhZTY4YjlmYzFjODRlYjZiNDFmYTc1ODYxYzk4NjlhNjgx M2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxp bmdUcmVlU2Nyb2xsaW5nTm9kZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9tYWMvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWMubW0KQEAgLTI4LDYgKzI4LDcg QEAKIAogI2lmIEVOQUJMRShUSFJFQURFRF9TQ1JPTExJTkcpCiAKKyNpbmNsdWRlICJGcmFtZVZp ZXcuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVdoZWVsRXZlbnQuaCIKICNpbmNsdWRlICJTY3JvbGxp bmdDb29yZGluYXRvci5oIgogI2luY2x1ZGUgIlNjcm9sbGluZ1RyZWUuaCIKQEAgLTMwNCw3ICsz MDUsNyBAQCB2b2lkIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFjOjpzZXRTY3JvbGxMYXll clBvc2l0aW9uKGNvbnN0IEludFBvaW50JiBwb3NpdAogICAgIEFTU0VSVCghc2hvdWxkVXBkYXRl U2Nyb2xsTGF5ZXJQb3NpdGlvbk9uTWFpblRocmVhZCgpKTsKICAgICBtX3Njcm9sbExheWVyLmdl dCgpLnBvc2l0aW9uID0gQ0dQb2ludE1ha2UoLXBvc2l0aW9uLngoKSArIHNjcm9sbE9yaWdpbigp LngoKSwgLXBvc2l0aW9uLnkoKSArIHNjcm9sbE9yaWdpbigpLnkoKSk7CiAKLSAgICBJbnRTaXpl IHNjcm9sbE9mZnNldEZvckZpeGVkQ2hpbGRyZW4gPSBXZWJDb3JlOjpzY3JvbGxPZmZzZXRGb3JG aXhlZFBvc2l0aW9uKHZpZXdwb3J0UmVjdCgpLCBjb250ZW50c1NpemUoKSwgcG9zaXRpb24sIHNj cm9sbE9yaWdpbigpLCBmcmFtZVNjYWxlRmFjdG9yKCksIGZhbHNlKTsKKyAgICBJbnRTaXplIHNj cm9sbE9mZnNldEZvckZpeGVkQ2hpbGRyZW4gPSBGcmFtZVZpZXc6OnNjcm9sbE9mZnNldEZvckZp eGVkUG9zaXRpb24odmlld3BvcnRSZWN0KCksIGNvbnRlbnRzU2l6ZSgpLCBwb3NpdGlvbiwgc2Ny b2xsT3JpZ2luKCksIGZyYW1lU2NhbGVGYWN0b3IoKSwgZmFsc2UpOwogICAgIGlmIChtX2NvdW50 ZXJTY3JvbGxpbmdMYXllcikKICAgICAgICAgbV9jb3VudGVyU2Nyb2xsaW5nTGF5ZXIuZ2V0KCku cG9zaXRpb24gPSBGbG9hdFBvaW50KHNjcm9sbE9mZnNldEZvckZpeGVkQ2hpbGRyZW4pOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAKaW5kZXggZjY5YmUwM2Jm NTU4ZTU2MmM3NjIzZjA4ZWMzMjEyNTY2M2Q2MWUwNy4uMzU0Njg0MTg1YTkxZmE1MzBiY2VlNGU2 YzI4OGYzZmZiMTI0NTExYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsYWJsZUFyZWEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVB cmVhLmNwcApAQCAtNDIxLDYgKzQyMSwzOCBAQCBJbnRSZWN0IFNjcm9sbGFibGVBcmVhOjp2aXNp YmxlQ29udGVudFJlY3QoVmlzaWJsZUNvbnRlbnRSZWN0SW5jbHVkZXNTY3JvbGxiYXJzCiAgICAg ICAgICAgICAgICAgICAgc3RkOjptYXgoMCwgdmlzaWJsZUhlaWdodCgpICsgaG9yaXpvbnRhbFNj cm9sbGJhckhlaWdodCkpOwogfQogCitzdGF0aWMgaW50IGNvbnN0cmFpbmVkU2Nyb2xsUG9zaXRp b24oaW50IHZpc2libGVDb250ZW50U2l6ZSwgaW50IGNvbnRlbnRzU2l6ZSwgaW50IHNjcm9sbFBv c2l0aW9uLCBpbnQgc2Nyb2xsT3JpZ2luKQoreworICAgIGludCBtYXhWYWx1ZSA9IGNvbnRlbnRz U2l6ZSAtIHZpc2libGVDb250ZW50U2l6ZTsKKyAgICBpZiAobWF4VmFsdWUgPD0gMCkKKyAgICAg ICAgcmV0dXJuIDA7CisKKyAgICBpZiAoIXNjcm9sbE9yaWdpbikgeworICAgICAgICBpZiAoc2Ny b2xsUG9zaXRpb24gPD0gMCkKKyAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICBpZiAoc2Ny b2xsUG9zaXRpb24gPiBtYXhWYWx1ZSkKKyAgICAgICAgICAgIHNjcm9sbFBvc2l0aW9uID0gbWF4 VmFsdWU7CisgICAgfSBlbHNlIHsKKyAgICAgICAgaWYgKHNjcm9sbFBvc2l0aW9uID49IDApCisg ICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgaWYgKHNjcm9sbFBvc2l0aW9uIDwgLW1heFZh bHVlKQorICAgICAgICAgICAgc2Nyb2xsUG9zaXRpb24gPSAtbWF4VmFsdWU7CisgICAgfQorCisg ICAgcmV0dXJuIHNjcm9sbFBvc2l0aW9uOworfQorCitJbnRQb2ludCBTY3JvbGxhYmxlQXJlYTo6 Y29uc3RyYWluU2Nyb2xsUG9zaXRpb25Gb3JPdmVyaGFuZyhjb25zdCBJbnRSZWN0JiB2aXNpYmxl Q29udGVudFJlY3QsIGNvbnN0IEludFNpemUmIGNvbnRlbnRzU2l6ZSwgY29uc3QgSW50UG9pbnQm IHNjcm9sbFBvc2l0aW9uLCBjb25zdCBJbnRQb2ludCYgc2Nyb2xsT3JpZ2luKQoreworICAgIHJl dHVybiBJbnRQb2ludChjb25zdHJhaW5lZFNjcm9sbFBvc2l0aW9uKHZpc2libGVDb250ZW50UmVj dC53aWR0aCgpLCBjb250ZW50c1NpemUud2lkdGgoKSwgc2Nyb2xsUG9zaXRpb24ueCgpLCBzY3Jv bGxPcmlnaW4ueCgpKSwKKyAgICAgICAgY29uc3RyYWluZWRTY3JvbGxQb3NpdGlvbih2aXNpYmxl Q29udGVudFJlY3QuaGVpZ2h0KCksIGNvbnRlbnRzU2l6ZS5oZWlnaHQoKSwgc2Nyb2xsUG9zaXRp b24ueSgpLCBzY3JvbGxPcmlnaW4ueSgpKSk7Cit9CisKK0ludFBvaW50IFNjcm9sbGFibGVBcmVh Ojpjb25zdHJhaW5TY3JvbGxQb3NpdGlvbkZvck92ZXJoYW5nKGNvbnN0IEludFBvaW50JiBzY3Jv bGxQb3NpdGlvbikKK3sKKyAgICByZXR1cm4gY29uc3RyYWluU2Nyb2xsUG9zaXRpb25Gb3JPdmVy aGFuZyh2aXNpYmxlQ29udGVudFJlY3QoKSwgY29udGVudHNTaXplKCksIHNjcm9sbFBvc2l0aW9u LCBzY3JvbGxPcmlnaW4oKSk7Cit9CisKIHZvaWQgU2Nyb2xsYWJsZUFyZWE6OnJlcG9ydE1lbW9y eVVzYWdlKE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pIGNvbnN0CiB7CiAgICAg TWVtb3J5Q2xhc3NJbmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgdGhpcyk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaAppbmRleCAzNThiZDhmNzhkMzJlMTUxMWEyNWYz ODFhOTY5YzhlMjk5MDUwMjNmLi4wMDQ5YzIzOGM3YjE4MWFiN2Y0ZWJmZjBiZjg5MDczNTY3MjZh ODgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKQEAgLTE2Nyw2 ICsxNjcsOSBAQCBwdWJsaWM6CiAgICAgLy8gTk9URTogT25seSBjYWxsZWQgZnJvbSBJbnRlcm5h bHMgZm9yIHRlc3RpbmcuCiAgICAgdm9pZCBzZXRTY3JvbGxPZmZzZXRGcm9tSW50ZXJuYWxzKGNv bnN0IEludFBvaW50Jik7CiAKKyAgICBzdGF0aWMgSW50UG9pbnQgY29uc3RyYWluU2Nyb2xsUG9z aXRpb25Gb3JPdmVyaGFuZyhjb25zdCBJbnRSZWN0JiB2aXNpYmxlQ29udGVudFJlY3QsIGNvbnN0 IEludFNpemUmIGNvbnRlbnRzU2l6ZSwgY29uc3QgSW50UG9pbnQmIHNjcm9sbFBvc2l0aW9uLCBj b25zdCBJbnRQb2ludCYgc2Nyb2xsT3JpZ2luKTsKKyAgICBJbnRQb2ludCBjb25zdHJhaW5TY3Jv bGxQb3NpdGlvbkZvck92ZXJoYW5nKGNvbnN0IEludFBvaW50JiBzY3JvbGxQb3NpdGlvbik7CisK ICAgICAvLyBMZXQgc3ViY2xhc3NlcyBwcm92aWRlIGEgd2F5IG9mIGFza2luZyBmb3IgYW5kIHNl cnZpY2luZyBzY3JvbGwKICAgICAvLyBhbmltYXRpb25zLgogICAgIHZpcnR1YWwgYm9vbCBzY2hl ZHVsZUFuaW1hdGlvbigpIHsgcmV0dXJuIGZhbHNlOyB9Cg==