47357 2010-10-07 09:51:31 -0700 Make findNextLineBreak writing-mode-aware. 2010-10-07 10:41:37 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 46123 1 hyatt hyatt webkit.review.bot oldest_to_newest 291065 0 hyatt 2010-10-07 09:51:31 -0700 Make findNextLineBreak writing-mode-aware. 291066 1 70099 hyatt 2010-10-07 09:52:51 -0700 Created attachment 70099 Patch 291069 2 webkit.review.bot 2010-10-07 09:54:14 -0700 Attachment 70099 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/rendering/RenderBoxModelObject.h:101: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] WebCore/rendering/RenderBoxModelObject.h:102: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 291073 3 70099 mitz 2010-10-07 09:57:48 -0700 Comment on attachment 70099 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=70099&action=review > WebCore/rendering/RenderBlockLineLayout.cpp:1594 > + tmpW += replacedLogicalWidth; extra space there > WebCore/rendering/RenderBoxModelObject.h:102 > + bool hasInlineDirectionBordersPaddingOrMargin() const { return hasInlineDirectionBordersOrPadding() || marginStart() != 0 || marginEnd() != 0; } > + bool hasInlineDirectionBordersOrPadding() const { return borderStart() != 0 || borderEnd() != 0 || paddingStart() != 0 || paddingEnd() != 0; } You should drop the “!= 0”s per our style. 291116 4 hyatt 2010-10-07 10:41:37 -0700 Fixed in r69319. 70099 2010-10-07 09:52:51 -0700 2010-10-07 09:57:48 -0700 Patch patch.txt text/plain 14804 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTMxMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMTAtMTAtMDcgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzM1NworICAgICAgICAKKyAgICAg ICAgTWFrZSBmaW5kTmV4dExpbmVCcmVhayBhbmQgc29tZSBvZiB0aGUgaGVscGVyIGZ1bmN0aW9u cyBpdCBhbHNvIGNhbGxzIHdyaXRpbmctbW9kZS1hd2FyZS4KKworICAgICAgICAqIHJlbmRlcmlu Zy9JbmxpbmVGbG93Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUZsb3dCb3g6OmNv bXB1dGVMb2dpY2FsQm94SGVpZ2h0cyk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVGbG93Qm94 OjpwbGFjZUJveGVzSW5CbG9ja0RpcmVjdGlvbik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpwb3NpdGlvbk5ld0Zs b2F0T25MaW5lKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmdldEJvcmRlclBhZGRpbmdNYXJnaW4pOgorICAgICAgICAo V2ViQ29yZTo6aW5saW5lTG9naWNhbFdpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJs b2NrOjpjb21wdXRlSW5saW5lRGlyZWN0aW9uUG9zaXRpb25zRm9yTGluZSk6CisgICAgICAgIChX ZWJDb3JlOjppbmxpbmVGbG93UmVxdWlyZXNMaW5lQm94KToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJsb2NrOjpza2lwTGVhZGluZ1doaXRlc3BhY2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQmxvY2s6OmZpdEJlbG93RmxvYXRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2Nr OjpmaW5kTmV4dExpbmVCcmVhayk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVs T2JqZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6aGFzSW5s aW5lRGlyZWN0aW9uQm9yZGVyc1BhZGRpbmdPck1hcmdpbik6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3hNb2RlbE9iamVjdDo6aGFzSW5saW5lRGlyZWN0aW9uQm9yZGVyc09yUGFkZGluZyk6 CisKIDIwMTAtMTAtMDUgIERpZWdvIEdvbnphbGV6ICA8ZGllZ29oY2dAd2Via2l0Lm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5nLgpJbmRleDogV2ViQ29yZS9yZW5kZXJp bmcvSW5saW5lRmxvd0JveC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvSW5s aW5lRmxvd0JveC5jcHAJKHJldmlzaW9uIDY5MjIxKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvSW5s aW5lRmxvd0JveC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2Miw3ICs0NjIsNyBAQCB2b2lkIElu bGluZUZsb3dCb3g6OmNvbXB1dGVMb2dpY2FsQm94SGVpCiAgICAgICAgIH0gZWxzZSBpZiAoY3Vy ci0+eSgpID09IFBvc2l0aW9uQm90dG9tKSB7CiAgICAgICAgICAgICBpZiAobWF4UG9zaXRpb25C b3R0b20gPCBsaW5lSGVpZ2h0KQogICAgICAgICAgICAgICAgIG1heFBvc2l0aW9uQm90dG9tID0g bGluZUhlaWdodDsKLSAgICAgICAgfSBlbHNlIGlmICgoIWlzSW5saW5lRmxvdyB8fCBzdGF0aWNf Y2FzdDxJbmxpbmVGbG93Qm94Kj4oY3VyciktPmhhc1RleHRDaGlsZHJlbigpKSB8fCBjdXJyLT5i b3hNb2RlbE9iamVjdCgpLT5oYXNIb3Jpem9udGFsQm9yZGVyc09yUGFkZGluZygpIHx8IHN0cmlj dE1vZGUpIHsKKyAgICAgICAgfSBlbHNlIGlmICgoIWlzSW5saW5lRmxvdyB8fCBzdGF0aWNfY2Fz dDxJbmxpbmVGbG93Qm94Kj4oY3VyciktPmhhc1RleHRDaGlsZHJlbigpKSB8fCBjdXJyLT5ib3hN b2RlbE9iamVjdCgpLT5oYXNJbmxpbmVEaXJlY3Rpb25Cb3JkZXJzT3JQYWRkaW5nKCkgfHwgc3Ry aWN0TW9kZSkgewogICAgICAgICAgICAgaW50IGFzY2VudCA9IGJhc2VsaW5lIC0gY3Vyci0+eSgp OwogICAgICAgICAgICAgaW50IGRlc2NlbnQgPSBsaW5lSGVpZ2h0IC0gYXNjZW50OwogICAgICAg ICAgICAgaWYgKG1heEFzY2VudCA8IGFzY2VudCkKQEAgLTQ5Nyw3ICs0OTcsNyBAQCB2b2lkIElu bGluZUZsb3dCb3g6OnBsYWNlQm94ZXNJbkJsb2NrRGlyCiAgICAgICAgIGVsc2UgaWYgKGN1cnIt PnkoKSA9PSBQb3NpdGlvbkJvdHRvbSkKICAgICAgICAgICAgIGN1cnItPnNldFkoeVBvcyArIG1h eEhlaWdodCAtIGN1cnItPmxpbmVIZWlnaHQoZmFsc2UpKTsKICAgICAgICAgZWxzZSB7Ci0gICAg ICAgICAgICBpZiAoKGlzSW5saW5lRmxvdyAmJiAhc3RhdGljX2Nhc3Q8SW5saW5lRmxvd0JveCo+ KGN1cnIpLT5oYXNUZXh0Q2hpbGRyZW4oKSkgJiYgIWN1cnItPmJveE1vZGVsT2JqZWN0KCktPmhh c0hvcml6b250YWxCb3JkZXJzT3JQYWRkaW5nKCkgJiYgIXN0cmljdE1vZGUpCisgICAgICAgICAg ICBpZiAoKGlzSW5saW5lRmxvdyAmJiAhc3RhdGljX2Nhc3Q8SW5saW5lRmxvd0JveCo+KGN1cnIp LT5oYXNUZXh0Q2hpbGRyZW4oKSkgJiYgIWN1cnItPmJveE1vZGVsT2JqZWN0KCktPmhhc0lubGlu ZURpcmVjdGlvbkJvcmRlcnNPclBhZGRpbmcoKSAmJiAhc3RyaWN0TW9kZSkKICAgICAgICAgICAg ICAgICBjaGlsZEFmZmVjdHNUb3BCb3R0b21Qb3MgPSBmYWxzZTsKICAgICAgICAgICAgIGludCBw b3NBZGp1c3QgPSBtYXhBc2NlbnQgLSBjdXJyLT5iYXNlbGluZVBvc2l0aW9uKGZhbHNlKTsKICAg ICAgICAgICAgIGN1cnItPnNldFkoY3Vyci0+eSgpICsgeVBvcyArIHBvc0FkanVzdCk7CkluZGV4 OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiA2OTIzNSkKKysrIFdlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEyMCwyOSArMzEy MCwyOSBAQCBib29sIFJlbmRlckJsb2NrOjpwb3NpdGlvbk5ld0Zsb2F0T25MaW5lCiAgICAgaWYg KCFkaWRQb3NpdGlvbiB8fCAhbmV3RmxvYXQtPm1fcGFnaW5hdGlvblN0cnV0KQogICAgICAgICBy ZXR1cm4gZGlkUG9zaXRpb247CiAgICAgCi0gICAgaW50IGZsb2F0VG9wID0gbmV3RmxvYXQtPnRv cCgpOworICAgIGludCBmbG9hdExvZ2ljYWxUb3AgPSBsb2dpY2FsVG9wRm9yRmxvYXQobmV3Rmxv YXQpOwogICAgIGludCBwYWdpbmF0aW9uU3RydXQgPSBuZXdGbG9hdC0+bV9wYWdpbmF0aW9uU3Ry dXQ7CiAgICAgRmxvYXRpbmdPYmplY3QqIGYgPSBtX2Zsb2F0aW5nT2JqZWN0cy0+bGFzdCgpOwog ICAgIAogICAgIEFTU0VSVChmID09IG5ld0Zsb2F0KTsKIAotICAgIGlmIChmbG9hdFRvcCAtIHBh Z2luYXRpb25TdHJ1dCAhPSBoZWlnaHQoKSkKKyAgICBpZiAoZmxvYXRMb2dpY2FsVG9wIC0gcGFn aW5hdGlvblN0cnV0ICE9IGxvZ2ljYWxIZWlnaHQoKSkKICAgICAgICAgcmV0dXJuIGRpZFBvc2l0 aW9uOwogCiAgICAgZm9yIChmID0gbV9mbG9hdGluZ09iamVjdHMtPnByZXYoKTsgZiAmJiBmICE9 IGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmU7IGYgPSBtX2Zsb2F0aW5nT2JqZWN0cy0+cHJldigp KSB7Ci0gICAgICAgIGlmIChmLT50b3AoKSA9PSBoZWlnaHQoKSkgeworICAgICAgICBpZiAobG9n aWNhbFRvcEZvckZsb2F0KGYpID09IGxvZ2ljYWxIZWlnaHQoKSkgewogICAgICAgICAgICAgQVNT RVJUKCFmLT5tX3BhZ2luYXRpb25TdHJ1dCk7CiAgICAgICAgICAgICBmLT5tX3BhZ2luYXRpb25T dHJ1dCA9IHBhZ2luYXRpb25TdHJ1dDsKICAgICAgICAgICAgIFJlbmRlckJveCogbyA9IGYtPm1f cmVuZGVyZXI7Ci0gICAgICAgICAgICBvLT5zZXRZKG8tPnkoKSArIG8tPm1hcmdpblRvcCgpICsg cGFnaW5hdGlvblN0cnV0KTsKKyAgICAgICAgICAgIHNldExvZ2ljYWxUb3BGb3JDaGlsZChvLCBs b2dpY2FsVG9wRm9yQ2hpbGQobykgKyBtYXJnaW5CZWZvcmVGb3JDaGlsZChvKSArIHBhZ2luYXRp b25TdHJ1dCk7CiAgICAgICAgICAgICBpZiAoby0+aXNSZW5kZXJCbG9jaygpKQogICAgICAgICAg ICAgICAgIHRvUmVuZGVyQmxvY2sobyktPnNldENoaWxkTmVlZHNMYXlvdXQodHJ1ZSwgZmFsc2Up OwogICAgICAgICAgICAgby0+bGF5b3V0SWZOZWVkZWQoKTsKLSAgICAgICAgICAgIGYtPnNldFRv cChmLT50b3AoKSArIGYtPm1fcGFnaW5hdGlvblN0cnV0KTsKKyAgICAgICAgICAgIHNldExvZ2lj YWxUb3BGb3JGbG9hdChmLCBsb2dpY2FsVG9wRm9yRmxvYXQoZikgKyBmLT5tX3BhZ2luYXRpb25T dHJ1dCk7CiAgICAgICAgIH0KICAgICB9CiAgICAgICAgIAotICAgIHNldExvZ2ljYWxIZWlnaHQo aGVpZ2h0KCkgKyBwYWdpbmF0aW9uU3RydXQpOworICAgIHNldExvZ2ljYWxIZWlnaHQobG9naWNh bEhlaWdodCgpICsgcGFnaW5hdGlvblN0cnV0KTsKICAgICAKICAgICByZXR1cm4gZGlkUG9zaXRp b247CiB9CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5j cHAJKHJldmlzaW9uIDY5MjM5KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5l TGF5b3V0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTcsMTMgKzU3LDEyIEBAIGNvbnN0IHVuc2ln bmVkIGNNYXhMaW5lRGVwdGggPSAyMDA7CiAKIHN0YXRpYyBpbnQgZ2V0Qm9yZGVyUGFkZGluZ01h cmdpbihSZW5kZXJCb3hNb2RlbE9iamVjdCogY2hpbGQsIGJvb2wgZW5kT2ZJbmxpbmUpCiB7Ci0g ICAgYm9vbCBsZWZ0U2lkZSA9IChjaGlsZC0+c3R5bGUoKS0+aXNMZWZ0VG9SaWdodERpcmVjdGlv bigpKSA/ICFlbmRPZklubGluZSA6IGVuZE9mSW5saW5lOwotICAgIGlmIChsZWZ0U2lkZSkKLSAg ICAgICAgcmV0dXJuIGNoaWxkLT5tYXJnaW5MZWZ0KCkgKyBjaGlsZC0+cGFkZGluZ0xlZnQoKSAr IGNoaWxkLT5ib3JkZXJMZWZ0KCk7Ci0gICAgcmV0dXJuIGNoaWxkLT5tYXJnaW5SaWdodCgpICsg Y2hpbGQtPnBhZGRpbmdSaWdodCgpICsgY2hpbGQtPmJvcmRlclJpZ2h0KCk7CisgICAgaWYgKGVu ZE9mSW5saW5lKQorICAgICAgICByZXR1cm4gY2hpbGQtPm1hcmdpbkVuZCgpICsgY2hpbGQtPnBh ZGRpbmdFbmQoKSArIGNoaWxkLT5ib3JkZXJFbmQoKTsKKyAgICByZXR1cm4gY2hpbGQtPm1hcmdp blN0YXJ0KCkgKyBjaGlsZC0+cGFkZGluZ1N0YXJ0KCkgKyBjaGlsZC0+Ym9yZGVyU3RhcnQoKTsK IH0KIAotc3RhdGljIGludCBpbmxpbmVXaWR0aChSZW5kZXJPYmplY3QqIGNoaWxkLCBib29sIHN0 YXJ0ID0gdHJ1ZSwgYm9vbCBlbmQgPSB0cnVlKQorc3RhdGljIGludCBpbmxpbmVMb2dpY2FsV2lk dGgoUmVuZGVyT2JqZWN0KiBjaGlsZCwgYm9vbCBzdGFydCA9IHRydWUsIGJvb2wgZW5kID0gdHJ1 ZSkKIHsKICAgICB1bnNpZ25lZCBsaW5lRGVwdGggPSAxOwogICAgIGludCBleHRyYVdpZHRoID0g MDsKQEAgLTI5Niw3ICsyOTUsNyBAQCBSb290SW5saW5lQm94KiBSZW5kZXJCbG9jazo6Y29uc3Ry dWN0TGluCiB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlSW5saW5lRGlyZWN0aW9uUG9zaXRpb25z Rm9yTGluZShSb290SW5saW5lQm94KiBsaW5lQm94LCBib29sIGZpcnN0TGluZSwgQmlkaVJ1biog Zmlyc3RSdW4sIEJpZGlSdW4qIHRyYWlsaW5nU3BhY2VSdW4sIGJvb2wgcmVhY2hlZEVuZCwgR2x5 cGhPdmVyZmxvd0FuZEZhbGxiYWNrRm9udHNNYXAmIHRleHRCb3hEYXRhTWFwKQogewogICAgIC8v IEZpcnN0IGRldGVybWluZSBvdXIgdG90YWwgd2lkdGguCi0gICAgaW50IGF2YWlsYWJsZVdpZHRo ID0gYXZhaWxhYmxlTG9naWNhbFdpZHRoRm9yTGluZShoZWlnaHQoKSwgZmlyc3RMaW5lKTsKKyAg ICBpbnQgYXZhaWxhYmxlV2lkdGggPSBhdmFpbGFibGVMb2dpY2FsV2lkdGhGb3JMaW5lKGxvZ2lj YWxIZWlnaHQoKSwgZmlyc3RMaW5lKTsKICAgICBpbnQgdG90V2lkdGggPSBsaW5lQm94LT5nZXRG bG93U3BhY2luZ0xvZ2ljYWxXaWR0aCgpOwogICAgIGJvb2wgbmVlZHNXb3JkU3BhY2luZyA9IGZh bHNlOwogICAgIHVuc2lnbmVkIG51bVNwYWNlcyA9IDA7CkBAIC0xMjAzLDcgKzEyMDIsNyBAQCBz dGF0aWMgYm9vbCBpbmxpbmVGbG93UmVxdWlyZXNMaW5lQm94KFJlCiAgICAgLy8gRklYTUU6IFJp Z2h0IG5vdywgd2Ugb25seSBhbGxvdyBsaW5lIGJveGVzIGZvciBpbmxpbmVzIHRoYXQgYXJlIHRy dWx5IGVtcHR5LgogICAgIC8vIFdlIG5lZWQgdG8gZml4IHRoaXMsIHRob3VnaCwgYmVjYXVzZSBh dCB0aGUgdmVyeSBsZWFzdCwgaW5saW5lcyBjb250YWluaW5nIG9ubHkKICAgICAvLyBpZ25vcmFi bGUgd2hpdGVzcGFjZSBzaG91bGQgc2hvdWxkIGFsc28gaGF2ZSBsaW5lIGJveGVzLiAKLSAgICBy ZXR1cm4gIWZsb3ctPmZpcnN0Q2hpbGQoKSAmJiBmbG93LT5oYXNIb3Jpem9udGFsQm9yZGVyc1Bh ZGRpbmdPck1hcmdpbigpOworICAgIHJldHVybiAhZmxvdy0+Zmlyc3RDaGlsZCgpICYmIGZsb3ct Pmhhc0lubGluZURpcmVjdGlvbkJvcmRlcnNQYWRkaW5nT3JNYXJnaW4oKTsKIH0KIAogYm9vbCBS ZW5kZXJCbG9jazo6cmVxdWlyZXNMaW5lQm94KGNvbnN0IElubGluZUl0ZXJhdG9yJiBpdCwgYm9v bCBpc0xpbmVFbXB0eSwgYm9vbCBwcmV2aW91c0xpbmVCcm9rZUNsZWFubHkpCkBAIC0xMjc1LDEy ICsxMjc0LDEyIEBAIHZvaWQgUmVuZGVyQmxvY2s6OnNraXBUcmFpbGluZ1doaXRlc3BhY2UKIGlu dCBSZW5kZXJCbG9jazo6c2tpcExlYWRpbmdXaGl0ZXNwYWNlKElubGluZUJpZGlSZXNvbHZlciYg cmVzb2x2ZXIsIGJvb2wgZmlyc3RMaW5lLCBib29sIGlzTGluZUVtcHR5LCBib29sIHByZXZpb3Vz TGluZUJyb2tlQ2xlYW5seSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IEZsb2F0aW5nT2JqZWN0KiBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lKQogewotICAgIGludCBh dmFpbGFibGVXaWR0aCA9IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aEZvckxpbmUoaGVpZ2h0KCksIGZp cnN0TGluZSk7CisgICAgaW50IGF2YWlsYWJsZVdpZHRoID0gYXZhaWxhYmxlTG9naWNhbFdpZHRo Rm9yTGluZShsb2dpY2FsSGVpZ2h0KCksIGZpcnN0TGluZSk7CiAgICAgd2hpbGUgKCFyZXNvbHZl ci5wb3NpdGlvbigpLmF0RW5kKCkgJiYgIXJlcXVpcmVzTGluZUJveChyZXNvbHZlci5wb3NpdGlv bigpLCBpc0xpbmVFbXB0eSwgcHJldmlvdXNMaW5lQnJva2VDbGVhbmx5KSkgewogICAgICAgICBS ZW5kZXJPYmplY3QqIG9iamVjdCA9IHJlc29sdmVyLnBvc2l0aW9uKCkub2JqOwogICAgICAgICBp ZiAob2JqZWN0LT5pc0Zsb2F0aW5nKCkpIHsKICAgICAgICAgICAgIHBvc2l0aW9uTmV3RmxvYXRP bkxpbmUoaW5zZXJ0RmxvYXRpbmdPYmplY3QodG9SZW5kZXJCb3gob2JqZWN0KSksIGxhc3RGbG9h dEZyb21QcmV2aW91c0xpbmUpOwotICAgICAgICAgICAgYXZhaWxhYmxlV2lkdGggPSBhdmFpbGFi bGVMb2dpY2FsV2lkdGhGb3JMaW5lKGhlaWdodCgpLCBmaXJzdExpbmUpOworICAgICAgICAgICAg YXZhaWxhYmxlV2lkdGggPSBhdmFpbGFibGVMb2dpY2FsV2lkdGhGb3JMaW5lKGxvZ2ljYWxIZWln aHQoKSwgZmlyc3RMaW5lKTsKICAgICAgICAgfSBlbHNlIGlmIChvYmplY3QtPmlzUG9zaXRpb25l ZCgpKSB7CiAgICAgICAgICAgICAvLyBGSVhNRTogVGhlIG1hdGggaGVyZSBpcyBhY3R1YWxseSBu b3QgcmVhbGx5IHJpZ2h0LiAgSXQncyBhIGJlc3QtZ3Vlc3MgYXBwcm94aW1hdGlvbiB0aGF0CiAg ICAgICAgICAgICAvLyB3aWxsIHdvcmsgZm9yIHRoZSBjb21tb24gY2FzZXMKQEAgLTEzMzIsNyAr MTMzMSw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmZpdEJlbG93RmxvYXRzKGludCB3aWQKICAgICBB U1NFUlQod2lkdGhUb0ZpdCA+IGF2YWlsYWJsZVdpZHRoKTsKIAogICAgIGludCBmbG9hdExvZ2lj YWxCb3R0b207Ci0gICAgaW50IGxhc3RGbG9hdExvZ2ljYWxCb3R0b20gPSBoZWlnaHQoKTsKKyAg ICBpbnQgbGFzdEZsb2F0TG9naWNhbEJvdHRvbSA9IGxvZ2ljYWxIZWlnaHQoKTsKICAgICBpbnQg bmV3TGluZVdpZHRoID0gYXZhaWxhYmxlV2lkdGg7CiAgICAgd2hpbGUgKHRydWUpIHsKICAgICAg ICAgZmxvYXRMb2dpY2FsQm90dG9tID0gbmV4dEZsb2F0TG9naWNhbEJvdHRvbUJlbG93KGxhc3RG bG9hdExvZ2ljYWxCb3R0b20pOwpAQCAtMTQzNyw3ICsxNDM2LDcgQEAgSW5saW5lSXRlcmF0b3Ig UmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZQogICAgIC8vIEZpcmVmb3ggYW5kIE9wZXJhIHdpbGwg YWxsb3cgYSB0YWJsZSBjZWxsIHRvIGdyb3cgdG8gZml0IGFuIGltYWdlIGluc2lkZSBpdCB1bmRl cgogICAgIC8vIHZlcnkgc3BlY2lmaWMgY2lyY3Vtc3RhbmNlcyAoaW4gb3JkZXIgdG8gbWF0Y2gg Y29tbW9uIFdpbklFIHJlbmRlcmluZ3MpLiAKICAgICAvLyBOb3Qgc3VwcG9ydGluZyB0aGUgcXVp cmsgaGFzIGNhdXNlZCB1cyB0byBtaXMtcmVuZGVyIHNvbWUgcmVhbCBzaXRlcy4gKFNlZSBCdWd6 aWxsYSAxMDUxNy4pIAotICAgIGJvb2wgYWxsb3dJbWFnZXNUb0JyZWFrID0gIWRvY3VtZW50KCkt PmluUXVpcmtzTW9kZSgpIHx8ICFpc1RhYmxlQ2VsbCgpIHx8ICFzdHlsZSgpLT53aWR0aCgpLmlz SW50cmluc2ljT3JBdXRvKCk7CisgICAgYm9vbCBhbGxvd0ltYWdlc1RvQnJlYWsgPSAhZG9jdW1l bnQoKS0+aW5RdWlya3NNb2RlKCkgfHwgIWlzVGFibGVDZWxsKCkgfHwgIXN0eWxlKCktPmxvZ2lj YWxXaWR0aCgpLmlzSW50cmluc2ljT3JBdXRvKCk7CiAKICAgICBFV2hpdGVTcGFjZSBjdXJyV1Mg PSBzdHlsZSgpLT53aGl0ZVNwYWNlKCk7CiAgICAgRVdoaXRlU3BhY2UgbGFzdFdTID0gY3VycldT OwpAQCAtMTQ4Nyw5ICsxNDg2LDkgQEAgSW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmRO ZXh0TGluZQogICAgICAgICAgICAgICAgIC8vIGNoZWNrIGlmIGl0IGZpdHMgaW4gdGhlIGN1cnJl bnQgbGluZS4KICAgICAgICAgICAgICAgICAvLyBJZiBpdCBkb2VzLCBwb3NpdGlvbiBpdCBub3cs IG90aGVyd2lzZSwgcG9zaXRpb24KICAgICAgICAgICAgICAgICAvLyBpdCBhZnRlciBtb3Zpbmcg dG8gbmV4dCBsaW5lIChpbiBuZXdMaW5lKCkgZnVuYykKLSAgICAgICAgICAgICAgICBpZiAoZmxv YXRzRml0T25MaW5lICYmIGZsb2F0Qm94LT53aWR0aCgpICsgZmxvYXRCb3gtPm1hcmdpbkxlZnQo KSArIGZsb2F0Qm94LT5tYXJnaW5SaWdodCgpICsgdyArIHRtcFcgPD0gd2lkdGgpIHsKKyAgICAg ICAgICAgICAgICBpZiAoZmxvYXRzRml0T25MaW5lICYmIGxvZ2ljYWxXaWR0aEZvckZsb2F0KGYp ICsgdyArIHRtcFcgPD0gd2lkdGgpIHsKICAgICAgICAgICAgICAgICAgICAgcG9zaXRpb25OZXdG bG9hdE9uTGluZShmLCBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lKTsKLSAgICAgICAgICAgICAg ICAgICAgd2lkdGggPSBhdmFpbGFibGVMb2dpY2FsV2lkdGhGb3JMaW5lKGhlaWdodCgpLCBmaXJz dExpbmUpOworICAgICAgICAgICAgICAgICAgICB3aWR0aCA9IGF2YWlsYWJsZUxvZ2ljYWxXaWR0 aEZvckxpbmUobG9naWNhbEhlaWdodCgpLCBmaXJzdExpbmUpOwogICAgICAgICAgICAgICAgIH0g ZWxzZQogICAgICAgICAgICAgICAgICAgICBmbG9hdHNGaXRPbkxpbmUgPSBmYWxzZTsKICAgICAg ICAgICAgIH0gZWxzZSBpZiAoby0+aXNQb3NpdGlvbmVkKCkpIHsKQEAgLTE1NTcsOCArMTU1Niw4 IEBAIElubGluZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmUKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIHRtcFcgKz0gZmxvd0JveC0+bWFy Z2luTGVmdCgpICsgZmxvd0JveC0+Ym9yZGVyTGVmdCgpICsgZmxvd0JveC0+cGFkZGluZ0xlZnQo KSArCi0gICAgICAgICAgICAgICAgICAgIGZsb3dCb3gtPm1hcmdpblJpZ2h0KCkgKyBmbG93Qm94 LT5ib3JkZXJSaWdodCgpICsgZmxvd0JveC0+cGFkZGluZ1JpZ2h0KCk7CisgICAgICAgICAgICB0 bXBXICs9IGZsb3dCb3gtPm1hcmdpblN0YXJ0KCkgKyBmbG93Qm94LT5ib3JkZXJTdGFydCgpICsg Zmxvd0JveC0+cGFkZGluZ1N0YXJ0KCkgKworICAgICAgICAgICAgICAgICAgICBmbG93Qm94LT5t YXJnaW5FbmQoKSArIGZsb3dCb3gtPmJvcmRlckVuZCgpICsgZmxvd0JveC0+cGFkZGluZ0VuZCgp OwogICAgICAgICB9IGVsc2UgaWYgKG8tPmlzUmVwbGFjZWQoKSkgewogICAgICAgICAgICAgUmVu ZGVyQm94KiByZXBsYWNlZEJveCA9IHRvUmVuZGVyQm94KG8pOwogCkBAIC0xNTgxLDcgKzE1ODAs OCBAQCBJbmxpbmVJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lCiAgICAgICAgICAg ICB0cmFpbGluZ1NwYWNlT2JqZWN0ID0gMDsKIAogICAgICAgICAgICAgLy8gT3B0aW1pemUgZm9y IGEgY29tbW9uIGNhc2UuIElmIHdlIGNhbid0IGZpbmQgd2hpdGVzcGFjZSBhZnRlciB0aGUgbGlz dAotICAgICAgICAgICAgLy8gaXRlbSwgdGhlbiB0aGlzIGlzIGFsbCBtb290LiAtZHdoCisgICAg ICAgICAgICAvLyBpdGVtLCB0aGVuIHRoaXMgaXMgYWxsIG1vb3QuCisgICAgICAgICAgICBpbnQg cmVwbGFjZWRMb2dpY2FsV2lkdGggPSBsb2dpY2FsV2lkdGhGb3JDaGlsZChyZXBsYWNlZEJveCkg KyBtYXJnaW5TdGFydEZvckNoaWxkKHJlcGxhY2VkQm94KSArIG1hcmdpbkVuZEZvckNoaWxkKHJl cGxhY2VkQm94KSArIGlubGluZUxvZ2ljYWxXaWR0aChvKTsKICAgICAgICAgICAgIGlmIChvLT5p c0xpc3RNYXJrZXIoKSkgewogICAgICAgICAgICAgICAgIGlmIChzdHlsZSgpLT5jb2xsYXBzZVdo aXRlU3BhY2UoKSAmJiBzaG91bGRTa2lwV2hpdGVzcGFjZUFmdGVyU3RhcnRPYmplY3QodGhpcywg bywgbGluZU1pZHBvaW50U3RhdGUpKSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIExpa2Ugd2l0 aCBpbmxpbmUgZmxvd3MsIHdlIHN0YXJ0IGlnbm9yaW5nIHNwYWNlcyB0byBtYWtlIHN1cmUgdGhh dCBhbnkgCkBAIC0xNTkxLDkgKzE1OTEsOSBAQCBJbmxpbmVJdGVyYXRvciBSZW5kZXJCbG9jazo6 ZmluZE5leHRMaW5lCiAgICAgICAgICAgICAgICAgICAgIGlnbm9yaW5nU3BhY2VzID0gdHJ1ZTsK ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgaWYgKHRvUmVuZGVyTGlzdE1hcmtl cihvKS0+aXNJbnNpZGUoKSkKLSAgICAgICAgICAgICAgICAgICAgdG1wVyArPSByZXBsYWNlZEJv eC0+d2lkdGgoKSArIHJlcGxhY2VkQm94LT5tYXJnaW5MZWZ0KCkgKyByZXBsYWNlZEJveC0+bWFy Z2luUmlnaHQoKSArIGlubGluZVdpZHRoKG8pOworICAgICAgICAgICAgICAgICAgICB0bXBXICs9 ICByZXBsYWNlZExvZ2ljYWxXaWR0aDsKICAgICAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAg ICAgIHRtcFcgKz0gcmVwbGFjZWRCb3gtPndpZHRoKCkgKyByZXBsYWNlZEJveC0+bWFyZ2luTGVm dCgpICsgcmVwbGFjZWRCb3gtPm1hcmdpblJpZ2h0KCkgKyBpbmxpbmVXaWR0aChvKTsKKyAgICAg ICAgICAgICAgICB0bXBXICs9IHJlcGxhY2VkTG9naWNhbFdpZHRoOwogICAgICAgICB9IGVsc2Ug aWYgKG8tPmlzVGV4dCgpKSB7CiAgICAgICAgICAgICBpZiAoIXBvcykKICAgICAgICAgICAgICAg ICBhcHBsaWVkU3RhcnRXaWR0aCA9IGZhbHNlOwpAQCAtMTYyMSw3ICsxNjIxLDcgQEAgSW5saW5l SXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZQogICAgICAgICAgICAgLy8gc3BhY2Us IHRoZW4gc3VidHJhY3QgaXRzIHdpZHRoLgogICAgICAgICAgICAgaW50IHdvcmRUcmFpbGluZ1Nw YWNlV2lkdGggPSBmLnR5cGVzZXR0aW5nRmVhdHVyZXMoKSAmIEtlcm5pbmcgPyBmLndpZHRoKFRl eHRSdW4oJnNwYWNlLCAxKSkgKyB3b3JkU3BhY2luZyA6IDA7CiAKLSAgICAgICAgICAgIGludCB3 cmFwVyA9IHRtcFcgKyBpbmxpbmVXaWR0aChvLCAhYXBwbGllZFN0YXJ0V2lkdGgsIHRydWUpOwor ICAgICAgICAgICAgaW50IHdyYXBXID0gdG1wVyArIGlubGluZUxvZ2ljYWxXaWR0aChvLCAhYXBw bGllZFN0YXJ0V2lkdGgsIHRydWUpOwogICAgICAgICAgICAgaW50IGNoYXJXaWR0aCA9IDA7CiAg ICAgICAgICAgICBib29sIGJyZWFrTkJTUCA9IGF1dG9XcmFwICYmIG8tPnN0eWxlKCktPm5ic3BN b2RlKCkgPT0gU1BBQ0U7CiAgICAgICAgICAgICAvLyBBdXRvLXdyYXBwaW5nIHRleHQgc2hvdWxk IHdyYXAgaW4gdGhlIG1pZGRsZSBvZiBhIHdvcmQgb25seSBpZiBpdCBjb3VsZCBub3Qgd3JhcCBi ZWZvcmUgdGhlIHdvcmQsCkBAIC0xNzA1LDcgKzE3MDUsNyBAQCBJbmxpbmVJdGVyYXRvciBSZW5k ZXJCbG9jazo6ZmluZE5leHRMaW5lCiAgICAgICAgICAgICAgICAgICAgICAgICBhZGRpdGlvbmFs VG1wVyA9IHRleHRXaWR0aCh0LCBsYXN0U3BhY2UsIHBvcyAtIGxhc3RTcGFjZSwgZiwgdyArIHRt cFcsIGlzRml4ZWRQaXRjaCwgY29sbGFwc2VXaGl0ZVNwYWNlKSArIGxhc3RTcGFjZVdvcmRTcGFj aW5nOwogICAgICAgICAgICAgICAgICAgICB0bXBXICs9IGFkZGl0aW9uYWxUbXBXOwogICAgICAg ICAgICAgICAgICAgICBpZiAoIWFwcGxpZWRTdGFydFdpZHRoKSB7Ci0gICAgICAgICAgICAgICAg ICAgICAgICB0bXBXICs9IGlubGluZVdpZHRoKG8sIHRydWUsIGZhbHNlKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgIHRtcFcgKz0gaW5saW5lTG9naWNhbFdpZHRoKG8sIHRydWUsIGZhbHNlKTsK ICAgICAgICAgICAgICAgICAgICAgICAgIGFwcGxpZWRTdGFydFdpZHRoID0gdHJ1ZTsKICAgICAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAKQEAgLTE4NTAsNyArMTg1MCw3 IEBAIElubGluZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmUKICAgICAgICAgICAg IC8vIElNUE9SVEFOVDogcG9zIGlzID4gbGVuZ3RoIGhlcmUhCiAgICAgICAgICAgICBpbnQgYWRk aXRpb25hbFRtcFcgPSBpZ25vcmluZ1NwYWNlcyA/IDAgOiB0ZXh0V2lkdGgodCwgbGFzdFNwYWNl LCBwb3MgLSBsYXN0U3BhY2UsIGYsIHcgKyB0bXBXLCBpc0ZpeGVkUGl0Y2gsIGNvbGxhcHNlV2hp dGVTcGFjZSkgKyBsYXN0U3BhY2VXb3JkU3BhY2luZzsKICAgICAgICAgICAgIHRtcFcgKz0gYWRk aXRpb25hbFRtcFc7Ci0gICAgICAgICAgICB0bXBXICs9IGlubGluZVdpZHRoKG8sICFhcHBsaWVk U3RhcnRXaWR0aCwgdHJ1ZSk7CisgICAgICAgICAgICB0bXBXICs9IGlubGluZUxvZ2ljYWxXaWR0 aChvLCAhYXBwbGllZFN0YXJ0V2lkdGgsIHRydWUpOwogCiAgICAgICAgICAgICBpZiAoY2FuSHlw aGVuYXRlICYmIHcgKyB0bXBXID4gd2lkdGgpIHsKICAgICAgICAgICAgICAgICB0cnlIeXBoZW5h dGluZyh0LCBmLCBzdHlsZS0+aHlwaGVuYXRpb25Mb2NhbGUoKSwgbGFzdFNwYWNlLCBwb3MsIHcg KyB0bXBXIC0gYWRkaXRpb25hbFRtcFcsIHdpZHRoLCBpc0ZpeGVkUGl0Y2gsIGNvbGxhcHNlV2hp dGVTcGFjZSwgbGFzdFNwYWNlV29yZFNwYWNpbmcsIGxCcmVhaywgbmV4dEJyZWFrYWJsZSwgaHlw aGVuYXRlZCk7CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmgJ KHJldmlzaW9uIDY5MjIxKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmpl Y3QuaAkod29ya2luZyBjb3B5KQpAQCAtOTgsOCArOTgsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCBpbnQgbWFyZ2luU3RhcnQoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBpbnQgbWFyZ2luRW5k KCkgY29uc3QgPSAwOwogCi0gICAgYm9vbCBoYXNIb3Jpem9udGFsQm9yZGVyc1BhZGRpbmdPck1h cmdpbigpIGNvbnN0IHsgcmV0dXJuIGhhc0hvcml6b250YWxCb3JkZXJzT3JQYWRkaW5nKCkgfHwg bWFyZ2luTGVmdCgpICE9IDAgfHwgbWFyZ2luUmlnaHQoKSAhPSAwOyB9Ci0gICAgYm9vbCBoYXNI b3Jpem9udGFsQm9yZGVyc09yUGFkZGluZygpIGNvbnN0IHsgcmV0dXJuIGJvcmRlckxlZnQoKSAh PSAwIHx8IGJvcmRlclJpZ2h0KCkgIT0gMCB8fCBwYWRkaW5nTGVmdCgpICE9IDAgfHwgcGFkZGlu Z1JpZ2h0KCkgIT0gMDsgfQorICAgIGJvb2wgaGFzSW5saW5lRGlyZWN0aW9uQm9yZGVyc1BhZGRp bmdPck1hcmdpbigpIGNvbnN0IHsgcmV0dXJuIGhhc0lubGluZURpcmVjdGlvbkJvcmRlcnNPclBh ZGRpbmcoKSB8fCBtYXJnaW5TdGFydCgpICE9IDAgfHwgbWFyZ2luRW5kKCkgIT0gMDsgfQorICAg IGJvb2wgaGFzSW5saW5lRGlyZWN0aW9uQm9yZGVyc09yUGFkZGluZygpIGNvbnN0IHsgcmV0dXJu IGJvcmRlclN0YXJ0KCkgIT0gMCB8fCBib3JkZXJFbmQoKSAhPSAwIHx8IHBhZGRpbmdTdGFydCgp ICE9IDAgfHwgcGFkZGluZ0VuZCgpICE9IDA7IH0KIAogICAgIHZpcnR1YWwgaW50IGNvbnRhaW5p bmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnQoKSBjb25zdDsKIAo=