116989 2013-05-29 12:56:30 -0700 WKViews using shouldClipToVisibleRect=YES should respect prepareContentInRect: if called 2013-05-29 16:52:23 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca sam simon.fraser oldest_to_newest 895170 0 thorton 2013-05-29 12:56:30 -0700 For maximum overdraw potential in the UIProcess scrollview case. <rdar://problem/14007440> 895265 1 203288 thorton 2013-05-29 16:39:41 -0700 Created attachment 203288 patch 895266 2 203288 thorton 2013-05-29 16:41:06 -0700 Comment on attachment 203288 patch View in context: https://bugs.webkit.org/attachment.cgi?id=203288&action=review > Source/WebKit2/UIProcess/API/mac/WKView.mm:461 > + if (_data->_clipsToVisibleRect && !_data->_useContentPreparationRectForVisibleRect) Ignore this, I'm going to let visibleRect changes update here, now that we're intersecting. 895270 3 203290 thorton 2013-05-29 16:44:29 -0700 Created attachment 203290 patch 895274 4 thorton 2013-05-29 16:52:23 -0700 http://trac.webkit.org/changeset/150936 203288 2013-05-29 16:39:41 -0700 2013-05-29 16:44:29 -0700 patch prepareContentRect.diff text/plain 5083 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyNTNjYWZlLi4xODdkODc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTMtMDUtMjkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgV0tWaWV3cyB1c2luZyBzaG91bGRDbGlwVG9WaXNpYmxlUmVjdD1ZRVMgc2hvdWxk IHJlc3BlY3QgcHJlcGFyZUNvbnRlbnRJblJlY3Q6IGlmIGNhbGxlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2OTg5CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8xNDAwNzQ0MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAgICAgICAgKC1bV0tW aWV3IHByZXBhcmVDb250ZW50SW5SZWN0Ol0pOgorICAgICAgICBJZiBwcmVwYXJlQ29udGVudElu UmVjdDogaXMgY2FsbGVkLCBzYXZlIHRoZSByZWN0IGFuZCBzZXQgYSBmbGFnIHNvIHdlIGtub3cg d2Ugc2hvdWxkIHVzZSBpdC4KKworICAgICAgICAoLVtXS1ZpZXcgX3VwZGF0ZVZpZXdFeHBvc2Vk UmVjdF0pOgorICAgICAgICBHaXZlIHRoZSBXZWJQYWdlIChhbmQgbGF0ZXIgdGhlIERyYXdpbmdB cmVhKSB0aGUgdW5pb24gb2YgdGhlIHJlY3QgaGFuZGVkIHRvIHByZXBhcmVDb250ZW50SW5SZWN0 OgorICAgICAgICBhbmQgdGhlIFdLVmlldydzIHZpc2libGVSZWN0LCBpZiB3ZSdyZSBpbiB0aGF0 IG1vZGUsIHNvIHRoYXQgYXBwbGljYXRpb25zIHRoYXQgZG8gdGhlaXIgb3duIHNjcm9sbGluZwor ICAgICAgICBjYW4gY2F1c2UgdGlsZXMgdG8gYmUgY3JlYXRlZCBpbiBjdXJyZW50bHkgb2Zmc2Ny ZWVuIHZpZXdzIChmb3Igb3ZlcmRyYXcpLgorCisgICAgICAgICgtW1dLVmlldyBzZXRGcmFtZVNp emU6XSk6CisgICAgICAgICgtW1dLVmlldyBfdXBkYXRlV2luZG93QW5kVmlld0ZyYW1lc10pOgor ICAgICAgICAoLVtXS1ZpZXcgaW5pdFdpdGhGcmFtZTpjb250ZXh0UmVmOnBhZ2VHcm91cFJlZjpy ZWxhdGVkVG9QYWdlOl0pOgorICAgICAgICAoLVtXS1ZpZXcgZW5hYmxlRnJhbWVTaXplVXBkYXRl c10pOgorICAgICAgICAoLVtXS1ZpZXcgc2V0U2hvdWxkQ2xpcFRvVmlzaWJsZVJlY3Q6XSk6Cisg ICAgICAgICgtW1dLVmlldyBmb3JjZUFzeW5jRHJhd2luZ0FyZWFTaXplVXBkYXRlOl0pOgorICAg ICAgICBVc2UgW191cGRhdGVWaWV3RXhwb3NlZFJlY3RdLgorCiAyMDEzLTA1LTI5ICBNYXJjZWxv IExpcmEgIDxtYXJjZWxvLmxpcmFAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBbV0syXVtDb29y ZGluYXRlZEdyYXBoaWNzXVtFRkxdIFdLVmlld1VzZXJWaWV3cG9ydFRvQ29udGVudHMoKSBmdW5j dGlvbiBkb2Vzbid0IGRvIHdoYXQgaXQgc2F5cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9tYWMvV0tWaWV3Lm1tCmluZGV4IDAzMmEzMDIuLjcwZTAyNTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KQEAgLTIzNiw2ICsyMzYsOCBAQCBzdHJ1Y3Qg V0tWaWV3SW50ZXJwcmV0S2V5RXZlbnRzUGFyYW1ldGVycyB7CiAgICAgCiAgICAgTlNTaXplIF9p bnRyaW5zaWNDb250ZW50U2l6ZTsKICAgICBCT09MIF9jbGlwc1RvVmlzaWJsZVJlY3Q7CisgICAg TlNSZWN0IF9jb250ZW50UHJlcGFyYXRpb25SZWN0OworICAgIEJPT0wgX3VzZUNvbnRlbnRQcmVw YXJhdGlvblJlY3RGb3JWaXNpYmxlUmVjdDsKIAogI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5f UkVRVUlSRUQgPj0gMTA5MAogICAgIEJPT0wgX2lzV2luZG93T2NjbHVkZWQ7CkBAIC0zOTIsNiAr Mzk0LDI0IEBAIHN0cnVjdCBXS1ZpZXdJbnRlcnByZXRLZXlFdmVudHNQYXJhbWV0ZXJzIHsKICAg ICByZXR1cm4gX2RhdGEtPl9pbnRyaW5zaWNDb250ZW50U2l6ZTsKIH0KIAorLSAodm9pZClwcmVw YXJlQ29udGVudEluUmVjdDooTlNSZWN0KXJlY3QKK3sKKyAgICBfZGF0YS0+X2NvbnRlbnRQcmVw YXJhdGlvblJlY3QgPSByZWN0OworICAgIF9kYXRhLT5fdXNlQ29udGVudFByZXBhcmF0aW9uUmVj dEZvclZpc2libGVSZWN0ID0gWUVTOworCisgICAgW3NlbGYgX3VwZGF0ZVZpZXdFeHBvc2VkUmVj dF07Cit9CisKKy0gKHZvaWQpX3VwZGF0ZVZpZXdFeHBvc2VkUmVjdAoreworICAgIE5TUmVjdCBl eHBvc2VkUmVjdCA9IFtzZWxmIHZpc2libGVSZWN0XTsKKworICAgIGlmIChfZGF0YS0+X3VzZUNv bnRlbnRQcmVwYXJhdGlvblJlY3RGb3JWaXNpYmxlUmVjdCkKKyAgICAgICAgZXhwb3NlZFJlY3Qg PSBOU1VuaW9uUmVjdChfZGF0YS0+X2NvbnRlbnRQcmVwYXJhdGlvblJlY3QsIGV4cG9zZWRSZWN0 KTsKKworICAgIF9kYXRhLT5fcGFnZS0+dmlld0V4cG9zZWRSZWN0Q2hhbmdlZChleHBvc2VkUmVj dCk7Cit9CisKIC0gKHZvaWQpc2V0RnJhbWVTaXplOihOU1NpemUpc2l6ZQogewogICAgIGlmICgh TlNFcXVhbFNpemVzKHNpemUsIFtzZWxmIGZyYW1lXS5zaXplKSkKQEAgLTQyNyw3ICs0NDcsNyBA QCBzdHJ1Y3QgV0tWaWV3SW50ZXJwcmV0S2V5RXZlbnRzUGFyYW1ldGVycyB7CiAKICAgICBpZiAo ZnJhbWVTaXplVXBkYXRlc0VuYWJsZWQpIHsKICAgICAgICAgaWYgKF9kYXRhLT5fY2xpcHNUb1Zp c2libGVSZWN0KQotICAgICAgICAgICAgX2RhdGEtPl9wYWdlLT52aWV3RXhwb3NlZFJlY3RDaGFu Z2VkKFtzZWxmIHZpc2libGVSZWN0XSk7CisgICAgICAgICAgICBbc2VsZiBfdXBkYXRlVmlld0V4 cG9zZWRSZWN0XTsKICAgICAgICAgW3NlbGYgX3NldERyYXdpbmdBcmVhU2l6ZTpzaXplXTsKICAg ICB9CiB9CkBAIC00MzgsOCArNDU4LDggQEAgc3RydWN0IFdLVmlld0ludGVycHJldEtleUV2ZW50 c1BhcmFtZXRlcnMgewogICAgIE5TUG9pbnQgYWNjZXNzaWJpbGl0eVBvc2l0aW9uID0gW1tzZWxm IGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZTpOU0FjY2Vzc2liaWxpdHlQb3NpdGlvbkF0dHJp YnV0ZV0gcG9pbnRWYWx1ZV07CiAgICAgCiAgICAgX2RhdGEtPl9wYWdlLT53aW5kb3dBbmRWaWV3 RnJhbWVzQ2hhbmdlZCh2aWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzLCBhY2Nlc3NpYmlsaXR5 UG9zaXRpb24pOwotICAgIGlmIChfZGF0YS0+X2NsaXBzVG9WaXNpYmxlUmVjdCkKLSAgICAgICAg X2RhdGEtPl9wYWdlLT52aWV3RXhwb3NlZFJlY3RDaGFuZ2VkKFtzZWxmIHZpc2libGVSZWN0XSk7 CisgICAgaWYgKF9kYXRhLT5fY2xpcHNUb1Zpc2libGVSZWN0ICYmICFfZGF0YS0+X3VzZUNvbnRl bnRQcmVwYXJhdGlvblJlY3RGb3JWaXNpYmxlUmVjdCkKKyAgICAgICAgW3NlbGYgX3VwZGF0ZVZp ZXdFeHBvc2VkUmVjdF07CiB9CiAKIC0gKHZvaWQpcmVuZXdHU3RhdGUKQEAgLTMwNjcsNiArMzA4 Nyw3IEBAIHN0YXRpYyBOU1N0cmluZyAqcGF0aFdpdGhVbmlxdWVGaWxlbmFtZUZvclBhdGgoTlNT dHJpbmcgKnBhdGgpCiAgICAgX2RhdGEtPl9tb3VzZURvd25FdmVudCA9IG5pbDsKICAgICBfZGF0 YS0+X2lnbm9yaW5nTW91c2VEcmFnZ2VkRXZlbnRzID0gTk87CiAgICAgX2RhdGEtPl9jbGlwc1Rv VmlzaWJsZVJlY3QgPSBOTzsKKyAgICBfZGF0YS0+X3VzZUNvbnRlbnRQcmVwYXJhdGlvblJlY3RG b3JWaXNpYmxlUmVjdCA9IE5POwogCiAgICAgX2RhdGEtPl9pbnRyaW5zaWNDb250ZW50U2l6ZSA9 IE5TTWFrZVNpemUoTlNWaWV3Tm9JbnN0cmluc2ljTWV0cmljLCBOU1ZpZXdOb0luc3RyaW5zaWNN ZXRyaWMpOwogCkBAIC0zMTcyLDcgKzMxOTMsNyBAQCBzdGF0aWMgTlNTdHJpbmcgKnBhdGhXaXRo VW5pcXVlRmlsZW5hbWVGb3JQYXRoKE5TU3RyaW5nICpwYXRoKQogICAgIAogICAgIGlmICghKC0t X2RhdGEtPl9mcmFtZVNpemVVcGRhdGVzRGlzYWJsZWRDb3VudCkpIHsKICAgICAgICAgaWYgKF9k YXRhLT5fY2xpcHNUb1Zpc2libGVSZWN0KQotICAgICAgICAgICAgX2RhdGEtPl9wYWdlLT52aWV3 RXhwb3NlZFJlY3RDaGFuZ2VkKFtzZWxmIHZpc2libGVSZWN0XSk7CisgICAgICAgICAgICBbc2Vs ZiBfdXBkYXRlVmlld0V4cG9zZWRSZWN0XTsKICAgICAgICAgW3NlbGYgX3NldERyYXdpbmdBcmVh U2l6ZTpbc2VsZiBmcmFtZV0uc2l6ZV07CiAgICAgfQogfQpAQCAtMzI0NCw3ICszMjY1LDcgQEAg c3RhdGljIE5TU3RyaW5nICpwYXRoV2l0aFVuaXF1ZUZpbGVuYW1lRm9yUGF0aChOU1N0cmluZyAq cGF0aCkKICAgICBfZGF0YS0+X2NsaXBzVG9WaXNpYmxlUmVjdCA9IGNsaXBzVG9WaXNpYmxlUmVj dDsKIAogICAgIGlmIChjbGlwc1RvVmlzaWJsZVJlY3QpCi0gICAgICAgIF9kYXRhLT5fcGFnZS0+ dmlld0V4cG9zZWRSZWN0Q2hhbmdlZChbc2VsZiB2aXNpYmxlUmVjdF0pOworICAgICAgICBbc2Vs ZiBfdXBkYXRlVmlld0V4cG9zZWRSZWN0XTsKIAogICAgIF9kYXRhLT5fcGFnZS0+c2V0TWFpbkZy YW1lSXNTY3JvbGxhYmxlKCFjbGlwc1RvVmlzaWJsZVJlY3QpOwogfQpAQCAtMzM2NSw3ICszMzg2 LDcgQEAgc3RhdGljIE5TU3RyaW5nICpwYXRoV2l0aFVuaXF1ZUZpbGVuYW1lRm9yUGF0aChOU1N0 cmluZyAqcGF0aCkKIC0gKHZvaWQpZm9yY2VBc3luY0RyYXdpbmdBcmVhU2l6ZVVwZGF0ZTooTlNT aXplKXNpemUKIHsKICAgICBpZiAoX2RhdGEtPl9jbGlwc1RvVmlzaWJsZVJlY3QpCi0gICAgICAg IF9kYXRhLT5fcGFnZS0+dmlld0V4cG9zZWRSZWN0Q2hhbmdlZChbc2VsZiB2aXNpYmxlUmVjdF0p OworICAgICAgICBbc2VsZiBfdXBkYXRlVmlld0V4cG9zZWRSZWN0XTsKICAgICBbc2VsZiBfc2V0 RHJhd2luZ0FyZWFTaXplOnNpemVdOwogCiAgICAgLy8gSWYgYSBnZW9tZXRyeSB1cGRhdGUgaXMg cGVuZGluZyB0aGUgbmV3IHVwZGF0ZSB3b24ndCBiZSBzZW50LiBQb2xsIHdpdGhvdXQgd2FpdGlu ZyBmb3IgYW55Cg== 203290 2013-05-29 16:44:29 -0700 2013-05-29 16:48:27 -0700 patch prepareContentRect.diff text/plain 4875 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyNTNjYWZlLi4xODdkODc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTMtMDUtMjkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgV0tWaWV3cyB1c2luZyBzaG91bGRDbGlwVG9WaXNpYmxlUmVjdD1ZRVMgc2hvdWxk IHJlc3BlY3QgcHJlcGFyZUNvbnRlbnRJblJlY3Q6IGlmIGNhbGxlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2OTg5CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8xNDAwNzQ0MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAgICAgICAgKC1bV0tW aWV3IHByZXBhcmVDb250ZW50SW5SZWN0Ol0pOgorICAgICAgICBJZiBwcmVwYXJlQ29udGVudElu UmVjdDogaXMgY2FsbGVkLCBzYXZlIHRoZSByZWN0IGFuZCBzZXQgYSBmbGFnIHNvIHdlIGtub3cg d2Ugc2hvdWxkIHVzZSBpdC4KKworICAgICAgICAoLVtXS1ZpZXcgX3VwZGF0ZVZpZXdFeHBvc2Vk UmVjdF0pOgorICAgICAgICBHaXZlIHRoZSBXZWJQYWdlIChhbmQgbGF0ZXIgdGhlIERyYXdpbmdB cmVhKSB0aGUgdW5pb24gb2YgdGhlIHJlY3QgaGFuZGVkIHRvIHByZXBhcmVDb250ZW50SW5SZWN0 OgorICAgICAgICBhbmQgdGhlIFdLVmlldydzIHZpc2libGVSZWN0LCBpZiB3ZSdyZSBpbiB0aGF0 IG1vZGUsIHNvIHRoYXQgYXBwbGljYXRpb25zIHRoYXQgZG8gdGhlaXIgb3duIHNjcm9sbGluZwor ICAgICAgICBjYW4gY2F1c2UgdGlsZXMgdG8gYmUgY3JlYXRlZCBpbiBjdXJyZW50bHkgb2Zmc2Ny ZWVuIHZpZXdzIChmb3Igb3ZlcmRyYXcpLgorCisgICAgICAgICgtW1dLVmlldyBzZXRGcmFtZVNp emU6XSk6CisgICAgICAgICgtW1dLVmlldyBfdXBkYXRlV2luZG93QW5kVmlld0ZyYW1lc10pOgor ICAgICAgICAoLVtXS1ZpZXcgaW5pdFdpdGhGcmFtZTpjb250ZXh0UmVmOnBhZ2VHcm91cFJlZjpy ZWxhdGVkVG9QYWdlOl0pOgorICAgICAgICAoLVtXS1ZpZXcgZW5hYmxlRnJhbWVTaXplVXBkYXRl c10pOgorICAgICAgICAoLVtXS1ZpZXcgc2V0U2hvdWxkQ2xpcFRvVmlzaWJsZVJlY3Q6XSk6Cisg ICAgICAgICgtW1dLVmlldyBmb3JjZUFzeW5jRHJhd2luZ0FyZWFTaXplVXBkYXRlOl0pOgorICAg ICAgICBVc2UgW191cGRhdGVWaWV3RXhwb3NlZFJlY3RdLgorCiAyMDEzLTA1LTI5ICBNYXJjZWxv IExpcmEgIDxtYXJjZWxvLmxpcmFAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBbV0syXVtDb29y ZGluYXRlZEdyYXBoaWNzXVtFRkxdIFdLVmlld1VzZXJWaWV3cG9ydFRvQ29udGVudHMoKSBmdW5j dGlvbiBkb2Vzbid0IGRvIHdoYXQgaXQgc2F5cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9tYWMvV0tWaWV3Lm1tCmluZGV4IDAzMmEzMDIuLjYyNDUyZWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KQEAgLTIzNiw2ICsyMzYsOCBAQCBzdHJ1Y3Qg V0tWaWV3SW50ZXJwcmV0S2V5RXZlbnRzUGFyYW1ldGVycyB7CiAgICAgCiAgICAgTlNTaXplIF9p bnRyaW5zaWNDb250ZW50U2l6ZTsKICAgICBCT09MIF9jbGlwc1RvVmlzaWJsZVJlY3Q7CisgICAg TlNSZWN0IF9jb250ZW50UHJlcGFyYXRpb25SZWN0OworICAgIEJPT0wgX3VzZUNvbnRlbnRQcmVw YXJhdGlvblJlY3RGb3JWaXNpYmxlUmVjdDsKIAogI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5f UkVRVUlSRUQgPj0gMTA5MAogICAgIEJPT0wgX2lzV2luZG93T2NjbHVkZWQ7CkBAIC0zOTIsNiAr Mzk0LDI0IEBAIHN0cnVjdCBXS1ZpZXdJbnRlcnByZXRLZXlFdmVudHNQYXJhbWV0ZXJzIHsKICAg ICByZXR1cm4gX2RhdGEtPl9pbnRyaW5zaWNDb250ZW50U2l6ZTsKIH0KIAorLSAodm9pZClwcmVw YXJlQ29udGVudEluUmVjdDooTlNSZWN0KXJlY3QKK3sKKyAgICBfZGF0YS0+X2NvbnRlbnRQcmVw YXJhdGlvblJlY3QgPSByZWN0OworICAgIF9kYXRhLT5fdXNlQ29udGVudFByZXBhcmF0aW9uUmVj dEZvclZpc2libGVSZWN0ID0gWUVTOworCisgICAgW3NlbGYgX3VwZGF0ZVZpZXdFeHBvc2VkUmVj dF07Cit9CisKKy0gKHZvaWQpX3VwZGF0ZVZpZXdFeHBvc2VkUmVjdAoreworICAgIE5TUmVjdCBl eHBvc2VkUmVjdCA9IFtzZWxmIHZpc2libGVSZWN0XTsKKworICAgIGlmIChfZGF0YS0+X3VzZUNv bnRlbnRQcmVwYXJhdGlvblJlY3RGb3JWaXNpYmxlUmVjdCkKKyAgICAgICAgZXhwb3NlZFJlY3Qg PSBOU1VuaW9uUmVjdChfZGF0YS0+X2NvbnRlbnRQcmVwYXJhdGlvblJlY3QsIGV4cG9zZWRSZWN0 KTsKKworICAgIF9kYXRhLT5fcGFnZS0+dmlld0V4cG9zZWRSZWN0Q2hhbmdlZChleHBvc2VkUmVj dCk7Cit9CisKIC0gKHZvaWQpc2V0RnJhbWVTaXplOihOU1NpemUpc2l6ZQogewogICAgIGlmICgh TlNFcXVhbFNpemVzKHNpemUsIFtzZWxmIGZyYW1lXS5zaXplKSkKQEAgLTQyNyw3ICs0NDcsNyBA QCBzdHJ1Y3QgV0tWaWV3SW50ZXJwcmV0S2V5RXZlbnRzUGFyYW1ldGVycyB7CiAKICAgICBpZiAo ZnJhbWVTaXplVXBkYXRlc0VuYWJsZWQpIHsKICAgICAgICAgaWYgKF9kYXRhLT5fY2xpcHNUb1Zp c2libGVSZWN0KQotICAgICAgICAgICAgX2RhdGEtPl9wYWdlLT52aWV3RXhwb3NlZFJlY3RDaGFu Z2VkKFtzZWxmIHZpc2libGVSZWN0XSk7CisgICAgICAgICAgICBbc2VsZiBfdXBkYXRlVmlld0V4 cG9zZWRSZWN0XTsKICAgICAgICAgW3NlbGYgX3NldERyYXdpbmdBcmVhU2l6ZTpzaXplXTsKICAg ICB9CiB9CkBAIC00MzksNyArNDU5LDcgQEAgc3RydWN0IFdLVmlld0ludGVycHJldEtleUV2ZW50 c1BhcmFtZXRlcnMgewogICAgIAogICAgIF9kYXRhLT5fcGFnZS0+d2luZG93QW5kVmlld0ZyYW1l c0NoYW5nZWQodmlld0ZyYW1lSW5XaW5kb3dDb29yZGluYXRlcywgYWNjZXNzaWJpbGl0eVBvc2l0 aW9uKTsKICAgICBpZiAoX2RhdGEtPl9jbGlwc1RvVmlzaWJsZVJlY3QpCi0gICAgICAgIF9kYXRh LT5fcGFnZS0+dmlld0V4cG9zZWRSZWN0Q2hhbmdlZChbc2VsZiB2aXNpYmxlUmVjdF0pOworICAg ICAgICBbc2VsZiBfdXBkYXRlVmlld0V4cG9zZWRSZWN0XTsKIH0KIAogLSAodm9pZClyZW5ld0dT dGF0ZQpAQCAtMzA2Nyw2ICszMDg3LDcgQEAgc3RhdGljIE5TU3RyaW5nICpwYXRoV2l0aFVuaXF1 ZUZpbGVuYW1lRm9yUGF0aChOU1N0cmluZyAqcGF0aCkKICAgICBfZGF0YS0+X21vdXNlRG93bkV2 ZW50ID0gbmlsOwogICAgIF9kYXRhLT5faWdub3JpbmdNb3VzZURyYWdnZWRFdmVudHMgPSBOTzsK ICAgICBfZGF0YS0+X2NsaXBzVG9WaXNpYmxlUmVjdCA9IE5POworICAgIF9kYXRhLT5fdXNlQ29u dGVudFByZXBhcmF0aW9uUmVjdEZvclZpc2libGVSZWN0ID0gTk87CiAKICAgICBfZGF0YS0+X2lu dHJpbnNpY0NvbnRlbnRTaXplID0gTlNNYWtlU2l6ZShOU1ZpZXdOb0luc3RyaW5zaWNNZXRyaWMs IE5TVmlld05vSW5zdHJpbnNpY01ldHJpYyk7CiAKQEAgLTMxNzIsNyArMzE5Myw3IEBAIHN0YXRp YyBOU1N0cmluZyAqcGF0aFdpdGhVbmlxdWVGaWxlbmFtZUZvclBhdGgoTlNTdHJpbmcgKnBhdGgp CiAgICAgCiAgICAgaWYgKCEoLS1fZGF0YS0+X2ZyYW1lU2l6ZVVwZGF0ZXNEaXNhYmxlZENvdW50 KSkgewogICAgICAgICBpZiAoX2RhdGEtPl9jbGlwc1RvVmlzaWJsZVJlY3QpCi0gICAgICAgICAg ICBfZGF0YS0+X3BhZ2UtPnZpZXdFeHBvc2VkUmVjdENoYW5nZWQoW3NlbGYgdmlzaWJsZVJlY3Rd KTsKKyAgICAgICAgICAgIFtzZWxmIF91cGRhdGVWaWV3RXhwb3NlZFJlY3RdOwogICAgICAgICBb c2VsZiBfc2V0RHJhd2luZ0FyZWFTaXplOltzZWxmIGZyYW1lXS5zaXplXTsKICAgICB9CiB9CkBA IC0zMjQ0LDcgKzMyNjUsNyBAQCBzdGF0aWMgTlNTdHJpbmcgKnBhdGhXaXRoVW5pcXVlRmlsZW5h bWVGb3JQYXRoKE5TU3RyaW5nICpwYXRoKQogICAgIF9kYXRhLT5fY2xpcHNUb1Zpc2libGVSZWN0 ID0gY2xpcHNUb1Zpc2libGVSZWN0OwogCiAgICAgaWYgKGNsaXBzVG9WaXNpYmxlUmVjdCkKLSAg ICAgICAgX2RhdGEtPl9wYWdlLT52aWV3RXhwb3NlZFJlY3RDaGFuZ2VkKFtzZWxmIHZpc2libGVS ZWN0XSk7CisgICAgICAgIFtzZWxmIF91cGRhdGVWaWV3RXhwb3NlZFJlY3RdOwogCiAgICAgX2Rh dGEtPl9wYWdlLT5zZXRNYWluRnJhbWVJc1Njcm9sbGFibGUoIWNsaXBzVG9WaXNpYmxlUmVjdCk7 CiB9CkBAIC0zMzY1LDcgKzMzODYsNyBAQCBzdGF0aWMgTlNTdHJpbmcgKnBhdGhXaXRoVW5pcXVl RmlsZW5hbWVGb3JQYXRoKE5TU3RyaW5nICpwYXRoKQogLSAodm9pZClmb3JjZUFzeW5jRHJhd2lu Z0FyZWFTaXplVXBkYXRlOihOU1NpemUpc2l6ZQogewogICAgIGlmIChfZGF0YS0+X2NsaXBzVG9W aXNpYmxlUmVjdCkKLSAgICAgICAgX2RhdGEtPl9wYWdlLT52aWV3RXhwb3NlZFJlY3RDaGFuZ2Vk KFtzZWxmIHZpc2libGVSZWN0XSk7CisgICAgICAgIFtzZWxmIF91cGRhdGVWaWV3RXhwb3NlZFJl Y3RdOwogICAgIFtzZWxmIF9zZXREcmF3aW5nQXJlYVNpemU6c2l6ZV07CiAKICAgICAvLyBJZiBh IGdlb21ldHJ5IHVwZGF0ZSBpcyBwZW5kaW5nIHRoZSBuZXcgdXBkYXRlIHdvbid0IGJlIHNlbnQu IFBvbGwgd2l0aG91dCB3YWl0aW5nIGZvciBhbnkK