113447 2013-03-27 14:57:01 -0700 [BlackBerry] Don't use WebKit thread scale information in WebPageCompositor 2013-03-28 11:42:26 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jpetsovits jpetsovits anilsson mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 864890 0 jpetsovits 2013-03-27 14:57:01 -0700 WebPageCompositor and the related BackingStore member function compositeContents() are using WebKit thread data on the user interface thread, without synchronization primitives or anything. That's bad and should be fixed. Potential threading problems can be avoided by moving from WebPage members and mapToTransformed() to the web page client's userInterfaceViewportAccessor(). As part of this cleaning effort, the WebPageCompositor's render() method is changed to now take document instead of pixel coordinates. 864892 1 195404 jpetsovits 2013-03-27 15:03:04 -0700 Created attachment 195404 Patch 865184 2 195404 anilsson 2013-03-27 23:00:27 -0700 Comment on attachment 195404 Patch Looks great! 865477 3 195404 rwlbuis 2013-03-28 07:06:19 -0700 Comment on attachment 195404 Patch LGTM. 865670 4 195404 webkit.review.bot 2013-03-28 11:42:23 -0700 Comment on attachment 195404 Patch Clearing flags on attachment: 195404 Committed r147136: <http://trac.webkit.org/changeset/147136> 865671 5 webkit.review.bot 2013-03-28 11:42:26 -0700 All reviewed patches have been landed. Closing bug. 195404 2013-03-27 15:03:04 -0700 2013-03-28 11:42:23 -0700 Patch bug-113447-20130327180227.patch text/plain 11059 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MDA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAzYjgxOTM5MWQwMTBlMzQ5NjRiN2FiNzc3YTU3NmVhZDhlYjg0N2JjLi5mNjhlOWU2Zjcy NDMzYWNmYmQxOWMwNGI4MDY3YjY3NTc5NjBjZWE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxMy0wMy0yNyAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0BibGFja2JlcnJ5LmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gRG9uJ3QgdXNl IFdlYktpdCB0aHJlYWQgc2NhbGUgaW5mb3JtYXRpb24gaW4gV2ViUGFnZUNvbXBvc2l0b3IuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM0NDcKKyAg ICAgICAgSW50ZXJuYWwgUFIgMzEzNDUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUG90ZW50aWFsIHRocmVhZGluZyBwcm9ibGVtcyBhcmUgYXZvaWRl ZCBieSBtb3ZpbmcgZnJvbQorICAgICAgICBXZWJQYWdlIG1lbWJlcnMgYW5kIG1hcFRvVHJhbnNm b3JtZWQoKSB0byB0aGUgd2ViIHBhZ2UKKyAgICAgICAgY2xpZW50J3MgdXNlckludGVyZmFjZVZp ZXdwb3J0QWNjZXNzb3IoKS4KKworICAgICAgICBBcyBwYXJ0IG9mIHRoaXMgY2xlYW5pbmcgZWZm b3J0LCB0aGUgV2ViUGFnZUNvbXBvc2l0b3IncworICAgICAgICByZW5kZXIoKSBtZXRob2QgaXMg Y2hhbmdlZCB0byBub3cgdGFrZSBkb2N1bWVudCBpbnN0ZWFkIG9mCisgICAgICAgIHBpeGVsIGNv b3JkaW5hdGVzLgorCisgICAgICAgICogQXBpL0JhY2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9yZVByaXZhdGU6OmNvbXBvc2l0ZUNvbnRlbnRz KToKKyAgICAgICAgKiBBcGkvV2ViUGFnZUNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoQmxhY2tC ZXJyeTo6V2ViS2l0OjpXZWJQYWdlQ29tcG9zaXRvclByaXZhdGU6OnJlbmRlcik6CisgICAgICAg IChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VDb21wb3NpdG9yOjpyZW5kZXIpOgorICAgICAg ICAqIEFwaS9XZWJQYWdlQ29tcG9zaXRvci5oOgorICAgICAgICAqIEFwaS9XZWJQYWdlQ29tcG9z aXRvcl9wLmg6CisgICAgICAgIChXZWJQYWdlQ29tcG9zaXRvclByaXZhdGUpOgorCiAyMDEzLTAz LTI2ICBIYXlhdG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBBbGxvdyBT aGFkb3dDb250ZW50cyBpbiBIaXRUZXN0cyBieSBkZWZhdWx0LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuY3BwCmluZGV4IDE2ZTNjMmRlMjYxODhmN2E3YTQ1 NjE1NmYxYTdjMDg5YjUwYjNhNjEuLjFkODBhOTk0YjE4ZTExZTc0OTIxMzhmMzAzOGJiYTMyMTVi MGM0OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0 b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5j cHAKQEAgLTE0MTAsMTIgKzE0MTAsMTUgQEAgdm9pZCBCYWNraW5nU3RvcmVQcml2YXRlOjpibGl0 VmlzaWJsZUNvbnRlbnRzKGJvb2wgZm9yY2UpCiB9CiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09N UE9TSVRJTkcpCi12b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6OmNvbXBvc2l0ZUNvbnRlbnRzKFdl YkNvcmU6OkxheWVyUmVuZGVyZXIqIGxheWVyUmVuZGVyZXIsIGNvbnN0IFdlYkNvcmU6OlRyYW5z Zm9ybWF0aW9uTWF0cml4JiB0cmFuc2Zvcm0sIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgY29u dGVudHMsIGJvb2wgY29udGVudHNPcGFxdWUpCit2b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6OmNv bXBvc2l0ZUNvbnRlbnRzKFdlYkNvcmU6OkxheWVyUmVuZGVyZXIqIGxheWVyUmVuZGVyZXIsIGNv bnN0IFdlYkNvcmU6OlRyYW5zZm9ybWF0aW9uTWF0cml4JiB0cmFuc2Zvcm0sIGNvbnN0IFdlYkNv cmU6OkZsb2F0UmVjdCYgZG9jdW1lbnRDb250ZW50cywgYm9vbCBjb250ZW50c09wYXF1ZSkKIHsK LSAgICBjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCB0cmFuc2Zvcm1lZENvbnRlbnRzUmVjdCA9IFBs YXRmb3JtOjpJbnRSZWN0KFBsYXRmb3JtOjpJbnRQb2ludCgwLCAwKSwgbV9jbGllbnQtPnRyYW5z Zm9ybWVkQ29udGVudHNTaXplKCkpOwotICAgIFBsYXRmb3JtOjpJbnRSZWN0IHRyYW5zZm9ybWVk Q29udGVudHMgPSBlbmNsb3NpbmdJbnRSZWN0KG1fd2ViUGFnZS0+ZC0+bV90cmFuc2Zvcm1hdGlv bk1hdHJpeC0+bWFwUmVjdChjb250ZW50cykpOwotICAgIHRyYW5zZm9ybWVkQ29udGVudHMuaW50 ZXJzZWN0KHRyYW5zZm9ybWVkQ29udGVudHNSZWN0KTsKLSAgICBpZiAodHJhbnNmb3JtZWRDb250 ZW50cy5pc0VtcHR5KCkpCisgICAgUGxhdGZvcm06OlZpZXdwb3J0QWNjZXNzb3IqIHZpZXdwb3J0 QWNjZXNzb3IgPSBtX3dlYlBhZ2UtPmNsaWVudCgpLT51c2VySW50ZXJmYWNlVmlld3BvcnRBY2Nl c3NvcigpOworICAgIGlmICghdmlld3BvcnRBY2Nlc3NvcikKKyAgICAgICAgcmV0dXJuOworCisg ICAgUGxhdGZvcm06OkludFJlY3QgcGl4ZWxDb250ZW50cyA9IHZpZXdwb3J0QWNjZXNzb3ItPnJv dW5kVG9QaXhlbEZyb21Eb2N1bWVudENvbnRlbnRzKGRvY3VtZW50Q29udGVudHMpOworICAgIHBp eGVsQ29udGVudHMuaW50ZXJzZWN0KHZpZXdwb3J0QWNjZXNzb3ItPnBpeGVsQ29udGVudHNSZWN0 KCkpOworICAgIGlmIChwaXhlbENvbnRlbnRzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwog CiAgICAgaWYgKCFpc0FjdGl2ZSgpKQpAQCAtMTQyOCwxOSArMTQzMSwxOCBAQCB2b2lkIEJhY2tp bmdTdG9yZVByaXZhdGU6OmNvbXBvc2l0ZUNvbnRlbnRzKFdlYkNvcmU6OkxheWVyUmVuZGVyZXIq IGxheWVyUmVuZGVyZQogICAgIFRpbGVNYXAgY3VycmVudE1hcCA9IGdlb21ldHJ5LT50aWxlTWFw KCk7CiAgICAgVmVjdG9yPFRpbGVCdWZmZXIqPiBjb21wb3NpdGVkVGlsZXM7CiAKLSAgICBQbGF0 Zm9ybTo6SW50UmVjdFJlZ2lvbiB0cmFuc2Zvcm1lZENvbnRlbnRzUmVnaW9uID0gdHJhbnNmb3Jt ZWRDb250ZW50czsKKyAgICBQbGF0Zm9ybTo6SW50UmVjdFJlZ2lvbiBwaXhlbENvbnRlbnRzUmVn aW9uID0gcGl4ZWxDb250ZW50czsKICAgICBQbGF0Zm9ybTo6SW50UmVjdFJlZ2lvbiBiYWNraW5n U3RvcmVSZWdpb24gPSBnZW9tZXRyeS0+YmFja2luZ1N0b3JlUmVjdCgpOwotICAgIFBsYXRmb3Jt OjpJbnRSZWN0UmVnaW9uIGNsZWFyUmVnaW9uCi0gICAgICAgID0gUGxhdGZvcm06OkludFJlY3RS ZWdpb246OnN1YnRyYWN0UmVnaW9ucyh0cmFuc2Zvcm1lZENvbnRlbnRzUmVnaW9uLCBiYWNraW5n U3RvcmVSZWdpb24pOworICAgIFBsYXRmb3JtOjpJbnRSZWN0UmVnaW9uIGNsZWFyUmVnaW9uID0g UGxhdGZvcm06OkludFJlY3RSZWdpb246OnN1YnRyYWN0UmVnaW9ucyhwaXhlbENvbnRlbnRzUmVn aW9uLCBiYWNraW5nU3RvcmVSZWdpb24pOwogCiAgICAgLy8gQ2xlYXIgdGhvc2UgcGFydHMgdGhh dCBhcmUgbm90IGNvdmVyZWQgYnkgdGhlIGJhY2tpbmdTdG9yZVJlY3QuCiAgICAgQ29sb3IgY2xl YXJDb2xvcihDb2xvcjo6d2hpdGUpOwogICAgIHN0ZDo6dmVjdG9yPFBsYXRmb3JtOjpJbnRSZWN0 PiBjbGVhclJlY3RzID0gY2xlYXJSZWdpb24ucmVjdHMoKTsKICAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IGNsZWFyUmVjdHMuc2l6ZSgpOyArK2kpCi0gICAgICAgIGxheWVyUmVuZGVyZXItPmRy YXdDb2xvcih0cmFuc2Zvcm0sIG1fd2ViUGFnZS0+ZC0+bWFwRnJvbVRyYW5zZm9ybWVkRmxvYXRS ZWN0KFdlYkNvcmU6OkludFJlY3QoY2xlYXJSZWN0cy5hdChpKSkpLCBjbGVhckNvbG9yKTsKKyAg ICAgICAgbGF5ZXJSZW5kZXJlci0+ZHJhd0NvbG9yKHRyYW5zZm9ybSwgdmlld3BvcnRBY2Nlc3Nv ci0+ZG9jdW1lbnRGcm9tUGl4ZWxDb250ZW50cyhjbGVhclJlY3RzLmF0KGkpKSwgY2xlYXJDb2xv cik7CiAKICAgICAvLyBHZXQgdGhlIGxpc3Qgb2YgdGlsZSByZWN0cyB0aGF0IG1ha2V1cCB0aGUg Y29udGVudC4KLSAgICBUaWxlUmVjdExpc3QgdGlsZVJlY3RMaXN0ID0gbWFwRnJvbVBpeGVsQ29u dGVudHNUb1RpbGVzKHRyYW5zZm9ybWVkQ29udGVudHMsIGdlb21ldHJ5KTsKKyAgICBUaWxlUmVj dExpc3QgdGlsZVJlY3RMaXN0ID0gbWFwRnJvbVBpeGVsQ29udGVudHNUb1RpbGVzKHBpeGVsQ29u dGVudHMsIGdlb21ldHJ5KTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHRpbGVSZWN0TGlz dC5zaXplKCk7ICsraSkgewogICAgICAgICBUaWxlUmVjdCB0aWxlUmVjdCA9IHRpbGVSZWN0TGlz dFtpXTsKICAgICAgICAgVGlsZUluZGV4IGluZGV4ID0gdGlsZVJlY3QuZmlyc3Q7CkBAIC0xNDQ4 LDEwICsxNDUwLDEwIEBAIHZvaWQgQmFja2luZ1N0b3JlUHJpdmF0ZTo6Y29tcG9zaXRlQ29udGVu dHMoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlciogbGF5ZXJSZW5kZXJlCiAgICAgICAgIFRpbGVCdWZm ZXIqIHRpbGVCdWZmZXIgPSBjdXJyZW50TWFwLmdldChpbmRleCk7CiAKICAgICAgICAgaWYgKCF0 aWxlQnVmZmVyIHx8ICFnZW9tZXRyeS0+aXNUaWxlQ29ycmVzcG9uZGluZ1RvQnVmZmVyKGluZGV4 LCB0aWxlQnVmZmVyKSkKLSAgICAgICAgICAgIGxheWVyUmVuZGVyZXItPmRyYXdDb2xvcih0cmFu c2Zvcm0sIG1fd2ViUGFnZS0+ZC0+bWFwRnJvbVRyYW5zZm9ybWVkRmxvYXRSZWN0KFBsYXRmb3Jt OjpGbG9hdFJlY3QoZGlydHlSZWN0KSksIGNsZWFyQ29sb3IpOworICAgICAgICAgICAgbGF5ZXJS ZW5kZXJlci0+ZHJhd0NvbG9yKHRyYW5zZm9ybSwgdmlld3BvcnRBY2Nlc3Nvci0+ZG9jdW1lbnRG cm9tUGl4ZWxDb250ZW50cyhkaXJ0eVJlY3QpLCBjbGVhckNvbG9yKTsKICAgICAgICAgZWxzZSB7 CiAgICAgICAgICAgICBQbGF0Zm9ybTo6SW50UG9pbnQgdGlsZU9yaWdpbiA9IHRpbGVCdWZmZXIt Pmxhc3RSZW5kZXJPcmlnaW4oKTsKLSAgICAgICAgICAgIFBsYXRmb3JtOjpGbG9hdFJlY3QgdGls ZURvY3VtZW50Q29udGVudHNSZWN0ID0gbV93ZWJQYWdlLT5kLT5tYXBGcm9tVHJhbnNmb3JtZWRG bG9hdFJlY3QoUGxhdGZvcm06OkZsb2F0UmVjdCh0aWxlQnVmZmVyLT5waXhlbENvbnRlbnRzUmVj dCgpKSk7CisgICAgICAgICAgICBQbGF0Zm9ybTo6RmxvYXRSZWN0IHRpbGVEb2N1bWVudENvbnRl bnRzUmVjdCA9IHZpZXdwb3J0QWNjZXNzb3ItPmRvY3VtZW50RnJvbVBpeGVsQ29udGVudHModGls ZUJ1ZmZlci0+cGl4ZWxDb250ZW50c1JlY3QoKSk7CiAKICAgICAgICAgICAgIGxheWVyUmVuZGVy ZXItPmNvbXBvc2l0ZUJ1ZmZlcih0cmFuc2Zvcm0sIHRpbGVEb2N1bWVudENvbnRlbnRzUmVjdCwg dGlsZUJ1ZmZlci0+bmF0aXZlQnVmZmVyKCksIGNvbnRlbnRzT3BhcXVlLCAxLjBmKTsKICAgICAg ICAgICAgIGNvbXBvc2l0ZWRUaWxlcy5hcHBlbmQodGlsZUJ1ZmZlcik7CkBAIC0xNDYyLDcgKzE0 NjQsNyBAQCB2b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6OmNvbXBvc2l0ZUNvbnRlbnRzKFdlYkNv cmU6OkxheWVyUmVuZGVyZXIqIGxheWVyUmVuZGVyZQogICAgICAgICAgICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBub3RSZW5kZXJlZFJlY3RzLnNpemUoKTsgKytpKSB7CiAgICAgICAgICAgICAg ICAgUGxhdGZvcm06OkludFJlY3QgdGlsZVN1cmZhY2VSZWN0ID0gbm90UmVuZGVyZWRSZWN0cy5h dChpKTsKICAgICAgICAgICAgICAgICB0aWxlU3VyZmFjZVJlY3QubW92ZSgtdGlsZU9yaWdpbi54 KCksIC10aWxlT3JpZ2luLnkoKSk7Ci0gICAgICAgICAgICAgICAgbGF5ZXJSZW5kZXJlci0+ZHJh d0NvbG9yKHRyYW5zZm9ybSwgbV93ZWJQYWdlLT5kLT5tYXBGcm9tVHJhbnNmb3JtZWRGbG9hdFJl Y3QoUGxhdGZvcm06OkZsb2F0UmVjdCh0aWxlU3VyZmFjZVJlY3QpKSwgY2xlYXJDb2xvcik7Cisg ICAgICAgICAgICAgICAgbGF5ZXJSZW5kZXJlci0+ZHJhd0NvbG9yKHRyYW5zZm9ybSwgdmlld3Bv cnRBY2Nlc3Nvci0+ZG9jdW1lbnRGcm9tUGl4ZWxDb250ZW50cyh0aWxlU3VyZmFjZVJlY3QpLCBj bGVhckNvbG9yKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNvbXBvc2l0b3IuY3BwIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvci5jcHAKaW5kZXggYmE0 MDkyMzY5NzYxYjRiOTIzY2M3ZWRjNjZkNzU0MTg1MjE2YmY5My4uM2Y1YTQ3YjJkNWZkZWJjMmFm MTQyYTk0OThhOTVhNDdjOWVlMWFkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvci5jcHAKQEAgLTE0NSw3ICsxNDUsNyBAQCB2b2lkIFdl YlBhZ2VDb21wb3NpdG9yUHJpdmF0ZTo6cHJlcGFyZUZyYW1lKGRvdWJsZSBhbmltYXRpb25UaW1l KQogICAgICAgICBtX2xheWVyUmVuZGVyZXItPnByZXBhcmVGcmFtZShhbmltYXRpb25UaW1lLCBt X2NvbXBvc2l0aW5nVGhyZWFkT3ZlcmxheUxheWVyLmdldCgpKTsKIH0KIAotdm9pZCBXZWJQYWdl Q29tcG9zaXRvclByaXZhdGU6OnJlbmRlcihjb25zdCBJbnRSZWN0JiB0YXJnZXRSZWN0LCBjb25z dCBJbnRSZWN0JiBjbGlwUmVjdCwgY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIHRyYW5zZm9y bUluLCBjb25zdCBGbG9hdFJlY3QmIHRyYW5zZm9ybWVkQ29udGVudHMsIGNvbnN0IEZsb2F0UmVj dCYgLyp2aWV3cG9ydCovKQordm9pZCBXZWJQYWdlQ29tcG9zaXRvclByaXZhdGU6OnJlbmRlcihj b25zdCBJbnRSZWN0JiB0YXJnZXRSZWN0LCBjb25zdCBJbnRSZWN0JiBjbGlwUmVjdCwgY29uc3Qg VHJhbnNmb3JtYXRpb25NYXRyaXgmIHRyYW5zZm9ybUluLCBjb25zdCBGbG9hdFJlY3QmIGRvY3Vt ZW50Q29udGVudHMsIGNvbnN0IEZsb2F0UmVjdCYgLyp2aWV3cG9ydCovKQogewogICAgIC8vIG1f bGF5ZXJSZW5kZXJlciBzaG91bGQgaGF2ZSBiZWVuIGNyZWF0ZWQgaW4gcHJlcGFyZUZyYW1lCiAg ICAgaWYgKCFtX2xheWVyUmVuZGVyZXIpCkBAIC0xNTgsMTYgKzE1OCwxMyBAQCB2b2lkIFdlYlBh Z2VDb21wb3NpdG9yUHJpdmF0ZTo6cmVuZGVyKGNvbnN0IEludFJlY3QmIHRhcmdldFJlY3QsIGNv bnN0IEludFJlY3QmCiAgICAgaWYgKCFtX3dlYlBhZ2UgfHwgbV93ZWJQYWdlLT5jb21wb3NpdG9y KCkgIT0gdGhpcykKICAgICAgICAgcmV0dXJuOwogCi0gICAgRmxvYXRSZWN0IGNvbnRlbnRzID0g bV93ZWJQYWdlLT5tYXBGcm9tVHJhbnNmb3JtZWRGbG9hdFJlY3QodHJhbnNmb3JtZWRDb250ZW50 cyk7Ci0KLSAgICBtX2xheWVyUmVuZGVyZXItPnNldFZpZXdwb3J0KHRhcmdldFJlY3QsIGNsaXBS ZWN0LCBjb250ZW50cywgbV9sYXlvdXRSZWN0LCBtX2RvY3VtZW50UmVjdC5zaXplKCkpOworICAg IG1fbGF5ZXJSZW5kZXJlci0+c2V0Vmlld3BvcnQodGFyZ2V0UmVjdCwgY2xpcFJlY3QsIGRvY3Vt ZW50Q29udGVudHMsIG1fbGF5b3V0UmVjdCwgbV9kb2N1bWVudFJlY3Quc2l6ZSgpKTsKIAogICAg IFRyYW5zZm9ybWF0aW9uTWF0cml4IHRyYW5zZm9ybSh0cmFuc2Zvcm1Jbik7Ci0gICAgdHJhbnNm b3JtICo9ICptX3dlYlBhZ2UtPm1fdHJhbnNmb3JtYXRpb25NYXRyaXg7CiAgICAgdHJhbnNmb3Jt LnRyYW5zbGF0ZSgtbV9kb2N1bWVudFJlY3QueCgpLCAtbV9kb2N1bWVudFJlY3QueSgpKTsKIAog ICAgIGlmICghZHJhd3NSb290TGF5ZXIoKSkKLSAgICAgICAgbV93ZWJQYWdlLT5tX2JhY2tpbmdT dG9yZS0+ZC0+Y29tcG9zaXRlQ29udGVudHMobV9sYXllclJlbmRlcmVyLmdldCgpLCB0cmFuc2Zv cm0sIGNvbnRlbnRzLCAhbV9iYWNrZ3JvdW5kQ29sb3IuaGFzQWxwaGEoKSk7CisgICAgICAgIG1f d2ViUGFnZS0+bV9iYWNraW5nU3RvcmUtPmQtPmNvbXBvc2l0ZUNvbnRlbnRzKG1fbGF5ZXJSZW5k ZXJlci5nZXQoKSwgdHJhbnNmb3JtLCBkb2N1bWVudENvbnRlbnRzLCAhbV9iYWNrZ3JvdW5kQ29s b3IuaGFzQWxwaGEoKSk7CiAKICAgICBjb21wb3NpdGVMYXllcnModHJhbnNmb3JtKTsKIH0KQEAg LTMzMSwxNSArMzI4LDEwIEBAIHZvaWQgV2ViUGFnZUNvbXBvc2l0b3I6OnByZXBhcmVGcmFtZShQ bGF0Zm9ybTo6R3JhcGhpY3M6OkdMRVMyQ29udGV4dCogY29udGV4dCwKICAgICBkLT5wcmVwYXJl RnJhbWUoYW5pbWF0aW9uVGltZSk7CiB9CiAKLXZvaWQgV2ViUGFnZUNvbXBvc2l0b3I6OnJlbmRl cihQbGF0Zm9ybTo6R3JhcGhpY3M6OkdMRVMyQ29udGV4dCogY29udGV4dCwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgdGFyZ2V0UmVjdCwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYg Y2xpcFJlY3QsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgUGxhdGZvcm06 OlRyYW5zZm9ybWF0aW9uTWF0cml4JiB0cmFuc2Zvcm0sCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY29uc3QgUGxhdGZvcm06OkZsb2F0UmVjdCYgY29udGVudHMsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgUGxhdGZvcm06OkZsb2F0UmVjdCYgdmlld3BvcnQp Cit2b2lkIFdlYlBhZ2VDb21wb3NpdG9yOjpyZW5kZXIoUGxhdGZvcm06OkdyYXBoaWNzOjpHTEVT MkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiB0YXJnZXRSZWN0LCBj b25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgY2xpcFJlY3QsIGNvbnN0IFBsYXRmb3JtOjpUcmFuc2Zv cm1hdGlvbk1hdHJpeCYgdHJhbnNmb3JtLCBjb25zdCBQbGF0Zm9ybTo6RmxvYXRSZWN0JiBkb2N1 bWVudENvbnRlbnRzLCBjb25zdCBQbGF0Zm9ybTo6RmxvYXRSZWN0JiB2aWV3cG9ydCkKIHsKICAg ICBkLT5zZXRDb250ZXh0KGNvbnRleHQpOwotICAgIGQtPnJlbmRlcih0YXJnZXRSZWN0LCBjbGlw UmVjdCwgVHJhbnNmb3JtYXRpb25NYXRyaXgocmVpbnRlcnByZXRfY2FzdDxjb25zdCBUcmFuc2Zv cm1hdGlvbk1hdHJpeCY+KHRyYW5zZm9ybSkpLCBjb250ZW50cywgdmlld3BvcnQpOworICAgIGQt PnJlbmRlcih0YXJnZXRSZWN0LCBjbGlwUmVjdCwgVHJhbnNmb3JtYXRpb25NYXRyaXgocmVpbnRl cnByZXRfY2FzdDxjb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCY+KHRyYW5zZm9ybSkpLCBkb2N1 bWVudENvbnRlbnRzLCB2aWV3cG9ydCk7CiB9CiAKIHZvaWQgV2ViUGFnZUNvbXBvc2l0b3I6OmNs ZWFudXAoUGxhdGZvcm06OkdyYXBoaWNzOjpHTEVTMkNvbnRleHQqIGNvbnRleHQpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yLmggYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yLmgKaW5kZXggZDM3 NmZlODIxOTNkN2I1MGM0N2E4NTQ5YjQ3MjFlN2Y3ZjQ2MGRjYi4uYzViYjIzZDIyOWFkN2Q0ZDc2 NTZlOTg1MTlhMjA3ZjZhNGI0YzZlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvV2ViUGFnZUNvbXBvc2l0b3IuaApAQCAtNTQsNyArNTQsNyBAQCBwdWJsaWM6CiAgICAg ICAgICAgICAgICAgY29uc3QgUGxhdGZvcm06OkludFJlY3QmIHRhcmdldFJlY3QsCiAgICAgICAg ICAgICAgICAgY29uc3QgUGxhdGZvcm06OkludFJlY3QmIGNsaXBSZWN0LAogICAgICAgICAgICAg ICAgIGNvbnN0IFBsYXRmb3JtOjpUcmFuc2Zvcm1hdGlvbk1hdHJpeCYsCi0gICAgICAgICAgICAg ICAgY29uc3QgUGxhdGZvcm06OkZsb2F0UmVjdCYgY29udGVudHMsCisgICAgICAgICAgICAgICAg Y29uc3QgUGxhdGZvcm06OkZsb2F0UmVjdCYgZG9jdW1lbnRDb250ZW50cywKICAgICAgICAgICAg ICAgICBjb25zdCBQbGF0Zm9ybTo6RmxvYXRSZWN0JiB2aWV3cG9ydCk7CiAKICAgICB2b2lkIGNs ZWFudXAoUGxhdGZvcm06OkdyYXBoaWNzOjpHTEVTMkNvbnRleHQqKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNvbXBvc2l0b3JfcC5oIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvcl9wLmgKaW5kZXggNTZkMTg1 MmQ3MjdmYTI0OTBjMDBmNTAyNzRlYTk2NjEyNTYyYTI2Yi4uMjAzZjE4YmJjOGM1NWMzZjI4ZjRh ZjFhM2U2NzhjZTQ1ZTQ2OGQxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L0FwaS9XZWJQYWdlQ29tcG9zaXRvcl9wLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L0FwaS9XZWJQYWdlQ29tcG9zaXRvcl9wLmgKQEAgLTYxLDcgKzYxLDcgQEAgcHVibGljOgogICAg IHZvaWQgcmVuZGVyKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHRhcmdldFJlY3QsCiAgICAgICAg ICAgICAgICAgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgY2xpcFJlY3QsCiAgICAgICAgICAgICAg ICAgY29uc3QgV2ViQ29yZTo6VHJhbnNmb3JtYXRpb25NYXRyaXgmLAotICAgICAgICAgICAgICAg IGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgY29udGVudHMsIC8vIFRoaXMgaXMgcHVibGljIEFQ SSwgdGh1cyB0YWtlcyB0cmFuc2Zvcm1lZCBjb250ZW50cworICAgICAgICAgICAgICAgIGNvbnN0 IFdlYkNvcmU6OkZsb2F0UmVjdCYgZG9jdW1lbnRDb250ZW50cywKICAgICAgICAgICAgICAgICBj b25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHZpZXdwb3J0KTsKIAogICAgIFBsYXRmb3JtOjpHcmFw aGljczo6R0xFUzJDb250ZXh0KiBjb250ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZXh0OyB9 Cg==