152088 2015-12-09 12:17:35 -0800 TextPainter: Rename start and end position to selectionStart and selectionEnd. 2015-12-09 13:22:25 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan mmaxfield simon.fraser oldest_to_newest 1147900 0 zalan 2015-12-09 12:17:35 -0800 that's what they are. 1147901 1 267035 zalan 2015-12-09 12:21:40 -0800 Created attachment 267035 Patch 1147902 2 commit-queue 2015-12-09 12:23:05 -0800 Attachment 267035 did not pass style-queue: ERROR: Source/WebCore/rendering/TextPainter.cpp:94: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/TextPainter.cpp:95: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1147905 3 267035 simon.fraser 2015-12-09 12:25:39 -0800 Comment on attachment 267035 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=267035&action=review > Source/WebCore/rendering/TextPainter.h:49 > + int selectionStart, int selectionEnd, int length, const AtomicString& emphasisMark, RenderCombineText*, > + TextRun&, FloatRect& boxRect, FloatPoint& textOrigin, int emphasisMarkOffset, const ShadowData* textShadow, const ShadowData* selectionShadow, I think 'selection' here is confusing. Is it really "selected" text, or just the start/end bits to paint? 1147906 4 zalan 2015-12-09 12:34:37 -0800 (In reply to comment #3) > Comment on attachment 267035 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=267035&action=review > > > Source/WebCore/rendering/TextPainter.h:49 > > + int selectionStart, int selectionEnd, int length, const AtomicString& emphasisMark, RenderCombineText*, > > + TextRun&, FloatRect& boxRect, FloatPoint& textOrigin, int emphasisMarkOffset, const ShadowData* textShadow, const ShadowData* selectionShadow, > > I think 'selection' here is confusing. Is it really "selected" text, or just > the start/end bits to paint? It is really the start and the end of the selected text. TextPainter::paintText() could be called with (!paintSelectedTextOnly and paintSelectedTextSeparately) which means we end up painting the non-selected text from 0-selectionStart and selectionEnd-length and then the selection run from selectionStart-selectionEnd. 1147911 5 zalan 2015-12-09 12:44:43 -0800 (In reply to comment #3) > Comment on attachment 267035 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=267035&action=review > > > Source/WebCore/rendering/TextPainter.h:49 > > + int selectionStart, int selectionEnd, int length, const AtomicString& emphasisMark, RenderCombineText*, > > + TextRun&, FloatRect& boxRect, FloatPoint& textOrigin, int emphasisMarkOffset, const ShadowData* textShadow, const ShadowData* selectionShadow, > > I think 'selection' here is confusing. Is it really "selected" text, or just > the start/end bits to paint? Also, 0/0 values are passed in when selection is not present(and we end up painting the run from 0-length) 1147925 6 zalan 2015-12-09 13:22:25 -0800 Committed r193857: <http://trac.webkit.org/changeset/193857> 267035 2015-12-09 12:21:40 -0800 2015-12-09 13:15:53 -0800 Patch bug-152088-20151209122109.patch text/plain 7812 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTkzODM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzM5MWY5NDBkYWZjMjQy Yjg5MmIwNTZiYzZkNjQ2NDMyMTExMTI2OS4uNDI5MWJjOTM4MTY2Mjk3NWRmMmRmYTBkZWJmNTIx OTZiOTZiZjhmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTEyLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgVGV4dFBhaW50ZXI6IFJlbmFt ZSBzdGFydCBhbmQgZW5kIHBvc2l0aW9uIHRvIHNlbGVjdGlvblN0YXJ0IGFuZCBzZWxlY3Rpb25F bmQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTIw ODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGV5 IGFjdHVhbGx5IG1lYW4gc2VsZWN0aW9uIHN0YXJ0L2VuZC4KKworICAgICAgICBObyBjaGFuZ2Ug aW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50KToKKyAgICAgICAgKiBy ZW5kZXJpbmcvVGV4dFBhaW50ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dFBhaW50ZXI6 OlRleHRQYWludGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRQYWludGVyOjpwYWludFRleHQp OgorICAgICAgICAqIHJlbmRlcmluZy9UZXh0UGFpbnRlci5oOgorCiAyMDE1LTEyLTA5ICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1N0 cmVhbXMgQVBJXSBwaXBlVGhyb3VnaCB0ZXN0IGZhaWxpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9JbmxpbmVUZXh0Qm94LmNwcAppbmRleCA5Nzc2NzIwY2MwODE5M2NjMDlmNGU1MWI2OWUx NWIzODA1NTdiNWZiLi5kYWJhZDFiZTgzN2JkOTllYTk5Mjc5Y2QyODVjM2QxYjNlZmUzN2ZlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCkBAIC01ODEsMTQg KzU4MSwxNCBAQCB2b2lkIElubGluZVRleHRCb3g6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJbmZv LCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQsCiAgICAgaWYgKGhhc0h5cGhlbigpKQog ICAgICAgICBsZW5ndGggPSB0ZXh0UnVuLmxlbmd0aCgpOwogCi0gICAgaW50IHNQb3MgPSAwOwot ICAgIGludCBlUG9zID0gMDsKKyAgICBpbnQgc2VsZWN0aW9uU3RhcnQgPSAwOworICAgIGludCBz ZWxlY3Rpb25FbmQgPSAwOwogICAgIGlmIChoYXZlU2VsZWN0aW9uICYmIChwYWludFNlbGVjdGVk VGV4dE9ubHkgfHwgcGFpbnRTZWxlY3RlZFRleHRTZXBhcmF0ZWx5KSkKLSAgICAgICAgc2VsZWN0 aW9uU3RhcnRFbmQoc1BvcywgZVBvcyk7CisgICAgICAgIHNlbGVjdGlvblN0YXJ0RW5kKHNlbGVj dGlvblN0YXJ0LCBzZWxlY3Rpb25FbmQpOwogCiAgICAgaWYgKG1fdHJ1bmNhdGlvbiAhPSBjTm9U cnVuY2F0aW9uKSB7Ci0gICAgICAgIHNQb3MgPSBzdGQ6Om1pbjxpbnQ+KHNQb3MsIG1fdHJ1bmNh dGlvbik7Ci0gICAgICAgIGVQb3MgPSBzdGQ6Om1pbjxpbnQ+KGVQb3MsIG1fdHJ1bmNhdGlvbik7 CisgICAgICAgIHNlbGVjdGlvblN0YXJ0ID0gc3RkOjptaW48aW50PihzZWxlY3Rpb25TdGFydCwg bV90cnVuY2F0aW9uKTsKKyAgICAgICAgc2VsZWN0aW9uRW5kID0gc3RkOjptaW48aW50PihzZWxl Y3Rpb25FbmQsIG1fdHJ1bmNhdGlvbik7CiAgICAgICAgIGxlbmd0aCA9IG1fdHJ1bmNhdGlvbjsK ICAgICB9CiAKQEAgLTYxMiw3ICs2MTIsNyBAQCB2b2lkIElubGluZVRleHRCb3g6OnBhaW50KFBh aW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQsCiAgICAg ZWxzZQogICAgICAgICB0ZXh0T3JpZ2luLnNldFgocm91bmRUb0RldmljZVBpeGVsKExheW91dFVu aXQodGV4dE9yaWdpbi54KCkpLCByZW5kZXJlcigpLmRvY3VtZW50KCkuZGV2aWNlU2NhbGVGYWN0 b3IoKSkpOwogCi0gICAgVGV4dFBhaW50ZXIgdGV4dFBhaW50ZXIoY29udGV4dCwgcGFpbnRTZWxl Y3RlZFRleHRPbmx5LCBwYWludFNlbGVjdGVkVGV4dFNlcGFyYXRlbHksIGZvbnQsIHNQb3MsIGVQ b3MsIGxlbmd0aCwgZW1waGFzaXNNYXJrLCBjb21iaW5lZFRleHQsIHRleHRSdW4sIGJveFJlY3Qs IHRleHRPcmlnaW4sIGVtcGhhc2lzTWFya09mZnNldCwgdGV4dFNoYWRvdywgc2VsZWN0aW9uU2hh ZG93LCBpc0hvcml6b250YWwoKSwgdGV4dFBhaW50U3R5bGUsIHNlbGVjdGlvblBhaW50U3R5bGUp OworICAgIFRleHRQYWludGVyIHRleHRQYWludGVyKGNvbnRleHQsIHBhaW50U2VsZWN0ZWRUZXh0 T25seSwgcGFpbnRTZWxlY3RlZFRleHRTZXBhcmF0ZWx5LCBmb250LCBzZWxlY3Rpb25TdGFydCwg c2VsZWN0aW9uRW5kLCBsZW5ndGgsIGVtcGhhc2lzTWFyaywgY29tYmluZWRUZXh0LCB0ZXh0UnVu LCBib3hSZWN0LCB0ZXh0T3JpZ2luLCBlbXBoYXNpc01hcmtPZmZzZXQsIHRleHRTaGFkb3csIHNl bGVjdGlvblNoYWRvdywgaXNIb3Jpem9udGFsKCksIHRleHRQYWludFN0eWxlLCBzZWxlY3Rpb25Q YWludFN0eWxlKTsKICAgICB0ZXh0UGFpbnRlci5wYWludFRleHQoKTsKIAogICAgIC8vIFBhaW50 IGRlY29yYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dFBh aW50ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRQYWludGVyLmNwcAppbmRl eCA2ODI5Zjc2NDhiNTY4NjM2MTBjMzM1ZDM1YmM0ZWYwMTAwOTExYWM0Li43ODQ1NjdjYTI4Yjdl ZjJjYWNmMjQ0ZmMzMDJjOTQ3ZGQ2NzA5MGMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvVGV4dFBhaW50ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9U ZXh0UGFpbnRlci5jcHAKQEAgLTc5LDggKzc5LDggQEAgU2hhZG93QXBwbGllcjo6flNoYWRvd0Fw cGxpZXIoKQogICAgICAgICBtX2NvbnRleHQuY2xlYXJTaGFkb3coKTsKIH0KIAotVGV4dFBhaW50 ZXI6OlRleHRQYWludGVyKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgYm9vbCBwYWludFNlbGVj dGVkVGV4dE9ubHksIGJvb2wgcGFpbnRTZWxlY3RlZFRleHRTZXBhcmF0ZWx5LCBjb25zdCBGb250 Q2FzY2FkZSYgZm9udCwgaW50IHN0YXJ0UG9zaXRpb25JblRleHRSdW4sCi0gICAgaW50IGVuZFBv c2l0aW9uSW5UZXh0Qm94U3RyaW5nLCBpbnQgbGVuZ3RoLCBjb25zdCBBdG9taWNTdHJpbmcmIGVt cGhhc2lzTWFyaywgUmVuZGVyQ29tYmluZVRleHQqIGNvbWJpbmVkVGV4dCwgVGV4dFJ1biYgdGV4 dFJ1biwgRmxvYXRSZWN0JiBib3hSZWN0LAorVGV4dFBhaW50ZXI6OlRleHRQYWludGVyKEdyYXBo aWNzQ29udGV4dCYgY29udGV4dCwgYm9vbCBwYWludFNlbGVjdGVkVGV4dE9ubHksIGJvb2wgcGFp bnRTZWxlY3RlZFRleHRTZXBhcmF0ZWx5LCBjb25zdCBGb250Q2FzY2FkZSYgZm9udCwgaW50IHNl bGVjdGlvblN0YXJ0LAorICAgIGludCBzZWxlY3Rpb25FbmQsIGludCBsZW5ndGgsIGNvbnN0IEF0 b21pY1N0cmluZyYgZW1waGFzaXNNYXJrLCBSZW5kZXJDb21iaW5lVGV4dCogY29tYmluZWRUZXh0 LCBUZXh0UnVuJiB0ZXh0UnVuLCBGbG9hdFJlY3QmIGJveFJlY3QsCiAgICAgRmxvYXRQb2ludCYg dGV4dE9yaWdpbiwgaW50IGVtcGhhc2lzTWFya09mZnNldCwgY29uc3QgU2hhZG93RGF0YSogdGV4 dFNoYWRvdywgY29uc3QgU2hhZG93RGF0YSogc2VsZWN0aW9uU2hhZG93LCBib29sIHRleHRCb3hJ c0hvcml6b250YWwsCiAgICAgVGV4dFBhaW50U3R5bGUmIHRleHRQYWludFN0eWxlLCBUZXh0UGFp bnRTdHlsZSYgc2VsZWN0aW9uUGFpbnRTdHlsZSkKICAgICA6IG1fY29udGV4dChjb250ZXh0KQpA QCAtOTEsOCArOTEsOCBAQCBUZXh0UGFpbnRlcjo6VGV4dFBhaW50ZXIoR3JhcGhpY3NDb250ZXh0 JiBjb250ZXh0LCBib29sIHBhaW50U2VsZWN0ZWRUZXh0T25seSwgYgogICAgICwgbV9wYWludFNl bGVjdGVkVGV4dE9ubHkocGFpbnRTZWxlY3RlZFRleHRPbmx5KQogICAgICwgbV9wYWludFNlbGVj dGVkVGV4dFNlcGFyYXRlbHkocGFpbnRTZWxlY3RlZFRleHRTZXBhcmF0ZWx5KQogICAgICwgbV9m b250KGZvbnQpCi0gICAgLCBtX3N0YXJ0UG9zaXRpb25JblRleHRSdW4oc3RhcnRQb3NpdGlvbklu VGV4dFJ1bikKLSAgICAsIG1fZW5kUG9zaXRpb25JblRleHRSdW4oZW5kUG9zaXRpb25JblRleHRC b3hTdHJpbmcpCisgICAgLCBtX3NlbGVjdGlvblN0YXJ0KHNlbGVjdGlvblN0YXJ0KQorICAgICwg bV9zZWxlY3Rpb25FbmQoc2VsZWN0aW9uRW5kKQogICAgICwgbV9sZW5ndGgobGVuZ3RoKQogICAg ICwgbV9lbXBoYXNpc01hcmsoZW1waGFzaXNNYXJrKQogICAgICwgbV9jb21iaW5lZFRleHQoY29t YmluZWRUZXh0KQpAQCAtMTg3LDE1ICsxODcsMTQgQEAgdm9pZCBUZXh0UGFpbnRlcjo6cGFpbnRU ZXh0KCkKICAgICBpZiAoIW1fcGFpbnRTZWxlY3RlZFRleHRPbmx5KSB7CiAgICAgICAgIC8vIEZv ciBzdHJva2VkIHBhaW50aW5nLCB3ZSBoYXZlIHRvIGNoYW5nZSB0aGUgdGV4dCBkcmF3aW5nIG1v ZGUuIEl0J3MgcHJvYmFibHkgZGFuZ2Vyb3VzIHRvIGxlYXZlIHRoYXQgbXV0YXRlZCBhcyBhIHNp ZGUKICAgICAgICAgLy8gZWZmZWN0LCBzbyBvbmx5IHdoZW4gd2Uga25vdyB3ZSdyZSBzdHJva2lu ZywgZG8gYSBzYXZlL3Jlc3RvcmUuCi0gICAgICAgIGJvb2wgZnVsbExlbmd0aFBhaW50ID0gIW1f cGFpbnRTZWxlY3RlZFRleHRTZXBhcmF0ZWx5IHx8IG1fZW5kUG9zaXRpb25JblRleHRSdW4gPD0g bV9zdGFydFBvc2l0aW9uSW5UZXh0UnVuOwotICAgICAgICBpbnQgc3RhcnRPZmZzZXQgPSBmdWxs TGVuZ3RoUGFpbnQgPyAwIDogbV9lbmRQb3NpdGlvbkluVGV4dFJ1bjsKLSAgICAgICAgaW50IGVu ZE9mZnNldCA9IGZ1bGxMZW5ndGhQYWludCA/IG1fbGVuZ3RoIDogbV9zdGFydFBvc2l0aW9uSW5U ZXh0UnVuOwotICAgICAgICBwYWludFRleHRXaXRoU3R5bGUobV90ZXh0UGFpbnRTdHlsZSwgc3Rh cnRPZmZzZXQsIGVuZE9mZnNldCwgbV90ZXh0U2hhZG93KTsKKyAgICAgICAgaW50IHN0YXJ0UG9z aXRpb24gPSBtX3BhaW50U2VsZWN0ZWRUZXh0U2VwYXJhdGVseSA/IG1fc2VsZWN0aW9uRW5kIDog MDsKKyAgICAgICAgaW50IGVuZFBvc2l0aW9uID0gbV9wYWludFNlbGVjdGVkVGV4dFNlcGFyYXRl bHkgPyBtX3NlbGVjdGlvblN0YXJ0IDogbV9sZW5ndGg7CisgICAgICAgIHBhaW50VGV4dFdpdGhT dHlsZShtX3RleHRQYWludFN0eWxlLCBzdGFydFBvc2l0aW9uLCBlbmRQb3NpdGlvbiwgbV90ZXh0 U2hhZG93KTsKICAgICB9CiAKICAgICAvLyBwYWludCBvbmx5IHRoZSB0ZXh0IHRoYXQgaXMgc2Vs ZWN0ZWQKLSAgICBpZiAoKG1fcGFpbnRTZWxlY3RlZFRleHRPbmx5IHx8IG1fcGFpbnRTZWxlY3Rl ZFRleHRTZXBhcmF0ZWx5KSAmJiBtX3N0YXJ0UG9zaXRpb25JblRleHRSdW4gPCBtX2VuZFBvc2l0 aW9uSW5UZXh0UnVuKQotICAgICAgICBwYWludFRleHRXaXRoU3R5bGUobV9zZWxlY3Rpb25QYWlu dFN0eWxlLCBtX3N0YXJ0UG9zaXRpb25JblRleHRSdW4sIG1fZW5kUG9zaXRpb25JblRleHRSdW4s IG1fc2VsZWN0aW9uU2hhZG93KTsKKyAgICBpZiAoKG1fcGFpbnRTZWxlY3RlZFRleHRPbmx5IHx8 IG1fcGFpbnRTZWxlY3RlZFRleHRTZXBhcmF0ZWx5KSAmJiBtX3NlbGVjdGlvblN0YXJ0IDwgbV9z ZWxlY3Rpb25FbmQpCisgICAgICAgIHBhaW50VGV4dFdpdGhTdHlsZShtX3NlbGVjdGlvblBhaW50 U3R5bGUsIG1fc2VsZWN0aW9uU3RhcnQsIG1fc2VsZWN0aW9uRW5kLCBtX3NlbGVjdGlvblNoYWRv dyk7CiB9CiAKICNpZiBFTkFCTEUoQ1NTM19URVhUX0RFQ09SQVRJT05fU0tJUF9JTkspCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dFBhaW50ZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9UZXh0UGFpbnRlci5oCmluZGV4IGRiNGU5ZmM0NmYxZWJiMGU4MWYw NzA2NjM2ODdlM2Q3OTZjOGUyMWMuLmI3Mjg2MTQzYWI2ZmIzODlhNDg0NzI5NDJiMjhiNjExNjZh NDNkYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0UGFpbnRlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0UGFpbnRlci5oCkBAIC00NSw5ICs0 NSw5IEBAIHN0YXRpYyBpbmxpbmUgQWZmaW5lVHJhbnNmb3JtIHJvdGF0aW9uKGNvbnN0IEZsb2F0 UmVjdCYgYm94UmVjdCwgUm90YXRpb25EaXJlY3RpCiBjbGFzcyBUZXh0UGFpbnRlciB7CiBwdWJs aWM6CiAgICAgVGV4dFBhaW50ZXIoR3JhcGhpY3NDb250ZXh0JiwgYm9vbCBwYWludFNlbGVjdGVk VGV4dE9ubHksIGJvb2wgcGFpbnRTZWxlY3RlZFRleHRTZXBhcmF0ZWx5LCBjb25zdCBGb250Q2Fz Y2FkZSYsCi0gICAgaW50IHN0YXJ0UG9zaXRpb25JblRleHRSdW4sIGludCBlbmRQb3NpdGlvbklu VGV4dEJveFN0cmluZywgaW50IGxlbmd0aCwgY29uc3QgQXRvbWljU3RyaW5nJiBlbXBoYXNpc01h cmssIFJlbmRlckNvbWJpbmVUZXh0KiwKLSAgICBUZXh0UnVuJiwgRmxvYXRSZWN0JiBib3hSZWN0 LCBGbG9hdFBvaW50JiB0ZXh0T3JpZ2luLCBpbnQgZW1waGFzaXNNYXJrT2Zmc2V0LCBjb25zdCBT aGFkb3dEYXRhKiB0ZXh0U2hhZG93LCBjb25zdCBTaGFkb3dEYXRhKiBzZWxlY3Rpb25TaGFkb3cs Ci0gICAgYm9vbCB0ZXh0Qm94SXNIb3Jpem9udGFsLCBUZXh0UGFpbnRTdHlsZSYgbm9uU2VsZWN0 aW9uUGFpbnRTdHlsZSwgVGV4dFBhaW50U3R5bGUmIHNlbGVjdGlvblBhaW50U3R5bGUpOworICAg ICAgICBpbnQgc2VsZWN0aW9uU3RhcnQsIGludCBzZWxlY3Rpb25FbmQsIGludCBsZW5ndGgsIGNv bnN0IEF0b21pY1N0cmluZyYgZW1waGFzaXNNYXJrLCBSZW5kZXJDb21iaW5lVGV4dCosCisgICAg ICAgIFRleHRSdW4mLCBGbG9hdFJlY3QmIGJveFJlY3QsIEZsb2F0UG9pbnQmIHRleHRPcmlnaW4s IGludCBlbXBoYXNpc01hcmtPZmZzZXQsIGNvbnN0IFNoYWRvd0RhdGEqIHRleHRTaGFkb3csIGNv bnN0IFNoYWRvd0RhdGEqIHNlbGVjdGlvblNoYWRvdywKKyAgICAgICAgYm9vbCB0ZXh0Qm94SXNI b3Jpem9udGFsLCBUZXh0UGFpbnRTdHlsZSYgbm9uU2VsZWN0aW9uUGFpbnRTdHlsZSwgVGV4dFBh aW50U3R5bGUmIHNlbGVjdGlvblBhaW50U3R5bGUpOwogICAgIAogICAgIHZvaWQgcGFpbnRUZXh0 KCk7CiAjaWYgRU5BQkxFKENTUzNfVEVYVF9ERUNPUkFUSU9OX1NLSVBfSU5LKQpAQCAtNzAsOCAr NzAsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9wYWludFNlbGVjdGVkVGV4dE9ubHk7CiAgICAg Ym9vbCBtX3BhaW50U2VsZWN0ZWRUZXh0U2VwYXJhdGVseTsKICAgICBjb25zdCBGb250Q2FzY2Fk ZSYgbV9mb250OwotICAgIGludCBtX3N0YXJ0UG9zaXRpb25JblRleHRSdW47Ci0gICAgaW50IG1f ZW5kUG9zaXRpb25JblRleHRSdW47CisgICAgaW50IG1fc2VsZWN0aW9uU3RhcnQ7CisgICAgaW50 IG1fc2VsZWN0aW9uRW5kOwogICAgIGludCBtX2xlbmd0aDsKICAgICBjb25zdCBBdG9taWNTdHJp bmcmIG1fZW1waGFzaXNNYXJrOwogICAgIFJlbmRlckNvbWJpbmVUZXh0KiBtX2NvbWJpbmVkVGV4 dDsK