107930 2013-01-25 02:48:46 -0800 [BlackBerry] AC layers appear in the wrong place on RTL page 2013-01-25 05:06:39 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 anilsson anilsson anilsson mifenton rwlbuis staikos tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 816423 0 anilsson 2013-01-25 02:48:46 -0800 PR #280229 The public API of the BlackBerry port always reports a minimum scroll position of (0, 0), even on RTL pages with left overflow. We accomplish this by translating the WebCore scroll position by an amount equal in size to the minimum scroll position, to obtain the API scroll position reported to the API client. This means the API client will ask us to render a rect that needs to be corrected for the minimum scroll position, or we'll render the wrong parts. This is done for BackingStore, but not for WebPageCompositor. 816441 1 184713 anilsson 2013-01-25 03:06:24 -0800 Created attachment 184713 Patch 816473 2 anilsson 2013-01-25 04:31:38 -0800 Since George is the internal reviewer, and this patch is identical to the internal patch, I'll mark him as upstream reviewer, too. 816476 3 184725 anilsson 2013-01-25 04:34:50 -0800 Created attachment 184725 Patch 816498 4 184725 webkit.review.bot 2013-01-25 05:06:35 -0800 Comment on attachment 184725 Patch Clearing flags on attachment: 184725 Committed r140816: <http://trac.webkit.org/changeset/140816> 816499 5 webkit.review.bot 2013-01-25 05:06:39 -0800 All reviewed patches have been landed. Closing bug. 184713 2013-01-25 03:06:24 -0800 2013-01-25 04:34:46 -0800 Patch bug-107930-20130125120314.patch text/plain 9890 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwODA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA0ZjFkMTU1M2ZmN2JmMGU1Yzc3OTFkNGFhZTg3MDRhYWI3M2NkNmMwLi41ZTcxNzllYjA4 ODBhNDE0MTVjMDNlNzcyMTRhMDUwZGJlYTZjNjhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSw0MiBAQAorMjAxMy0wMS0yNSAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxz c29uQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIEFDIGxheWVycyBhcHBlYXIgaW4g dGhlIHdyb25nIHBsYWNlIG9uIFJUTCBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDc5MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgcHVibGljIEFQSSBvZiB0aGUgQmxhY2tCZXJyeSBwb3J0 IGFsd2F5cyByZXBvcnRzIGEgbWluaW11bSBzY3JvbGwKKyAgICAgICAgcG9zaXRpb24gb2YgKDAs IDApLCBldmVuIG9uIFJUTCBwYWdlcyB3aXRoIGxlZnQgb3ZlcmZsb3cuIFdlCisgICAgICAgIGFj Y29tcGxpc2ggdGhpcyBieSB0cmFuc2xhdGluZyB0aGUgV2ViQ29yZSBzY3JvbGwgcG9zaXRpb24g YnkgYW4KKyAgICAgICAgYW1vdW50IGVxdWFsIGluIHNpemUgdG8gdGhlIG1pbmltdW0gc2Nyb2xs IHBvc2l0aW9uLCB0byBvYnRhaW4gdGhlIEFQSQorICAgICAgICBzY3JvbGwgcG9zaXRpb24gcmVw b3J0ZWQgdG8gdGhlIEFQSSBjbGllbnQuCisKKyAgICAgICAgVGhpcyBtZWFucyB0aGUgQVBJIGNs aWVudCB3aWxsIGFzayB1cyB0byByZW5kZXIgYSByZWN0IHRoYXQgbmVlZHMgdG8KKyAgICAgICAg YmUgY29ycmVjdGVkIGZvciB0aGUgbWluaW11bSBzY3JvbGwgcG9zaXRpb24sIG9yIHdlJ2xsIHJl bmRlciB0aGUgd3JvbmcKKyAgICAgICAgcGFydC4gVGhpcyBpcyBkb25lIGZvciBCYWNraW5nU3Rv cmUsIGJ1dCBub3QgZm9yIFdlYlBhZ2VDb21wb3NpdG9yLgorCisgICAgICAgIFdlYlBhZ2VDb21w b3NpdG9yIHdhcyByZW5kZXJpbmcgdGhlIHdyb25nIHBhcnQgb2YgdGhlIHdlYiBwYWdlIHdoZW4K KyAgICAgICAgdGhlIG1pbmltdW0gc2Nyb2xsIHBvc2l0aW9uIHdhcyBub24temVyby4gRml4ZWQg YnkgY29tbXVuaWNhdGluZyB0aGUKKyAgICAgICAgbWluaW11bSBzY3JvbGwgcG9zaXRpb24gdG8g dGhlIFdlYlBhZ2VDb21wb3NpdG9yLCBhbmQgYWNjb3VudGluZyBmb3IgaXQKKyAgICAgICAgd2hl biBpbnRlcnByZXRpbmcgdGhlIHJlcXVlc3RlZCBjb250ZW50IHJlY3RhbmdsZSB0byByZW5kZXIu CisKKyAgICAgICAgUFIgMjgwMjI5LgorCisgICAgICAgICogQXBpL1dlYlBhZ2UuY3BwOgorICAg ICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6Y29tbWl0Um9vdExheWVy KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmNvbW1pdFJv b3RMYXllcklmTmVlZGVkKToKKyAgICAgICAgKiBBcGkvV2ViUGFnZUNvbXBvc2l0b3IuY3BwOgor ICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlQ29tcG9zaXRvclByaXZhdGU6OnJl bmRlcik6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VDb21wb3NpdG9yUHJp dmF0ZTo6ZHJhd0xheWVycyk6CisgICAgICAgICogQXBpL1dlYlBhZ2VDb21wb3NpdG9yX3AuaDoK KyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZUNvbXBvc2l0b3JQcml2YXRlOjps YXlvdXRSZWN0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZUNvbXBvc2l0 b3JQcml2YXRlOjpzZXRMYXlvdXRSZWN0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6 V2ViUGFnZUNvbXBvc2l0b3JQcml2YXRlOjpkb2N1bWVudFJlY3QpOgorICAgICAgICAoQmxhY2tC ZXJyeTo6V2ViS2l0OjpXZWJQYWdlQ29tcG9zaXRvclByaXZhdGU6OnNldERvY3VtZW50UmVjdCk6 CisgICAgICAgIChXZWJQYWdlQ29tcG9zaXRvclByaXZhdGUpOgorICAgICAgICAqIEFwaS9XZWJQ YWdlX3AuaDoKKyAgICAgICAgKFdlYlBhZ2VQcml2YXRlKToKKwogMjAxMy0wMS0yNCAgTmltYSBH aGFuYXZhdGlhbiAgPG5naGFuYXZhdGlhbkByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5 XSBGaXggY3Jhc2ggaW4gU3BlbGxpbmdIYW5kbGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJQYWdlLmNwcAppbmRleCBjNTYzZTJlMmU0OTlkYjBjYTgxM2MxODM3ZDBiNzZhZjZmYzI4 YTI1Li44YjI1YjdkOGVjNDJmY2Q2YzgxNWFmNjgzNzYwMjc2OWQ2MTk0Zjc4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKQEAgLTU0MjcsOSArNTQyNyw3IEBAIHZv aWQgV2ViUGFnZVByaXZhdGU6OnNldENvbXBvc2l0b3JCYWNrZ3JvdW5kQ29sb3IoY29uc3QgQ29s b3ImIGJhY2tncm91bmRDb2xvcikKICAgICAgICAgbV9jb21wb3NpdG9yLT5zZXRCYWNrZ3JvdW5k Q29sb3IoYmFja2dyb3VuZENvbG9yKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJpdmF0ZTo6Y29tbWl0 Um9vdExheWVyKGNvbnN0IEludFJlY3QmIGxheW91dFJlY3RGb3JDb21wb3NpdGluZywKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBJbnRTaXplJiBjb250ZW50c1Np emVGb3JDb21wb3NpdGluZywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBi b29sIGRyYXdzUm9vdExheWVyKQordm9pZCBXZWJQYWdlUHJpdmF0ZTo6Y29tbWl0Um9vdExheWVy KGNvbnN0IEludFJlY3QmIGxheW91dFJlY3QsIGNvbnN0IEludFJlY3QmIGRvY3VtZW50UmVjdCwg Ym9vbCBkcmF3c1Jvb3RMYXllcikKIHsKICNpZiBERUJVR19BQ19DT01NSVQKICAgICBQbGF0Zm9y bTo6bG9nQWx3YXlzKFBsYXRmb3JtOjpMb2dMZXZlbENyaXRpY2FsLApAQCAtNTQ1Niw4ICs1NDU0 LDggQEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6Y29tbWl0Um9vdExheWVyKGNvbnN0IEludFJlY3Qm IGxheW91dFJlY3RGb3JDb21wb3NpdGluZywKICAgICBpZiAob3ZlcmxheUxheWVyICYmIG92ZXJs YXlMYXllci0+bGF5ZXJDb21wb3NpdGluZ1RocmVhZCgpICE9IG1fY29tcG9zaXRvci0+b3Zlcmxh eUxheWVyKCkpCiAgICAgICAgIG1fY29tcG9zaXRvci0+c2V0T3ZlcmxheUxheWVyKG92ZXJsYXlM YXllci0+bGF5ZXJDb21wb3NpdGluZ1RocmVhZCgpKTsKIAotICAgIG1fY29tcG9zaXRvci0+c2V0 TGF5b3V0UmVjdEZvckNvbXBvc2l0aW5nKGxheW91dFJlY3RGb3JDb21wb3NpdGluZyk7Ci0gICAg bV9jb21wb3NpdG9yLT5zZXRDb250ZW50c1NpemVGb3JDb21wb3NpdGluZyhjb250ZW50c1NpemVG b3JDb21wb3NpdGluZyk7CisgICAgbV9jb21wb3NpdG9yLT5zZXRMYXlvdXRSZWN0KGxheW91dFJl Y3QpOworICAgIG1fY29tcG9zaXRvci0+c2V0RG9jdW1lbnRSZWN0KGRvY3VtZW50UmVjdCk7CiAg ICAgbV9jb21wb3NpdG9yLT5zZXREcmF3c1Jvb3RMYXllcihkcmF3c1Jvb3RMYXllcik7CiAKICAg ICBpZiAocm9vdExheWVyKQpAQCAtNTUzMCw4ICs1NTI4LDggQEAgYm9vbCBXZWJQYWdlUHJpdmF0 ZTo6Y29tbWl0Um9vdExheWVySWZOZWVkZWQoKQogICAgIC8vIFN0YXNoIHRoZSB2aXNpYmxlIGNv bnRlbnQgcmVjdCBhY2NvcmRpbmcgdG8gd2Via2l0IHRocmVhZAogICAgIC8vIFRoaXMgaXMgdGhl IHJlY3RhbmdsZSB1c2VkIHRvIGxheW91dCBmaXhlZCBwb3NpdGlvbmVkIGVsZW1lbnRzLAogICAg IC8vIGFuZCB0aGF0J3Mgd2hhdCB0aGUgbGF5ZXIgcmVuZGVyZXIgd2FudHMuCi0gICAgSW50UmVj dCBsYXlvdXRSZWN0Rm9yQ29tcG9zaXRpbmcoc2Nyb2xsUG9zaXRpb24oKSwgYWN0dWFsVmlzaWJs ZVNpemUoKSk7Ci0gICAgSW50U2l6ZSBjb250ZW50c1NpemVGb3JDb21wb3NpdGluZyA9IGNvbnRl bnRzU2l6ZSgpOworICAgIEludFJlY3QgbGF5b3V0UmVjdChzY3JvbGxQb3NpdGlvbigpLCBhY3R1 YWxWaXNpYmxlU2l6ZSgpKTsKKyAgICBJbnRSZWN0IGRvY3VtZW50UmVjdCh2aWV3LT5taW5pbXVt U2Nyb2xsUG9zaXRpb24oKSwgdmlldy0+Y29udGVudHNTaXplKCkpOwogICAgIGJvb2wgZHJhd3NS b290TGF5ZXIgPSBjb21wb3NpdG9yRHJhd3NSb290TGF5ZXIoKTsKIAogICAgIC8vIENvbW1pdCBj aGFuZ2VzIG1hZGUgdG8gdGhlIGxheWVycyBzeW5jaHJvbm91c2x5IHdpdGggdGhlIGNvbXBvc2l0 aW5nIHRocmVhZC4KQEAgLTU1MzksOCArNTUzNyw4IEBAIGJvb2wgV2ViUGFnZVByaXZhdGU6OmNv bW1pdFJvb3RMYXllcklmTmVlZGVkKCkKICAgICAgICAgUGxhdGZvcm06OmNyZWF0ZU1ldGhvZENh bGxNZXNzYWdlKAogICAgICAgICAgICAgJldlYlBhZ2VQcml2YXRlOjpjb21taXRSb290TGF5ZXIs CiAgICAgICAgICAgICB0aGlzLAotICAgICAgICAgICAgbGF5b3V0UmVjdEZvckNvbXBvc2l0aW5n LAotICAgICAgICAgICAgY29udGVudHNTaXplRm9yQ29tcG9zaXRpbmcsCisgICAgICAgICAgICBs YXlvdXRSZWN0LAorICAgICAgICAgICAgZG9jdW1lbnRSZWN0LAogICAgICAgICAgICAgZHJhd3NS b290TGF5ZXIpKTsKIAogICAgIGRpZENvbXBvc2l0ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yLmNwcAppbmRleCBkYTMzNDY0ODRkNzVi OGM1MjZmNTk5MWIwNmNlZTMyOWZjYThjYWU5Li5hNDkwOWQ3NjQ1MjAzNzdkOWViM2U1ODU1ZWYz M2ExNzNmNzI0NGFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dl YlBhZ2VDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dl YlBhZ2VDb21wb3NpdG9yLmNwcApAQCAtMTQwLDEwICsxNDAsMTEgQEAgdm9pZCBXZWJQYWdlQ29t cG9zaXRvclByaXZhdGU6OnJlbmRlcihjb25zdCBJbnRSZWN0JiB0YXJnZXRSZWN0LCBjb25zdCBJ bnRSZWN0JgogCiAgICAgRmxvYXRSZWN0IGNvbnRlbnRzID0gbV93ZWJQYWdlLT5tYXBGcm9tVHJh bnNmb3JtZWRGbG9hdFJlY3QodHJhbnNmb3JtZWRDb250ZW50cyk7CiAKLSAgICBtX2xheWVyUmVu ZGVyZXItPnNldFZpZXdwb3J0KHRhcmdldFJlY3QsIGNsaXBSZWN0LCBjb250ZW50cywgbV9sYXlv dXRSZWN0Rm9yQ29tcG9zaXRpbmcsIG1fY29udGVudHNTaXplRm9yQ29tcG9zaXRpbmcpOworICAg IG1fbGF5ZXJSZW5kZXJlci0+c2V0Vmlld3BvcnQodGFyZ2V0UmVjdCwgY2xpcFJlY3QsIGNvbnRl bnRzLCBtX2xheW91dFJlY3QsIG1fZG9jdW1lbnRSZWN0LnNpemUoKSk7CiAKICAgICBUcmFuc2Zv cm1hdGlvbk1hdHJpeCB0cmFuc2Zvcm0odHJhbnNmb3JtSW4pOwogICAgIHRyYW5zZm9ybSAqPSAq bV93ZWJQYWdlLT5tX3RyYW5zZm9ybWF0aW9uTWF0cml4OworICAgIHRyYW5zZm9ybS50cmFuc2xh dGUoLW1fZG9jdW1lbnRSZWN0LngoKSwgLW1fZG9jdW1lbnRSZWN0LnkoKSk7CiAKICAgICBpZiAo IWRyYXdzUm9vdExheWVyKCkpCiAgICAgICAgIG1fd2ViUGFnZS0+bV9iYWNraW5nU3RvcmUtPmQt PmNvbXBvc2l0ZUNvbnRlbnRzKG1fbGF5ZXJSZW5kZXJlci5nZXQoKSwgdHJhbnNmb3JtLCBjb250 ZW50cywgIW1fYmFja2dyb3VuZENvbG9yLmhhc0FscGhhKCkpOwpAQCAtMTk2LDE0ICsxOTcsMTQg QEAgYm9vbCBXZWJQYWdlQ29tcG9zaXRvclByaXZhdGU6OmRyYXdMYXllcnMoY29uc3QgSW50UmVj dCYgZHN0UmVjdCwgY29uc3QgRmxvYXRSZWMKICAgICBpbnQgdmlld3BvcnRZID0gc3RkOjptYXgo MCwgbV9jb250ZXh0LT5zdXJmYWNlU2l6ZSgpLmhlaWdodCgpIC0gZHN0UmVjdC5tYXhZKCkpOwog ICAgIEludFJlY3Qgdmlld3BvcnQgPSBJbnRSZWN0KGRzdFJlY3QueCgpLCB2aWV3cG9ydFksIGRz dFJlY3Qud2lkdGgoKSwgZHN0UmVjdC5oZWlnaHQoKSk7CiAKLSAgICBtX2xheWVyUmVuZGVyZXIt PnNldFZpZXdwb3J0KHZpZXdwb3J0LCB2aWV3cG9ydCwgY29udGVudHMsIG1fbGF5b3V0UmVjdEZv ckNvbXBvc2l0aW5nLCBtX2NvbnRlbnRzU2l6ZUZvckNvbXBvc2l0aW5nKTsKKyAgICBtX2xheWVy UmVuZGVyZXItPnNldFZpZXdwb3J0KHZpZXdwb3J0LCB2aWV3cG9ydCwgY29udGVudHMsIG1fbGF5 b3V0UmVjdCwgbV9kb2N1bWVudFJlY3Quc2l6ZSgpKTsKIAogICAgIC8vIFdlYktpdCB1c2VzIHJv dyB2ZWN0b3JzIHdoaWNoIGFyZSBtdWx0aXBsaWVkIGJ5IHRoZSBtYXRyaXggb24gdGhlIGxlZnQg KGkuZS4gdipNKQogICAgIC8vIFRyYW5zZm9ybWF0aW9ucyBhcmUgY29tcG9zZWQgb24gdGhlIGxl ZnQgc28gdGhhdCBNMS54Zm9ybShNMikgbWVhbnMgTTIqTTEKICAgICAvLyBXZSB0aGVyZWZvcmUg c3RhcnQgd2l0aCBvdXIgKG90aG9nb25hbCkgcHJvamVjdGlvbiBtYXRyaXgsIHdoaWNoIHdpbGwg YmUgYXBwbGllZAogICAgIC8vIGFzIHRoZSBsYXN0IHRyYW5zZm9ybWF0aW9uLgogICAgIFRyYW5z Zm9ybWF0aW9uTWF0cml4IHRyYW5zZm9ybSA9IExheWVyUmVuZGVyZXI6Om9ydGhvTWF0cml4KDAs IGNvbnRlbnRzLndpZHRoKCksIGNvbnRlbnRzLmhlaWdodCgpLCAwLCAtMTAwMCwgMTAwMCk7Ci0g ICAgdHJhbnNmb3JtLnRyYW5zbGF0ZTNkKC1jb250ZW50cy54KCksIC1jb250ZW50cy55KCksIDAp OworICAgIHRyYW5zZm9ybS50cmFuc2xhdGUzZCgtY29udGVudHMueCgpIC0gbV9kb2N1bWVudFJl Y3QueCgpLCAtY29udGVudHMueSgpIC0gbV9kb2N1bWVudFJlY3QueSgpLCAwKTsKICAgICBjb21w b3NpdGVMYXllcnModHJhbnNmb3JtKTsKIAogICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvcl9wLmggYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yX3AuaAppbmRleCA0YWVm ZjM2ZDliODAxMWUwMDBlNjIwMmJlZTc0Y2Y1OGU3NmEyYmU0Li42NmUyYzBiZTRiZjk1NDM1NjI3 MGJiOGE1ZjBjNzYzZTJjNzFkYmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yX3AuaApAQCAtNzUsMTEgKzc1LDExIEBAIHB1YmxpYzoK ICAgICAvLyBSZW5kZXIgZXZlcnl0aGluZyBidXQgdGhlIHJvb3QgbGF5ZXIsIG9yIGV2ZXJ5dGhp bmcgaWYgZHJhd3NSb290TGF5ZXIoKSBpcyB0cnVlLgogICAgIGJvb2wgZHJhd0xheWVycyhjb25z dCBXZWJDb3JlOjpJbnRSZWN0JiBkc3RSZWN0LCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIGNv bnRlbnRzKTsKIAotICAgIFdlYkNvcmU6OkludFJlY3QgbGF5b3V0UmVjdEZvckNvbXBvc2l0aW5n KCkgY29uc3QgeyByZXR1cm4gbV9sYXlvdXRSZWN0Rm9yQ29tcG9zaXRpbmc7IH0KLSAgICB2b2lk IHNldExheW91dFJlY3RGb3JDb21wb3NpdGluZyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0 KSB7IG1fbGF5b3V0UmVjdEZvckNvbXBvc2l0aW5nID0gcmVjdDsgfQorICAgIFdlYkNvcmU6Oklu dFJlY3QgbGF5b3V0UmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0UmVjdDsgfQorICAgIHZv aWQgc2V0TGF5b3V0UmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0KSB7IG1fbGF5b3V0 UmVjdCA9IHJlY3Q7IH0KIAotICAgIFdlYkNvcmU6OkludFNpemUgY29udGVudHNTaXplRm9yQ29t cG9zaXRpbmcoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRzU2l6ZUZvckNvbXBvc2l0aW5nOyB9 Ci0gICAgdm9pZCBzZXRDb250ZW50c1NpemVGb3JDb21wb3NpdGluZyhjb25zdCBXZWJDb3JlOjpJ bnRTaXplJiBzaXplKSB7IG1fY29udGVudHNTaXplRm9yQ29tcG9zaXRpbmcgPSBzaXplOyB9Cisg ICAgV2ViQ29yZTo6SW50UmVjdCBkb2N1bWVudFJlY3QoKSBjb25zdCB7IHJldHVybiBtX2RvY3Vt ZW50UmVjdDsgfQorICAgIHZvaWQgc2V0RG9jdW1lbnRSZWN0KGNvbnN0IFdlYkNvcmU6OkludFJl Y3QmIHJlY3QpIHsgbV9kb2N1bWVudFJlY3QgPSByZWN0OyB9CiAKICAgICBXZWJDb3JlOjpMYXll clJlbmRlcmluZ1Jlc3VsdHMgbGFzdENvbXBvc2l0aW5nUmVzdWx0cygpIGNvbnN0IHsgcmV0dXJu IG1fbGFzdENvbXBvc2l0aW5nUmVzdWx0czsgfQogICAgIHZvaWQgc2V0TGFzdENvbXBvc2l0aW5n UmVzdWx0cyhjb25zdCBXZWJDb3JlOjpMYXllclJlbmRlcmluZ1Jlc3VsdHMmIHJlc3VsdHMpIHsg bV9sYXN0Q29tcG9zaXRpbmdSZXN1bHRzID0gcmVzdWx0czsgfQpAQCAtMTEyLDggKzExMiw4IEBA IHByaXZhdGU6CiAgICAgUmVmUHRyPFdlYkNvcmU6OkxheWVyQ29tcG9zaXRpbmdUaHJlYWQ+IG1f cm9vdExheWVyOwogICAgIFJlZlB0cjxXZWJDb3JlOjpMYXllckNvbXBvc2l0aW5nVGhyZWFkPiBt X292ZXJsYXlMYXllcjsKICAgICBSZWZQdHI8V2ViQ29yZTo6TGF5ZXJDb21wb3NpdGluZ1RocmVh ZD4gbV9jb21wb3NpdGluZ1RocmVhZE92ZXJsYXlMYXllcjsKLSAgICBXZWJDb3JlOjpJbnRSZWN0 IG1fbGF5b3V0UmVjdEZvckNvbXBvc2l0aW5nOwotICAgIFdlYkNvcmU6OkludFNpemUgbV9jb250 ZW50c1NpemVGb3JDb21wb3NpdGluZzsKKyAgICBXZWJDb3JlOjpJbnRSZWN0IG1fbGF5b3V0UmVj dDsKKyAgICBXZWJDb3JlOjpJbnRSZWN0IG1fZG9jdW1lbnRSZWN0OwogICAgIFdlYkNvcmU6Okxh eWVyUmVuZGVyaW5nUmVzdWx0cyBtX2xhc3RDb21wb3NpdGluZ1Jlc3VsdHM7CiAgICAgV2ViQ29y ZTo6Q29sb3IgbV9iYWNrZ3JvdW5kQ29sb3I7CiAgICAgYm9vbCBtX2RyYXdzUm9vdExheWVyOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaCBiL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmgKaW5kZXggYjIwNmU4M2Y3OTJj NzNjZGIxNjZlYzA3NTk5ZjllMTljYTkyZDdiYi4uOGMxYzM0ZDQ5ZjllMDcyY2ZlMzU1M2QyMjE4 ODc5ZTZhMjRmNWFlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJQYWdlX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5o CkBAIC00MDgsNyArNDA4LDcgQEAgcHVibGljOgogCiAgICAgLy8gQ29tcG9zaXRpbmcgdGhyZWFk LgogICAgIHZvaWQgc2V0Um9vdExheWVyQ29tcG9zaXRpbmdUaHJlYWQoV2ViQ29yZTo6TGF5ZXJD b21wb3NpdGluZ1RocmVhZCopOwotICAgIHZvaWQgY29tbWl0Um9vdExheWVyKGNvbnN0IFdlYkNv cmU6OkludFJlY3QmLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiwgYm9vbCk7CisgICAgdm9pZCBj b21taXRSb290TGF5ZXIoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgbGF5b3V0UmVjdCwgY29uc3Qg V2ViQ29yZTo6SW50UmVjdCYgZG9jdW1lbnRSZWN0LCBib29sKTsKICAgICBib29sIGlzQWNjZWxl cmF0ZWRDb21wb3NpdGluZ0FjdGl2ZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29tcG9zaXRvcjsgfQog ICAgIFdlYlBhZ2VDb21wb3NpdG9yUHJpdmF0ZSogY29tcG9zaXRvcigpIGNvbnN0IHsgcmV0dXJu IG1fY29tcG9zaXRvci5nZXQoKTsgfQogICAgIHZvaWQgc2V0Q29tcG9zaXRvcihQYXNzUmVmUHRy PFdlYlBhZ2VDb21wb3NpdG9yUHJpdmF0ZT4pOwo= 184725 2013-01-25 04:34:50 -0800 2013-01-25 05:06:35 -0800 Patch bug-107930-20130125133139.patch text/plain 9890 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwODA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA0ZjFkMTU1M2ZmN2JmMGU1Yzc3OTFkNGFhZTg3MDRhYWI3M2NkNmMwLi5hOTllNjZjNjcw ODg0YzU5MTBjOGEwZjUxYWRkODZlYjIxNDE5NmMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSw0MiBAQAorMjAxMy0wMS0yNSAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxz c29uQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIEFDIGxheWVycyBhcHBlYXIgaW4g dGhlIHdyb25nIHBsYWNlIG9uIFJUTCBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDc5MzAKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9yZ2Ug U3RhaWtvcy4KKworICAgICAgICBUaGUgcHVibGljIEFQSSBvZiB0aGUgQmxhY2tCZXJyeSBwb3J0 IGFsd2F5cyByZXBvcnRzIGEgbWluaW11bSBzY3JvbGwKKyAgICAgICAgcG9zaXRpb24gb2YgKDAs IDApLCBldmVuIG9uIFJUTCBwYWdlcyB3aXRoIGxlZnQgb3ZlcmZsb3cuIFdlCisgICAgICAgIGFj Y29tcGxpc2ggdGhpcyBieSB0cmFuc2xhdGluZyB0aGUgV2ViQ29yZSBzY3JvbGwgcG9zaXRpb24g YnkgYW4KKyAgICAgICAgYW1vdW50IGVxdWFsIGluIHNpemUgdG8gdGhlIG1pbmltdW0gc2Nyb2xs IHBvc2l0aW9uLCB0byBvYnRhaW4gdGhlIEFQSQorICAgICAgICBzY3JvbGwgcG9zaXRpb24gcmVw b3J0ZWQgdG8gdGhlIEFQSSBjbGllbnQuCisKKyAgICAgICAgVGhpcyBtZWFucyB0aGUgQVBJIGNs aWVudCB3aWxsIGFzayB1cyB0byByZW5kZXIgYSByZWN0IHRoYXQgbmVlZHMgdG8KKyAgICAgICAg YmUgY29ycmVjdGVkIGZvciB0aGUgbWluaW11bSBzY3JvbGwgcG9zaXRpb24sIG9yIHdlJ2xsIHJl bmRlciB0aGUgd3JvbmcKKyAgICAgICAgcGFydC4gVGhpcyBpcyBkb25lIGZvciBCYWNraW5nU3Rv cmUsIGJ1dCBub3QgZm9yIFdlYlBhZ2VDb21wb3NpdG9yLgorCisgICAgICAgIFdlYlBhZ2VDb21w b3NpdG9yIHdhcyByZW5kZXJpbmcgdGhlIHdyb25nIHBhcnQgb2YgdGhlIHdlYiBwYWdlIHdoZW4K KyAgICAgICAgdGhlIG1pbmltdW0gc2Nyb2xsIHBvc2l0aW9uIHdhcyBub24temVyby4gRml4ZWQg YnkgY29tbXVuaWNhdGluZyB0aGUKKyAgICAgICAgbWluaW11bSBzY3JvbGwgcG9zaXRpb24gdG8g dGhlIFdlYlBhZ2VDb21wb3NpdG9yLCBhbmQgYWNjb3VudGluZyBmb3IgaXQKKyAgICAgICAgd2hl biBpbnRlcnByZXRpbmcgdGhlIHJlcXVlc3RlZCBjb250ZW50IHJlY3RhbmdsZSB0byByZW5kZXIu CisKKyAgICAgICAgUFIgMjgwMjI5LgorCisgICAgICAgICogQXBpL1dlYlBhZ2UuY3BwOgorICAg ICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6Y29tbWl0Um9vdExheWVy KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmNvbW1pdFJv b3RMYXllcklmTmVlZGVkKToKKyAgICAgICAgKiBBcGkvV2ViUGFnZUNvbXBvc2l0b3IuY3BwOgor ICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlQ29tcG9zaXRvclByaXZhdGU6OnJl bmRlcik6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VDb21wb3NpdG9yUHJp dmF0ZTo6ZHJhd0xheWVycyk6CisgICAgICAgICogQXBpL1dlYlBhZ2VDb21wb3NpdG9yX3AuaDoK KyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZUNvbXBvc2l0b3JQcml2YXRlOjps YXlvdXRSZWN0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZUNvbXBvc2l0 b3JQcml2YXRlOjpzZXRMYXlvdXRSZWN0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6 V2ViUGFnZUNvbXBvc2l0b3JQcml2YXRlOjpkb2N1bWVudFJlY3QpOgorICAgICAgICAoQmxhY2tC ZXJyeTo6V2ViS2l0OjpXZWJQYWdlQ29tcG9zaXRvclByaXZhdGU6OnNldERvY3VtZW50UmVjdCk6 CisgICAgICAgIChXZWJQYWdlQ29tcG9zaXRvclByaXZhdGUpOgorICAgICAgICAqIEFwaS9XZWJQ YWdlX3AuaDoKKyAgICAgICAgKFdlYlBhZ2VQcml2YXRlKToKKwogMjAxMy0wMS0yNCAgTmltYSBH aGFuYXZhdGlhbiAgPG5naGFuYXZhdGlhbkByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5 XSBGaXggY3Jhc2ggaW4gU3BlbGxpbmdIYW5kbGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJQYWdlLmNwcAppbmRleCBjNTYzZTJlMmU0OTlkYjBjYTgxM2MxODM3ZDBiNzZhZjZmYzI4 YTI1Li44YjI1YjdkOGVjNDJmY2Q2YzgxNWFmNjgzNzYwMjc2OWQ2MTk0Zjc4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKQEAgLTU0MjcsOSArNTQyNyw3IEBAIHZv aWQgV2ViUGFnZVByaXZhdGU6OnNldENvbXBvc2l0b3JCYWNrZ3JvdW5kQ29sb3IoY29uc3QgQ29s b3ImIGJhY2tncm91bmRDb2xvcikKICAgICAgICAgbV9jb21wb3NpdG9yLT5zZXRCYWNrZ3JvdW5k Q29sb3IoYmFja2dyb3VuZENvbG9yKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJpdmF0ZTo6Y29tbWl0 Um9vdExheWVyKGNvbnN0IEludFJlY3QmIGxheW91dFJlY3RGb3JDb21wb3NpdGluZywKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBJbnRTaXplJiBjb250ZW50c1Np emVGb3JDb21wb3NpdGluZywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBi b29sIGRyYXdzUm9vdExheWVyKQordm9pZCBXZWJQYWdlUHJpdmF0ZTo6Y29tbWl0Um9vdExheWVy KGNvbnN0IEludFJlY3QmIGxheW91dFJlY3QsIGNvbnN0IEludFJlY3QmIGRvY3VtZW50UmVjdCwg Ym9vbCBkcmF3c1Jvb3RMYXllcikKIHsKICNpZiBERUJVR19BQ19DT01NSVQKICAgICBQbGF0Zm9y bTo6bG9nQWx3YXlzKFBsYXRmb3JtOjpMb2dMZXZlbENyaXRpY2FsLApAQCAtNTQ1Niw4ICs1NDU0 LDggQEAgdm9pZCBXZWJQYWdlUHJpdmF0ZTo6Y29tbWl0Um9vdExheWVyKGNvbnN0IEludFJlY3Qm IGxheW91dFJlY3RGb3JDb21wb3NpdGluZywKICAgICBpZiAob3ZlcmxheUxheWVyICYmIG92ZXJs YXlMYXllci0+bGF5ZXJDb21wb3NpdGluZ1RocmVhZCgpICE9IG1fY29tcG9zaXRvci0+b3Zlcmxh eUxheWVyKCkpCiAgICAgICAgIG1fY29tcG9zaXRvci0+c2V0T3ZlcmxheUxheWVyKG92ZXJsYXlM YXllci0+bGF5ZXJDb21wb3NpdGluZ1RocmVhZCgpKTsKIAotICAgIG1fY29tcG9zaXRvci0+c2V0 TGF5b3V0UmVjdEZvckNvbXBvc2l0aW5nKGxheW91dFJlY3RGb3JDb21wb3NpdGluZyk7Ci0gICAg bV9jb21wb3NpdG9yLT5zZXRDb250ZW50c1NpemVGb3JDb21wb3NpdGluZyhjb250ZW50c1NpemVG b3JDb21wb3NpdGluZyk7CisgICAgbV9jb21wb3NpdG9yLT5zZXRMYXlvdXRSZWN0KGxheW91dFJl Y3QpOworICAgIG1fY29tcG9zaXRvci0+c2V0RG9jdW1lbnRSZWN0KGRvY3VtZW50UmVjdCk7CiAg ICAgbV9jb21wb3NpdG9yLT5zZXREcmF3c1Jvb3RMYXllcihkcmF3c1Jvb3RMYXllcik7CiAKICAg ICBpZiAocm9vdExheWVyKQpAQCAtNTUzMCw4ICs1NTI4LDggQEAgYm9vbCBXZWJQYWdlUHJpdmF0 ZTo6Y29tbWl0Um9vdExheWVySWZOZWVkZWQoKQogICAgIC8vIFN0YXNoIHRoZSB2aXNpYmxlIGNv bnRlbnQgcmVjdCBhY2NvcmRpbmcgdG8gd2Via2l0IHRocmVhZAogICAgIC8vIFRoaXMgaXMgdGhl IHJlY3RhbmdsZSB1c2VkIHRvIGxheW91dCBmaXhlZCBwb3NpdGlvbmVkIGVsZW1lbnRzLAogICAg IC8vIGFuZCB0aGF0J3Mgd2hhdCB0aGUgbGF5ZXIgcmVuZGVyZXIgd2FudHMuCi0gICAgSW50UmVj dCBsYXlvdXRSZWN0Rm9yQ29tcG9zaXRpbmcoc2Nyb2xsUG9zaXRpb24oKSwgYWN0dWFsVmlzaWJs ZVNpemUoKSk7Ci0gICAgSW50U2l6ZSBjb250ZW50c1NpemVGb3JDb21wb3NpdGluZyA9IGNvbnRl bnRzU2l6ZSgpOworICAgIEludFJlY3QgbGF5b3V0UmVjdChzY3JvbGxQb3NpdGlvbigpLCBhY3R1 YWxWaXNpYmxlU2l6ZSgpKTsKKyAgICBJbnRSZWN0IGRvY3VtZW50UmVjdCh2aWV3LT5taW5pbXVt U2Nyb2xsUG9zaXRpb24oKSwgdmlldy0+Y29udGVudHNTaXplKCkpOwogICAgIGJvb2wgZHJhd3NS b290TGF5ZXIgPSBjb21wb3NpdG9yRHJhd3NSb290TGF5ZXIoKTsKIAogICAgIC8vIENvbW1pdCBj aGFuZ2VzIG1hZGUgdG8gdGhlIGxheWVycyBzeW5jaHJvbm91c2x5IHdpdGggdGhlIGNvbXBvc2l0 aW5nIHRocmVhZC4KQEAgLTU1MzksOCArNTUzNyw4IEBAIGJvb2wgV2ViUGFnZVByaXZhdGU6OmNv bW1pdFJvb3RMYXllcklmTmVlZGVkKCkKICAgICAgICAgUGxhdGZvcm06OmNyZWF0ZU1ldGhvZENh bGxNZXNzYWdlKAogICAgICAgICAgICAgJldlYlBhZ2VQcml2YXRlOjpjb21taXRSb290TGF5ZXIs CiAgICAgICAgICAgICB0aGlzLAotICAgICAgICAgICAgbGF5b3V0UmVjdEZvckNvbXBvc2l0aW5n LAotICAgICAgICAgICAgY29udGVudHNTaXplRm9yQ29tcG9zaXRpbmcsCisgICAgICAgICAgICBs YXlvdXRSZWN0LAorICAgICAgICAgICAgZG9jdW1lbnRSZWN0LAogICAgICAgICAgICAgZHJhd3NS b290TGF5ZXIpKTsKIAogICAgIGRpZENvbXBvc2l0ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yLmNwcAppbmRleCBkYTMzNDY0ODRkNzVi OGM1MjZmNTk5MWIwNmNlZTMyOWZjYThjYWU5Li5hNDkwOWQ3NjQ1MjAzNzdkOWViM2U1ODU1ZWYz M2ExNzNmNzI0NGFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dl YlBhZ2VDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dl YlBhZ2VDb21wb3NpdG9yLmNwcApAQCAtMTQwLDEwICsxNDAsMTEgQEAgdm9pZCBXZWJQYWdlQ29t cG9zaXRvclByaXZhdGU6OnJlbmRlcihjb25zdCBJbnRSZWN0JiB0YXJnZXRSZWN0LCBjb25zdCBJ bnRSZWN0JgogCiAgICAgRmxvYXRSZWN0IGNvbnRlbnRzID0gbV93ZWJQYWdlLT5tYXBGcm9tVHJh bnNmb3JtZWRGbG9hdFJlY3QodHJhbnNmb3JtZWRDb250ZW50cyk7CiAKLSAgICBtX2xheWVyUmVu ZGVyZXItPnNldFZpZXdwb3J0KHRhcmdldFJlY3QsIGNsaXBSZWN0LCBjb250ZW50cywgbV9sYXlv dXRSZWN0Rm9yQ29tcG9zaXRpbmcsIG1fY29udGVudHNTaXplRm9yQ29tcG9zaXRpbmcpOworICAg IG1fbGF5ZXJSZW5kZXJlci0+c2V0Vmlld3BvcnQodGFyZ2V0UmVjdCwgY2xpcFJlY3QsIGNvbnRl bnRzLCBtX2xheW91dFJlY3QsIG1fZG9jdW1lbnRSZWN0LnNpemUoKSk7CiAKICAgICBUcmFuc2Zv cm1hdGlvbk1hdHJpeCB0cmFuc2Zvcm0odHJhbnNmb3JtSW4pOwogICAgIHRyYW5zZm9ybSAqPSAq bV93ZWJQYWdlLT5tX3RyYW5zZm9ybWF0aW9uTWF0cml4OworICAgIHRyYW5zZm9ybS50cmFuc2xh dGUoLW1fZG9jdW1lbnRSZWN0LngoKSwgLW1fZG9jdW1lbnRSZWN0LnkoKSk7CiAKICAgICBpZiAo IWRyYXdzUm9vdExheWVyKCkpCiAgICAgICAgIG1fd2ViUGFnZS0+bV9iYWNraW5nU3RvcmUtPmQt PmNvbXBvc2l0ZUNvbnRlbnRzKG1fbGF5ZXJSZW5kZXJlci5nZXQoKSwgdHJhbnNmb3JtLCBjb250 ZW50cywgIW1fYmFja2dyb3VuZENvbG9yLmhhc0FscGhhKCkpOwpAQCAtMTk2LDE0ICsxOTcsMTQg QEAgYm9vbCBXZWJQYWdlQ29tcG9zaXRvclByaXZhdGU6OmRyYXdMYXllcnMoY29uc3QgSW50UmVj dCYgZHN0UmVjdCwgY29uc3QgRmxvYXRSZWMKICAgICBpbnQgdmlld3BvcnRZID0gc3RkOjptYXgo MCwgbV9jb250ZXh0LT5zdXJmYWNlU2l6ZSgpLmhlaWdodCgpIC0gZHN0UmVjdC5tYXhZKCkpOwog ICAgIEludFJlY3Qgdmlld3BvcnQgPSBJbnRSZWN0KGRzdFJlY3QueCgpLCB2aWV3cG9ydFksIGRz dFJlY3Qud2lkdGgoKSwgZHN0UmVjdC5oZWlnaHQoKSk7CiAKLSAgICBtX2xheWVyUmVuZGVyZXIt PnNldFZpZXdwb3J0KHZpZXdwb3J0LCB2aWV3cG9ydCwgY29udGVudHMsIG1fbGF5b3V0UmVjdEZv ckNvbXBvc2l0aW5nLCBtX2NvbnRlbnRzU2l6ZUZvckNvbXBvc2l0aW5nKTsKKyAgICBtX2xheWVy UmVuZGVyZXItPnNldFZpZXdwb3J0KHZpZXdwb3J0LCB2aWV3cG9ydCwgY29udGVudHMsIG1fbGF5 b3V0UmVjdCwgbV9kb2N1bWVudFJlY3Quc2l6ZSgpKTsKIAogICAgIC8vIFdlYktpdCB1c2VzIHJv dyB2ZWN0b3JzIHdoaWNoIGFyZSBtdWx0aXBsaWVkIGJ5IHRoZSBtYXRyaXggb24gdGhlIGxlZnQg KGkuZS4gdipNKQogICAgIC8vIFRyYW5zZm9ybWF0aW9ucyBhcmUgY29tcG9zZWQgb24gdGhlIGxl ZnQgc28gdGhhdCBNMS54Zm9ybShNMikgbWVhbnMgTTIqTTEKICAgICAvLyBXZSB0aGVyZWZvcmUg c3RhcnQgd2l0aCBvdXIgKG90aG9nb25hbCkgcHJvamVjdGlvbiBtYXRyaXgsIHdoaWNoIHdpbGwg YmUgYXBwbGllZAogICAgIC8vIGFzIHRoZSBsYXN0IHRyYW5zZm9ybWF0aW9uLgogICAgIFRyYW5z Zm9ybWF0aW9uTWF0cml4IHRyYW5zZm9ybSA9IExheWVyUmVuZGVyZXI6Om9ydGhvTWF0cml4KDAs IGNvbnRlbnRzLndpZHRoKCksIGNvbnRlbnRzLmhlaWdodCgpLCAwLCAtMTAwMCwgMTAwMCk7Ci0g ICAgdHJhbnNmb3JtLnRyYW5zbGF0ZTNkKC1jb250ZW50cy54KCksIC1jb250ZW50cy55KCksIDAp OworICAgIHRyYW5zZm9ybS50cmFuc2xhdGUzZCgtY29udGVudHMueCgpIC0gbV9kb2N1bWVudFJl Y3QueCgpLCAtY29udGVudHMueSgpIC0gbV9kb2N1bWVudFJlY3QueSgpLCAwKTsKICAgICBjb21w b3NpdGVMYXllcnModHJhbnNmb3JtKTsKIAogICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvcl9wLmggYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yX3AuaAppbmRleCA0YWVm ZjM2ZDliODAxMWUwMDBlNjIwMmJlZTc0Y2Y1OGU3NmEyYmU0Li42NmUyYzBiZTRiZjk1NDM1NjI3 MGJiOGE1ZjBjNzYzZTJjNzFkYmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yX3AuaApAQCAtNzUsMTEgKzc1LDExIEBAIHB1YmxpYzoK ICAgICAvLyBSZW5kZXIgZXZlcnl0aGluZyBidXQgdGhlIHJvb3QgbGF5ZXIsIG9yIGV2ZXJ5dGhp bmcgaWYgZHJhd3NSb290TGF5ZXIoKSBpcyB0cnVlLgogICAgIGJvb2wgZHJhd0xheWVycyhjb25z dCBXZWJDb3JlOjpJbnRSZWN0JiBkc3RSZWN0LCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIGNv bnRlbnRzKTsKIAotICAgIFdlYkNvcmU6OkludFJlY3QgbGF5b3V0UmVjdEZvckNvbXBvc2l0aW5n KCkgY29uc3QgeyByZXR1cm4gbV9sYXlvdXRSZWN0Rm9yQ29tcG9zaXRpbmc7IH0KLSAgICB2b2lk IHNldExheW91dFJlY3RGb3JDb21wb3NpdGluZyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0 KSB7IG1fbGF5b3V0UmVjdEZvckNvbXBvc2l0aW5nID0gcmVjdDsgfQorICAgIFdlYkNvcmU6Oklu dFJlY3QgbGF5b3V0UmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0UmVjdDsgfQorICAgIHZv aWQgc2V0TGF5b3V0UmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0KSB7IG1fbGF5b3V0 UmVjdCA9IHJlY3Q7IH0KIAotICAgIFdlYkNvcmU6OkludFNpemUgY29udGVudHNTaXplRm9yQ29t cG9zaXRpbmcoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRzU2l6ZUZvckNvbXBvc2l0aW5nOyB9 Ci0gICAgdm9pZCBzZXRDb250ZW50c1NpemVGb3JDb21wb3NpdGluZyhjb25zdCBXZWJDb3JlOjpJ bnRTaXplJiBzaXplKSB7IG1fY29udGVudHNTaXplRm9yQ29tcG9zaXRpbmcgPSBzaXplOyB9Cisg ICAgV2ViQ29yZTo6SW50UmVjdCBkb2N1bWVudFJlY3QoKSBjb25zdCB7IHJldHVybiBtX2RvY3Vt ZW50UmVjdDsgfQorICAgIHZvaWQgc2V0RG9jdW1lbnRSZWN0KGNvbnN0IFdlYkNvcmU6OkludFJl Y3QmIHJlY3QpIHsgbV9kb2N1bWVudFJlY3QgPSByZWN0OyB9CiAKICAgICBXZWJDb3JlOjpMYXll clJlbmRlcmluZ1Jlc3VsdHMgbGFzdENvbXBvc2l0aW5nUmVzdWx0cygpIGNvbnN0IHsgcmV0dXJu IG1fbGFzdENvbXBvc2l0aW5nUmVzdWx0czsgfQogICAgIHZvaWQgc2V0TGFzdENvbXBvc2l0aW5n UmVzdWx0cyhjb25zdCBXZWJDb3JlOjpMYXllclJlbmRlcmluZ1Jlc3VsdHMmIHJlc3VsdHMpIHsg bV9sYXN0Q29tcG9zaXRpbmdSZXN1bHRzID0gcmVzdWx0czsgfQpAQCAtMTEyLDggKzExMiw4IEBA IHByaXZhdGU6CiAgICAgUmVmUHRyPFdlYkNvcmU6OkxheWVyQ29tcG9zaXRpbmdUaHJlYWQ+IG1f cm9vdExheWVyOwogICAgIFJlZlB0cjxXZWJDb3JlOjpMYXllckNvbXBvc2l0aW5nVGhyZWFkPiBt X292ZXJsYXlMYXllcjsKICAgICBSZWZQdHI8V2ViQ29yZTo6TGF5ZXJDb21wb3NpdGluZ1RocmVh ZD4gbV9jb21wb3NpdGluZ1RocmVhZE92ZXJsYXlMYXllcjsKLSAgICBXZWJDb3JlOjpJbnRSZWN0 IG1fbGF5b3V0UmVjdEZvckNvbXBvc2l0aW5nOwotICAgIFdlYkNvcmU6OkludFNpemUgbV9jb250 ZW50c1NpemVGb3JDb21wb3NpdGluZzsKKyAgICBXZWJDb3JlOjpJbnRSZWN0IG1fbGF5b3V0UmVj dDsKKyAgICBXZWJDb3JlOjpJbnRSZWN0IG1fZG9jdW1lbnRSZWN0OwogICAgIFdlYkNvcmU6Okxh eWVyUmVuZGVyaW5nUmVzdWx0cyBtX2xhc3RDb21wb3NpdGluZ1Jlc3VsdHM7CiAgICAgV2ViQ29y ZTo6Q29sb3IgbV9iYWNrZ3JvdW5kQ29sb3I7CiAgICAgYm9vbCBtX2RyYXdzUm9vdExheWVyOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaCBiL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmgKaW5kZXggYjIwNmU4M2Y3OTJj NzNjZGIxNjZlYzA3NTk5ZjllMTljYTkyZDdiYi4uOGMxYzM0ZDQ5ZjllMDcyY2ZlMzU1M2QyMjE4 ODc5ZTZhMjRmNWFlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJQYWdlX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5o CkBAIC00MDgsNyArNDA4LDcgQEAgcHVibGljOgogCiAgICAgLy8gQ29tcG9zaXRpbmcgdGhyZWFk LgogICAgIHZvaWQgc2V0Um9vdExheWVyQ29tcG9zaXRpbmdUaHJlYWQoV2ViQ29yZTo6TGF5ZXJD b21wb3NpdGluZ1RocmVhZCopOwotICAgIHZvaWQgY29tbWl0Um9vdExheWVyKGNvbnN0IFdlYkNv cmU6OkludFJlY3QmLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiwgYm9vbCk7CisgICAgdm9pZCBj b21taXRSb290TGF5ZXIoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgbGF5b3V0UmVjdCwgY29uc3Qg V2ViQ29yZTo6SW50UmVjdCYgZG9jdW1lbnRSZWN0LCBib29sKTsKICAgICBib29sIGlzQWNjZWxl cmF0ZWRDb21wb3NpdGluZ0FjdGl2ZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29tcG9zaXRvcjsgfQog ICAgIFdlYlBhZ2VDb21wb3NpdG9yUHJpdmF0ZSogY29tcG9zaXRvcigpIGNvbnN0IHsgcmV0dXJu IG1fY29tcG9zaXRvci5nZXQoKTsgfQogICAgIHZvaWQgc2V0Q29tcG9zaXRvcihQYXNzUmVmUHRy PFdlYlBhZ2VDb21wb3NpdG9yUHJpdmF0ZT4pOwo=