118002 2013-06-25 15:39:49 -0700 [CSS Shapes] Clear overflowing line's segments in pushShapeContentOverflowBelowTheContentBox 2013-07-19 10:44:54 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89256 1 zoltan zoltan commit-queue esprehn+autocc glenn oldest_to_newest 903440 0 zoltan 2013-06-25 15:39:49 -0700 When the last line in the shape overlaps with the shape bottom boundaries we need to clear the computed segments. (We need to compute the segments anyway, since shape-outside's code uses the same code path to determine its segments and the line containing is not a requirement in that case.) Rather then doing the job in RenderBlock::LineBreaker::nextLineBreak I moved the functionality to its correct place to pushShapeContentOverflowBelowTheContentBox. Now all the overflow related functionality is located in one function. 903441 1 205425 zoltan 2013-06-25 15:47:44 -0700 Created attachment 205425 proposed patch 909466 2 206917 zoltan 2013-07-17 14:54:35 -0700 Created attachment 206917 updated patch after r152800 910214 3 206917 hyatt 2013-07-19 10:21:56 -0700 Comment on attachment 206917 updated patch after r152800 r=me 910236 4 206917 commit-queue 2013-07-19 10:44:52 -0700 Comment on attachment 206917 updated patch after r152800 Clearing flags on attachment: 206917 Committed r152906: <http://trac.webkit.org/changeset/152906> 910237 5 commit-queue 2013-07-19 10:44:54 -0700 All reviewed patches have been landed. Closing bug. 205425 2013-06-25 15:47:44 -0700 2013-07-17 14:54:35 -0700 proposed patch removeSegments.patch text/plain 7232 zoltan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2MGRiNDBhLi44MTAxMWU1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTMtMDYt MjUgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NTUyBT aGFwZXNdIENsZWFyIG92ZXJmbG93aW5nIGxpbmUncyBzZWdtZW50cyBpbiBwdXNoU2hhcGVDb250 ZW50T3ZlcmZsb3dCZWxvd1RoZUNvbnRlbnRCb3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExODAwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlIGxhc3QgbGluZSBpbiB0aGUgc2hhcGUgb3Zl cmxhcHMgd2l0aCB0aGUgc2hhcGUgYm90dG9tIGJvdW5kYXJpZXMgd2UgbmVlZCB0byBjbGVhciB0 aGUgY29tcHV0ZWQgc2VnbWVudHMuIChXZSBuZWVkIHRvIGNvbXB1dGUKKyAgICAgICAgdGhlIHNl Z21lbnRzIGFueXdheSwgc2luY2Ugc2hhcGUtb3V0c2lkZSdzIGNvZGUgdXNlcyB0aGUgc2FtZSBj b2RlIHBhdGggdG8gZGV0ZXJtaW5lIGl0cyBzZWdtZW50cyBhbmQgdGhlIGxpbmUgY29udGFpbmlu ZyBpcyBub3QgYQorICAgICAgICByZXF1aXJlbWVudCBpbiB0aGF0IGNhc2UuKSBSYXRoZXIgdGhl biBkb2luZyB0aGUgam9iIGluIFJlbmRlckJsb2NrOjpMaW5lQnJlYWtlcjo6bmV4dExpbmVCcmVh ayBJIG1vdmVkIHRoZSBmdW5jdGlvbmFsaXR5IHRvIGl0cyBjb3JyZWN0CisgICAgICAgIHBsYWNl IHRvIHB1c2hTaGFwZUNvbnRlbnRPdmVyZmxvd0JlbG93VGhlQ29udGVudEJveC4gTm93IGFsbCB0 aGUgb3ZlcmZsb3cgcmVsYXRlZCBmdW5jdGlvbmFsaXR5IGlzIGxvY2F0ZWQgaW4gb25lIGZ1bmN0 aW9uLiBJIGZpeGVkIHRoZQorICAgICAgICBjb3JyZXNwb25kaW5nIGxheW91dCB0ZXN0LgorCisg ICAgICAgICogZmFzdC9leGNsdXNpb25zL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtb3ZlcmZs b3ctZXhwZWN0ZWQuaHRtbDoKKyAgICAgICAgKiBmYXN0L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRl L3NoYXBlLWluc2lkZS1vdmVyZmxvdy5odG1sOgorCiAyMDEzLTA2LTI0ICBIYW5zIE11bGxlciAg PGhtdWxsZXJAYWRvYmUuY29tPgogCiAgICAgICAgIFtDU1MgU2hhcGVzXSBzcGxpdCB0ZXN0IHNo YXBlLWluc2lkZS1maXJzdC1maXQtMDAxLmh0bWwgaW50byA4MDB4NjAwIHBhcnRzCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lk ZS1vdmVyZmxvdy1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9leGNsdXNpb25zL3No YXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtb3ZlcmZsb3ctZXhwZWN0ZWQuaHRtbAppbmRleCBiM2I5 MzNlLi4wZmUxOTQyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2V4Y2x1c2lvbnMvc2hh cGUtaW5zaWRlL3NoYXBlLWluc2lkZS1vdmVyZmxvdy1leHBlY3RlZC5odG1sCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvZXhjbHVzaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW92ZXJmbG93 LWV4cGVjdGVkLmh0bWwKQEAgLTksMjYgKzksMjEgQEAKICAgICAgICAgbGluZS1oZWlnaHQ6IDIw cHg7CiAgICAgICAgIGJvcmRlcjogMnB4IHNvbGlkIGJsdWU7CiAgICAgfQotICAgICNib3JkZXIg ewotICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7Ci0gICAgICAgIGxlZnQ6IDQ4cHg7CisgICAg I3NoYXBlLWluc2lkZSB7CisgICAgICAgIG1hcmdpbi10b3A6IC0ycHg7CisgICAgICAgIG1hcmdp bi1sZWZ0OiA0OHB4OwogICAgICAgICB3aWR0aDogMTAwcHg7Ci0gICAgICAgIGhlaWdodDogNDBw eDsKKyAgICAgICAgaGVpZ2h0OiA1MHB4OwogICAgICAgICBib3JkZXI6IDJweCBzb2xpZCBncmVl bjsKICAgICB9Ci0gICAgLnNwYWNlciB7Ci0gICAgICAgIHdpZHRoOiA1MHB4OwotICAgICAgICBo ZWlnaHQ6IDQwcHg7Ci0gICAgfQorICAgICNvdmVyZmxvdyB7IG1hcmdpbi10b3A6IC0ycHg7IH0K IDwvc3R5bGU+CiA8L2hlYWQ+CiA8Ym9keT4KICAgICA8ZGl2IGlkPSJjb250YWluZXIiPgotICAg ICAgICA8ZGl2IGlkPSJib3JkZXIiPjwvZGl2PgotICAgICAgICA8ZGl2IGlkPSJzaGFwZS1pbnNp ZGUiPgotICAgICAgICAgICAgPGRpdiBjbGFzcz0ic3BhY2VyIiBzdHlsZT0iZmxvYXQ6bGVmdCI+ PC9kaXY+Ci0gICAgICAgICAgICA8ZGl2IGNsYXNzPSJzcGFjZXIiIHN0eWxlPSJmbG9hdDpyaWdo dCI+PC9kaXY+Ci0gICAgICAgICAgICBUaGlzIHRleHQgc2hvdWxkIHdyYXAgaW5zaWRlIHRoZSBn cmVlbiByZWN0YW5nbGUsIGFuZCBvdmVyZmxvdyBzaG91bGQgd3JhcAorICAgICAgICA8ZGl2IGlk PSJzaGFwZS1pbnNpZGUiPlRoaXMgdGV4dCBzaG91bGQgd3JhcDwvZGl2PgorICAgICAgICA8ZGl2 IGlkPSJvdmVyZmxvdyI+CisgICAgICAgICAgICBpbnNpZGUgdGhlIGdyZWVuIHJlY3RhbmdsZSwg YW5kIG92ZXJmbG93IHNob3VsZCB3cmFwCiAgICAgICAgICAgICBpbnNpZGUgdGhlIGJsdWUgcmVj dGFuZ2xlLgogICAgICAgICA8L2Rpdj4KICAgICA8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvZXhjbHVzaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW92ZXJmbG93Lmh0 bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lk ZS1vdmVyZmxvdy5odG1sCmluZGV4IDdlZWMzOGIuLjY3NDY3OWUgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2Zhc3QvZXhjbHVzaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW92ZXJmbG93 Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9leGNsdXNpb25zL3NoYXBlLWluc2lkZS9zaGFw ZS1pbnNpZGUtb3ZlcmZsb3cuaHRtbApAQCAtMjAsNyArMjAsOCBAQAogICAgICAgICBwb3NpdGlv bjogYWJzb2x1dGU7CiAgICAgICAgIGxlZnQ6IDQ4cHg7CiAgICAgICAgIHdpZHRoOiAxMDBweDsK LSAgICAgICAgaGVpZ2h0OiA0MHB4OworICAgICAgICBoZWlnaHQ6IDUwcHg7CisgICAgICAgIG1h cmdpbi10b3A6IC0ycHg7CiAgICAgICAgIGJvcmRlcjogMnB4IHNvbGlkIGdyZWVuOwogICAgIH0K IDwvc3R5bGU+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmU2ZmM3Zi4uZTU4ODg0MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIyIEBACisyMDEzLTA2LTI1ICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQu b3JnPgorCisgICAgICAgIFtDU1MgU2hhcGVzXSBDbGVhciBvdmVyZmxvd2luZyBsaW5lJ3Mgc2Vn bWVudHMgaW4gcHVzaFNoYXBlQ29udGVudE92ZXJmbG93QmVsb3dUaGVDb250ZW50Qm94CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTgwMDIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHRoZSBsYXN0 IGxpbmUgaW4gdGhlIHNoYXBlIG92ZXJsYXBzIHdpdGggdGhlIHNoYXBlIGJvdHRvbSBib3VuZGFy aWVzIHdlIG5lZWQgdG8gY2xlYXIgdGhlIGNvbXB1dGVkIHNlZ21lbnRzLiAoV2UgbmVlZCB0byBj b21wdXRlCisgICAgICAgIHRoZSBzZWdtZW50cyBhbnl3YXksIHNpbmNlIHNoYXBlLW91dHNpZGUn cyBjb2RlIHVzZXMgdGhlIHNhbWUgY29kZSBwYXRoIHRvIGRldGVybWluZSBpdHMgc2VnbWVudHMg YW5kIHRoZSBsaW5lIGNvbnRhaW5pbmcgaXMgbm90IGEKKyAgICAgICAgcmVxdWlyZW1lbnQgaW4g dGhhdCBjYXNlLikgUmF0aGVyIHRoZW4gZG9pbmcgdGhlIGpvYiBpbiBSZW5kZXJCbG9jazo6TGlu ZUJyZWFrZXI6Om5leHRMaW5lQnJlYWsgSSBtb3ZlZCB0aGUgZnVuY3Rpb25hbGl0eSB0byBpdHMg Y29ycmVjdAorICAgICAgICBwbGFjZSB0byBwdXNoU2hhcGVDb250ZW50T3ZlcmZsb3dCZWxvd1Ro ZUNvbnRlbnRCb3guIE5vdyBhbGwgdGhlIG92ZXJmbG93IHJlbGF0ZWQgZnVuY3Rpb25hbGl0eSBp cyBsb2NhdGVkIGluIG9uZSBmdW5jdGlvbi4gSSBmaXhlZCB0aGUKKyAgICAgICAgY29ycmVzcG9u ZGluZyBsYXlvdXQgdGVzdC4KKworICAgICAgICBUZXN0czogSSBtb2RpZmllZCBzaGFwZS1pbnNp ZGUtb3ZlcmZsb3cuaHRtbC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVM YXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cHVzaFNoYXBlQ29udGVudE92ZXJmbG93QmVs b3dUaGVDb250ZW50Qm94KTogUmVtb3ZlIHNlZ21lbnRzIGlmIGxpbmUgb3ZlcmxhcHMgd2l0aCB0 aGUgc2hhcGUncyBib3VuZGFyaWVzLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6Okxp bmVCcmVha2VyOjpuZXh0TGluZUJyZWFrKTogTW92ZSBzZWdtZW50cyBjbGVhciBsb2dpYyB0byBw dXNoU2hhcGVDb250ZW50T3ZlcmZsb3dCZWxvd0NvbnRlbnRCb3guCisKIDIwMTMtMDYtMjQgIFJ1 dGggRm9uZyAgPHJ1dGhfZm9uZ0BhcHBsZS5jb20+CiAKICAgICAgICAgRXhwb3NlIHRoZSBtZWRp YUhhc0F1ZGlvKCkgZnVuY3Rpb24gaW4gV0syCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCmluZGV4IDM0ZmU2N2EuLjM0YzU4ZjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQu Y3BwCkBAIC0xNjYxLDExICsxNjYxLDE2IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBwdXNoU2hhcGVD b250ZW50T3ZlcmZsb3dCZWxvd1RoZUNvbnRlbnRCb3goUmVuZGVyQmxvY2sqIGJsb2NrCiAgICAg QVNTRVJUKHNoYXBlSW5zaWRlSW5mbyk7CiAKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxMaW5lQm90 dG9tID0gbGluZVRvcCArIGxpbmVIZWlnaHQ7CisgICAgTGF5b3V0VW5pdCBzaGFwZUxvZ2ljYWxC b3R0b20gPSBzaGFwZUluc2lkZUluZm8tPnNoYXBlTG9naWNhbEJvdHRvbSgpOwogICAgIExheW91 dFVuaXQgc2hhcGVDb250YWluaW5nQmxvY2tIZWlnaHQgPSBzaGFwZUluc2lkZUluZm8tPnNoYXBl Q29udGFpbmluZ0Jsb2NrSGVpZ2h0KCk7CiAKICAgICBib29sIGlzT3ZlcmZsb3dQb3NpdGlvbmVk QWxyZWFkeSA9IChzaGFwZUNvbnRhaW5pbmdCbG9ja0hlaWdodCAtIHNoYXBlSW5zaWRlSW5mby0+ b3duZXIoKS0+Ym9yZGVyQW5kUGFkZGluZ0FmdGVyKCkgKyBsaW5lSGVpZ2h0KSA8PSBsaW5lVG9w OwogCi0gICAgaWYgKGxvZ2ljYWxMaW5lQm90dG9tIDw9IHNoYXBlSW5zaWRlSW5mby0+c2hhcGVM b2dpY2FsQm90dG9tKCkgfHwgIXNoYXBlQ29udGFpbmluZ0Jsb2NrSGVpZ2h0IHx8IGlzT3ZlcmZs b3dQb3NpdGlvbmVkQWxyZWFkeSkKKyAgICAvLyBJZiB0aGUgbGFzdCBsaW5lIG92ZXJsYXBzIHdp dGggdGhlIHNoYXBlLCB3ZSBkb24ndCBuZWVkIHRoZSBzZWdtZW50cyBhbnltb3JlCisgICAgaWYg KGxpbmVUb3AgPCBzaGFwZUxvZ2ljYWxCb3R0b20gJiYgc2hhcGVMb2dpY2FsQm90dG9tIDwgbG9n aWNhbExpbmVCb3R0b20pCisgICAgICAgIHNoYXBlSW5zaWRlSW5mby0+Y2xlYXJTZWdtZW50cygp OworCisgICAgaWYgKGxvZ2ljYWxMaW5lQm90dG9tIDw9IHNoYXBlTG9naWNhbEJvdHRvbSB8fCAh c2hhcGVDb250YWluaW5nQmxvY2tIZWlnaHQgfHwgaXNPdmVyZmxvd1Bvc2l0aW9uZWRBbHJlYWR5 KQogICAgICAgICByZXR1cm47CiAKICAgICBMYXlvdXRVbml0IG5ld0xvZ2ljYWxIZWlnaHQgPSBi bG9jay0+bG9naWNhbEhlaWdodCgpICsgKHNoYXBlQ29udGFpbmluZ0Jsb2NrSGVpZ2h0IC0gKGxp bmVUb3AgKyBzaGFwZUluc2lkZUluZm8tPm93bmVyKCktPmJvcmRlckFuZFBhZGRpbmdBZnRlcigp KSk7CkBAIC0yODA3LDEzICsyODEyLDYgQEAgSW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6Okxp bmVCcmVha2VyOjpuZXh0TGluZUJyZWFrKElubGluZUJpZGlSZXNvbHZlciYgcmVzb2wKICAgICBp ZiAoIXNoYXBlSW5zaWRlSW5mbyB8fCAhc2hhcGVJbnNpZGVJbmZvLT5saW5lT3ZlcmxhcHNTaGFw ZUJvdW5kcygpKQogICAgICAgICByZXR1cm4gbmV4dFNlZ21lbnRCcmVhayhyZXNvbHZlciwgbGlu ZUluZm8sIHJlbmRlclRleHRJbmZvLCBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lLCBjb25zZWN1 dGl2ZUh5cGhlbmF0ZWRMaW5lcywgd29yZE1lYXN1cmVtZW50cyk7CiAKLSAgICAvLyBJbiBsYXlv dXRSdW5zQW5kRmxvYXRzSW5SYW5nZSB3ZSBoYXZlIHRvIHVzZSBsaW5lT3ZlcmxhcHNTaGFwZUJv dW5kcygpIHRvIGRldGVybWluZSB0aGUgbGluZSBzZWdtZW50cyBzaW5jZSBzaGFwZS1vdXRzaWRl J3MgY29kZXBhdGhzIHVzZXMgdGhlIHNhbWUgY29kZSB0byBkZXRlcm1pbmUgaXRzIHNlZ21lbnRz LiBUaGUgbGluZSBjb250YWluaW5nIGlzIG5vdCBhIHJlcXVpcmVtZW50IGZvciBzaGFwZS1vdXRz aWRlLAotICAgIC8vIHNvIGluIHRoaXMgY2FzZSB3ZSBjYW4gZW5kIHVwIHdpdGggc29tZSBleHRy YSBzZWdtZW50cyBmb3IgdGhlIG92ZXJmbG93aW5nIGNvbnRlbnQsIGJ1dCB3ZSBkb24ndCB3YW50 IHRvIGFwcGx5IHRoZSBzZWdtZW50cyBmb3IgdGhlIG92ZXJmbG93aW5nIGNvbnRlbnQsIHNvIHdl IG5lZWQgdG8gcmVzZXQgaXQuCi0gICAgaWYgKCFtX2Jsb2NrLT5mbG93VGhyZWFkQ29udGFpbmlu Z0Jsb2NrKCkgJiYgIXNoYXBlSW5zaWRlSW5mby0+bGluZVdpdGhpblNoYXBlQm91bmRzKCkpIHsK LSAgICAgICAgc2hhcGVJbnNpZGVJbmZvLT5jbGVhclNlZ21lbnRzKCk7Ci0gICAgICAgIHJldHVy biBuZXh0U2VnbWVudEJyZWFrKHJlc29sdmVyLCBsaW5lSW5mbywgcmVuZGVyVGV4dEluZm8sIGxh c3RGbG9hdEZyb21QcmV2aW91c0xpbmUsIGNvbnNlY3V0aXZlSHlwaGVuYXRlZExpbmVzLCB3b3Jk TWVhc3VyZW1lbnRzKTsKLSAgICB9Ci0KICAgICBJbmxpbmVJdGVyYXRvciBlbmQgPSByZXNvbHZl ci5wb3NpdGlvbigpOwogICAgIElubGluZUl0ZXJhdG9yIG9sZEVuZCA9IGVuZDsKIAo= 206917 2013-07-17 14:54:35 -0700 2013-07-19 10:44:52 -0700 updated patch after r152800 118002.patch text/plain 7239 zoltan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwNTg2NDcwLi40NDM3ZDA0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTMtMDct MTcgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NTUyBT aGFwZXNdIENsZWFyIG92ZXJmbG93aW5nIGxpbmUncyBzZWdtZW50cyBpbiBwdXNoU2hhcGVDb250 ZW50T3ZlcmZsb3dCZWxvd1RoZUNvbnRlbnRCb3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExODAwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlIGxhc3QgbGluZSBpbiB0aGUgc2hhcGUgb3Zl cmxhcHMgd2l0aCB0aGUgc2hhcGUgYm90dG9tIGJvdW5kYXJpZXMgd2UgbmVlZCB0byBjbGVhciB0 aGUgY29tcHV0ZWQgc2VnbWVudHMuIChXZSBuZWVkIHRvIGNvbXB1dGUKKyAgICAgICAgdGhlIHNl Z21lbnRzIGFueXdheSwgc2luY2Ugc2hhcGUtb3V0c2lkZSdzIGNvZGUgdXNlcyB0aGUgc2FtZSBj b2RlIHBhdGggdG8gZGV0ZXJtaW5lIGl0cyBzZWdtZW50cyBhbmQgdGhlIGxpbmUgY29udGFpbmlu ZyBpcyBub3QgYQorICAgICAgICByZXF1aXJlbWVudCBpbiB0aGF0IGNhc2UuKSBSYXRoZXIgdGhl biBkb2luZyB0aGUgam9iIGluIFJlbmRlckJsb2NrOjpMaW5lQnJlYWtlcjo6bmV4dExpbmVCcmVh ayBJIG1vdmVkIHRoZSBmdW5jdGlvbmFsaXR5IHRvIGl0cyBjb3JyZWN0CisgICAgICAgIHBsYWNl IHRvIHB1c2hTaGFwZUNvbnRlbnRPdmVyZmxvd0JlbG93VGhlQ29udGVudEJveC4gTm93IGFsbCB0 aGUgb3ZlcmZsb3cgcmVsYXRlZCBmdW5jdGlvbmFsaXR5IGlzIGxvY2F0ZWQgaW4gb25lIGZ1bmN0 aW9uLiBJIGZpeGVkIHRoZQorICAgICAgICBjb3JyZXNwb25kaW5nIGxheW91dCB0ZXN0LgorCisg ICAgICAgICogZmFzdC9zaGFwZXMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1vdmVyZmxvdy1l eHBlY3RlZC5odG1sOgorICAgICAgICAqIGZhc3Qvc2hhcGVzL3NoYXBlLWluc2lkZS9zaGFwZS1p bnNpZGUtb3ZlcmZsb3cuaHRtbDoKKwogMjAxMy0wNy0xNyAgQmVhciBUcmF2aXMgIDxiZXRyYXZp c0BhZG9iZS5jb20+CiAKICAgICAgICAgW0NTUyBTaGFwZXNdW0NTUyBFeGNsdXNpb25zXSBDbGVh bnVwIHRlc3RzIHRvIHJlZmxlY3Qgc3BsaXQgYmV0d2VlbiBDU1MgU2hhcGVzIGFuZCBDU1MgRXhj bHVzaW9ucwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtaW5zaWRl L3NoYXBlLWluc2lkZS1vdmVyZmxvdy1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9z aGFwZXMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1vdmVyZmxvdy1leHBlY3RlZC5odG1sCmlu ZGV4IGIzYjkzM2UuLjBmZTE5NDIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVz L3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtb3ZlcmZsb3ctZXhwZWN0ZWQuaHRtbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW92ZXJmbG93 LWV4cGVjdGVkLmh0bWwKQEAgLTksMjYgKzksMjEgQEAKICAgICAgICAgbGluZS1oZWlnaHQ6IDIw cHg7CiAgICAgICAgIGJvcmRlcjogMnB4IHNvbGlkIGJsdWU7CiAgICAgfQotICAgICNib3JkZXIg ewotICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7Ci0gICAgICAgIGxlZnQ6IDQ4cHg7CisgICAg I3NoYXBlLWluc2lkZSB7CisgICAgICAgIG1hcmdpbi10b3A6IC0ycHg7CisgICAgICAgIG1hcmdp bi1sZWZ0OiA0OHB4OwogICAgICAgICB3aWR0aDogMTAwcHg7Ci0gICAgICAgIGhlaWdodDogNDBw eDsKKyAgICAgICAgaGVpZ2h0OiA1MHB4OwogICAgICAgICBib3JkZXI6IDJweCBzb2xpZCBncmVl bjsKICAgICB9Ci0gICAgLnNwYWNlciB7Ci0gICAgICAgIHdpZHRoOiA1MHB4OwotICAgICAgICBo ZWlnaHQ6IDQwcHg7Ci0gICAgfQorICAgICNvdmVyZmxvdyB7IG1hcmdpbi10b3A6IC0ycHg7IH0K IDwvc3R5bGU+CiA8L2hlYWQ+CiA8Ym9keT4KICAgICA8ZGl2IGlkPSJjb250YWluZXIiPgotICAg ICAgICA8ZGl2IGlkPSJib3JkZXIiPjwvZGl2PgotICAgICAgICA8ZGl2IGlkPSJzaGFwZS1pbnNp ZGUiPgotICAgICAgICAgICAgPGRpdiBjbGFzcz0ic3BhY2VyIiBzdHlsZT0iZmxvYXQ6bGVmdCI+ PC9kaXY+Ci0gICAgICAgICAgICA8ZGl2IGNsYXNzPSJzcGFjZXIiIHN0eWxlPSJmbG9hdDpyaWdo dCI+PC9kaXY+Ci0gICAgICAgICAgICBUaGlzIHRleHQgc2hvdWxkIHdyYXAgaW5zaWRlIHRoZSBn cmVlbiByZWN0YW5nbGUsIGFuZCBvdmVyZmxvdyBzaG91bGQgd3JhcAorICAgICAgICA8ZGl2IGlk PSJzaGFwZS1pbnNpZGUiPlRoaXMgdGV4dCBzaG91bGQgd3JhcDwvZGl2PgorICAgICAgICA8ZGl2 IGlkPSJvdmVyZmxvdyI+CisgICAgICAgICAgICBpbnNpZGUgdGhlIGdyZWVuIHJlY3RhbmdsZSwg YW5kIG92ZXJmbG93IHNob3VsZCB3cmFwCiAgICAgICAgICAgICBpbnNpZGUgdGhlIGJsdWUgcmVj dGFuZ2xlLgogICAgICAgICA8L2Rpdj4KICAgICA8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtb3ZlcmZsb3cuaHRtbCBi L0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtb3ZlcmZs b3cuaHRtbAppbmRleCA3ZWVjMzhiLi42NzQ2NzllIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9m YXN0L3NoYXBlcy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW92ZXJmbG93Lmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1vdmVyZmxv dy5odG1sCkBAIC0yMCw3ICsyMCw4IEBACiAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAg ICAgICAgbGVmdDogNDhweDsKICAgICAgICAgd2lkdGg6IDEwMHB4OwotICAgICAgICBoZWlnaHQ6 IDQwcHg7CisgICAgICAgIGhlaWdodDogNTBweDsKKyAgICAgICAgbWFyZ2luLXRvcDogLTJweDsK ICAgICAgICAgYm9yZGVyOiAycHggc29saWQgZ3JlZW47CiAgICAgfQogPC9zdHlsZT4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCAwZWVlNjdmLi5iMWRiNjQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIw MTMtMDctMTcgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAg W0NTUyBTaGFwZXNdIENsZWFyIG92ZXJmbG93aW5nIGxpbmUncyBzZWdtZW50cyBpbiBwdXNoU2hh cGVDb250ZW50T3ZlcmZsb3dCZWxvd1RoZUNvbnRlbnRCb3gKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExODAwMgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlIGxhc3QgbGluZSBpbiB0aGUgc2hh cGUgb3ZlcmxhcHMgd2l0aCB0aGUgc2hhcGUgYm90dG9tIGJvdW5kYXJpZXMgd2UgbmVlZCB0byBj bGVhciB0aGUgY29tcHV0ZWQgc2VnbWVudHMuIChXZSBuZWVkIHRvIGNvbXB1dGUKKyAgICAgICAg dGhlIHNlZ21lbnRzIGFueXdheSwgc2luY2Ugc2hhcGUtb3V0c2lkZSdzIGNvZGUgdXNlcyB0aGUg c2FtZSBjb2RlIHBhdGggdG8gZGV0ZXJtaW5lIGl0cyBzZWdtZW50cyBhbmQgdGhlIGxpbmUgY29u dGFpbmluZyBpcyBub3QgYQorICAgICAgICByZXF1aXJlbWVudCBpbiB0aGF0IGNhc2UuKSBSYXRo ZXIgdGhlbiBkb2luZyB0aGUgam9iIGluIFJlbmRlckJsb2NrOjpMaW5lQnJlYWtlcjo6bmV4dExp bmVCcmVhayBJIG1vdmVkIHRoZSBmdW5jdGlvbmFsaXR5IHRvIGl0cyBjb3JyZWN0CisgICAgICAg IHBsYWNlIHRvIHB1c2hTaGFwZUNvbnRlbnRPdmVyZmxvd0JlbG93VGhlQ29udGVudEJveC4gTm93 IGFsbCB0aGUgb3ZlcmZsb3cgcmVsYXRlZCBmdW5jdGlvbmFsaXR5IGlzIGxvY2F0ZWQgaW4gb25l IGZ1bmN0aW9uLiBJIGZpeGVkIHRoZQorICAgICAgICBjb3JyZXNwb25kaW5nIGxheW91dCB0ZXN0 LgorCisgICAgICAgIFRlc3RzOiBJIG1vZGlmaWVkIHNoYXBlLWluc2lkZS1vdmVyZmxvdy5odG1s LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpwdXNoU2hhcGVDb250ZW50T3ZlcmZsb3dCZWxvd1RoZUNvbnRlbnRCb3gp OiBSZW1vdmUgc2VnbWVudHMgaWYgbGluZSBvdmVybGFwcyB3aXRoIHRoZSBzaGFwZSdzIGJvdW5k YXJpZXMuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6TGluZUJyZWFrZXI6Om5leHRM aW5lQnJlYWspOiBNb3ZlIHNlZ21lbnRzIGNsZWFyIGxvZ2ljIHRvIHB1c2hTaGFwZUNvbnRlbnRP dmVyZmxvd0JlbG93Q29udGVudEJveC4KKwogMjAxMy0wNy0xNyAgQmVtIEpvbmVzLUJleSAgPGJq b25lc2JlQGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTIFNoYXBlc10gUG9ydCByZWZhY3Rvcmlu ZyBvZiBzaGFwZS1vdXRzaWRlIGNvZGUgZnJvbSBCbGluawpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAppbmRleCA2N2NlNmZjLi4xMGRm M2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5l TGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5l TGF5b3V0LmNwcApAQCAtMTY2NSwxMSArMTY2NSwxNiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgcHVz aFNoYXBlQ29udGVudE92ZXJmbG93QmVsb3dUaGVDb250ZW50Qm94KFJlbmRlckJsb2NrKiBibG9j awogICAgIEFTU0VSVChzaGFwZUluc2lkZUluZm8pOwogCiAgICAgTGF5b3V0VW5pdCBsb2dpY2Fs TGluZUJvdHRvbSA9IGxpbmVUb3AgKyBsaW5lSGVpZ2h0OworICAgIExheW91dFVuaXQgc2hhcGVM b2dpY2FsQm90dG9tID0gc2hhcGVJbnNpZGVJbmZvLT5zaGFwZUxvZ2ljYWxCb3R0b20oKTsKICAg ICBMYXlvdXRVbml0IHNoYXBlQ29udGFpbmluZ0Jsb2NrSGVpZ2h0ID0gc2hhcGVJbnNpZGVJbmZv LT5zaGFwZUNvbnRhaW5pbmdCbG9ja0hlaWdodCgpOwogCiAgICAgYm9vbCBpc092ZXJmbG93UG9z aXRpb25lZEFscmVhZHkgPSAoc2hhcGVDb250YWluaW5nQmxvY2tIZWlnaHQgLSBzaGFwZUluc2lk ZUluZm8tPm93bmVyKCktPmJvcmRlckFuZFBhZGRpbmdBZnRlcigpICsgbGluZUhlaWdodCkgPD0g bGluZVRvcDsKIAotICAgIGlmIChsb2dpY2FsTGluZUJvdHRvbSA8PSBzaGFwZUluc2lkZUluZm8t PnNoYXBlTG9naWNhbEJvdHRvbSgpIHx8ICFzaGFwZUNvbnRhaW5pbmdCbG9ja0hlaWdodCB8fCBp c092ZXJmbG93UG9zaXRpb25lZEFscmVhZHkpCisgICAgLy8gSWYgdGhlIGxhc3QgbGluZSBvdmVy bGFwcyB3aXRoIHRoZSBzaGFwZSwgd2UgZG9uJ3QgbmVlZCB0aGUgc2VnbWVudHMgYW55bW9yZQor ICAgIGlmIChsaW5lVG9wIDwgc2hhcGVMb2dpY2FsQm90dG9tICYmIHNoYXBlTG9naWNhbEJvdHRv bSA8IGxvZ2ljYWxMaW5lQm90dG9tKQorICAgICAgICBzaGFwZUluc2lkZUluZm8tPmNsZWFyU2Vn bWVudHMoKTsKKworICAgIGlmIChsb2dpY2FsTGluZUJvdHRvbSA8PSBzaGFwZUxvZ2ljYWxCb3R0 b20gfHwgIXNoYXBlQ29udGFpbmluZ0Jsb2NrSGVpZ2h0IHx8IGlzT3ZlcmZsb3dQb3NpdGlvbmVk QWxyZWFkeSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgTGF5b3V0VW5pdCBuZXdMb2dpY2FsSGVp Z2h0ID0gYmxvY2stPmxvZ2ljYWxIZWlnaHQoKSArIChzaGFwZUNvbnRhaW5pbmdCbG9ja0hlaWdo dCAtIChsaW5lVG9wICsgc2hhcGVJbnNpZGVJbmZvLT5vd25lcigpLT5ib3JkZXJBbmRQYWRkaW5n QWZ0ZXIoKSkpOwpAQCAtMjgxMSwxMyArMjgxNiw2IEBAIElubGluZUl0ZXJhdG9yIFJlbmRlckJs b2NrOjpMaW5lQnJlYWtlcjo6bmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJlc29s CiAgICAgaWYgKCFzaGFwZUluc2lkZUluZm8gfHwgIXNoYXBlSW5zaWRlSW5mby0+bGluZU92ZXJs YXBzU2hhcGVCb3VuZHMoKSkKICAgICAgICAgcmV0dXJuIG5leHRTZWdtZW50QnJlYWsocmVzb2x2 ZXIsIGxpbmVJbmZvLCByZW5kZXJUZXh0SW5mbywgbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSwg Y29uc2VjdXRpdmVIeXBoZW5hdGVkTGluZXMsIHdvcmRNZWFzdXJlbWVudHMpOwogCi0gICAgLy8g SW4gbGF5b3V0UnVuc0FuZEZsb2F0c0luUmFuZ2Ugd2UgaGF2ZSB0byB1c2UgbGluZU92ZXJsYXBz U2hhcGVCb3VuZHMoKSB0byBkZXRlcm1pbmUgdGhlIGxpbmUgc2VnbWVudHMgc2luY2Ugc2hhcGUt b3V0c2lkZSdzIGNvZGVwYXRocyB1c2VzIHRoZSBzYW1lIGNvZGUgdG8gZGV0ZXJtaW5lIGl0cyBz ZWdtZW50cy4gVGhlIGxpbmUgY29udGFpbmluZyBpcyBub3QgYSByZXF1aXJlbWVudCBmb3Igc2hh cGUtb3V0c2lkZSwKLSAgICAvLyBzbyBpbiB0aGlzIGNhc2Ugd2UgY2FuIGVuZCB1cCB3aXRoIHNv bWUgZXh0cmEgc2VnbWVudHMgZm9yIHRoZSBvdmVyZmxvd2luZyBjb250ZW50LCBidXQgd2UgZG9u J3Qgd2FudCB0byBhcHBseSB0aGUgc2VnbWVudHMgZm9yIHRoZSBvdmVyZmxvd2luZyBjb250ZW50 LCBzbyB3ZSBuZWVkIHRvIHJlc2V0IGl0LgotICAgIGlmICghbV9ibG9jay0+Zmxvd1RocmVhZENv bnRhaW5pbmdCbG9jaygpICYmICFzaGFwZUluc2lkZUluZm8tPmxpbmVXaXRoaW5TaGFwZUJvdW5k cygpKSB7Ci0gICAgICAgIHNoYXBlSW5zaWRlSW5mby0+Y2xlYXJTZWdtZW50cygpOwotICAgICAg ICByZXR1cm4gbmV4dFNlZ21lbnRCcmVhayhyZXNvbHZlciwgbGluZUluZm8sIHJlbmRlclRleHRJ bmZvLCBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lLCBjb25zZWN1dGl2ZUh5cGhlbmF0ZWRMaW5l cywgd29yZE1lYXN1cmVtZW50cyk7Ci0gICAgfQotCiAgICAgSW5saW5lSXRlcmF0b3IgZW5kID0g cmVzb2x2ZXIucG9zaXRpb24oKTsKICAgICBJbmxpbmVJdGVyYXRvciBvbGRFbmQgPSBlbmQ7CiAK