118032 2013-06-25 23:07:48 -0700 Don't force layout when querying a fixed or non-box margin/padding property 2013-07-25 14:39:39 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 118930 118936 1 rniwa rniwa barraclough commit-queue eric esprehn+autocc glenn hyatt kling koivisto macpherson menard mjs simon.fraser tonyg oldest_to_newest 903543 0 rniwa 2013-06-25 23:07:48 -0700 Merge https://chromium.googlesource.com/chromium/blink/+/66427d0825fcc2975bd50220cdcaa2504d6f36e5 The case which calculates the margin only depends on the RenderStyle when the margin is fixed. It is non-fixed margins that depend on the RenderBox's margin. The case that calculates the padding only depends on the RenderStyle when the element is not a box. This improves the page load time of the economist by 27% (4.7s -> 3.4s) on my z620 workstation. 903563 1 simon.fraser 2013-06-25 23:49:39 -0700 Don't merge verbatim. isLayoutDependent should not take a PassRefPtr<RenderStyle> style. 903875 2 koivisto 2013-06-26 13:47:22 -0700 Also there should be an inline helper function for all these renderer && renderer->isBox() && (!style || !style->paddingBottom().isFixed()); 908519 3 rniwa 2013-07-15 14:53:30 -0700 Also see https://chromium.googlesource.com/chromium/blink/+/ff234b1593b2b493d47f38f687d09a87bc42c9eb. Also see the bug 118618. 911513 4 207433 rniwa 2013-07-24 22:36:57 -0700 Created attachment 207433 Merges the patch 911616 5 tonyg 2013-07-25 08:03:58 -0700 There were two follow-ups you might be interested in: https://codereview.chromium.org/18298016/ https://codereview.chromium.org/19272007/ 911718 6 rniwa 2013-07-25 11:53:15 -0700 (In reply to comment #5) > There were two follow-ups you might be interested in: > https://codereview.chromium.org/18298016/ > https://codereview.chromium.org/19272007/ Thanks but those are follow ups for the patch to be merged in the bug 118618, right? 911747 7 207433 hyatt 2013-07-25 13:49:12 -0700 Comment on attachment 207433 Merges the patch r=me 911753 8 tonyg 2013-07-25 13:54:26 -0700 (In reply to comment #6) > (In reply to comment #5) > > There were two follow-ups you might be interested in: > > https://codereview.chromium.org/18298016/ > > https://codereview.chromium.org/19272007/ > > Thanks but those are follow ups for the patch to be merged in the bug 118618, right? You are right. Sorry, I got the bugs confused. 911769 9 207433 rniwa 2013-07-25 14:39:34 -0700 Comment on attachment 207433 Merges the patch Clearing flags on attachment: 207433 Committed r153347: <http://trac.webkit.org/changeset/153347> 911770 10 rniwa 2013-07-25 14:39:39 -0700 All reviewed patches have been landed. Closing bug. 207433 2013-07-24 22:36:57 -0700 2013-07-25 14:39:34 -0700 Merges the patch bug-118032-20130724223656.patch text/plain 11037 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzI5OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA3LTI0ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIERvbid0IGZvcmNlIGxheW91dCB3 aGVuIHF1ZXJ5aW5nIGEgZml4ZWQgb3Igbm9uLWJveCBtYXJnaW4vcGFkZGluZyBwcm9wZXJ0eQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4MDMyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWVyZ2UgaHR0 cHM6Ly9jaHJvbWl1bS5nb29nbGVzb3VyY2UuY29tL2Nocm9taXVtL2JsaW5rLysvNjY0MjdkMDgy NWZjYzI5NzViZDUwMjIwY2RjYWEyNTA0ZDZmMzZlNS4KKworICAgICAgICBUaGlzIHBhdGNoIGF2 b2lkcyBsYXlvdXQgaW4gQ29tcHV0ZWRTdHlsZUV4dHJhY3Rvcjo6cHJvcGVydHlWYWx1ZSBmb3Ig bWFyZ2luIGFuZCBwYWRkaW5nIHByb3BlcnRpZXMKKyAgICAgICAgd2hlbiB0aGV5IGFyZSBvZiBm aXhlZCBsZW5ndGguIEFjY29yZGluZyB0byB0aGUgQmxpbmsgcGF0Y2gncyBhdXRob3IsIHRoaXMg aW1wcm92ZXMgdGhlIHBhZ2UgbG9hZAorICAgICAgICB0aW1lIG9mIGVjb25vbWlzdC5jb20gYnkg MjclLgorCisgICAgICAgIFRoZSBhY3R1YWwgY29kZSBjaGFuZ2UgaXMgc2lnbmlmaWNhbnRseSBk aWZmZXJlbnQgZnJvbSB0aGUgb3JpZ2luYWwgQmxpbmsgcGF0Y2ggc2luY2Ugd2UndmUgZG9uZQor ICAgICAgICBzb21lIHJlZmFjdG9yaW5zIGluIHIxNTI5MzggYW5kIHIxNTMwNjcgdG8gbWFrZSB0 aGlzIGNoYW5nZSBtb3JlIHNlbGYtY29udGFpbmVkLgorCisgICAgICAgIFRlc3Q6IGZhc3QvY3Nz L2NvbXB1dGVkLXdpZHRoLXdpdGhvdXQtcmVuZGVyZXIuaHRtbAorCisgICAgICAgICogY3NzL0NT U0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjp6b29tQWRq dXN0ZWRQYWRkaW5nT3JNYXJnaW5QaXhlbFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OnBhZGRp bmdPck1hcmdpbklzUmVuZGVyZXJEZXBlbmRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6aXNMYXlv dXREZXBlbmRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6Q29tcHV0ZWRTdHlsZUV4dHJhY3Rvcjo6 cHJvcGVydHlWYWx1ZSk6CisKIDIwMTMtMDctMjQgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtp bUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBJbnRyb2R1Y2UgdG9TVkdQYXR0ZXJuRWxlbWVudCgp LCB1c2UgaXQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFy YXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0 eWxlRGVjbGFyYXRpb24uY3BwCShyZXZpc2lvbiAxNTMxMTApCisrKyBTb3VyY2UvV2ViQ29yZS9j c3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTUy MCwyMSArMTUyMCwzMSBAQCBzdGF0aWMgUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gZm9u CiAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1 ZU5vcm1hbCk7CiB9CiAKLXN0YXRpYyBib29sIGlzTGF5b3V0RGVwZW5kZW50UHJvcGVydHkoQ1NT UHJvcGVydHlJRCBwcm9wZXJ0eUlEKQordHlwZWRlZiBMZW5ndGggKFJlbmRlclN0eWxlOjoqUmVu ZGVyU3R5bGVMZW5ndGhHZXR0ZXIpKCkgY29uc3Q7Cit0eXBlZGVmIExheW91dFVuaXQgKFJlbmRl ckJveE1vZGVsT2JqZWN0OjoqUmVuZGVyQm94Q29tcHV0ZWRDU1NWYWx1ZUdldHRlcikoKSBjb25z dDsKKwordGVtcGxhdGU8UmVuZGVyU3R5bGVMZW5ndGhHZXR0ZXIgbGVuZ3RoR2V0dGVyLCBSZW5k ZXJCb3hDb21wdXRlZENTU1ZhbHVlR2V0dGVyIGNvbXB1dGVkQ1NTVmFsdWVHZXR0ZXI+Citpbmxp bmUgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gem9vbUFkanVzdGVkUGFkZGluZ09yTWFyZ2luUGl4ZWxW YWx1ZShSZW5kZXJTdHlsZSogc3R5bGUsIFJlbmRlck9iamVjdCogcmVuZGVyZXIpCit7CisgICAg TGVuZ3RoIHVuem9vbXplZExlbmd0aCA9IChzdHlsZS0+Kmxlbmd0aEdldHRlcikoKTsKKyAgICBp ZiAoIXJlbmRlcmVyIHx8ICFyZW5kZXJlci0+aXNCb3goKSB8fCB1bnpvb216ZWRMZW5ndGguaXNG aXhlZCgpKQorICAgICAgICByZXR1cm4gem9vbUFkanVzdGVkUGl4ZWxWYWx1ZUZvckxlbmd0aCh1 bnpvb216ZWRMZW5ndGgsIHN0eWxlKTsKKyAgICByZXR1cm4gem9vbUFkanVzdGVkUGl4ZWxWYWx1 ZSgodG9SZW5kZXJCb3gocmVuZGVyZXIpLT4qY29tcHV0ZWRDU1NWYWx1ZUdldHRlcikoKSwgc3R5 bGUpOworfQorCit0ZW1wbGF0ZTxSZW5kZXJTdHlsZUxlbmd0aEdldHRlciBsZW5ndGhHZXR0ZXI+ CitpbmxpbmUgYm9vbCBwYWRkaW5nT3JNYXJnaW5Jc1JlbmRlcmVyRGVwZW5kZW50KFJlbmRlclN0 eWxlKiBzdHlsZSwgUmVuZGVyT2JqZWN0KiByZW5kZXJlcikKK3sKKyAgICBpZiAoIXJlbmRlcmVy IHx8ICFyZW5kZXJlci0+aXNCb3goKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVy biAhKHN0eWxlICYmIChzdHlsZS0+Kmxlbmd0aEdldHRlcikoKS5pc0ZpeGVkKCkpOworfQorCitz dGF0aWMgYm9vbCBpc0xheW91dERlcGVuZGVudChDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIFJl bmRlclN0eWxlKiBzdHlsZSwgUmVuZGVyT2JqZWN0KiByZW5kZXJlcikKIHsKICAgICBzd2l0Y2gg KHByb3BlcnR5SUQpIHsKICAgICBjYXNlIENTU1Byb3BlcnR5V2lkdGg6CiAgICAgY2FzZSBDU1NQ cm9wZXJ0eUhlaWdodDoKLSAgICBjYXNlIENTU1Byb3BlcnR5TWFyZ2luOgotICAgIGNhc2UgQ1NT UHJvcGVydHlNYXJnaW5Ub3A6Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eU1hcmdpbkJvdHRvbToKLSAg ICBjYXNlIENTU1Byb3BlcnR5TWFyZ2luTGVmdDoKLSAgICBjYXNlIENTU1Byb3BlcnR5TWFyZ2lu UmlnaHQ6Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVBhZGRpbmc6Ci0gICAgY2FzZSBDU1NQcm9wZXJ0 eVBhZGRpbmdUb3A6Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVBhZGRpbmdCb3R0b206Ci0gICAgY2Fz ZSBDU1NQcm9wZXJ0eVBhZGRpbmdMZWZ0OgotICAgIGNhc2UgQ1NTUHJvcGVydHlQYWRkaW5nUmln aHQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFBlcnNwZWN0aXZlT3JpZ2luOgogICAgIGNh c2UgQ1NTUHJvcGVydHlXZWJraXRUcmFuc2Zvcm1PcmlnaW46CiAgICAgY2FzZSBDU1NQcm9wZXJ0 eVdlYmtpdFRyYW5zZm9ybToKQEAgLTE1NDIsNiArMTU1MiwzNCBAQCBzdGF0aWMgYm9vbCBpc0xh eW91dERlcGVuZGVudFByb3BlcnR5KENTCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZpbHRl cjoKICNlbmRpZgogICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBjYXNlIENTU1Byb3BlcnR5TWFy Z2luOiB7CisgICAgICAgIGlmICghcmVuZGVyZXIgfHwgIXJlbmRlcmVyLT5pc0JveCgpKQorICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gIShzdHlsZSAmJiBzdHlsZS0+ bWFyZ2luVG9wKCkuaXNGaXhlZCgpICYmIHN0eWxlLT5tYXJnaW5SaWdodCgpLmlzRml4ZWQoKQor ICAgICAgICAgICAgJiYgc3R5bGUtPm1hcmdpbkJvdHRvbSgpLmlzRml4ZWQoKSAmJiBzdHlsZS0+ bWFyZ2luTGVmdCgpLmlzRml4ZWQoKSk7CisgICAgfQorICAgIGNhc2UgQ1NTUHJvcGVydHlNYXJn aW5Ub3A6CisgICAgICAgIHJldHVybiBwYWRkaW5nT3JNYXJnaW5Jc1JlbmRlcmVyRGVwZW5kZW50 PCZSZW5kZXJTdHlsZTo6bWFyZ2luVG9wPihzdHlsZSwgcmVuZGVyZXIpOworICAgIGNhc2UgQ1NT UHJvcGVydHlNYXJnaW5SaWdodDoKKyAgICAgICAgcmV0dXJuIHBhZGRpbmdPck1hcmdpbklzUmVu ZGVyZXJEZXBlbmRlbnQ8JlJlbmRlclN0eWxlOjptYXJnaW5SaWdodD4oc3R5bGUsIHJlbmRlcmVy KTsKKyAgICBjYXNlIENTU1Byb3BlcnR5TWFyZ2luQm90dG9tOgorICAgICAgICByZXR1cm4gcGFk ZGluZ09yTWFyZ2luSXNSZW5kZXJlckRlcGVuZGVudDwmUmVuZGVyU3R5bGU6Om1hcmdpbkJvdHRv bT4oc3R5bGUsIHJlbmRlcmVyKTsKKyAgICBjYXNlIENTU1Byb3BlcnR5TWFyZ2luTGVmdDoKKyAg ICAgICAgcmV0dXJuIHBhZGRpbmdPck1hcmdpbklzUmVuZGVyZXJEZXBlbmRlbnQ8JlJlbmRlclN0 eWxlOjptYXJnaW5MZWZ0PihzdHlsZSwgcmVuZGVyZXIpOworICAgIGNhc2UgQ1NTUHJvcGVydHlQ YWRkaW5nOiB7CisgICAgICAgIGlmICghcmVuZGVyZXIgfHwgIXJlbmRlcmVyLT5pc0JveCgpKQor ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gIShzdHlsZSAmJiBzdHls ZS0+cGFkZGluZ1RvcCgpLmlzRml4ZWQoKSAmJiBzdHlsZS0+cGFkZGluZ1JpZ2h0KCkuaXNGaXhl ZCgpCisgICAgICAgICAgICAmJiBzdHlsZS0+cGFkZGluZ0JvdHRvbSgpLmlzRml4ZWQoKSAmJiBz dHlsZS0+cGFkZGluZ0xlZnQoKS5pc0ZpeGVkKCkpOworICAgIH0KKyAgICBjYXNlIENTU1Byb3Bl cnR5UGFkZGluZ1RvcDoKKyAgICAgICAgcmV0dXJuIHBhZGRpbmdPck1hcmdpbklzUmVuZGVyZXJE ZXBlbmRlbnQ8JlJlbmRlclN0eWxlOjpwYWRkaW5nVG9wPihzdHlsZSwgcmVuZGVyZXIpOworICAg IGNhc2UgQ1NTUHJvcGVydHlQYWRkaW5nUmlnaHQ6CisgICAgICAgIHJldHVybiBwYWRkaW5nT3JN YXJnaW5Jc1JlbmRlcmVyRGVwZW5kZW50PCZSZW5kZXJTdHlsZTo6cGFkZGluZ1JpZ2h0PihzdHls ZSwgcmVuZGVyZXIpOworICAgIGNhc2UgQ1NTUHJvcGVydHlQYWRkaW5nQm90dG9tOgorICAgICAg ICByZXR1cm4gcGFkZGluZ09yTWFyZ2luSXNSZW5kZXJlckRlcGVuZGVudDwmUmVuZGVyU3R5bGU6 OnBhZGRpbmdCb3R0b20+KHN0eWxlLCByZW5kZXJlcik7CisgICAgY2FzZSBDU1NQcm9wZXJ0eVBh ZGRpbmdMZWZ0OgorICAgICAgICByZXR1cm4gcGFkZGluZ09yTWFyZ2luSXNSZW5kZXJlckRlcGVu ZGVudDwmUmVuZGVyU3R5bGU6OnBhZGRpbmdMZWZ0PihzdHlsZSwgcmVuZGVyZXIpOyAKICAgICBk ZWZhdWx0OgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQpAQCAtMTU5Niw0NyArMTYzNCw0 OCBAQCBzdGF0aWMgaW5saW5lIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IGNvCiAgICAgcmV0dXJu IHN0eWxlZE5vZGUtPmNvbXB1dGVkU3R5bGUoc3R5bGVkTm9kZS0+aXNQc2V1ZG9FbGVtZW50KCkg PyBOT1BTRVVETyA6IHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIpOwogfQogCi10eXBlZGVmIExlbmd0 aCAoUmVuZGVyU3R5bGU6OipSZW5kZXJTdHlsZUxlbmd0aEdldHRlcikoKSBjb25zdDsKLXR5cGVk ZWYgTGF5b3V0VW5pdCAoUmVuZGVyQm94TW9kZWxPYmplY3Q6OipSZW5kZXJCb3hDb21wdXRlZENT U1ZhbHVlR2V0dGVyKSgpIGNvbnN0OwotCi10ZW1wbGF0ZTxSZW5kZXJTdHlsZUxlbmd0aEdldHRl ciBsZW5ndGhHZXR0ZXIsIFJlbmRlckJveENvbXB1dGVkQ1NTVmFsdWVHZXR0ZXIgY29tcHV0ZWRD U1NWYWx1ZUdldHRlcj4KLWlubGluZSBQYXNzUmVmUHRyPENTU1ZhbHVlPiB6b29tQWRqdXN0ZWRQ YWRkaW5nT3JNYXJnaW5QaXhlbFZhbHVlKFJlbmRlclN0eWxlKiBzdHlsZSwgUmVuZGVyT2JqZWN0 KiByZW5kZXJlcikKLXsKLSAgICBMZW5ndGggdW56b29tZWRMZW5ndGggPSAoc3R5bGUtPipsZW5n dGhHZXR0ZXIpKCk7Ci0gICAgaWYgKHVuem9vbWVkTGVuZ3RoLmlzRml4ZWQoKSB8fCAhcmVuZGVy ZXIgfHwgIXJlbmRlcmVyLT5pc0JveCgpKQotICAgICAgICByZXR1cm4gem9vbUFkanVzdGVkUGl4 ZWxWYWx1ZUZvckxlbmd0aCh1bnpvb21lZExlbmd0aCwgc3R5bGUpOwotICAgIHJldHVybiB6b29t QWRqdXN0ZWRQaXhlbFZhbHVlKCh0b1JlbmRlckJveChyZW5kZXJlciktPipjb21wdXRlZENTU1Zh bHVlR2V0dGVyKSgpLCBzdHlsZSk7Ci19Ci0KIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVk U3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELCBF VXBkYXRlTGF5b3V0IHVwZGF0ZUxheW91dCkgY29uc3QKIHsKICAgICBOb2RlKiBzdHlsZWROb2Rl ID0gdGhpcy0+c3R5bGVkTm9kZSgpOwogICAgIGlmICghc3R5bGVkTm9kZSkKICAgICAgICAgcmV0 dXJuIDA7CiAKKyAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IHN0eWxlOworICAgIFJlbmRlck9iamVj dCogcmVuZGVyZXI7CisgICAgYm9vbCBmb3JjZUZ1bGxMYXlvdXQgPSBmYWxzZTsKICAgICBpZiAo dXBkYXRlTGF5b3V0KSB7CiAgICAgICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHN0eWxlZE5vZGUt PmRvY3VtZW50KCk7CisKKyAgICAgICAgaWYgKG5vZGVPckl0c0FuY2VzdG9yTmVlZHNTdHlsZVJl Y2FsYyhzdHlsZWROb2RlKSkgeworICAgICAgICAgICAgZG9jdW1lbnQtPnVwZGF0ZVN0eWxlSWZO ZWVkZWQoKTsKKyAgICAgICAgICAgIC8vIFRoZSBzdHlsZSByZWNhbGMgY291bGQgaGF2ZSBjYXVz ZWQgdGhlIHN0eWxlZCBub2RlIHRvIGJlIGRpc2NhcmRlZCBvciByZXBsYWNlZAorICAgICAgICAg ICAgLy8gaWYgaXQgd2FzIGEgUHNldWRvRWxlbWVudCBzbyB3ZSBuZWVkIHRvIHVwZGF0ZSBpdC4K KyAgICAgICAgICAgIHN0eWxlZE5vZGUgPSB0aGlzLT5zdHlsZWROb2RlKCk7CisgICAgICAgIH0K KworICAgICAgICBzdHlsZSA9IGNvbXB1dGVSZW5kZXJTdHlsZUZvclByb3BlcnR5KHN0eWxlZE5v ZGUsIG1fcHNldWRvRWxlbWVudFNwZWNpZmllciwgcHJvcGVydHlJRCk7CisgICAgICAgIHJlbmRl cmVyID0gc3R5bGVkTm9kZS0+cmVuZGVyZXIoKTsKKwogICAgICAgICAvLyBGSVhNRTogU29tZSBv ZiB0aGVzZSBjYXNlcyBjb3VsZCBiZSBuYXJyb3dlZCBkb3duIG9yIG9wdGltaXplZCBiZXR0ZXIu Ci0gICAgICAgIGJvb2wgZm9yY2VGdWxsTGF5b3V0ID0gaXNMYXlvdXREZXBlbmRlbnRQcm9wZXJ0 eShwcm9wZXJ0eUlEKQorICAgICAgICBmb3JjZUZ1bGxMYXlvdXQgPSBpc0xheW91dERlcGVuZGVu dChwcm9wZXJ0eUlELCBzdHlsZS5nZXQoKSwgcmVuZGVyZXIpCiAgICAgICAgICAgICB8fCBzdHls ZWROb2RlLT5pc0luU2hhZG93VHJlZSgpCiAgICAgICAgICAgICB8fCAoZG9jdW1lbnQtPnN0eWxl UmVzb2x2ZXJJZkV4aXN0cygpICYmIGRvY3VtZW50LT5zdHlsZVJlc29sdmVySWZFeGlzdHMoKS0+ aGFzVmlld3BvcnREZXBlbmRlbnRNZWRpYVF1ZXJpZXMoKSAmJiBkb2N1bWVudC0+b3duZXJFbGVt ZW50KCkpCiAgICAgICAgICAgICB8fCBkb2N1bWVudC0+c2VhbWxlc3NQYXJlbnRJRnJhbWUoKTsK IAotICAgICAgICBpZiAoZm9yY2VGdWxsTGF5b3V0KQorICAgICAgICBpZiAoZm9yY2VGdWxsTGF5 b3V0KSB7CiAgICAgICAgICAgICBkb2N1bWVudC0+dXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0 eWxlc2hlZXRzKCk7Ci0gICAgICAgIGVsc2UgaWYgKG5vZGVPckl0c0FuY2VzdG9yTmVlZHNTdHls ZVJlY2FsYyhzdHlsZWROb2RlKSkKLSAgICAgICAgICAgIGRvY3VtZW50LT51cGRhdGVTdHlsZUlm TmVlZGVkKCk7CisgICAgICAgICAgICBzdHlsZWROb2RlID0gdGhpcy0+c3R5bGVkTm9kZSgpOwor ICAgICAgICB9CisgICAgfQogCi0gICAgICAgIC8vIFRoZSBzdHlsZSByZWNhbGMgY291bGQgaGF2 ZSBjYXVzZWQgdGhlIHN0eWxlZCBub2RlIHRvIGJlIGRpc2NhcmRlZCBvciByZXBsYWNlZAotICAg ICAgICAvLyBpZiBpdCB3YXMgYSBQc2V1ZG9FbGVtZW50IHNvIHdlIG5lZWQgdG8gdXBkYXRlIGl0 LgotICAgICAgICBzdHlsZWROb2RlID0gdGhpcy0+c3R5bGVkTm9kZSgpOworICAgIGlmICghdXBk YXRlTGF5b3V0IHx8IGZvcmNlRnVsbExheW91dCkgeworICAgICAgICBzdHlsZSA9IGNvbXB1dGVS ZW5kZXJTdHlsZUZvclByb3BlcnR5KHN0eWxlZE5vZGUsIG1fcHNldWRvRWxlbWVudFNwZWNpZmll ciwgcHJvcGVydHlJRCk7CisgICAgICAgIHJlbmRlcmVyID0gc3R5bGVkTm9kZS0+cmVuZGVyZXIo KTsKICAgICB9CiAKLSAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IHN0eWxlID0gY29tcHV0ZVJlbmRl clN0eWxlRm9yUHJvcGVydHkoc3R5bGVkTm9kZSwgbV9wc2V1ZG9FbGVtZW50U3BlY2lmaWVyLCBw cm9wZXJ0eUlEKTsKICAgICBpZiAoIXN0eWxlKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIFJl bmRlck9iamVjdCogcmVuZGVyZXIgPSBzdHlsZWROb2RlLT5yZW5kZXJlcigpOwogICAgIHByb3Bl cnR5SUQgPSBDU1NQcm9wZXJ0eTo6cmVzb2x2ZURpcmVjdGlvbkF3YXJlUHJvcGVydHkocHJvcGVy dHlJRCwgc3R5bGUtPmRpcmVjdGlvbigpLCBzdHlsZS0+d3JpdGluZ01vZGUoKSk7CiAKICAgICBz d2l0Y2ggKHByb3BlcnR5SUQpIHsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzI5OCkKKysrIExheW91 dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEzLTA3 LTI0ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIERvbid0IGZv cmNlIGxheW91dCB3aGVuIHF1ZXJ5aW5nIGEgZml4ZWQgb3Igbm9uLWJveCBtYXJnaW4vcGFkZGlu ZyBwcm9wZXJ0eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTE4MDMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWRkIGEgcmVncmVzc2lvbiB0ZXN0IGluc3BpcmVkIGJ5IHRoZSBvbmUgYWRkZWQgaW4KKyAg ICAgICAgaHR0cHM6Ly9jaHJvbWl1bS5nb29nbGVzb3VyY2UuY29tL2Nocm9taXVtL2JsaW5rLysv ZmYyMzRiMTU5M2IyYjQ5M2Q0N2YzOGY2ODdkMDlhODdiYzQyYzllYi4KKworICAgICAgICAqIGZh c3QvY3NzL2NvbXB1dGVkLXdpZHRoLXdpdGhvdXQtcmVuZGVyZXItZXhwZWN0ZWQudHh0OiBBZGRl ZC4KKyAgICAgICAgKiBmYXN0L2Nzcy9jb21wdXRlZC13aWR0aC13aXRob3V0LXJlbmRlcmVyLmh0 bWw6IEFkZGVkLgorCiAyMDEzLTA3LTE5ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+ CiAKICAgICAgICAgZm91cnRoVGllcjogU3RyaW5nIEdldEJ5VmFsIG91dC1vZi1ib3VuZHMgaGFu ZGxpbmcgaXMgc28gd3JvbmcKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvY3NzL2NvbXB1dGVkLXdp ZHRoLXdpdGhvdXQtcmVuZGVyZXItZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL2Zhc3QvY3NzL2NvbXB1dGVkLXdpZHRoLXdpdGhvdXQtcmVuZGVyZXItZXhwZWN0ZWQudHh0 CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9jc3MvY29tcHV0ZWQtd2lkdGgtd2l0 aG91dC1yZW5kZXJlci1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw3IEBA CitUaGlzIHRlc3RzIG9idGFpbmluZyB3aWR0aHMgb2YgdGhlIHNhbWUgQ1NTQ29tcHV0ZWRTdHls ZURlY2xhcmF0aW9uIHR3aWNlIGltbWVkaWF0ZWx5IGFmdGVyIGluc2VydGluZyBhIHN0eWxlc2hl ZXQuIFRoZXkgc2hvdWxkIG1hdGNoLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJp ZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKwor UEFTUyBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGRpdik7IHN0eWxlID0gZ2V0Q29tcHV0ZWRT dHlsZShkaXYpOyBzdHlsZS53aWR0aCBpcyBzdHlsZS53aWR0aAorCkluZGV4OiBMYXlvdXRUZXN0 cy9mYXN0L2Nzcy9jb21wdXRlZC13aWR0aC13aXRob3V0LXJlbmRlcmVyLmh0bWwKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jc3MvY29tcHV0ZWQtd2lkdGgtd2l0aG91dC1yZW5kZXJl ci5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9jc3MvY29tcHV0ZWQtd2lk dGgtd2l0aG91dC1yZW5kZXJlci5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMjYgQEAK KzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNv dXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK2lmICh3aW5kb3cudGVz dFJ1bm5lcikKKyAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKwordmFyIGRpdjsKKworZnVu Y3Rpb24gcnVuVGVzdCgpIHsKKyAgICBkZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyBvYnRhaW5pbmcg d2lkdGhzIG9mIHRoZSBzYW1lIENTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbiB0d2ljZSBpbW1l ZGlhdGVseSBhZnRlciBpbnNlcnRpbmcgYSBzdHlsZXNoZWV0LiBUaGV5IHNob3VsZCBtYXRjaC4i KTsKKworICAgIHZhciBsaW5rID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnbGluaycpOworICAg IGxpbmsucmVsID0gJ3N0eWxlc2hlZXQnOworICAgIGxpbmsuaHJlZiA9ICJkb2Vzbm90ZXhpc3Qu Y3NzIjsKKyAgICBkb2N1bWVudC5oZWFkLmFwcGVuZENoaWxkKGxpbmspOworCisgICAgZGl2ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7CisgICAgc2hvdWxkQmUoImRvY3VtZW50LmJv ZHkuYXBwZW5kQ2hpbGQoZGl2KTsgc3R5bGUgPSBnZXRDb21wdXRlZFN0eWxlKGRpdik7IHN0eWxl LndpZHRoIiwgInN0eWxlLndpZHRoIik7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9u bG9hZD0icnVuVGVzdCgpIj4KKzwvYm9keT4KKzwvaHRtbD4K