116545 2013-05-21 08:56:43 -0700 [BlackBerry] Compositor API change: Don't pass the unused "viewport" parameter 2013-05-23 23:07:37 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jpetsovits jpetsovits anilsson commit-queue rwlbuis oldest_to_newest 891807 0 jpetsovits 2013-05-21 08:56:43 -0700 The "viewport" parameter in WebPageCompositor::render() is an artifact of our port's historical development, both unused and unnecessary. We should get rid of it. Also change the name of the "documentContents" parameter to the more descriptive "documentSrcRect". Patch below. 891812 1 202437 jpetsovits 2013-05-21 08:58:57 -0700 Created attachment 202437 Patch 891924 2 202437 anilsson 2013-05-21 11:51:59 -0700 Comment on attachment 202437 Patch LGTM, nice cleanup 891931 3 202455 jpetsovits 2013-05-21 12:02:36 -0700 Created attachment 202455 Patch Mike Fenton recently changed indentations, update patch to apply against current trunk. 891981 4 202465 jpetsovits 2013-05-21 13:28:38 -0700 Created attachment 202465 Patch Bug 116542 modifies a clashing hunk and with it (probably) not getting in, update the patch to apply against the state of the code without the other patch. 893112 5 202465 rwlbuis 2013-05-23 20:51:38 -0700 Comment on attachment 202465 Patch Ok. 893149 6 202465 commit-queue 2013-05-23 23:07:35 -0700 Comment on attachment 202465 Patch Clearing flags on attachment: 202465 Committed r150625: <http://trac.webkit.org/changeset/150625> 893150 7 commit-queue 2013-05-23 23:07:37 -0700 All reviewed patches have been landed. Closing bug. 202437 2013-05-21 08:58:57 -0700 2013-05-21 12:02:30 -0700 Patch bug-116545-20130521155735.patch text/plain 6109 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5NjI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA0ZmJiMDM5YjYyODM5ZWY1NzAxNGMyNmEyZDVkODQwMWJiNzUxMTQyLi5hNWFmMzFmOTE5 YTYyMzAzMzU3YzgyY2QxZjk4MDJlNDFlMzBiMTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMy0wNS0yMSAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0BibGFja2JlcnJ5LmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gQ29tcG9zaXRv ciBBUEkgY2hhbmdlOiBEb24ndCBwYXNzIHRoZSB1bnVzZWQgInZpZXdwb3J0IiBwYXJhbWV0ZXIu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTY1NDUK KyAgICAgICAgSW50ZXJuYWwgUFIgMTg5Nzc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWxzbyBjaGFuZ2UgdGhlIG5hbWUgb2YgdGhlICJkb2N1bWVu dENvbnRlbnRzIiBwYXJhbWV0ZXIKKyAgICAgICAgdG8gdGhlIG1vcmUgZGVzY3JpcHRpdmUgImRv Y3VtZW50U3JjUmVjdCIuCisKKyAgICAgICAgKiBBcGkvV2ViUGFnZUNvbXBvc2l0b3IuY3BwOgor ICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlQ29tcG9zaXRvclByaXZhdGU6OnJl bmRlcik6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VDb21wb3NpdG9yOjpy ZW5kZXIpOgorICAgICAgICAqIEFwaS9XZWJQYWdlQ29tcG9zaXRvci5oOgorICAgICAgICAqIEFw aS9XZWJQYWdlQ29tcG9zaXRvcl9wLmg6CisgICAgICAgIChXZWJQYWdlQ29tcG9zaXRvclByaXZh dGUpOgorCiAyMDEzLTA1LTE3ICBKYWtvYiBQZXRzb3ZpdHMgIDxqcGV0c292aXRzQGJsYWNrYmVy cnkuY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBEb24ndCB1c2UgcmVpbnRlcnByZXRfY2Fz dCB0byBjb252ZXJ0IHRvIFRyYW5zZm9ybWF0aW9uTWF0cml4LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yLmNwcAppbmRleCAyMzFiNGZiZDlm Yjg3ZDMwYzI3OGM1MTYyNzBkZTA5YTdkOGMzNzdkLi5kMTUyYzc3ODI0ODA1NDc3OTIyZjQxMDVm MzVjNjIwZGMzMTgxMjUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L1dlYlBhZ2VDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L1dlYlBhZ2VDb21wb3NpdG9yLmNwcApAQCAtMTQ1LDcgKzE0NSw3IEBAIHZvaWQgV2ViUGFnZUNv bXBvc2l0b3JQcml2YXRlOjpwcmVwYXJlRnJhbWUoZG91YmxlIGFuaW1hdGlvblRpbWUpCiAgICAg ICAgIG1fbGF5ZXJSZW5kZXJlci0+cHJlcGFyZUZyYW1lKGFuaW1hdGlvblRpbWUsIG1fY29tcG9z aXRpbmdUaHJlYWRPdmVybGF5TGF5ZXIuZ2V0KCkpOwogfQogCi12b2lkIFdlYlBhZ2VDb21wb3Np dG9yUHJpdmF0ZTo6cmVuZGVyKGNvbnN0IEludFJlY3QmIHRhcmdldFJlY3QsIGNvbnN0IEludFJl Y3QmIGNsaXBSZWN0LCBjb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgdHJhbnNmb3JtSW4sIGNv bnN0IEZsb2F0UmVjdCYgZG9jdW1lbnRDb250ZW50cywgY29uc3QgRmxvYXRSZWN0JiAvKnZpZXdw b3J0Ki8pCit2b2lkIFdlYlBhZ2VDb21wb3NpdG9yUHJpdmF0ZTo6cmVuZGVyKGNvbnN0IEludFJl Y3QmIHRhcmdldFJlY3QsIGNvbnN0IEludFJlY3QmIGNsaXBSZWN0LCBjb25zdCBUcmFuc2Zvcm1h dGlvbk1hdHJpeCYgdHJhbnNmb3JtSW4sIGNvbnN0IEZsb2F0UmVjdCYgZG9jdW1lbnRTcmNSZWN0 KQogewogICAgIC8vIG1fbGF5ZXJSZW5kZXJlciBzaG91bGQgaGF2ZSBiZWVuIGNyZWF0ZWQgaW4g cHJlcGFyZUZyYW1lCiAgICAgaWYgKCFtX2xheWVyUmVuZGVyZXIpCkBAIC0xNTgsMTMgKzE1OCwx MyBAQCB2b2lkIFdlYlBhZ2VDb21wb3NpdG9yUHJpdmF0ZTo6cmVuZGVyKGNvbnN0IEludFJlY3Qm IHRhcmdldFJlY3QsIGNvbnN0IEludFJlY3QmCiAgICAgaWYgKCFtX3dlYlBhZ2UgfHwgbV93ZWJQ YWdlLT5jb21wb3NpdG9yKCkgIT0gdGhpcykKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9sYXll clJlbmRlcmVyLT5zZXRWaWV3cG9ydCh0YXJnZXRSZWN0LCBjbGlwUmVjdCwgZG9jdW1lbnRDb250 ZW50cywgbV9sYXlvdXRSZWN0LCBtX2RvY3VtZW50UmVjdC5zaXplKCkpOworICAgIG1fbGF5ZXJS ZW5kZXJlci0+c2V0Vmlld3BvcnQodGFyZ2V0UmVjdCwgY2xpcFJlY3QsIGRvY3VtZW50U3JjUmVj dCwgbV9sYXlvdXRSZWN0LCBtX2RvY3VtZW50UmVjdC5zaXplKCkpOwogCiAgICAgVHJhbnNmb3Jt YXRpb25NYXRyaXggdHJhbnNmb3JtKHRyYW5zZm9ybUluKTsKICAgICB0cmFuc2Zvcm0udHJhbnNs YXRlKC1tX2RvY3VtZW50UmVjdC54KCksIC1tX2RvY3VtZW50UmVjdC55KCkpOwogCiAgICAgaWYg KCFkcmF3c1Jvb3RMYXllcigpKQotICAgICAgICBtX3dlYlBhZ2UtPm1fYmFja2luZ1N0b3JlLT5k LT5jb21wb3NpdGVDb250ZW50cyhtX2xheWVyUmVuZGVyZXIuZ2V0KCksIHRyYW5zZm9ybSwgZG9j dW1lbnRDb250ZW50cywgIW1fYmFja2dyb3VuZENvbG9yLmhhc0FscGhhKCkpOworICAgICAgICBt X3dlYlBhZ2UtPm1fYmFja2luZ1N0b3JlLT5kLT5jb21wb3NpdGVDb250ZW50cyhtX2xheWVyUmVu ZGVyZXIuZ2V0KCksIHRyYW5zZm9ybSwgZG9jdW1lbnRTcmNSZWN0LCAhbV9iYWNrZ3JvdW5kQ29s b3IuaGFzQWxwaGEoKSk7CiAKICAgICBjb21wb3NpdGVMYXllcnModHJhbnNmb3JtKTsKIH0KQEAg LTM0NSw3ICszNDUsNyBAQCB2b2lkIFdlYlBhZ2VDb21wb3NpdG9yOjpwcmVwYXJlRnJhbWUoUGxh dGZvcm06OkdyYXBoaWNzOjpHTEVTMkNvbnRleHQqIGNvbnRleHQsCiAgICAgZC0+cHJlcGFyZUZy YW1lKGFuaW1hdGlvblRpbWUpOwogfQogCi12b2lkIFdlYlBhZ2VDb21wb3NpdG9yOjpyZW5kZXIo UGxhdGZvcm06OkdyYXBoaWNzOjpHTEVTMkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IFBsYXRmb3Jt OjpJbnRSZWN0JiB0YXJnZXRSZWN0LCBjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgY2xpcFJlY3Qs IGNvbnN0IFBsYXRmb3JtOjpUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgdHJhbnNmb3JtLCBjb25zdCBQ bGF0Zm9ybTo6RmxvYXRSZWN0JiBkb2N1bWVudENvbnRlbnRzLCBjb25zdCBQbGF0Zm9ybTo6Rmxv YXRSZWN0JiB2aWV3cG9ydCkKK3ZvaWQgV2ViUGFnZUNvbXBvc2l0b3I6OnJlbmRlcihQbGF0Zm9y bTo6R3JhcGhpY3M6OkdMRVMyQ29udGV4dCogY29udGV4dCwgY29uc3QgUGxhdGZvcm06OkludFJl Y3QmIHRhcmdldFJlY3QsIGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiBjbGlwUmVjdCwgY29uc3Qg UGxhdGZvcm06OlRyYW5zZm9ybWF0aW9uTWF0cml4JiB0cmFuc2Zvcm0sIGNvbnN0IFBsYXRmb3Jt OjpGbG9hdFJlY3QmIGRvY3VtZW50U3JjUmVjdCkKIHsKICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJp eCB0ZigKICAgICAgICAgdHJhbnNmb3JtLm0xMSgpLCB0cmFuc2Zvcm0ubTEyKCksIHRyYW5zZm9y bS5tMTMoKSwgdHJhbnNmb3JtLm0xNCgpLApAQCAtMzU0LDcgKzM1NCw3IEBAIHZvaWQgV2ViUGFn ZUNvbXBvc2l0b3I6OnJlbmRlcihQbGF0Zm9ybTo6R3JhcGhpY3M6OkdMRVMyQ29udGV4dCogY29u dGV4dCwgY29uc3QKICAgICAgICAgdHJhbnNmb3JtLm00MSgpLCB0cmFuc2Zvcm0ubTQyKCksIHRy YW5zZm9ybS5tNDMoKSwgdHJhbnNmb3JtLm00NCgpKTsKIAogICAgIGQtPnNldENvbnRleHQoY29u dGV4dCk7Ci0gICAgZC0+cmVuZGVyKHRhcmdldFJlY3QsIGNsaXBSZWN0LCB0ZiwgZG9jdW1lbnRD b250ZW50cywgdmlld3BvcnQpOworICAgIGQtPnJlbmRlcih0YXJnZXRSZWN0LCBjbGlwUmVjdCwg dGYsIGRvY3VtZW50U3JjUmVjdCk7CiB9CiAKIHZvaWQgV2ViUGFnZUNvbXBvc2l0b3I6OmNsZWFu dXAoUGxhdGZvcm06OkdyYXBoaWNzOjpHTEVTMkNvbnRleHQqKQpAQCAtNDA0LDcgKzQwNCw2IEBA IHZvaWQgV2ViUGFnZUNvbXBvc2l0b3I6OnJlbmRlcihQbGF0Zm9ybTo6R3JhcGhpY3M6OkdMRVMy Q29udGV4dCosCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgUGxhdGZvcm06 OkludFJlY3QmLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFBsYXRmb3Jt OjpJbnRSZWN0JiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBQbGF0Zm9y bTo6VHJhbnNmb3JtYXRpb25NYXRyaXgmLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IFBsYXRmb3JtOjpGbG9hdFJlY3QmLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNvbnN0IFBsYXRmb3JtOjpGbG9hdFJlY3QmKQogewogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvci5oIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvci5oCmluZGV4IGM1YmIyM2QyMjlhZDdk NGQ3NjU2ZTk4NTE5YTIwN2Y2YTRiNGM2ZWUuLjZlYzg1ZGJjN2I2ZDhjMTg0NGIxNGE4NjRlZmQx MTRkNGY1MzliOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi UGFnZUNvbXBvc2l0b3IuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBh Z2VDb21wb3NpdG9yLmgKQEAgLTU0LDggKzU0LDcgQEAgcHVibGljOgogICAgICAgICAgICAgICAg IGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiB0YXJnZXRSZWN0LAogICAgICAgICAgICAgICAgIGNv bnN0IFBsYXRmb3JtOjpJbnRSZWN0JiBjbGlwUmVjdCwKICAgICAgICAgICAgICAgICBjb25zdCBQ bGF0Zm9ybTo6VHJhbnNmb3JtYXRpb25NYXRyaXgmLAotICAgICAgICAgICAgICAgIGNvbnN0IFBs YXRmb3JtOjpGbG9hdFJlY3QmIGRvY3VtZW50Q29udGVudHMsCi0gICAgICAgICAgICAgICAgY29u c3QgUGxhdGZvcm06OkZsb2F0UmVjdCYgdmlld3BvcnQpOworICAgICAgICAgICAgICAgIGNvbnN0 IFBsYXRmb3JtOjpGbG9hdFJlY3QmIGRvY3VtZW50U3JjUmVjdCk7CiAKICAgICB2b2lkIGNsZWFu dXAoUGxhdGZvcm06OkdyYXBoaWNzOjpHTEVTMkNvbnRleHQqKTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvcl9wLmggYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yX3AuaAppbmRleCBlZjczZjE2 MTNmOTczZDUyYWZhYWY2OGYyM2Y3OGEzYjk0NWExODAxLi4wNGFkZTcxNDkzYjBhOWNkMmFkZmU4 MzNiODE5NjMwODhhMTM1ZTRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv QXBpL1dlYlBhZ2VDb21wb3NpdG9yX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv QXBpL1dlYlBhZ2VDb21wb3NpdG9yX3AuaApAQCAtNjEsOCArNjEsNyBAQCBwdWJsaWM6CiAgICAg dm9pZCByZW5kZXIoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgdGFyZ2V0UmVjdCwKICAgICAgICAg ICAgICAgICBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBjbGlwUmVjdCwKICAgICAgICAgICAgICAg ICBjb25zdCBXZWJDb3JlOjpUcmFuc2Zvcm1hdGlvbk1hdHJpeCYsCi0gICAgICAgICAgICAgICAg Y29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBkb2N1bWVudENvbnRlbnRzLAotICAgICAgICAgICAg ICAgIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgdmlld3BvcnQpOworICAgICAgICAgICAgICAg IGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgZG9jdW1lbnRTcmNSZWN0KTsKIAogICAgIFBsYXRm b3JtOjpHcmFwaGljczo6R0xFUzJDb250ZXh0KiBjb250ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9j b250ZXh0OyB9CiAgICAgdm9pZCBzZXRDb250ZXh0KFBsYXRmb3JtOjpHcmFwaGljczo6R0xFUzJD b250ZXh0Kik7Cg== 202455 2013-05-21 12:02:36 -0700 2013-05-21 13:28:35 -0700 Patch bug-116545-20130521190112.patch text/plain 6193 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNDM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA3MmQ5ODA5MTNkN2FkMTIxZTQ5MTBiMTliNTQ1OTFjMGViZjIxYjFkLi41YmQ2N2NlYWFk NWRkYTZhZDU1NzI4YzIxZjBjZmRlYzE1ZDFjNTQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMy0wNS0yMSAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0BibGFja2JlcnJ5LmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gQ29tcG9zaXRv ciBBUEkgY2hhbmdlOiBEb24ndCBwYXNzIHRoZSB1bnVzZWQgInZpZXdwb3J0IiBwYXJhbWV0ZXIu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTY1NDUK KyAgICAgICAgSW50ZXJuYWwgUFIgMTg5Nzc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWxzbyBjaGFuZ2UgdGhlIG5hbWUgb2YgdGhlICJkb2N1bWVu dENvbnRlbnRzIiBwYXJhbWV0ZXIKKyAgICAgICAgdG8gdGhlIG1vcmUgZGVzY3JpcHRpdmUgImRv Y3VtZW50U3JjUmVjdCIuCisKKyAgICAgICAgKiBBcGkvV2ViUGFnZUNvbXBvc2l0b3IuY3BwOgor ICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlQ29tcG9zaXRvclByaXZhdGU6OnJl bmRlcik6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VDb21wb3NpdG9yOjpy ZW5kZXIpOgorICAgICAgICAqIEFwaS9XZWJQYWdlQ29tcG9zaXRvci5oOgorICAgICAgICAqIEFw aS9XZWJQYWdlQ29tcG9zaXRvcl9wLmg6CisgICAgICAgIChXZWJQYWdlQ29tcG9zaXRvclByaXZh dGUpOgorCiAyMDEzLTA1LTE3ICBKYWtvYiBQZXRzb3ZpdHMgIDxqcGV0c292aXRzQGJsYWNrYmVy cnkuY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBEb24ndCB1c2UgcmVpbnRlcnByZXRfY2Fz dCB0byBjb252ZXJ0IHRvIFRyYW5zZm9ybWF0aW9uTWF0cml4LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yLmNwcAppbmRleCA4OGIxNTMwYjZh NmFlNDVlOGFlYmY3ODM1NDI2MzQ5OWYzMDI2MjlkLi4yZTQ4YTc1NWE1ODg2MDgwMTZlMzUwOTQ3 NzVlZjUwOGM4NzUyN2NlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L1dlYlBhZ2VDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L1dlYlBhZ2VDb21wb3NpdG9yLmNwcApAQCAtMTQ0LDcgKzE0NCw3IEBAIHZvaWQgV2ViUGFnZUNv bXBvc2l0b3JQcml2YXRlOjpwcmVwYXJlRnJhbWUoZG91YmxlIGFuaW1hdGlvblRpbWUpCiAgICAg ICAgIG1fbGF5ZXJSZW5kZXJlci0+cHJlcGFyZUZyYW1lKGFuaW1hdGlvblRpbWUsIG1fY29tcG9z aXRpbmdUaHJlYWRPdmVybGF5TGF5ZXIuZ2V0KCkpOwogfQogCi12b2lkIFdlYlBhZ2VDb21wb3Np dG9yUHJpdmF0ZTo6cmVuZGVyKGNvbnN0IEludFJlY3QmIHRhcmdldFJlY3QsIGNvbnN0IEludFJl Y3QmIGNsaXBSZWN0LCBjb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgdHJhbnNmb3JtSW4sIGNv bnN0IEZsb2F0UmVjdCYgZG9jdW1lbnRDb250ZW50cywgY29uc3QgRmxvYXRSZWN0JiAvKnZpZXdw b3J0Ki8pCit2b2lkIFdlYlBhZ2VDb21wb3NpdG9yUHJpdmF0ZTo6cmVuZGVyKGNvbnN0IEludFJl Y3QmIHRhcmdldFJlY3QsIGNvbnN0IEludFJlY3QmIGNsaXBSZWN0LCBjb25zdCBUcmFuc2Zvcm1h dGlvbk1hdHJpeCYgdHJhbnNmb3JtSW4sIGNvbnN0IEZsb2F0UmVjdCYgZG9jdW1lbnRTcmNSZWN0 KQogewogICAgIC8vIG1fbGF5ZXJSZW5kZXJlciBzaG91bGQgaGF2ZSBiZWVuIGNyZWF0ZWQgaW4g cHJlcGFyZUZyYW1lCiAgICAgaWYgKCFtX2xheWVyUmVuZGVyZXIpCkBAIC0xNTcsMTMgKzE1Nywx MyBAQCB2b2lkIFdlYlBhZ2VDb21wb3NpdG9yUHJpdmF0ZTo6cmVuZGVyKGNvbnN0IEludFJlY3Qm IHRhcmdldFJlY3QsIGNvbnN0IEludFJlY3QmCiAgICAgaWYgKCFtX3dlYlBhZ2UgfHwgbV93ZWJQ YWdlLT5jb21wb3NpdG9yKCkgIT0gdGhpcykKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9sYXll clJlbmRlcmVyLT5zZXRWaWV3cG9ydCh0YXJnZXRSZWN0LCBjbGlwUmVjdCwgZG9jdW1lbnRDb250 ZW50cywgbV9sYXlvdXRSZWN0LCBtX2RvY3VtZW50UmVjdC5zaXplKCkpOworICAgIG1fbGF5ZXJS ZW5kZXJlci0+c2V0Vmlld3BvcnQodGFyZ2V0UmVjdCwgY2xpcFJlY3QsIGRvY3VtZW50U3JjUmVj dCwgbV9sYXlvdXRSZWN0LCBtX2RvY3VtZW50UmVjdC5zaXplKCkpOwogCiAgICAgVHJhbnNmb3Jt YXRpb25NYXRyaXggdHJhbnNmb3JtKHRyYW5zZm9ybUluKTsKICAgICB0cmFuc2Zvcm0udHJhbnNs YXRlKC1tX2RvY3VtZW50UmVjdC54KCksIC1tX2RvY3VtZW50UmVjdC55KCkpOwogCiAgICAgaWYg KCFkcmF3c1Jvb3RMYXllcigpKQotICAgICAgICBtX3dlYlBhZ2UtPm1fYmFja2luZ1N0b3JlLT5k LT5jb21wb3NpdGVDb250ZW50cyhtX2xheWVyUmVuZGVyZXIuZ2V0KCksIHRyYW5zZm9ybSwgZG9j dW1lbnRDb250ZW50cywgIW1fYmFja2dyb3VuZENvbG9yLmhhc0FscGhhKCkpOworICAgICAgICBt X3dlYlBhZ2UtPm1fYmFja2luZ1N0b3JlLT5kLT5jb21wb3NpdGVDb250ZW50cyhtX2xheWVyUmVu ZGVyZXIuZ2V0KCksIHRyYW5zZm9ybSwgZG9jdW1lbnRTcmNSZWN0LCAhbV9iYWNrZ3JvdW5kQ29s b3IuaGFzQWxwaGEoKSk7CiAKICAgICBjb21wb3NpdGVMYXllcnModHJhbnNmb3JtKTsKIH0KQEAg LTM0NCw3ICszNDQsNyBAQCB2b2lkIFdlYlBhZ2VDb21wb3NpdG9yOjpwcmVwYXJlRnJhbWUoUGxh dGZvcm06OkdyYXBoaWNzOjpHTEVTMkNvbnRleHQqIGNvbnRleHQsCiAgICAgZC0+cHJlcGFyZUZy YW1lKGFuaW1hdGlvblRpbWUpOwogfQogCi12b2lkIFdlYlBhZ2VDb21wb3NpdG9yOjpyZW5kZXIo UGxhdGZvcm06OkdyYXBoaWNzOjpHTEVTMkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IFBsYXRmb3Jt OjpJbnRSZWN0JiB0YXJnZXRSZWN0LCBjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgY2xpcFJlY3Qs IGNvbnN0IFBsYXRmb3JtOjpUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgdHJhbnNmb3JtLCBjb25zdCBQ bGF0Zm9ybTo6RmxvYXRSZWN0JiBkb2N1bWVudENvbnRlbnRzLCBjb25zdCBQbGF0Zm9ybTo6Rmxv YXRSZWN0JiB2aWV3cG9ydCkKK3ZvaWQgV2ViUGFnZUNvbXBvc2l0b3I6OnJlbmRlcihQbGF0Zm9y bTo6R3JhcGhpY3M6OkdMRVMyQ29udGV4dCogY29udGV4dCwgY29uc3QgUGxhdGZvcm06OkludFJl Y3QmIHRhcmdldFJlY3QsIGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiBjbGlwUmVjdCwgY29uc3Qg UGxhdGZvcm06OlRyYW5zZm9ybWF0aW9uTWF0cml4JiB0cmFuc2Zvcm0sIGNvbnN0IFBsYXRmb3Jt OjpGbG9hdFJlY3QmIGRvY3VtZW50U3JjUmVjdCkKIHsKICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJp eCB0ZigKICAgICAgICAgdHJhbnNmb3JtLm0xMSgpLCB0cmFuc2Zvcm0ubTEyKCksIHRyYW5zZm9y bS5tMTMoKSwgdHJhbnNmb3JtLm0xNCgpLApAQCAtMzUzLDcgKzM1Myw3IEBAIHZvaWQgV2ViUGFn ZUNvbXBvc2l0b3I6OnJlbmRlcihQbGF0Zm9ybTo6R3JhcGhpY3M6OkdMRVMyQ29udGV4dCogY29u dGV4dCwgY29uc3QKICAgICAgICAgdHJhbnNmb3JtLm00MSgpLCB0cmFuc2Zvcm0ubTQyKCksIHRy YW5zZm9ybS5tNDMoKSwgdHJhbnNmb3JtLm00NCgpKTsKIAogICAgIGQtPnNldENvbnRleHQoY29u dGV4dCk7Ci0gICAgZC0+cmVuZGVyKHRhcmdldFJlY3QsIGNsaXBSZWN0LCB0ZiwgZG9jdW1lbnRD b250ZW50cywgdmlld3BvcnQpOworICAgIGQtPnJlbmRlcih0YXJnZXRSZWN0LCBjbGlwUmVjdCwg dGYsIGRvY3VtZW50U3JjUmVjdCk7CiB9CiAKIHZvaWQgV2ViUGFnZUNvbXBvc2l0b3I6OmNsZWFu dXAoUGxhdGZvcm06OkdyYXBoaWNzOjpHTEVTMkNvbnRleHQqKQpAQCAtNDAzLDcgKzQwMyw2IEBA IHZvaWQgV2ViUGFnZUNvbXBvc2l0b3I6OnJlbmRlcihQbGF0Zm9ybTo6R3JhcGhpY3M6OkdMRVMy Q29udGV4dCosCiAgICAgY29uc3QgUGxhdGZvcm06OkludFJlY3QmLAogICAgIGNvbnN0IFBsYXRm b3JtOjpJbnRSZWN0JiwKICAgICBjb25zdCBQbGF0Zm9ybTo6VHJhbnNmb3JtYXRpb25NYXRyaXgm LAotICAgIGNvbnN0IFBsYXRmb3JtOjpGbG9hdFJlY3QmLAogICAgIGNvbnN0IFBsYXRmb3JtOjpG bG9hdFJlY3QmKQogewogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJQYWdlQ29tcG9zaXRvci5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQ YWdlQ29tcG9zaXRvci5oCmluZGV4IGZjMjdiYTY4ZmQ0ODJhY2U0NWE3NTZiYzk4MDQyNmQwZWU3 YThlY2IuLjA0ZTkyOThhZGQxNmViOGIxZjhkNGE0ZDRiOWFiZTE5NGQxOTM5M2UgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNvbXBvc2l0b3IuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yLmgKQEAgLTU0 LDggKzU0LDcgQEAgcHVibGljOgogICAgICAgICBjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgdGFy Z2V0UmVjdCwKICAgICAgICAgY29uc3QgUGxhdGZvcm06OkludFJlY3QmIGNsaXBSZWN0LAogICAg ICAgICBjb25zdCBQbGF0Zm9ybTo6VHJhbnNmb3JtYXRpb25NYXRyaXgmLAotICAgICAgICBjb25z dCBQbGF0Zm9ybTo6RmxvYXRSZWN0JiBkb2N1bWVudENvbnRlbnRzLAotICAgICAgICBjb25zdCBQ bGF0Zm9ybTo6RmxvYXRSZWN0JiB2aWV3cG9ydCk7CisgICAgICAgIGNvbnN0IFBsYXRmb3JtOjpG bG9hdFJlY3QmIGRvY3VtZW50U3JjUmVjdCk7CiAKICAgICB2b2lkIGNsZWFudXAoUGxhdGZvcm06 OkdyYXBoaWNzOjpHTEVTMkNvbnRleHQqKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvcl9wLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yX3AuaAppbmRleCA1ZDcxOWVkY2QzNGU1YzBiZjEy ZTA0MTZiMTM0OTQyMWFhNmU0YWJkLi4zYWU0NjM2NTBlMGJkMjI0NmJkOWU2NTgyMDg5NTc4OTcz MWQyNTU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VD b21wb3NpdG9yX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VD b21wb3NpdG9yX3AuaApAQCAtNTgsMTEgKzU4LDcgQEAgcHVibGljOgogICAgIC8vIFB1YmxpYyBB UEkKICAgICB2b2lkIHNldENoaWxkV2luZG93UGxhY2VtZW50KFdlYlBhZ2VDb21wb3NpdG9yOjpD aGlsZFdpbmRvd1BsYWNlbWVudCBwbGFjZW1lbnQpIHsgbV9jaGlsZFdpbmRvd1BsYWNlbWVudCA9 IHBsYWNlbWVudDsgfQogICAgIHZvaWQgcHJlcGFyZUZyYW1lKGRvdWJsZSBhbmltYXRpb25UaW1l KTsKLSAgICB2b2lkIHJlbmRlcihjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB0YXJnZXRSZWN0LAot ICAgICAgICBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBjbGlwUmVjdCwKLSAgICAgICAgY29uc3Qg V2ViQ29yZTo6VHJhbnNmb3JtYXRpb25NYXRyaXgmLAotICAgICAgICBjb25zdCBXZWJDb3JlOjpG bG9hdFJlY3QmIGRvY3VtZW50Q29udGVudHMsCi0gICAgICAgIGNvbnN0IFdlYkNvcmU6OkZsb2F0 UmVjdCYgdmlld3BvcnQpOworICAgIHZvaWQgcmVuZGVyKGNvbnN0IFdlYkNvcmU6OkludFJlY3Qm IHRhcmdldFJlY3QsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGNsaXBSZWN0LCBjb25zdCBXZWJD b3JlOjpUcmFuc2Zvcm1hdGlvbk1hdHJpeCYsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgZG9j dW1lbnRTcmNSZWN0KTsKIAogICAgIFBsYXRmb3JtOjpHcmFwaGljczo6R0xFUzJDb250ZXh0KiBj b250ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZXh0OyB9CiAgICAgdm9pZCBzZXRDb250ZXh0 KFBsYXRmb3JtOjpHcmFwaGljczo6R0xFUzJDb250ZXh0Kik7Cg== 202465 2013-05-21 13:28:38 -0700 2013-05-23 23:07:35 -0700 Patch bug-116545-20130521202715.patch text/plain 6065 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNDM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA2MzNlMTNmMGU5NzY5ZDY0YzZkNjZjODI3OWU2ZDI3NmM3ZTE2Y2U3Li5iYWFkMzllMjI5 ZTEyZTRmMzBjZDk4Mzc0MTM2ZmI1YjVhODUwZjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMy0wNS0xNyAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0BibGFja2JlcnJ5LmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gQ29tcG9zaXRv ciBBUEkgY2hhbmdlOiBEb24ndCBwYXNzIHRoZSB1bnVzZWQgInZpZXdwb3J0IiBwYXJhbWV0ZXIu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTY1NDUK KyAgICAgICAgSW50ZXJuYWwgUFIgMTg5Nzc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWxzbyBjaGFuZ2UgdGhlIG5hbWUgb2YgdGhlICJkb2N1bWVu dENvbnRlbnRzIiBwYXJhbWV0ZXIKKyAgICAgICAgdG8gdGhlIG1vcmUgZGVzY3JpcHRpdmUgImRv Y3VtZW50U3JjUmVjdCIuCisKKyAgICAgICAgKiBBcGkvV2ViUGFnZUNvbXBvc2l0b3IuY3BwOgor ICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlQ29tcG9zaXRvclByaXZhdGU6OnJl bmRlcik6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VDb21wb3NpdG9yOjpy ZW5kZXIpOgorICAgICAgICAqIEFwaS9XZWJQYWdlQ29tcG9zaXRvci5oOgorICAgICAgICAqIEFw aS9XZWJQYWdlQ29tcG9zaXRvcl9wLmg6CisgICAgICAgIChXZWJQYWdlQ29tcG9zaXRvclByaXZh dGUpOgorCiAyMDEzLTA1LTIxICBKYWtvYiBQZXRzb3ZpdHMgIDxqcGV0c292aXRzQGJsYWNrYmVy cnkuY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBNYWtlIHNjcmVlbiB1cGRhdGVzIGRlcGVu ZGVudCBvbiB0aGUgZXhpc3RlbmNlIG9mIGEgZHJhd2luZyBidWZmZXIuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yLmNwcCBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNvbXBvc2l0b3IuY3BwCmluZGV4IDlhMGZj OGNlY2NjZjJkZDU4YThmN2YzMDUyZDgxOWYzNTI5YTQ2NjUuLjgyODViZWRmNzBjZDQ4YmFlNGRh NWNhYzNkMjRjMmY3NWJiODRmNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvV2ViUGFnZUNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvV2ViUGFnZUNvbXBvc2l0b3IuY3BwCkBAIC0xNDQsNyArMTQ0LDcgQEAgdm9pZCBXZWJQ YWdlQ29tcG9zaXRvclByaXZhdGU6OnByZXBhcmVGcmFtZShkb3VibGUgYW5pbWF0aW9uVGltZSkK ICAgICAgICAgbV9sYXllclJlbmRlcmVyLT5wcmVwYXJlRnJhbWUoYW5pbWF0aW9uVGltZSwgbV9j b21wb3NpdGluZ1RocmVhZE92ZXJsYXlMYXllci5nZXQoKSk7CiB9CiAKLXZvaWQgV2ViUGFnZUNv bXBvc2l0b3JQcml2YXRlOjpyZW5kZXIoY29uc3QgSW50UmVjdCYgdGFyZ2V0UmVjdCwgY29uc3Qg SW50UmVjdCYgY2xpcFJlY3QsIGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiB0cmFuc2Zvcm1J biwgY29uc3QgRmxvYXRSZWN0JiBkb2N1bWVudENvbnRlbnRzLCBjb25zdCBGbG9hdFJlY3QmIC8q dmlld3BvcnQqLykKK3ZvaWQgV2ViUGFnZUNvbXBvc2l0b3JQcml2YXRlOjpyZW5kZXIoY29uc3Qg SW50UmVjdCYgdGFyZ2V0UmVjdCwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QsIGNvbnN0IFRyYW5z Zm9ybWF0aW9uTWF0cml4JiB0cmFuc2Zvcm1JbiwgY29uc3QgRmxvYXRSZWN0JiBkb2N1bWVudFNy Y1JlY3QpCiB7CiAgICAgLy8gbV9sYXllclJlbmRlcmVyIHNob3VsZCBoYXZlIGJlZW4gY3JlYXRl ZCBpbiBwcmVwYXJlRnJhbWUKICAgICBpZiAoIW1fbGF5ZXJSZW5kZXJlcikKQEAgLTE1NywxMyAr MTU3LDEzIEBAIHZvaWQgV2ViUGFnZUNvbXBvc2l0b3JQcml2YXRlOjpyZW5kZXIoY29uc3QgSW50 UmVjdCYgdGFyZ2V0UmVjdCwgY29uc3QgSW50UmVjdCYKICAgICBpZiAoIW1fd2ViUGFnZSB8fCBt X3dlYlBhZ2UtPmNvbXBvc2l0b3IoKSAhPSB0aGlzKQogICAgICAgICByZXR1cm47CiAKLSAgICBt X2xheWVyUmVuZGVyZXItPnNldFZpZXdwb3J0KHRhcmdldFJlY3QsIGNsaXBSZWN0LCBkb2N1bWVu dENvbnRlbnRzLCBtX2xheW91dFJlY3QsIG1fZG9jdW1lbnRSZWN0LnNpemUoKSk7CisgICAgbV9s YXllclJlbmRlcmVyLT5zZXRWaWV3cG9ydCh0YXJnZXRSZWN0LCBjbGlwUmVjdCwgZG9jdW1lbnRT cmNSZWN0LCBtX2xheW91dFJlY3QsIG1fZG9jdW1lbnRSZWN0LnNpemUoKSk7CiAKICAgICBUcmFu c2Zvcm1hdGlvbk1hdHJpeCB0cmFuc2Zvcm0odHJhbnNmb3JtSW4pOwogICAgIHRyYW5zZm9ybS50 cmFuc2xhdGUoLW1fZG9jdW1lbnRSZWN0LngoKSwgLW1fZG9jdW1lbnRSZWN0LnkoKSk7CiAKICAg ICBpZiAoIWRyYXdzUm9vdExheWVyKCkpCi0gICAgICAgIG1fd2ViUGFnZS0+bV9iYWNraW5nU3Rv cmUtPmQtPmNvbXBvc2l0ZUNvbnRlbnRzKG1fbGF5ZXJSZW5kZXJlci5nZXQoKSwgdHJhbnNmb3Jt LCBkb2N1bWVudENvbnRlbnRzLCAhbV9iYWNrZ3JvdW5kQ29sb3IuaGFzQWxwaGEoKSk7CisgICAg ICAgIG1fd2ViUGFnZS0+bV9iYWNraW5nU3RvcmUtPmQtPmNvbXBvc2l0ZUNvbnRlbnRzKG1fbGF5 ZXJSZW5kZXJlci5nZXQoKSwgdHJhbnNmb3JtLCBkb2N1bWVudFNyY1JlY3QsICFtX2JhY2tncm91 bmRDb2xvci5oYXNBbHBoYSgpKTsKIAogICAgIGNvbXBvc2l0ZUxheWVycyh0cmFuc2Zvcm0pOwog fQpAQCAtMzQ0LDEwICszNDQsMTAgQEAgdm9pZCBXZWJQYWdlQ29tcG9zaXRvcjo6cHJlcGFyZUZy YW1lKFBsYXRmb3JtOjpHcmFwaGljczo6R0xFUzJDb250ZXh0KiBjb250ZXh0LAogICAgIGQtPnBy ZXBhcmVGcmFtZShhbmltYXRpb25UaW1lKTsKIH0KIAotdm9pZCBXZWJQYWdlQ29tcG9zaXRvcjo6 cmVuZGVyKFBsYXRmb3JtOjpHcmFwaGljczo6R0xFUzJDb250ZXh0KiBjb250ZXh0LCBjb25zdCBQ bGF0Zm9ybTo6SW50UmVjdCYgdGFyZ2V0UmVjdCwgY29uc3QgUGxhdGZvcm06OkludFJlY3QmIGNs aXBSZWN0LCBjb25zdCBQbGF0Zm9ybTo6VHJhbnNmb3JtYXRpb25NYXRyaXgmIHRyYW5zZm9ybSwg Y29uc3QgUGxhdGZvcm06OkZsb2F0UmVjdCYgZG9jdW1lbnRDb250ZW50cywgY29uc3QgUGxhdGZv cm06OkZsb2F0UmVjdCYgdmlld3BvcnQpCit2b2lkIFdlYlBhZ2VDb21wb3NpdG9yOjpyZW5kZXIo UGxhdGZvcm06OkdyYXBoaWNzOjpHTEVTMkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IFBsYXRmb3Jt OjpJbnRSZWN0JiB0YXJnZXRSZWN0LCBjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgY2xpcFJlY3Qs IGNvbnN0IFBsYXRmb3JtOjpUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgdHJhbnNmb3JtLCBjb25zdCBQ bGF0Zm9ybTo6RmxvYXRSZWN0JiBkb2N1bWVudFNyY1JlY3QpCiB7CiAgICAgZC0+c2V0Q29udGV4 dChjb250ZXh0KTsKLSAgICBkLT5yZW5kZXIodGFyZ2V0UmVjdCwgY2xpcFJlY3QsIFRyYW5zZm9y bWF0aW9uTWF0cml4KHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgm Pih0cmFuc2Zvcm0pKSwgZG9jdW1lbnRDb250ZW50cywgdmlld3BvcnQpOworICAgIGQtPnJlbmRl cih0YXJnZXRSZWN0LCBjbGlwUmVjdCwgVHJhbnNmb3JtYXRpb25NYXRyaXgocmVpbnRlcnByZXRf Y2FzdDxjb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCY+KHRyYW5zZm9ybSkpLCBkb2N1bWVudFNy Y1JlY3QpOwogfQogCiB2b2lkIFdlYlBhZ2VDb21wb3NpdG9yOjpjbGVhbnVwKFBsYXRmb3JtOjpH cmFwaGljczo6R0xFUzJDb250ZXh0KikKQEAgLTM5Nyw3ICszOTcsNiBAQCB2b2lkIFdlYlBhZ2VD b21wb3NpdG9yOjpyZW5kZXIoUGxhdGZvcm06OkdyYXBoaWNzOjpHTEVTMkNvbnRleHQqLAogICAg IGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiwKICAgICBjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYs CiAgICAgY29uc3QgUGxhdGZvcm06OlRyYW5zZm9ybWF0aW9uTWF0cml4JiwKLSAgICBjb25zdCBQ bGF0Zm9ybTo6RmxvYXRSZWN0JiwKICAgICBjb25zdCBQbGF0Zm9ybTo6RmxvYXRSZWN0JikKIHsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNvbXBv c2l0b3IuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNvbXBvc2l0b3Iu aAppbmRleCBmYzI3YmE2OGZkNDgyYWNlNDVhNzU2YmM5ODA0MjZkMGVlN2E4ZWNiLi4wNGU5Mjk4 YWRkMTZlYjhiMWY4ZDRhNGQ0YjlhYmUxOTRkMTkzOTNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yLmgKKysrIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvci5oCkBAIC01NCw4ICs1NCw3IEBAIHB1 YmxpYzoKICAgICAgICAgY29uc3QgUGxhdGZvcm06OkludFJlY3QmIHRhcmdldFJlY3QsCiAgICAg ICAgIGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiBjbGlwUmVjdCwKICAgICAgICAgY29uc3QgUGxh dGZvcm06OlRyYW5zZm9ybWF0aW9uTWF0cml4JiwKLSAgICAgICAgY29uc3QgUGxhdGZvcm06OkZs b2F0UmVjdCYgZG9jdW1lbnRDb250ZW50cywKLSAgICAgICAgY29uc3QgUGxhdGZvcm06OkZsb2F0 UmVjdCYgdmlld3BvcnQpOworICAgICAgICBjb25zdCBQbGF0Zm9ybTo6RmxvYXRSZWN0JiBkb2N1 bWVudFNyY1JlY3QpOwogCiAgICAgdm9pZCBjbGVhbnVwKFBsYXRmb3JtOjpHcmFwaGljczo6R0xF UzJDb250ZXh0Kik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkv V2ViUGFnZUNvbXBvc2l0b3JfcC5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQ YWdlQ29tcG9zaXRvcl9wLmgKaW5kZXggNWQ3MTllZGNkMzRlNWMwYmYxMmUwNDE2YjEzNDk0MjFh YTZlNGFiZC4uM2FlNDYzNjUwZTBiZDIyNDZiZDllNjU4MjA4OTU3ODk3MzFkMjU1NCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvcl9wLmgK KysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvcl9wLmgK QEAgLTU4LDExICs1OCw3IEBAIHB1YmxpYzoKICAgICAvLyBQdWJsaWMgQVBJCiAgICAgdm9pZCBz ZXRDaGlsZFdpbmRvd1BsYWNlbWVudChXZWJQYWdlQ29tcG9zaXRvcjo6Q2hpbGRXaW5kb3dQbGFj ZW1lbnQgcGxhY2VtZW50KSB7IG1fY2hpbGRXaW5kb3dQbGFjZW1lbnQgPSBwbGFjZW1lbnQ7IH0K ICAgICB2b2lkIHByZXBhcmVGcmFtZShkb3VibGUgYW5pbWF0aW9uVGltZSk7Ci0gICAgdm9pZCBy ZW5kZXIoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgdGFyZ2V0UmVjdCwKLSAgICAgICAgY29uc3Qg V2ViQ29yZTo6SW50UmVjdCYgY2xpcFJlY3QsCi0gICAgICAgIGNvbnN0IFdlYkNvcmU6OlRyYW5z Zm9ybWF0aW9uTWF0cml4JiwKLSAgICAgICAgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBkb2N1 bWVudENvbnRlbnRzLAotICAgICAgICBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHZpZXdwb3J0 KTsKKyAgICB2b2lkIHJlbmRlcihjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB0YXJnZXRSZWN0LCBj b25zdCBXZWJDb3JlOjpJbnRSZWN0JiBjbGlwUmVjdCwgY29uc3QgV2ViQ29yZTo6VHJhbnNmb3Jt YXRpb25NYXRyaXgmLCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIGRvY3VtZW50U3JjUmVjdCk7 CiAKICAgICBQbGF0Zm9ybTo6R3JhcGhpY3M6OkdMRVMyQ29udGV4dCogY29udGV4dCgpIGNvbnN0 IHsgcmV0dXJuIG1fY29udGV4dDsgfQogICAgIHZvaWQgc2V0Q29udGV4dChQbGF0Zm9ybTo6R3Jh cGhpY3M6OkdMRVMyQ29udGV4dCopOwo=