108872 2013-02-04 15:40:23 -0800 Change computeStickyPositionConstraints to use LayoutBoxExtent for margins 2013-02-19 16:47:28 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eae eae eric leviw ojan.autocc webkit.review.bot oldest_to_newest 824837 0 eae 2013-02-04 15:40:23 -0800 Change RenderBoxModelObject::computeStickyPositionConstraints to use a LayoutBoxExtent to represent margins. 824840 1 186482 eae 2013-02-04 15:44:00 -0800 Created attachment 186482 Patch 833222 2 186482 leviw 2013-02-14 10:40:05 -0800 Comment on attachment 186482 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186482&action=review > Source/WebCore/platform/graphics/LayoutSize.h:75 > + void contract(LayoutUnit width, LayoutUnit height) This seems like the analogue of "shrunkTo" below. We should be consistent, though I understand this is consistent with LayourRect's naming. 833386 3 eae 2013-02-14 13:56:57 -0800 (In reply to comment #2) > (From update of attachment 186482 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=186482&action=review > > > Source/WebCore/platform/graphics/LayoutSize.h:75 > > + void contract(LayoutUnit width, LayoutUnit height) > > This seems like the analogue of "shrunkTo" below. We should be consistent, though I understand this is consistent with LayourRect's naming. Not quite. shrunkTo shrinks it to the minimum of the current and supplied size. Contract always shrinks it by the supplied delta. 836636 4 leviw 2013-02-19 12:09:39 -0800 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 186482 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=186482&action=review > > > > > Source/WebCore/platform/graphics/LayoutSize.h:75 > > > + void contract(LayoutUnit width, LayoutUnit height) > > > > This seems like the analogue of "shrunkTo" below. We should be consistent, though I understand this is consistent with LayourRect's naming. > > Not quite. shrunkTo shrinks it to the minimum of the current and supplied size. Contract always shrinks it by the supplied delta. I'm not sure if I follow your point. There's expand (always expands) expandTo (max of the two values) and shrunkTo (min of the two values). The missing value would make sense to be called shrunk, not contract. Being internally consistent to LayoutSize makes more sense to me than matching what LayoutRect uses. 836639 5 leviw 2013-02-19 12:09:58 -0800 (In reply to comment #4) > (In reply to comment #3) > > (In reply to comment #2) > > > (From update of attachment 186482 [details] [details] [details]) > > > View in context: https://bugs.webkit.org/attachment.cgi?id=186482&action=review > > > > > > > Source/WebCore/platform/graphics/LayoutSize.h:75 > > > > + void contract(LayoutUnit width, LayoutUnit height) > > > > > > This seems like the analogue of "shrunkTo" below. We should be consistent, though I understand this is consistent with LayourRect's naming. > > > > Not quite. shrunkTo shrinks it to the minimum of the current and supplied size. Contract always shrinks it by the supplied delta. > > I'm not sure if I follow your point. There's expand (always expands) expandTo (max of the two values) and shrunkTo (min of the two values). The missing value would make sense to be called shrunk, not contract. Being internally consistent to LayoutSize makes more sense to me than matching what LayoutRect uses. Sorry, s/shrunk/shrink/ 836866 6 eae 2013-02-19 15:34:55 -0800 (In reply to comment #5) Ah, I see what you are saying now. Thanks for clarifying. Renamed contract to shrink. 836867 7 189186 eae 2013-02-19 15:35:01 -0800 Created attachment 189186 Patch 836873 8 189186 leviw 2013-02-19 15:38:31 -0800 Comment on attachment 189186 Patch I like it :) 836975 9 189186 webkit.review.bot 2013-02-19 16:47:25 -0800 Comment on attachment 189186 Patch Clearing flags on attachment: 189186 Committed r143410: <http://trac.webkit.org/changeset/143410> 836976 10 webkit.review.bot 2013-02-19 16:47:28 -0800 All reviewed patches have been landed. Closing bug. 186482 2013-02-04 15:44:00 -0800 2013-02-19 15:34:59 -0800 Patch bug-108872-20130204154039.patch text/plain 4579 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MTgyNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAyLTA0ICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBDaGFuZ2UgY29tcHV0ZVN0aWNr eVBvc2l0aW9uQ29uc3RyYWludHMgdG8gdXNlIExheW91dEJveEV4dGVudCBmb3IgbWFyZ2lucwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4ODcyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBD aGFuZ2UgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmNvbXB1dGVTdGlja3lQb3NpdGlvbkNvbnN0cmFp bnRzIHRvCisgICAgICAgIHVzZSBhIExheW91dEJveEV4dGVudCB0byByZXByZXNlbnQgbWFyZ2lu cy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5Lgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvTGF5b3V0UmVjdC5oOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0UmVjdDo6Y29udHJhY3QpOgorICAgICAgICBBZGQgdmVyc2lvbiBjb250cmFj dCBtZXRob2RzIHRoYXQgdGFrZXMgYSBMYXlvdXRCb3hFeHRlbnQgb2JqZWN0LgorICAgICAgICAK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRTaXplLmg6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXRTaXplOjpjb250cmFjdCk6CisgICAgICAgIEFkZCBjb250cmFjdCBtZXRob2Qu CisgICAgICAgIAorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6Y29tcHV0ZVN0aWNreVBv c2l0aW9uQ29uc3RyYWludHMpOgorICAgICAgICBDaGFuZ2UgdG8gdXNlIGEgTGF5b3V0Qm94RXh0 ZW50IG9iamVjdCB0byByZXByZXNlbnQgbWFyZ2lucy4KKwogMjAxMy0wMi0wNCAgR3VzdGF2byBO b3JvbmhhIFNpbHZhICA8Z25zQGdub21lLm9yZz4KIAogICAgICAgICBbU291cF0gUmVtb3ZlIGR1 cGxpY2F0ZSBzZXR0aW5nIG9mIGZpcnN0IHBhcnR5IGZvciBjb29raWVzCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRSZWN0LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTGF5b3V0UmVjdC5oCShyZXZpc2lvbiAxNDE3 OTkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRSZWN0LmgJKHdv cmtpbmcgY29weSkKQEAgLTEwNyw2ICsxMDcsMTEgQEAgcHVibGljOgogICAgIH0KICAgICB2b2lk IGV4cGFuZChMYXlvdXRVbml0IGR3LCBMYXlvdXRVbml0IGRoKSB7IG1fc2l6ZS5leHBhbmQoZHcs IGRoKTsgfQogICAgIHZvaWQgY29udHJhY3QoY29uc3QgTGF5b3V0U2l6ZSYgc2l6ZSkgeyBtX3Np emUgLT0gc2l6ZTsgfQorICAgIHZvaWQgY29udHJhY3QoY29uc3QgTGF5b3V0Qm94RXh0ZW50JiBi b3gpCisgICAgeworICAgICAgICBtX2xvY2F0aW9uLm1vdmUoYm94LmxlZnQoKSwgYm94LnRvcCgp KTsKKyAgICAgICAgbV9zaXplLmNvbnRyYWN0KGJveC5sZWZ0KCkgKyBib3gucmlnaHQoKSwgYm94 LnRvcCgpICsgYm94LmJvdHRvbSgpKTsKKyAgICB9CiAgICAgdm9pZCBjb250cmFjdChMYXlvdXRV bml0IGR3LCBMYXlvdXRVbml0IGRoKSB7IG1fc2l6ZS5leHBhbmQoLWR3LCAtZGgpOyB9CiAKICAg ICB2b2lkIHNoaWZ0WEVkZ2VUbyhMYXlvdXRVbml0IGVkZ2UpCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRTaXplLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTGF5b3V0U2l6ZS5oCShyZXZpc2lvbiAxNDE3OTkpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRTaXplLmgJKHdvcmtpbmcg Y29weSkKQEAgLTcyLDYgKzcyLDEyIEBAIHB1YmxpYzoKICAgICAgICAgbV9oZWlnaHQgKz0gaGVp Z2h0OwogICAgIH0KICAgICAKKyAgICB2b2lkIGNvbnRyYWN0KExheW91dFVuaXQgd2lkdGgsIExh eW91dFVuaXQgaGVpZ2h0KQorICAgIHsKKyAgICAgICAgbV93aWR0aCAtPSB3aWR0aDsKKyAgICAg ICAgbV9oZWlnaHQgLT0gaGVpZ2h0OworICAgIH0KKyAgICAKICAgICB2b2lkIHNjYWxlKGZsb2F0 IHNjYWxlKQogICAgIHsKICAgICAgICAgbV93aWR0aCAqPSBzY2FsZTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAkocmV2aXNp b24gMTQxNzk5KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2Jq ZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDU5LDE3ICs0NTksMTcgQEAgdm9pZCBSZW5kZXJC b3hNb2RlbE9iamVjdDo6Y29tcHV0ZVN0aWNreQogICAgIFJlbmRlckJsb2NrKiBjb250YWluaW5n QmxvY2sgPSB0aGlzLT5jb250YWluaW5nQmxvY2soKTsKIAogICAgIExheW91dFJlY3QgY29udGFp bmVyQ29udGVudFJlY3QgPSBjb250YWluaW5nQmxvY2stPmNvbnRlbnRCb3hSZWN0KCk7CisgICAg TGF5b3V0VW5pdCBtYXhXaWR0aCA9IGNvbnRhaW5pbmdCbG9jay0+YXZhaWxhYmxlTG9naWNhbFdp ZHRoKCk7CiAKICAgICAvLyBTdGlja3kgcG9zaXRpb25lZCBlbGVtZW50IGlnbm9yZSBhbnkgb3Zl cnJpZGUgbG9naWNhbCB3aWR0aCBvbiB0aGUgY29udGFpbmluZyBibG9jayAoYXMgdGhleSBkb24n dCBjYWxsCiAgICAgLy8gY29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudCkuIEl0 J3MgdW5jbGVhciB3aGV0aGVyIHRoaXMgaXMgdG90YWxseSBmaW5lLgotICAgIExheW91dFVuaXQg bWluTGVmdE1hcmdpbiA9IG1pbmltdW1WYWx1ZUZvckxlbmd0aChzdHlsZSgpLT5tYXJnaW5MZWZ0 KCksIGNvbnRhaW5pbmdCbG9jay0+YXZhaWxhYmxlTG9naWNhbFdpZHRoKCksIHZpZXcoKSk7Ci0g ICAgTGF5b3V0VW5pdCBtaW5Ub3BNYXJnaW4gPSBtaW5pbXVtVmFsdWVGb3JMZW5ndGgoc3R5bGUo KS0+bWFyZ2luVG9wKCksIGNvbnRhaW5pbmdCbG9jay0+YXZhaWxhYmxlTG9naWNhbFdpZHRoKCks IHZpZXcoKSk7Ci0gICAgTGF5b3V0VW5pdCBtaW5SaWdodE1hcmdpbiA9IG1pbmltdW1WYWx1ZUZv ckxlbmd0aChzdHlsZSgpLT5tYXJnaW5SaWdodCgpLCBjb250YWluaW5nQmxvY2stPmF2YWlsYWJs ZUxvZ2ljYWxXaWR0aCgpLCB2aWV3KCkpOwotICAgIExheW91dFVuaXQgbWluQm90dG9tTWFyZ2lu ID0gbWluaW11bVZhbHVlRm9yTGVuZ3RoKHN0eWxlKCktPm1hcmdpbkJvdHRvbSgpLCBjb250YWlu aW5nQmxvY2stPmF2YWlsYWJsZUxvZ2ljYWxXaWR0aCgpLCB2aWV3KCkpOworICAgIExheW91dEJv eEV4dGVudCBtaW5NYXJnaW4obWluaW11bVZhbHVlRm9yTGVuZ3RoKHN0eWxlKCktPm1hcmdpblRv cCgpLCBtYXhXaWR0aCwgdmlldygpKSwKKyAgICAgICAgbWluaW11bVZhbHVlRm9yTGVuZ3RoKHN0 eWxlKCktPm1hcmdpblJpZ2h0KCksIG1heFdpZHRoLCB2aWV3KCkpLAorICAgICAgICBtaW5pbXVt VmFsdWVGb3JMZW5ndGgoc3R5bGUoKS0+bWFyZ2luQm90dG9tKCksIG1heFdpZHRoLCB2aWV3KCkp LAorICAgICAgICBtaW5pbXVtVmFsdWVGb3JMZW5ndGgoc3R5bGUoKS0+bWFyZ2luTGVmdCgpLCBt YXhXaWR0aCwgdmlldygpKSk7CiAKICAgICAvLyBDb21wdXRlIHRoZSBjb250YWluZXItcmVsYXRp dmUgYXJlYSB3aXRoaW4gd2hpY2ggdGhlIHN0aWNreSBlbGVtZW50IGlzIGFsbG93ZWQgdG8gbW92 ZS4KLSAgICBjb250YWluZXJDb250ZW50UmVjdC5tb3ZlKG1pbkxlZnRNYXJnaW4sIG1pblRvcE1h cmdpbik7Ci0gICAgY29udGFpbmVyQ29udGVudFJlY3QuY29udHJhY3QobWluTGVmdE1hcmdpbiAr IG1pblJpZ2h0TWFyZ2luLCBtaW5Ub3BNYXJnaW4gKyBtaW5Cb3R0b21NYXJnaW4pOworICAgIGNv bnRhaW5lckNvbnRlbnRSZWN0LmNvbnRyYWN0KG1pbk1hcmdpbik7CiAgICAgLy8gTWFwIHRvIHRo ZSB2aWV3IHRvIGF2b2lkIGluY2x1ZGluZyBwYWdlIHNjYWxlIGZhY3Rvci4KICAgICBjb25zdHJh aW50cy5zZXRBYnNvbHV0ZUNvbnRhaW5pbmdCbG9ja1JlY3QoY29udGFpbmluZ0Jsb2NrLT5sb2Nh bFRvQ29udGFpbmVyUXVhZChGbG9hdFJlY3QoY29udGFpbmVyQ29udGVudFJlY3QpLCB2aWV3KCkp LmJvdW5kaW5nQm94KCkpOwogCg== 189186 2013-02-19 15:35:01 -0800 2013-02-19 16:47:25 -0800 Patch bug-108872-20130219153124.patch text/plain 4542 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MzM4NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAyLTE5ICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBDaGFuZ2UgY29tcHV0ZVN0aWNr eVBvc2l0aW9uQ29uc3RyYWludHMgdG8gdXNlIExheW91dEJveEV4dGVudCBmb3IgbWFyZ2lucwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4ODcyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBD aGFuZ2UgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmNvbXB1dGVTdGlja3lQb3NpdGlvbkNvbnN0cmFp bnRzIHRvCisgICAgICAgIHVzZSBhIExheW91dEJveEV4dGVudCB0byByZXByZXNlbnQgbWFyZ2lu cy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5Lgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvTGF5b3V0UmVjdC5oOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0UmVjdDo6Y29udHJhY3QpOgorICAgICAgICBBZGQgdmVyc2lvbiBjb250cmFj dCBtZXRob2RzIHRoYXQgdGFrZXMgYSBMYXlvdXRCb3hFeHRlbnQgb2JqZWN0LgorICAgICAgICAK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRTaXplLmg6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXRTaXplOjpzaHJpbmspOgorICAgICAgICBBZGQgc2hyaW5rIG1ldGhvZC4KKyAg ICAgICAgCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0Ojpjb21wdXRlU3RpY2t5UG9zaXRp b25Db25zdHJhaW50cyk6CisgICAgICAgIENoYW5nZSB0byB1c2UgYSBMYXlvdXRCb3hFeHRlbnQg b2JqZWN0IHRvIHJlcHJlc2VudCBtYXJnaW5zLgorCiAyMDEzLTAyLTE5ICBFbGxpb3R0IFNwcmVo biAgPGVzcHJlaG5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlbW92ZSBSZW5kZXJUZXh0Ojp1 cGRhdGVUZXh0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRS ZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTGF5 b3V0UmVjdC5oCShyZXZpc2lvbiAxNDMwNDQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9MYXlvdXRSZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTEwNyw2ICsxMDcsMTEgQEAg cHVibGljOgogICAgIH0KICAgICB2b2lkIGV4cGFuZChMYXlvdXRVbml0IGR3LCBMYXlvdXRVbml0 IGRoKSB7IG1fc2l6ZS5leHBhbmQoZHcsIGRoKTsgfQogICAgIHZvaWQgY29udHJhY3QoY29uc3Qg TGF5b3V0U2l6ZSYgc2l6ZSkgeyBtX3NpemUgLT0gc2l6ZTsgfQorICAgIHZvaWQgY29udHJhY3Qo Y29uc3QgTGF5b3V0Qm94RXh0ZW50JiBib3gpCisgICAgeworICAgICAgICBtX2xvY2F0aW9uLm1v dmUoYm94LmxlZnQoKSwgYm94LnRvcCgpKTsKKyAgICAgICAgbV9zaXplLnNocmluayhib3gubGVm dCgpICsgYm94LnJpZ2h0KCksIGJveC50b3AoKSArIGJveC5ib3R0b20oKSk7CisgICAgfQogICAg IHZvaWQgY29udHJhY3QoTGF5b3V0VW5pdCBkdywgTGF5b3V0VW5pdCBkaCkgeyBtX3NpemUuZXhw YW5kKC1kdywgLWRoKTsgfQogCiAgICAgdm9pZCBzaGlmdFhFZGdlVG8oTGF5b3V0VW5pdCBlZGdl KQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTGF5b3V0U2l6ZS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0xheW91dFNpemUu aAkocmV2aXNpb24gMTQzMDQ0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv TGF5b3V0U2l6ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC03Miw2ICs3MiwxMiBAQCBwdWJsaWM6CiAg ICAgICAgIG1faGVpZ2h0ICs9IGhlaWdodDsKICAgICB9CiAgICAgCisgICAgdm9pZCBzaHJpbmso TGF5b3V0VW5pdCB3aWR0aCwgTGF5b3V0VW5pdCBoZWlnaHQpCisgICAgeworICAgICAgICBtX3dp ZHRoIC09IHdpZHRoOworICAgICAgICBtX2hlaWdodCAtPSBoZWlnaHQ7CisgICAgfQorICAgIAog ICAgIHZvaWQgc2NhbGUoZmxvYXQgc2NhbGUpCiAgICAgewogICAgICAgICBtX3dpZHRoICo9IHNj YWxlOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9k ZWxPYmplY3QuY3BwCShyZXZpc2lvbiAxNDMwNDQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NTAsMTcgKzQ1 MCwxNyBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0Ojpjb21wdXRlU3RpY2t5CiAgICAgUmVu ZGVyQmxvY2sqIGNvbnRhaW5pbmdCbG9jayA9IHRoaXMtPmNvbnRhaW5pbmdCbG9jaygpOwogCiAg ICAgTGF5b3V0UmVjdCBjb250YWluZXJDb250ZW50UmVjdCA9IGNvbnRhaW5pbmdCbG9jay0+Y29u dGVudEJveFJlY3QoKTsKKyAgICBMYXlvdXRVbml0IG1heFdpZHRoID0gY29udGFpbmluZ0Jsb2Nr LT5hdmFpbGFibGVMb2dpY2FsV2lkdGgoKTsKIAogICAgIC8vIFN0aWNreSBwb3NpdGlvbmVkIGVs ZW1lbnQgaWdub3JlIGFueSBvdmVycmlkZSBsb2dpY2FsIHdpZHRoIG9uIHRoZSBjb250YWluaW5n IGJsb2NrIChhcyB0aGV5IGRvbid0IGNhbGwKICAgICAvLyBjb250YWluaW5nQmxvY2tMb2dpY2Fs V2lkdGhGb3JDb250ZW50KS4gSXQncyB1bmNsZWFyIHdoZXRoZXIgdGhpcyBpcyB0b3RhbGx5IGZp bmUuCi0gICAgTGF5b3V0VW5pdCBtaW5MZWZ0TWFyZ2luID0gbWluaW11bVZhbHVlRm9yTGVuZ3Ro KHN0eWxlKCktPm1hcmdpbkxlZnQoKSwgY29udGFpbmluZ0Jsb2NrLT5hdmFpbGFibGVMb2dpY2Fs V2lkdGgoKSwgdmlldygpKTsKLSAgICBMYXlvdXRVbml0IG1pblRvcE1hcmdpbiA9IG1pbmltdW1W YWx1ZUZvckxlbmd0aChzdHlsZSgpLT5tYXJnaW5Ub3AoKSwgY29udGFpbmluZ0Jsb2NrLT5hdmFp bGFibGVMb2dpY2FsV2lkdGgoKSwgdmlldygpKTsKLSAgICBMYXlvdXRVbml0IG1pblJpZ2h0TWFy Z2luID0gbWluaW11bVZhbHVlRm9yTGVuZ3RoKHN0eWxlKCktPm1hcmdpblJpZ2h0KCksIGNvbnRh aW5pbmdCbG9jay0+YXZhaWxhYmxlTG9naWNhbFdpZHRoKCksIHZpZXcoKSk7Ci0gICAgTGF5b3V0 VW5pdCBtaW5Cb3R0b21NYXJnaW4gPSBtaW5pbXVtVmFsdWVGb3JMZW5ndGgoc3R5bGUoKS0+bWFy Z2luQm90dG9tKCksIGNvbnRhaW5pbmdCbG9jay0+YXZhaWxhYmxlTG9naWNhbFdpZHRoKCksIHZp ZXcoKSk7CisgICAgTGF5b3V0Qm94RXh0ZW50IG1pbk1hcmdpbihtaW5pbXVtVmFsdWVGb3JMZW5n dGgoc3R5bGUoKS0+bWFyZ2luVG9wKCksIG1heFdpZHRoLCB2aWV3KCkpLAorICAgICAgICBtaW5p bXVtVmFsdWVGb3JMZW5ndGgoc3R5bGUoKS0+bWFyZ2luUmlnaHQoKSwgbWF4V2lkdGgsIHZpZXco KSksCisgICAgICAgIG1pbmltdW1WYWx1ZUZvckxlbmd0aChzdHlsZSgpLT5tYXJnaW5Cb3R0b20o KSwgbWF4V2lkdGgsIHZpZXcoKSksCisgICAgICAgIG1pbmltdW1WYWx1ZUZvckxlbmd0aChzdHls ZSgpLT5tYXJnaW5MZWZ0KCksIG1heFdpZHRoLCB2aWV3KCkpKTsKIAogICAgIC8vIENvbXB1dGUg dGhlIGNvbnRhaW5lci1yZWxhdGl2ZSBhcmVhIHdpdGhpbiB3aGljaCB0aGUgc3RpY2t5IGVsZW1l bnQgaXMgYWxsb3dlZCB0byBtb3ZlLgotICAgIGNvbnRhaW5lckNvbnRlbnRSZWN0Lm1vdmUobWlu TGVmdE1hcmdpbiwgbWluVG9wTWFyZ2luKTsKLSAgICBjb250YWluZXJDb250ZW50UmVjdC5jb250 cmFjdChtaW5MZWZ0TWFyZ2luICsgbWluUmlnaHRNYXJnaW4sIG1pblRvcE1hcmdpbiArIG1pbkJv dHRvbU1hcmdpbik7CisgICAgY29udGFpbmVyQ29udGVudFJlY3QuY29udHJhY3QobWluTWFyZ2lu KTsKICAgICAvLyBNYXAgdG8gdGhlIHZpZXcgdG8gYXZvaWQgaW5jbHVkaW5nIHBhZ2Ugc2NhbGUg ZmFjdG9yLgogICAgIGNvbnN0cmFpbnRzLnNldEFic29sdXRlQ29udGFpbmluZ0Jsb2NrUmVjdChj b250YWluaW5nQmxvY2stPmxvY2FsVG9Db250YWluZXJRdWFkKEZsb2F0UmVjdChjb250YWluZXJD b250ZW50UmVjdCksIHZpZXcoKSkuYm91bmRpbmdCb3goKSk7CiAK