59846 2011-04-29 16:42:55 -0700 Scrolling causes rounded bottom window corners to become square 2011-04-29 18:01:30 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 bdakin bdakin bdakin oldest_to_newest 395620 0 bdakin 2011-04-29 16:42:55 -0700 In a window with rounded corners, scrolling in WK2 causes the rounded corners to become square. <rdar://problem/9234239> Patch forthcoming. 395622 1 91767 bdakin 2011-04-29 16:51:50 -0700 Created attachment 91767 Patch 395625 2 91767 simon.fraser 2011-04-29 16:58:14 -0700 Comment on attachment 91767 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91767&action=review > Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm:145 > + NSDisableScreenUpdates(); A comment explaining why disabling is required would be good > Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm:161 > + m_windowBottomCornerIntersectionRect = NSZeroRect; > + m_windowBottomCornerIntersectionRect = [[m_wkView window] _intersectBottomCornersWithRect:[m_wkView convertRect:[m_wkView visibleRect] toView:nil]]; Why the double assignment? 395630 3 91767 simon.fraser 2011-04-29 17:07:59 -0700 Comment on attachment 91767 Patch Maybe move this code to WKView, too? 395657 4 91774 bdakin 2011-04-29 17:48:10 -0700 Created attachment 91774 Patch that addresses Simon's comments 395662 5 91774 simon.fraser 2011-04-29 17:53:30 -0700 Comment on attachment 91774 Patch that addresses Simon's comments View in context: https://bugs.webkit.org/attachment.cgi?id=91774&action=review > Source/WebKit2/UIProcess/API/mac/PageClientImpl.h:127 > + NSRect m_windowBottomCornerIntersectionRect; This is unused? > Source/WebKit2/UIProcess/API/mac/WKView.mm:933 > + BOOL maskWindow = window && !NSIsEmptyRect(_data->_windowBottomCornerIntersectionRect); Would read better if this was shouldMaskWindow 395664 6 bdakin 2011-04-29 17:56:55 -0700 (In reply to comment #5) > (From update of attachment 91774 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=91774&action=review > > > Source/WebKit2/UIProcess/API/mac/PageClientImpl.h:127 > > + NSRect m_windowBottomCornerIntersectionRect; > > This is unused? > Oops! Meant to remove that. > > Source/WebKit2/UIProcess/API/mac/WKView.mm:933 > > + BOOL maskWindow = window && !NSIsEmptyRect(_data->_windowBottomCornerIntersectionRect); > > Would read better if this was shouldMaskWindow Will change. Thanks! 395670 7 bdakin 2011-04-29 18:01:30 -0700 Committed fix with revision 85376. 91767 2011-04-29 16:51:50 -0700 2011-04-29 17:48:10 -0700 Patch for-review.txt text/plain 3374 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1MzcwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDQtMjkgIEJldGggRGFr aW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 OTg0NgorICAgICAgICBTY3JvbGxpbmcgY2F1c2VzIHJvdW5kZWQgYm90dG9tIHdpbmRvdyBjb3Ju ZXJzIHRvIGJlY29tZSBzcXVhcmUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzkyMzQyMzk+CisK KyAgICAgICAgS2VlcCB0cmFjayBvZiB0aGUgbV93aW5kb3dCb3R0b21Db3JuZXJJbnRlcnNlY3Rp b25SZWN0IGluIFBhZ2VDbGllbnRJbXBsLiAKKyAgICAgICAgSW52YWxpZGF0ZSB0aGUgcmVjdCBi ZWZvcmUgc2Nyb2xsaW5nLiBBbmQgaWYgdGhlIHJlY3QgaXMgbm9uLXplcm8gZHVyaW5nIGEgCisg ICAgICAgIGRpc3BsYXksIG1hc2sgdGhlIGNvcm5lcnMsIHRoZW4gc2V0IHRoZSByZWN0IHRvIHpl cm8gc28gdGhhdCBvbmx5IGRpc3BsYXlzIHRoYXQgCisgICAgICAgIGhhcHBlbiByaWdodCBhZnRl ciBhIHNjcm9sbCBib3RoZXIgdG8gZG8gdGhpcy4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21h Yy9QYWdlQ2xpZW50SW1wbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGll bnRJbXBsLm1tOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6ZGlzcGxheVZpZXcp OgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6c2Nyb2xsVmlldyk6CisKIDIwMTEt MDQtMjkgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvbWFjL1BhZ2VDbGllbnRJbXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaAkocmV2aXNpb24gODUzNDEpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCSh3b3JraW5nIGNv cHkpCkBAIC0xMjUsNiArMTI1LDcgQEAgcHJpdmF0ZToKICNpZiAhZGVmaW5lZChCVUlMRElOR19P Tl9TTk9XX0xFT1BBUkQpCiAgICAgQ29ycmVjdGlvblBhbmVsIG1fY29ycmVjdGlvblBhbmVsOwog I2VuZGlmCisgICAgTlNSZWN0IG1fd2luZG93Qm90dG9tQ29ybmVySW50ZXJzZWN0aW9uUmVjdDsK IH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0JKHJldmlzaW9uIDg1MzQxKQor KysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0JKHdv cmtpbmcgY29weSkKQEAgLTUxLDYgKzUxLDExIEBAIEBpbnRlcmZhY2UgTlNBcHBsaWNhdGlvbiAo V2ViTlNBcHBsaWNhdGkKIC0gKE5TQ3Vyc29yICopX2N1cnNvclJlY3RDdXJzb3I7CiBAZW5kCiAK K0BpbnRlcmZhY2UgTlNXaW5kb3cgKFdlYk5TV2luZG93RGV0YWlscykKKy0gKE5TUmVjdClfaW50 ZXJzZWN0Qm90dG9tQ29ybmVyc1dpdGhSZWN0OihOU1JlY3Qpdmlld1JlY3Q7CistICh2b2lkKV9t YXNrUm91bmRlZEJvdHRvbUNvcm5lcnM6KE5TUmVjdCljbGlwUmVjdDsKK0BlbmQKKwogdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCkBAIC0xMzYsMTMg KzE0MSwyNyBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjpzZXRWaWV3TmVlZHNEaXNwbGF5CiAKIHZv aWQgUGFnZUNsaWVudEltcGw6OmRpc3BsYXlWaWV3KCkKIHsKKyAgICBpZiAoIU5TSXNFbXB0eVJl Y3QobV93aW5kb3dCb3R0b21Db3JuZXJJbnRlcnNlY3Rpb25SZWN0KSkKKyAgICAgICAgTlNEaXNh YmxlU2NyZWVuVXBkYXRlcygpOworCiAgICAgW21fd2tWaWV3IGRpc3BsYXlJZk5lZWRlZF07CisK KyAgICBpZiAoIU5TSXNFbXB0eVJlY3QobV93aW5kb3dCb3R0b21Db3JuZXJJbnRlcnNlY3Rpb25S ZWN0KSkgeworICAgICAgICBbW21fd2tWaWV3IHdpbmRvd10gX21hc2tSb3VuZGVkQm90dG9tQ29y bmVyczptX3dpbmRvd0JvdHRvbUNvcm5lckludGVyc2VjdGlvblJlY3RdOworICAgICAgICBOU0Vu YWJsZVNjcmVlblVwZGF0ZXMoKTsKKyAgICAgICAgbV93aW5kb3dCb3R0b21Db3JuZXJJbnRlcnNl Y3Rpb25SZWN0ID0gTlNaZXJvUmVjdDsKKyAgICB9CiB9CiAKIHZvaWQgUGFnZUNsaWVudEltcGw6 OnNjcm9sbFZpZXcoY29uc3QgSW50UmVjdCYgc2Nyb2xsUmVjdCwgY29uc3QgSW50U2l6ZSYgc2Ny b2xsT2Zmc2V0KQogewogICAgIE5TUmVjdCBjbGlwcGVkU2Nyb2xsUmVjdCA9IE5TSW50ZXJzZWN0 aW9uUmVjdChzY3JvbGxSZWN0LCBOU09mZnNldFJlY3Qoc2Nyb2xsUmVjdCwgLXNjcm9sbE9mZnNl dC53aWR0aCgpLCAtc2Nyb2xsT2Zmc2V0LmhlaWdodCgpKSk7CiAKKyAgICBtX3dpbmRvd0JvdHRv bUNvcm5lckludGVyc2VjdGlvblJlY3QgPSBOU1plcm9SZWN0OworICAgIG1fd2luZG93Qm90dG9t Q29ybmVySW50ZXJzZWN0aW9uUmVjdCA9IFtbbV93a1ZpZXcgd2luZG93XSBfaW50ZXJzZWN0Qm90 dG9tQ29ybmVyc1dpdGhSZWN0OlttX3drVmlldyBjb252ZXJ0UmVjdDpbbV93a1ZpZXcgdmlzaWJs ZVJlY3RdIHRvVmlldzpuaWxdXTsKKyAgICBpZiAoIU5TSXNFbXB0eVJlY3QobV93aW5kb3dCb3R0 b21Db3JuZXJJbnRlcnNlY3Rpb25SZWN0KSkKKyAgICAgICAgW21fd2tWaWV3IHNldE5lZWRzRGlz cGxheUluUmVjdDpbbV93a1ZpZXcgY29udmVydFJlY3Q6bV93aW5kb3dCb3R0b21Db3JuZXJJbnRl cnNlY3Rpb25SZWN0IGZyb21WaWV3Om5pbF1dOworCiAgICAgW21fd2tWaWV3IHRyYW5zbGF0ZVJl Y3RzTmVlZGluZ0Rpc3BsYXlJblJlY3Q6Y2xpcHBlZFNjcm9sbFJlY3QgYnk6c2Nyb2xsT2Zmc2V0 XTsKICAgICBbbV93a1ZpZXcgc2Nyb2xsUmVjdDpjbGlwcGVkU2Nyb2xsUmVjdCBieTpzY3JvbGxP ZmZzZXRdOwogfQo= 91774 2011-04-29 17:48:10 -0700 2011-04-29 17:53:30 -0700 Patch that addresses Simon's comments for-review-2.txt text/plain 5257 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1Mzc0KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDQtMjkgIEJldGggRGFr aW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 OTg0NgorICAgICAgICBTY3JvbGxpbmcgY2F1c2VzIHJvdW5kZWQgYm90dG9tIHdpbmRvdyBjb3Ju ZXJzIHRvIGJlY29tZSBzcXVhcmUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzkyMzQyMzk+CisK KyAgICAgICAgS2VlcCB0cmFjayBvZiB0aGUgbV93aW5kb3dCb3R0b21Db3JuZXJJbnRlcnNlY3Rp b25SZWN0IGluIFdLVmlldy4gCisgICAgICAgIEludmFsaWRhdGUgdGhlIHJlY3QgYmVmb3JlIHNj cm9sbGluZy4gQW5kIGlmIHRoZSByZWN0IGlzIG5vbi16ZXJvIGR1cmluZyBhIAorICAgICAgICBk aXNwbGF5LCBtYXNrIHRoZSBjb3JuZXJzLCB0aGVuIHNldCB0aGUgcmVjdCB0byB6ZXJvIHNvIHRo YXQgb25seSBkaXNwbGF5cyB0aGF0IAorICAgICAgICBoYXBwZW4gcmlnaHQgYWZ0ZXIgYSBzY3Jv bGwgYm90aGVyIHRvIGRvIHRoaXMuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNs aWVudEltcGwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5t bToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OnNjcm9sbFZpZXcpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAgICAgICAgKC1bV0tWaWV3IGRpc3Bs YXlJZk5lZWRlZF0pOgorICAgICAgICAoLVtXS1ZpZXcgX2NhY2hlV2luZG93Qm90dG9tQ29ybmVy UmVjdF0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmg6CisK IDIwMTEtMDQtMjkgIEppYSBQdSAgPGpwdUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgU2FtIFdlaW5pZy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1Bh Z2VDbGllbnRJbXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9tYWMvUGFnZUNsaWVudEltcGwuaAkocmV2aXNpb24gODUzNDEpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0x MjQsNiArMTI0LDcgQEAgcHJpdmF0ZToKICAgICBSZXRhaW5QdHI8V0tFZGl0b3JVbmRvVGFyZ2V0 T2JqQz4gbV91bmRvVGFyZ2V0OwogI2lmICFkZWZpbmVkKEJVSUxESU5HX09OX1NOT1dfTEVPUEFS RCkKICAgICBDb3JyZWN0aW9uUGFuZWwgbV9jb3JyZWN0aW9uUGFuZWw7CisgICAgTlNSZWN0IG1f d2luZG93Qm90dG9tQ29ybmVySW50ZXJzZWN0aW9uUmVjdDsKICNlbmRpZgogfTsKIApJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwu bW0JKHJldmlzaW9uIDg1MzQxKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMv UGFnZUNsaWVudEltcGwubW0JKHdvcmtpbmcgY29weSkKQEAgLTE0Myw2ICsxNDMsOCBAQCB2b2lk IFBhZ2VDbGllbnRJbXBsOjpzY3JvbGxWaWV3KGNvbnN0IEluCiB7CiAgICAgTlNSZWN0IGNsaXBw ZWRTY3JvbGxSZWN0ID0gTlNJbnRlcnNlY3Rpb25SZWN0KHNjcm9sbFJlY3QsIE5TT2Zmc2V0UmVj dChzY3JvbGxSZWN0LCAtc2Nyb2xsT2Zmc2V0LndpZHRoKCksIC1zY3JvbGxPZmZzZXQuaGVpZ2h0 KCkpKTsKIAorICAgIFttX3drVmlldyBfY2FjaGVXaW5kb3dCb3R0b21Db3JuZXJSZWN0XTsKKwog ICAgIFttX3drVmlldyB0cmFuc2xhdGVSZWN0c05lZWRpbmdEaXNwbGF5SW5SZWN0OmNsaXBwZWRT Y3JvbGxSZWN0IGJ5OnNjcm9sbE9mZnNldF07CiAgICAgW21fd2tWaWV3IHNjcm9sbFJlY3Q6Y2xp cHBlZFNjcm9sbFJlY3QgYnk6c2Nyb2xsT2Zmc2V0XTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0JKHJldmlzaW9uIDg1MzQxKQorKysgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC04 Nyw2ICs4Nyw4IEBAIC0gKE5TUmVjdClfZ3Jvd0JveFJlY3Q7CiAtIChpZClfZ3Jvd0JveE93bmVy OwogLSAodm9pZClfc2V0U2hvd09wYXF1ZUdyb3dCb3hGb3JPd25lcjooaWQpb3duZXI7CiAtIChC T09MKV91cGRhdGVHcm93Qm94Rm9yV2luZG93RnJhbWVDaGFuZ2U7CistIChOU1JlY3QpX2ludGVy c2VjdEJvdHRvbUNvcm5lcnNXaXRoUmVjdDooTlNSZWN0KXZpZXdSZWN0OworLSAodm9pZClfbWFz a1JvdW5kZWRCb3R0b21Db3JuZXJzOihOU1JlY3QpY2xpcFJlY3Q7CiBAZW5kCiAKIHVzaW5nIG5h bWVzcGFjZSBXZWJLaXQ7CkBAIC0xNTYsNiArMTU4LDggQEAgQGludGVyZmFjZSBXS1ZpZXdEYXRh IDogTlNPYmplY3QgewogICAgIE5TSW50ZWdlciBfc3BlbGxDaGVja2VyRG9jdW1lbnRUYWc7CiAK ICAgICBCT09MIF9pblNlY3VyZUlucHV0U3RhdGU7CisKKyAgICBOU1JlY3QgX3dpbmRvd0JvdHRv bUNvcm5lckludGVyc2VjdGlvblJlY3Q7CiB9CiBAZW5kCiAKQEAgLTkxOSw2ICs5MjMsMjkgQEAg LSAodm9pZCljYXBpdGFsaXplV29yZDooaWQpc2VuZGVyCiAgICAgX2RhdGEtPl9wYWdlLT5jYXBp dGFsaXplV29yZCgpOwogfQogCistICh2b2lkKWRpc3BsYXlJZk5lZWRlZAoreworI2lmICFkZWZp bmVkKEJVSUxESU5HX09OX1NOT1dfTEVPUEFSRCkKKyAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIHJl bW92ZSB0aGlzIGNvZGUgd2hlbiA8cmRhcjovL3Byb2JsZW0vOTM2MjA4NT4gaXMgcmVzb2x2ZWQu IEluIHRoZSBtZWFudGltZSwKKyAgICAvLyBpdCBpcyBuZWNlc3NhcnkgdG8gZGlzYWJsZSBzY3Jl biB1cGRhdGVzIHNvIHdlIGdldCBhIGNoYW5jZSB0byByZWRyYXcgdGhlIGNvcm5lcnMgYmVmb3Jl IHRoaXMgCisgICAgLy8gZGlzcGxheSBpcyB2aXNpYmxlLgorICAgIE5TV2luZG93ICp3aW5kb3cg PSBbc2VsZiB3aW5kb3ddOworICAgIEJPT0wgbWFza1dpbmRvdyA9IHdpbmRvdyAmJiAhTlNJc0Vt cHR5UmVjdChfZGF0YS0+X3dpbmRvd0JvdHRvbUNvcm5lckludGVyc2VjdGlvblJlY3QpOworICAg IGlmIChtYXNrV2luZG93KQorICAgICAgICBOU0Rpc2FibGVTY3JlZW5VcGRhdGVzKCk7CisjZW5k aWYKKworICAgIFtzdXBlciBkaXNwbGF5SWZOZWVkZWRdOworCisjaWYgIWRlZmluZWQoQlVJTERJ TkdfT05fU05PV19MRU9QQVJEKQorICAgIGlmIChtYXNrV2luZG93KSB7CisgICAgICAgIFt3aW5k b3cgX21hc2tSb3VuZGVkQm90dG9tQ29ybmVyczpfZGF0YS0+X3dpbmRvd0JvdHRvbUNvcm5lcklu dGVyc2VjdGlvblJlY3RdOworICAgICAgICBOU0VuYWJsZVNjcmVlblVwZGF0ZXMoKTsKKyAgICAg ICAgX2RhdGEtPl93aW5kb3dCb3R0b21Db3JuZXJJbnRlcnNlY3Rpb25SZWN0ID0gTlNaZXJvUmVj dDsKKyAgICB9CisjZW5kaWYKK30KKwogLy8gRXZlbnRzCiAKIC8vIE92ZXJyaWRlIHRoaXMgc28g dGhhdCBBcHBLaXQgd2lsbCBzZW5kIHVzIGFycm93IGtleXMgYXMga2V5IGRvd24gZXZlbnRzIHNv IHdlIGNhbgpAQCAtMjM5OSw2ICsyNDI2LDIwIEBAIC0gKGJvb2wpX2V4ZWN1dGVTYXZlZENvbW1h bmRCeVNlbGVjdG9yOigKICAgICByZXR1cm4gIVtzaW5rLmdldCgpIGRpZFJlY2VpdmVVbmhhbmRs ZWRDb21tYW5kXTsKIH0KIAorLSAodm9pZClfY2FjaGVXaW5kb3dCb3R0b21Db3JuZXJSZWN0Cit7 CisjaWYgIWRlZmluZWQoQlVJTERJTkdfT05fU05PV19MRU9QQVJEKQorICAgIC8vIEZJWE1FOiBX ZSBzaG91bGQgcmVtb3ZlIHRoaXMgY29kZSB3aGVuIDxyZGFyOi8vcHJvYmxlbS85MzYyMDg1PiBp cyByZXNvbHZlZC4gCisgICAgTlNXaW5kb3cgKndpbmRvdyA9IFtzZWxmIHdpbmRvd107CisgICAg aWYgKCF3aW5kb3cpCisgICAgICAgIHJldHVybjsKKworICAgIF9kYXRhLT5fd2luZG93Qm90dG9t Q29ybmVySW50ZXJzZWN0aW9uUmVjdCA9IFt3aW5kb3cgX2ludGVyc2VjdEJvdHRvbUNvcm5lcnNX aXRoUmVjdDpbc2VsZiBjb252ZXJ0UmVjdDpbc2VsZiB2aXNpYmxlUmVjdF0gdG9WaWV3Om5pbF1d OworICAgIGlmICghTlNJc0VtcHR5UmVjdChfZGF0YS0+X3dpbmRvd0JvdHRvbUNvcm5lckludGVy c2VjdGlvblJlY3QpKQorICAgICAgICBbc2VsZiBzZXROZWVkc0Rpc3BsYXlJblJlY3Q6W3NlbGYg Y29udmVydFJlY3Q6X2RhdGEtPl93aW5kb3dCb3R0b21Db3JuZXJJbnRlcnNlY3Rpb25SZWN0IGZy b21WaWV3Om5pbF1dOworI2VuZGlmCit9CisKIEBlbmQKIAogQGltcGxlbWVudGF0aW9uIFdLVmll dyAoUHJpdmF0ZSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmll d0ludGVybmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9t YWMvV0tWaWV3SW50ZXJuYWwuaAkocmV2aXNpb24gODUzNDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oCSh3b3JraW5nIGNvcHkpCkBAIC04NSw0 ICs4NSw2IEBAIEBpbnRlcmZhY2UgV0tWaWV3IChJbnRlcm5hbCkKICNpZiBFTkFCTEUoRlVMTFND UkVFTl9BUEkpCiAtIChXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyKilmdWxsU2NyZWVuV2lu ZG93Q29udHJvbGxlcjsKICNlbmRpZgorCistICh2b2lkKV9jYWNoZVdpbmRvd0JvdHRvbUNvcm5l clJlY3Q7CiBAZW5kCg==