111606 2013-03-06 11:30:57 -0800 border-fit should happen at layout time rather than paint time 2021-12-24 13:25:09 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX https://bugs.webkit.org/show_bug.cgi?id=229564 InRadar P2 Normal --- 1 hyatt hyatt bfulgham dino eoconnor eric esprehn+autocc jonlee ntim ojan.autocc roger_fong simon.fraser webkit-bug-importer webkit.review.bot oldest_to_newest 849126 0 hyatt 2013-03-06 11:30:57 -0800 border-fit-adjust should happen at layout time rather than paint time. When the border-fit-adjusted box is right-aligned but contains left-aligned text, the paint time hack chops off the right side of the box correctly but then doesn't shift the smaller box to the right. We basically need to genuinely shrink the box during layout so that cases like this work. 850184 1 192024 hyatt 2013-03-07 09:52:27 -0800 Created attachment 192024 Patch 850256 2 192024 koivisto 2013-03-07 10:35:06 -0800 Comment on attachment 192024 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192024&action=review r=me > Source/WebCore/rendering/RenderBlock.cpp:6885 > + layoutBlock(false); Recursion :( 850267 3 hyatt 2013-03-07 10:44:21 -0800 Fixed in r145100. 850479 4 roger_fong 2013-03-07 14:18:46 -0800 Hi, this broke +fast/borders/border-fit-2.html +fast/borders/border-fit.html +fast/repaint/border-fit-lines.html on mac and windows. http://build.webkit.org/results/Apple%20MountainLion%20Release%20WK1%20(Tests)/r145119%20(7678)/results.html 850606 5 dino 2013-03-07 16:29:18 -0800 Test Expectations added to get our EWS going again. Reopening bug until the tests can be reenabled. 850607 6 dino 2013-03-07 16:29:39 -0800 https://trac.webkit.org/r145151 854939 7 jonlee 2013-03-13 21:36:56 -0700 r145139 fixed one of the tests. See bug 111776. 854942 8 jonlee 2013-03-13 21:40:02 -0700 <rdar://problem/13101714> 1132411 9 bfulgham 2015-10-12 12:03:56 -0700 I no longer see border-fit-lines.html failing on Windows. 1826755 10 ntim 2021-12-24 13:25:09 -0800 Bug 229564 removed -webkit-border-fit. 192024 2013-03-07 09:52:27 -0800 2013-03-07 10:35:06 -0800 Patch patch.txt text/plain 13998 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NTA5MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUwIEBACisyMDEzLTAzLTA3ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBib3JkZXItZml0LWFkanVzdCBzaG91 bGQgaGFwcGVuIGF0IGxheW91dCB0aW1lIHJhdGhlciB0aGFuIHBhaW50IHRpbWUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTYwNgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIG9yZGVyIGZvciBib3Jk ZXItZml0LWFkanVzdCB0byBiZSBhY2N1cmF0ZSBpbiBtb3JlIGNhc2VzLCBpdCBuZWVkcworICAg ICAgICB0byBiZSBhIGxheW91dC10aW1lIGFkanVzdG1lbnQgcmF0aGVyIHRoYW4gYSBwYWludC10 aW1lIGFkanVzdG1lbnQuCisgICAgICAgIFNwZWNpZmljYWxseSB0aGVyZSBhcmUgY2FzZXMgd2hl cmUgYW4gTFRSIGFkanVzdGVkIGJveCB3YXMgcmlnaHQtYWxpZ25lZAorICAgICAgICBieSBpdHMg Y29udGFpbmVyLCBhbmQgd2l0aG91dCBnZW51aW5lbHkgc2hyaW5raW5nIHRoZSBzaXplIG9mIHRo ZSBib3gsCisgICAgICAgIHdlIGVuZCB1cCBjaG9wcGluZyBvZmYgdGhlIHJpZ2h0IGVkZ2UgYnV0 IG5vdCBzaGlmdGluZyB0aGUgYm94IHRvIHRoZQorICAgICAgICByaWdodCB0byBjb21wZW5zYXRl LgorICAgICAgICAKKyAgICAgICAgVGhpcyBwYXRjaCBjaGFuZ2VzIGJvcmRlci1maXQtYWRqdXN0 IHRvIG5vdyBkbyB0aGUgYWRqdXN0bWVudCB1c2luZworICAgICAgICB0aGUgb3ZlcnJpZGUgd2lk dGggbWVjaGFuaXNtIGFuZCBhIHNlY29uZCBsYXlvdXQgcGFzcyBpbnN0ZWFkIG9mIGp1c3QKKyAg ICAgICAgaGFja2luZyBwYWludGluZy4KKworICAgICAgICBUZXN0OiBmYXN0L2Jsb2NrL2JvcmRl ci1maXQtd2l0aC1yaWdodC1hbGlnbm1lbnQuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpsYXlvdXRCbG9j ayk6CisgICAgICAgIENhbGxzIGZpdEJvcmRlclRvTGluZXNJZk5lZWRlZCBhdCB0aGUgZW5kIG9m IGxheW91dCB0byBkbyBhIHNlY29uZAorICAgICAgICBsYXlvdXQgcGFzcyBpZiB0aGUgYWRqdXN0 bWVudCBuZWVkcyB0byBiZSBtYWRlLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6 Zml0Qm9yZGVyVG9MaW5lc0lmTmVlZGVkKToKKyAgICAgICAgUmVuYW1lZCBib3JkZXJGaXRBZGp1 c3QgdG8gZml0Qm9yZGVyVG9MaW5lc0lmTmVlZGVkIGFuZCBtYWRlIGl0CisgICAgICAgIG5vbi12 aXJ0dWFsLCBzaW5jZSBpdCdzIG5vIGxvbmdlciBjYWxsZWQgZnJvbSBSZW5kZXJCb3ggY29kZS4g Q2hhbmdlZCBpdAorICAgICAgICB0byBkbyBhIHJlbGF5b3V0IHVzaW5nIG92ZXJyaWRlIHdpZHRo cyBpZiBhbiBhZGp1c3RtZW50IGlzIG5lZWRlZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJCbG9jay5oOgorICAgICAgICAoUmVuZGVyQmxvY2spOgorICAgICAgICBSZW5hbWVkIGJvcmRl ckZpdEFkanVzdCB0byBmaXRCb3JkZXJUb0xpbmVzSWZOZWVkZWQgYW5kIG1hZGUgaXQKKyAgICAg ICAgbm9uLXZpcnR1YWwuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6cGFpbnRCb3hEZWNvcmF0aW9ucyk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJCb3g6OnBhaW50TWFzayk6CisgICAgICAgIFJlbW92ZWQgdGhlIHBh aW50LXRpbWUgYm9yZGVyLWZpdCBhZGp1c3RtZW50LgorCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhJblJlZ2lvbik6CisgICAgICAgIFVzZSB0aGUgb3Zl cnJpZGUgd2lkdGggd2hlbiBib3JkZXItZml0IGlzIHNldCB0byBsaW5lcy4KKworICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKyAgICAgICAgKFJlbmRlckJveCk6CisgICAgICAgIFJl bW92ZSB0aGUgdmlydHVhbCBib3JkZXJGaXRBZGp1c3QgbWV0aG9kLgorCiAyMDEzLTAzLTA3ICBW c2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFN0eWxlcyBzaWRlYmFyIHBhbmUgdG9vbGJhciBkaXNhcHBlYXJzIGluIGhvcml6b250 YWwgc3BsaXQgbW9kZS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr LmNwcAkocmV2aXNpb24gMTQ0OTU5KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYyNCw2ICsxNjI0LDggQEAgdm9pZCBSZW5k ZXJCbG9jazo6bGF5b3V0QmxvY2soYm9vbCByZWxheQogICAgIAogICAgIHN0YXRlUHVzaGVyLnBv cCgpOwogCisgICAgZml0Qm9yZGVyVG9MaW5lc0lmTmVlZGVkKCk7CisKICAgICBpZiAocmVuZGVy Vmlldy0+bGF5b3V0U3RhdGUoKS0+bV9wYWdlTG9naWNhbEhlaWdodCkKICAgICAgICAgc2V0UGFn ZUxvZ2ljYWxPZmZzZXQocmVuZGVyVmlldy0+bGF5b3V0U3RhdGUoKS0+cGFnZUxvZ2ljYWxPZmZz ZXQodGhpcywgbG9naWNhbFRvcCgpKSk7CiAKQEAgLTE2NzUsNyArMTY3Nyw3IEBAIHZvaWQgUmVu ZGVyQmxvY2s6OmxheW91dEJsb2NrKGJvb2wgcmVsYXkKICAgICAgICAgICAgICAgICByZXBhaW50 UmVjdGFuZ2xlKHJlZmxlY3RlZFJlY3QocmVwYWludFJlY3QpKTsKICAgICAgICAgfQogICAgIH0K LSAgICAKKwogICAgIHNldE5lZWRzTGF5b3V0KGZhbHNlKTsKIH0KIApAQCAtNjg2MiwzMiArNjg2 NCwyNiBAQCB2b2lkIFJlbmRlckJsb2NrOjphZGp1c3RGb3JCb3JkZXJGaXQoTGF5CiAgICAgfQog fQogCi12b2lkIFJlbmRlckJsb2NrOjpib3JkZXJGaXRBZGp1c3QoTGF5b3V0UmVjdCYgcmVjdCkg Y29uc3QKK3ZvaWQgUmVuZGVyQmxvY2s6OmZpdEJvcmRlclRvTGluZXNJZk5lZWRlZCgpCiB7Ci0g ICAgaWYgKHN0eWxlKCktPmJvcmRlckZpdCgpID09IEJvcmRlckZpdEJvcmRlcikKKyAgICBpZiAo c3R5bGUoKS0+Ym9yZGVyRml0KCkgPT0gQm9yZGVyRml0Qm9yZGVyIHx8IGhhc092ZXJyaWRlV2lk dGgoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gV2FsayBhbnkgbm9ybWFsIGZsb3cgbGlu ZXMgdG8gc251Z2x5IGZpdC4KICAgICBMYXlvdXRVbml0IGxlZnQgPSBMYXlvdXRVbml0OjptYXgo KTsKICAgICBMYXlvdXRVbml0IHJpZ2h0ID0gTGF5b3V0VW5pdDo6bWluKCk7Ci0gICAgTGF5b3V0 VW5pdCBvbGRXaWR0aCA9IHJlY3Qud2lkdGgoKTsKKyAgICBMYXlvdXRVbml0IG9sZFdpZHRoID0g Y29udGVudFdpZHRoKCk7CiAgICAgYWRqdXN0Rm9yQm9yZGVyRml0KDAsIGxlZnQsIHJpZ2h0KTsK LSAgICBpZiAobGVmdCAhPSBMYXlvdXRVbml0OjptYXgoKSkgewotICAgICAgICBsZWZ0ID0gbWlu KGxlZnQsIG9sZFdpZHRoIC0gKGJvcmRlclJpZ2h0KCkgKyBwYWRkaW5nUmlnaHQoKSkpOwotCi0g ICAgICAgIGxlZnQgLT0gKGJvcmRlckxlZnQoKSArIHBhZGRpbmdMZWZ0KCkpOwotICAgICAgICBp ZiAobGVmdCA+IDApIHsKLSAgICAgICAgICAgIHJlY3QubW92ZShsZWZ0LCAwKTsKLSAgICAgICAg ICAgIHJlY3QuZXhwYW5kKC1sZWZ0LCAwKTsKLSAgICAgICAgfQotICAgIH0KLSAgICBpZiAocmln aHQgIT0gTGF5b3V0VW5pdDo6bWluKCkpIHsKLSAgICAgICAgcmlnaHQgPSBtYXgocmlnaHQsIGJv cmRlckxlZnQoKSArIHBhZGRpbmdMZWZ0KCkpOwotCi0gICAgICAgIHJpZ2h0ICs9IChib3JkZXJS aWdodCgpICsgcGFkZGluZ1JpZ2h0KCkpOwotICAgICAgICBpZiAocmlnaHQgPCBvbGRXaWR0aCkK LSAgICAgICAgICAgIHJlY3QuZXhwYW5kKC0ob2xkV2lkdGggLSByaWdodCksIDApOwotICAgIH0K KyAgICBsZWZ0ID0gbWF4KGJvcmRlckxlZnQoKSArIHBhZGRpbmdMZWZ0KCksIGxlZnQpOworICAg IHJpZ2h0ID0gbWluKGJvcmRlckxlZnQoKSArIHBhZGRpbmdMZWZ0KCkgKyBjb250ZW50V2lkdGgo KSwgcmlnaHQpOworICAgIAorICAgIExheW91dFVuaXQgbmV3Q29udGVudFdpZHRoID0gcmlnaHQg LSBsZWZ0OworICAgIGlmIChuZXdDb250ZW50V2lkdGggPT0gb2xkV2lkdGgpCisgICAgICAgIHJl dHVybjsKKyAgICAKKyAgICBzZXRPdmVycmlkZUxvZ2ljYWxDb250ZW50V2lkdGgobmV3Q29udGVu dFdpZHRoKTsKKyAgICBsYXlvdXRCbG9jayhmYWxzZSk7CisgICAgY2xlYXJPdmVycmlkZUxvZ2lj YWxDb250ZW50V2lkdGgoKTsKIH0KIAogdm9pZCBSZW5kZXJCbG9jazo6Y2xlYXJUcnVuY2F0aW9u KCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCShyZXZpc2lvbiAx NDQ5NTkpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAkod29ya2lu ZyBjb3B5KQpAQCAtNjA2LDggKzYwNiw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBpbnNlcnRJbnRv VHJhY2tlZFJlbmRlcmVyTWFwcyhSZW5kZXJCb3gqIGRlc2NlbmRhbnQsIFRyYWNrZWREZXNjZW5k YW50c01hcComLCBUcmFja2VkQ29udGFpbmVyTWFwKiYpOwogICAgIHN0YXRpYyB2b2lkIHJlbW92 ZUZyb21UcmFja2VkUmVuZGVyZXJNYXBzKFJlbmRlckJveCogZGVzY2VuZGFudCwgVHJhY2tlZERl c2NlbmRhbnRzTWFwKiYsIFRyYWNrZWRDb250YWluZXJNYXAqJik7CiAKLSAgICB2aXJ0dWFsIHZv aWQgYm9yZGVyRml0QWRqdXN0KExheW91dFJlY3QmKSBjb25zdDsgLy8gU2hyaW5rIHRoZSBib3gg aW4gd2hpY2ggdGhlIGJvcmRlciBwYWludHMgaWYgYm9yZGVyLWZpdCBpcyBzZXQuCi0KICAgICB2 aXJ0dWFsIFJvb3RJbmxpbmVCb3gqIGNyZWF0ZVJvb3RJbmxpbmVCb3goKTsgLy8gU3ViY2xhc3Nl ZCBieSBTVkcgYW5kIFJ1YnkuCiAKICAgICAvLyBDYWxsZWQgdG8gbGF5IG91dCB0aGUgbGVnZW5k IGZvciBhIGZpZWxkc2V0IG9yIHRoZSBydWJ5IHRleHQgb2YgYSBydWJ5IHJ1bi4KQEAgLTkyNyw2 ICs5MjUsOCBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgTGF5b3V0UmVjdCBsb2NhbENhcmV0UmVj dChJbmxpbmVCb3gqLCBpbnQgY2FyZXRPZmZzZXQsIExheW91dFVuaXQqIGV4dHJhV2lkdGhUb0Vu ZE9mTGluZSA9IDApOwogCiAgICAgdm9pZCBhZGp1c3RQb2ludFRvQ29sdW1uQ29udGVudHMoTGF5 b3V0UG9pbnQmKSBjb25zdDsKKyAgICAKKyAgICB2b2lkIGZpdEJvcmRlclRvTGluZXNJZk5lZWRl ZCgpOyAvLyBTaHJpbmsgdGhlIGJveCBpbiB3aGljaCB0aGUgYm9yZGVyIHBhaW50cyBpZiBib3Jk ZXItZml0IGlzIHNldC4KICAgICB2b2lkIGFkanVzdEZvckJvcmRlckZpdChMYXlvdXRVbml0IHgs IExheW91dFVuaXQmIGxlZnQsIExheW91dFVuaXQmIHJpZ2h0KSBjb25zdDsgLy8gSGVscGVyIGZ1 bmN0aW9uIGZvciBib3JkZXJGaXRBZGp1c3QKIAogICAgIHZvaWQgbWFya0xpbmVzRGlydHlJbkJs b2NrUmFuZ2UoTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMYXlvdXRVbml0IGxvZ2ljYWxCb3R0b20s IFJvb3RJbmxpbmVCb3gqIGhpZ2hlc3QgPSAwKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guY3BwCShyZXZpc2lvbiAxNDQ5NTkpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA3NywxMCArMTA3Nyw2IEBA IHZvaWQgUmVuZGVyQm94OjpwYWludEJveERlY29yYXRpb25zKFBhaW4KICAgICBMYXlvdXRSZWN0 IHBhaW50UmVjdCA9IGJvcmRlckJveFJlY3RJblJlZ2lvbihwYWludEluZm8ucmVuZGVyUmVnaW9u KTsKICAgICBwYWludFJlY3QubW92ZUJ5KHBhaW50T2Zmc2V0KTsKIAotICAgIC8vIGJvcmRlci1m aXQgY2FuIGFkanVzdCB3aGVyZSB3ZSBwYWludCBvdXIgYm9yZGVyIGFuZCBiYWNrZ3JvdW5kLiAg SWYgc2V0LCB3ZSBzbnVnbHkgZml0IG91ciBsaW5lIGJveCBkZXNjZW5kYW50cy4gIChUaGUgaUNo YXQKLSAgICAvLyBiYWxsb29uIGxheW91dCBpcyBhbiBleGFtcGxlIG9mIHRoaXMpLgotICAgIGJv cmRlckZpdEFkanVzdChwYWludFJlY3QpOwotCiAgICAgQmFja2dyb3VuZEJsZWVkQXZvaWRhbmNl IGJsZWVkQXZvaWRhbmNlID0gZGV0ZXJtaW5lQmFja2dyb3VuZEJsZWVkQXZvaWRhbmNlKHBhaW50 SW5mby5jb250ZXh0KTsKIAogICAgIC8vIEZJWE1FOiBTaG91bGQgZXZlbnR1YWxseSBnaXZlIHRo ZSB0aGVtZSBjb250cm9sIG92ZXIgd2hldGhlciB0aGUgYm94IHNoYWRvdyBzaG91bGQgcGFpbnQs IHNpbmNlIGNvbnRyb2xzIGNvdWxkIGhhdmUKQEAgLTExOTQsMTEgKzExOTAsNiBAQCB2b2lkIFJl bmRlckJveDo6cGFpbnRNYXNrKFBhaW50SW5mbyYgcGFpCiAgICAgICAgIHJldHVybjsKIAogICAg IExheW91dFJlY3QgcGFpbnRSZWN0ID0gTGF5b3V0UmVjdChwYWludE9mZnNldCwgc2l6ZSgpKTsK LQotICAgIC8vIGJvcmRlci1maXQgY2FuIGFkanVzdCB3aGVyZSB3ZSBwYWludCBvdXIgYm9yZGVy IGFuZCBiYWNrZ3JvdW5kLiAgSWYgc2V0LCB3ZSBzbnVnbHkgZml0IG91ciBsaW5lIGJveCBkZXNj ZW5kYW50cy4gIChUaGUgaUNoYXQKLSAgICAvLyBiYWxsb29uIGxheW91dCBpcyBhbiBleGFtcGxl IG9mIHRoaXMpLgotICAgIGJvcmRlckZpdEFkanVzdChwYWludFJlY3QpOwotCiAgICAgcGFpbnRN YXNrSW1hZ2VzKHBhaW50SW5mbywgcGFpbnRSZWN0KTsKIH0KIApAQCAtMTk4Myw3ICsxOTc0LDcg QEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhJblJlZwogICAgIC8vIHdpZHRo LiAgVXNlIHRoZSB3aWR0aCBmcm9tIHRoZSBzdHlsZSBjb250ZXh0LgogICAgIC8vIEZJWE1FOiBB Y2NvdW50IGZvciBibG9jay1mbG93IGluIGZsZXhpYmxlIGJveGVzLgogICAgIC8vIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjQxOAotICAgIGlmIChoYXNPdmVycmlk ZVdpZHRoKCkgJiYgcGFyZW50KCktPmlzRmxleGlibGVCb3hJbmNsdWRpbmdEZXByZWNhdGVkKCkp IHsKKyAgICBpZiAoaGFzT3ZlcnJpZGVXaWR0aCgpICYmIChzdHlsZSgpLT5ib3JkZXJGaXQoKSA9 PSBCb3JkZXJGaXRMaW5lcyB8fCBwYXJlbnQoKS0+aXNGbGV4aWJsZUJveEluY2x1ZGluZ0RlcHJl Y2F0ZWQoKSkpIHsKICAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgPSBvdmVycmlkZUxv Z2ljYWxDb250ZW50V2lkdGgoKSArIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94 LmgJKHJldmlzaW9uIDE0NDk1OSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guaAkod29ya2luZyBjb3B5KQpAQCAtMzI3LDggKzMyNyw2IEBAIHB1YmxpYzoKICAgICBMYXlv dXRVbml0IGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcoTGF5b3V0VW5p dCB3aWR0aCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBhZGp1c3RDb250ZW50Qm94TG9naWNhbEhl aWdodEZvckJveFNpemluZyhMYXlvdXRVbml0IGhlaWdodCkgY29uc3Q7CiAKLSAgICB2aXJ0dWFs IHZvaWQgYm9yZGVyRml0QWRqdXN0KExheW91dFJlY3QmKSBjb25zdCB7IH0gLy8gU2hyaW5rIHRo ZSBib3ggaW4gd2hpY2ggdGhlIGJvcmRlciBwYWludHMgaWYgYm9yZGVyLWZpdCBpcyBzZXQuCi0K ICAgICBzdHJ1Y3QgQ29tcHV0ZWRNYXJnaW5WYWx1ZXMgewogICAgICAgICBDb21wdXRlZE1hcmdp blZhbHVlcygpCiAgICAgICAgICAgICA6IG1fYmVmb3JlKDApCkluZGV4OiBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAx NDUwOTApCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxMyBAQAorMjAxMy0wMy0wNyAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CisKKyAg ICAgICAgYm9yZGVyLWZpdC1hZGp1c3Qgc2hvdWxkIGhhcHBlbiBhdCBsYXlvdXQgdGltZSByYXRo ZXIgdGhhbiBwYWludCB0aW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTE2MDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIGZhc3QvYmxvY2svYm9yZGVyLWZpdC13aXRoLXJpZ2h0LWFsaWdubWVudC1l eHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Jsb2NrL2JvcmRlci1maXQtd2l0 aC1yaWdodC1hbGlnbm1lbnQuaHRtbDogQWRkZWQuCisKIDIwMTMtMDMtMDcgIEFhcm9uIENvbHdl bGwgIDxhY29sd2VsbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVtb3ZlIEdDIGNvZGUgZHVw bGljYXRpb24gaW4gaHR0cC90ZXN0cyBMYXlvdXRUZXN0cy4KSW5kZXg6IExheW91dFRlc3RzL2Zh c3QvYmxvY2svYm9yZGVyLWZpdC13aXRoLXJpZ2h0LWFsaWdubWVudC1leHBlY3RlZC5odG1sCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KQ2Fubm90IGRpc3BsYXk6IGZpbGUgbWFya2VkIGFzIGEgYmluYXJ5IHR5cGUuCnN2 bjptaW1lLXR5cGUgPSBhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0KClByb3BlcnR5IGNoYW5nZXMg b246IExheW91dFRlc3RzL2Zhc3QvYmxvY2svYm9yZGVyLWZpdC13aXRoLXJpZ2h0LWFsaWdubWVu dC1leHBlY3RlZC5odG1sCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2bjptaW1lLXR5cGUKICAgKyBhcHBs aWNhdGlvbi9vY3RldC1zdHJlYW0KCgovLzQ4QUdnQWRBQnRBR3dBUGdBS0FEd0FhQUJsQUdFQVpB QStBQW9BUEFCekFIUUFlUUJzQUdVQVBnQUtBR01BYUFCaEFIUUFhUUIwCkFHVUFiUUFnQUhzQUNn QUpBSGNBYVFCa0FIUUFhQUE2QUNBQU5RQXdBREFBY0FCNEFEc0FDZ0FnQUNBQUlBQWdBR1FBYVFC ekFIQUEKYkFCaEFIa0FPZ0FnQUMwQWR3QmxBR0lBYXdCcEFIUUFMUUJpQUc4QWVBQTdBQW9BSUFB Z0FDQUFJQUF0QUhjQVpRQmlBR3NBYVFCMApBQzBBWWdCdkFIZ0FMUUJ2QUhJQWFRQmxBRzRBZEFB NkFIWUFaUUJ5QUhRQWFRQmpBR0VBYkFBN0FBb0FmUUFLQUZzQWRBQmxBSGdBCmRBQXRBR1FBYVFC eUFHVUFZd0IwQUdrQWJ3QnVBRDBBSWdCc0FIUUFjZ0FpQUYwQUlBQjdBQW9BSUFBZ0FDQUFJQUJr QUdrQWNnQmwKQUdNQWRBQnBBRzhBYmdBNkFDQUFiQUIwQUhJQUlBQWhBR2tBYlFCd0FHOEFjZ0Iw QUdFQWJnQjBBRHNBQ2dCOUFBb0FDZ0J0QUdVQQpjd0J6QUdFQVp3QmxBQ0FBZXdBS0FBa0FaQUJw QUhNQWNBQnNBR0VBZVFBNkFHSUFiQUJ2QUdNQWF3QTdBQW9BQ1FCd0FHOEFjd0JwCkFIUUFhUUJ2 QUc0QU9nQWdBSElBWlFCc0FHRUFkQUJwQUhZQVpRQTdBQW9BZlFBS0FHMEFaUUJ6QUhNQVlRQm5B R1VBZEFCbEFIZ0EKZEFBZ0FIc0FDZ0FKQUdRQWFRQnpBSEFBYkFCaEFIa0FPZ0JwQUc0QWJBQnBB RzRBWlFBdEFHSUFiQUJ2QUdNQWF3QTdBQW9BSUFBZwpBQ0FBSUFCdEFHRUFlQUF0QUhjQWFRQmtB SFFBYUFBNkFEa0FNQUFsQURzQUNnQUpBSGNBYndCeUFHUUFMUUIzQUhJQVlRQndBRG9BCllnQnlB R1VBWVFCckFDMEFkd0J2QUhJQVpBQTdBQW9BQ1FCMEFHVUFlQUIwQUMwQVlRQnNBR2tBWndCdUFE b0FiQUJsQUdZQWRBQTcKQUFvQUlBQWdBQ0FBSUFCaUFHOEFjZ0JrQUdVQWNnQXRBSFFBYndCd0FE b0FNUUF3QUhBQWVBQTdBQW9BSUFBZ0FDQUFJQUJpQUc4QQpjZ0JrQUdVQWNnQXRBR0lBYndCMEFI UUFid0J0QURvQU1RQXlBSEFBZUFBN0FBb0FDUUJqQUhVQWNnQnpBRzhBY2dBNkFDQUFZUUIxCkFI UUFid0E3QUFvQUlBQWdBQ0FBSUFCaUFHRUFZd0JyQUdjQWNnQnZBSFVBYmdCa0FDMEFZd0J2QUd3 QWJ3QnlBRG9BSUFCakFIa0EKWVFCdUFEc0FDZ0FnQUNBQUlBQWdBQzBBZHdCbEFHSUFhd0JwQUhR QUxRQmlBRzhBY2dCa0FHVUFjZ0F0QUdZQWFRQjBBRG9BSUFCcwpBR2tBYmdCbEFITUFPd0FLQUgw QUNnQUtBQW9BV3dCbUFISUFid0J0QUMwQWJRQmxBRDBBSWdCNUFHVUFjd0FpQUYwQUlBQjdBQW9B CklBQWdBQ0FBSUFCMEFHVUFlQUIwQUMwQVlRQnNBR2tBWndCdUFEb0FjZ0JwQUdjQWFBQjBBQW9B ZlFBS0FBb0FDZ0E4QUM4QWN3QjAKQUhrQWJBQmxBRDRBQ2dBOEFDOEFhQUJsQUdFQVpBQStBQW9B Q2dBOEFHSUFid0JrQUhrQVBnQUtBRHdBWXdCb0FHRUFkQUJwQUhRQQpaUUJ0QUQ0QVBBQnRBR1VB Y3dCekFHRUFad0JsQUNBQVpnQnlBRzhBYlFBdEFHMEFaUUE5QUNJQWVRQmxBSE1BSWdBK0FEd0Fi UUJsCkFITUFjd0JoQUdjQVpRQjBBR1VBZUFCMEFENEFQQUJ0QUdVQWN3QnpBR0VBWndCbEFHSUFi d0JrQUhrQUlBQjBBR1VBZUFCMEFDMEEKWkFCcEFISUFaUUJqQUhRQWFRQnZBRzRBUFFBaUFHd0Fk QUJ5QUNJQVBnQUtBRHdBY3dCd0FHRUFiZ0FpQUQ0QWFBQjBBSFFBY0FCegpBRG9BTHdBdkFIUUFi d0J2QUd3QWN3QXVBSFVBY3dCd0FITUFMZ0JqQUc4QWJRQXZBR2NBYndBdkFGUUFjZ0JoQUdNQWF3 QkRBRzhBCmJnQm1BR2tBY2dCdEFFRUFZd0IwQUdrQWJ3QnVBRjhBYVFCdUFIQUFkUUIwQUQ4QUNn QnpBSFFBY2dCUEFISUFhUUJuQUZRQWNnQmgKQUdNQWF3Qk9BSFVBYlFBOUFEa0FOQUF3QURVQU5R QXhBREFBTWdBd0FEQUFPQUE0QURJQU5nQTBBRFFBTUFBeUFEWUFOUUF6QURJQQpQQUF2QUhNQWNB QmhBRzRBUGdBS0FEd0FMd0J0QUdVQWN3QnpBR0VBWndCbEFHSUFid0JrQUhrQVBnQThBQzhBYlFC bEFITUFjd0JoCkFHY0FaUUIwQUdVQWVBQjBBRDRBUEFBdkFHMEFaUUJ6QUhNQVlRQm5BR1VBUGdB OEFDOEFZd0JvQUdFQWRBQnBBSFFBWlFCdEFENEEKQ2dBOEFDOEFZZ0J2QUdRQWVRQStBRHdBTHdC b0FIUUFiUUJzQUQ0QQoKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvYmxvY2svYm9yZGVyLWZpdC13 aXRoLXJpZ2h0LWFsaWdubWVudC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KQ2Fubm90IGRpc3BsYXk6IGZpbGUg bWFya2VkIGFzIGEgYmluYXJ5IHR5cGUuCnN2bjptaW1lLXR5cGUgPSBhcHBsaWNhdGlvbi9vY3Rl dC1zdHJlYW0KClByb3BlcnR5IGNoYW5nZXMgb246IExheW91dFRlc3RzL2Zhc3QvYmxvY2svYm9y ZGVyLWZpdC13aXRoLXJpZ2h0LWFsaWdubWVudC5odG1sCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2bjpt aW1lLXR5cGUKICAgKyBhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0KCgovLzQ4QUdnQWRBQnRBR3dB UGdBS0FEd0FhQUJsQUdFQVpBQStBQW9BUEFCekFIUUFlUUJzQUdVQVBnQUtBR01BYUFCaEFIUUFh UUIwCkFHVUFiUUFnQUhzQUNnQUpBSGNBYVFCa0FIUUFhQUE2QUNBQU5RQXdBREFBY0FCNEFEc0FD Z0FnQUNBQUlBQWdBR1FBYVFCekFIQUEKYkFCaEFIa0FPZ0FnQUMwQWR3QmxBR0lBYXdCcEFIUUFM UUJpQUc4QWVBQTdBQW9BSUFBZ0FDQUFJQUF0QUhjQVpRQmlBR3NBYVFCMApBQzBBWWdCdkFIZ0FM UUJ2QUhJQWFRQmxBRzRBZEFBNkFIWUFaUUJ5QUhRQWFRQmpBR0VBYkFBN0FBb0FmUUFLQUZzQWRB QmxBSGdBCmRBQXRBR1FBYVFCeUFHVUFZd0IwQUdrQWJ3QnVBRDBBSWdCc0FIUUFjZ0FpQUYwQUlB QjdBQW9BSUFBZ0FDQUFJQUJrQUdrQWNnQmwKQUdNQWRBQnBBRzhBYmdBNkFDQUFiQUIwQUhJQUlB QWhBR2tBYlFCd0FHOEFjZ0IwQUdFQWJnQjBBRHNBQ2dCOUFBb0FDZ0J0QUdVQQpjd0J6QUdFQVp3 QmxBQ0FBZXdBS0FBa0FaQUJwQUhNQWNBQnNBR0VBZVFBNkFHSUFiQUJ2QUdNQWF3QTdBQW9BQ1FC d0FHOEFjd0JwCkFIUUFhUUJ2QUc0QU9nQWdBSElBWlFCc0FHRUFkQUJwQUhZQVpRQTdBQW9BZlFB S0FHMEFaUUJ6QUhNQVlRQm5BR1VBZEFCbEFIZ0EKZEFBZ0FIc0FDZ0FKQUdRQWFRQnpBSEFBYkFC aEFIa0FPZ0JwQUc0QWJBQnBBRzRBWlFBdEFHSUFiQUJ2QUdNQWF3QTdBQW9BSUFBZwpBQ0FBSUFC dEFHRUFlQUF0QUhjQWFRQmtBSFFBYUFBNkFEa0FNQUFsQURzQUNnQUpBSGNBYndCeUFHUUFMUUIz QUhJQVlRQndBRG9BCllnQnlBR1VBWVFCckFDMEFkd0J2QUhJQVpBQTdBQW9BQ1FCMEFHVUFlQUIw QUMwQVlRQnNBR2tBWndCdUFEb0FiQUJsQUdZQWRBQTcKQUFvQUlBQWdBQ0FBSUFCaUFHOEFjZ0Jr QUdVQWNnQXRBSFFBYndCd0FEb0FNUUF3QUhBQWVBQTdBQW9BSUFBZ0FDQUFJQUJpQUc4QQpjZ0Jr QUdVQWNnQXRBR0lBYndCMEFIUUFid0J0QURvQU1RQXlBSEFBZUFBN0FBb0FDUUJqQUhVQWNnQnpB RzhBY2dBNkFDQUFZUUIxCkFIUUFid0E3QUFvQUlBQWdBQ0FBSUFCaUFHRUFZd0JyQUdjQWNnQnZB SFVBYmdCa0FDMEFZd0J2QUd3QWJ3QnlBRG9BSUFCakFIa0EKWVFCdUFEc0FDZ0FnQUNBQUlBQWdB QzBBZHdCbEFHSUFhd0JwQUhRQUxRQmlBRzhBY2dCa0FHVUFjZ0F0QUdZQWFRQjBBRG9BSUFCcwpB R2tBYmdCbEFITUFPd0FLQUgwQUNnQUtBQW9BV3dCbUFISUFid0J0QUMwQWJRQmxBRDBBSWdCNUFH VUFjd0FpQUYwQUlBQjdBQW9BCklBQWdBQ0FBSUFCMEFHVUFlQUIwQUMwQVlRQnNBR2tBWndCdUFE b0FjZ0JwQUdjQWFBQjBBQW9BZlFBS0FBb0FDZ0E4QUM4QWN3QjAKQUhrQWJBQmxBRDRBQ2dBOEFD OEFhQUJsQUdFQVpBQStBQW9BQ2dBOEFHSUFid0JrQUhrQVBnQUtBRHdBWXdCb0FHRUFkQUJwQUhR QQpaUUJ0QUQ0QVBBQnRBR1VBY3dCekFHRUFad0JsQUNBQVpnQnlBRzhBYlFBdEFHMEFaUUE5QUNJ QWVRQmxBSE1BSWdBK0FEd0FiUUJsCkFITUFjd0JoQUdjQVpRQjBBR1VBZUFCMEFENEFQQUJ0QUdV QWN3QnpBR0VBWndCbEFHSUFid0JrQUhrQUlBQjBBR1VBZUFCMEFDMEEKWkFCcEFISUFaUUJqQUhR QWFRQnZBRzRBUFFBaUFHd0FkQUJ5QUNJQVBnQUtBRHdBY3dCd0FHRUFiZ0FpQUQ0QWFBQjBBSFFB Y0FCegpBRG9BTHdBdkFIUUFid0J2QUd3QWN3QXVBSFVBY3dCd0FITUFMZ0JqQUc4QWJRQXZBR2NB YndBdkFGUUFjZ0JoQUdNQWF3QkRBRzhBCmJnQm1BR2tBY2dCdEFFRUFZd0IwQUdrQWJ3QnVBRjhB YVFCdUFIQUFkUUIwQUQ4QWN3QjBBSElBVHdCeUFHa0Fad0JVQUhJQVlRQmoKQUdzQVRnQjFBRzBB UFFBNUFEUUFNQUExQURVQU1RQXdBRElBTUFBd0FEZ0FPQUF5QURZQU5BQTBBREFBTWdBMkFEVUFN d0F5QUR3QQpMd0J6QUhBQVlRQnVBRDRBQ2dBOEFDOEFiUUJsQUhNQWN3QmhBR2NBWlFCaUFHOEFa QUI1QUQ0QVBBQXZBRzBBWlFCekFITUFZUUJuCkFHVUFkQUJsQUhnQWRBQStBRHdBTHdCdEFHVUFj d0J6QUdFQVp3QmxBRDRBUEFBdkFHTUFhQUJoQUhRQWFRQjBBR1VBYlFBK0FBb0EKUEFBdkFHSUFi d0JrQUhrQVBnQThBQzhBYUFCMEFHMEFiQUErQUE9PQoK