108707 2013-02-01 15:19:17 -0800 Remove duplicate code in RenderBoxModelObject::computedCSSPadding* 2013-02-04 09:46:48 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 108728 1 eae eae dglazkov eric jberlin leviw ojan.autocc simon.fraser webkit.review.bot oldest_to_newest 823333 0 eae 2013-02-01 15:19:17 -0800 The computedCSSPaddingTop/Bottom/... methods in RenderBoxModelObject all do pretty much exactly the same thing yet share no code. 823335 1 186160 eae 2013-02-01 15:20:15 -0800 Created attachment 186160 Patch 823351 2 186160 leviw 2013-02-01 15:31:20 -0800 Comment on attachment 186160 Patch Hallelujah! 823442 3 186160 webkit.review.bot 2013-02-01 17:11:37 -0800 Comment on attachment 186160 Patch Clearing flags on attachment: 186160 Committed r141669: <http://trac.webkit.org/changeset/141669> 823443 4 webkit.review.bot 2013-02-01 17:11:40 -0800 All reviewed patches have been landed. Closing bug. 823449 5 jberlin 2013-02-01 17:22:56 -0800 (In reply to comment #3) > (From update of attachment 186160 [details]) > Clearing flags on attachment: 186160 > > Committed r141669: <http://trac.webkit.org/changeset/141669> This broke the Windows build: http://build.webkit.org/builders/Apple%20Win%20Debug%20%28Build%29/builds/61773/steps/compile-webkit/logs/stdio 7>LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/LTCG' specification 7>WebCore.lib(RenderSVGAllInOne.obj) : error LNK2005: "public: class WebCore::LayoutUnit __thiscall WebCore::RenderBoxModelObject::computedCSSPaddingTop(void)const " (?computedCSSPaddingTop@RenderBoxModelObject@WebCore@@QBE?AVLayoutUnit@2@XZ) already defined in WebCore.lib(RenderingAllInOne.obj) 7>WebCore.lib(RenderSVGAllInOne.obj) : error LNK2005: "public: class WebCore::LayoutUnit __thiscall WebCore::RenderBoxModelObject::computedCSSPaddingBottom(void)const " (?computedCSSPaddingBottom@RenderBoxModelObject@WebCore@@QBE?AVLayoutUnit@2@XZ) already defined in WebCore.lib(RenderingAllInOne.obj) 7>WebCore.lib(RenderSVGAllInOne.obj) : error LNK2005: "public: class WebCore::LayoutUnit __thiscall WebCore::RenderBoxModelObject::computedCSSPaddingLeft(void)const " (?computedCSSPaddingLeft@RenderBoxModelObject@WebCore@@QBE?AVLayoutUnit@2@XZ) already defined in WebCore.lib(RenderingAllInOne.obj) 7>WebCore.lib(RenderSVGAllInOne.obj) : error LNK2005: "public: class WebCore::LayoutUnit __thiscall WebCore::RenderBoxModelObject::computedCSSPaddingRight(void)const " (?computedCSSPaddingRight@RenderBoxModelObject@WebCore@@QBE?AVLayoutUnit@2@XZ) already defined in WebCore.lib(RenderingAllInOne.obj) 7>WebCore.lib(RenderSVGAllInOne.obj) : error LNK2005: "public: class WebCore::LayoutUnit __thiscall WebCore::RenderBoxModelObject::computedCSSPaddingBefore(void)const " (?computedCSSPaddingBefore@RenderBoxModelObject@WebCore@@QBE?AVLayoutUnit@2@XZ) already defined in WebCore.lib(RenderingAllInOne.obj) 7>WebCore.lib(RenderSVGAllInOne.obj) : error LNK2005: "public: class WebCore::LayoutUnit __thiscall WebCore::RenderBoxModelObject::computedCSSPaddingAfter(void)const " (?computedCSSPaddingAfter@RenderBoxModelObject@WebCore@@QBE?AVLayoutUnit@2@XZ) already defined in WebCore.lib(RenderingAllInOne.obj) 7>WebCore.lib(RenderSVGAllInOne.obj) : error LNK2005: "public: class WebCore::LayoutUnit __thiscall WebCore::RenderBoxModelObject::computedCSSPaddingStart(void)const " (?computedCSSPaddingStart@RenderBoxModelObject@WebCore@@QBE?AVLayoutUnit@2@XZ) already defined in WebCore.lib(RenderingAllInOne.obj) 823451 6 webkit.review.bot 2013-02-01 17:23:37 -0800 Re-opened since this is blocked by bug 108728 823464 7 eae 2013-02-01 17:42:17 -0800 Thanks for rolling it out. Probably just needs to force a rebuild (or revalidation of the all in one file). Will try to figure out a way to commit in a way that doesn't break windows. 823542 8 186160 eric 2013-02-01 21:21:19 -0800 Comment on attachment 186160 Patch Wow. 823543 9 eric 2013-02-01 21:21:49 -0800 Oh, sorry, I guess you didn't need another r+. 824468 10 eae 2013-02-04 09:46:48 -0800 Committed r141775: <http://trac.webkit.org/changeset/141775> 186160 2013-02-01 15:20:15 -0800 2013-02-01 21:21:19 -0800 Patch bug-108707-20130201151658.patch text/plain 7353 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MTY1MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDEzLTAyLTAxICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW1vdmUgZHVwbGljYXRlIGNv ZGUgaW4gUmVuZGVyQm94TW9kZWxPYmplY3Q6OmNvbXB1dGVkQ1NTUGFkZGluZyoKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODcwNworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhlIGNvbXB1 dGVkQ1NTUGFkZGluZ1RvcC9Cb3R0b20vLi4uIG1ldGhvZHMgaW4KKyAgICAgICAgUmVuZGVyQm94 TW9kZWxPYmplY3QgYWxsIGRvIHByZXR0eSBtdWNoIGV4YWN0bHkgdGhlIHNhbWUgdGhpbmcKKyAg ICAgICAgeWV0IHNoYXJlIG5vIGNvZGUuCisgICAgICAgIAorICAgICAgICBCcmVhayBvdXQgc2hh cmVkIGNvZGUgaW50byBjb21wdXRlZENTU1BhZGRpbmcgbWV0aG9kIGFuZCBoYXZlCisgICAgICAg IHRoZSB0b3AvYm90dG9tL2xlZnQvcmlnaHQvLi4uIG9uZXMgY2FsbCBpdCB3aXRoIHRoZSBhcHBy b3ByaWF0ZQorICAgICAgICBsZW5ndGggdmFsdWUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBu byBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJC b3hNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVj dDo6Y29tcHV0ZWRDU1NQYWRkaW5nKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94TW9k ZWxPYmplY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0Ojpjb21w dXRlZENTU1BhZGRpbmdUb3ApOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmpl Y3Q6OmNvbXB1dGVkQ1NTUGFkZGluZ0JvdHRvbSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJC b3hNb2RlbE9iamVjdDo6Y29tcHV0ZWRDU1NQYWRkaW5nTGVmdCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6Y29tcHV0ZWRDU1NQYWRkaW5nUmlnaHQpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OmNvbXB1dGVkQ1NTUGFkZGluZ0JlZm9y ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6Y29tcHV0ZWRDU1NQ YWRkaW5nQWZ0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OmNv bXB1dGVkQ1NTUGFkZGluZ1N0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVs T2JqZWN0Ojpjb21wdXRlZENTU1BhZGRpbmdFbmQpOgorICAgICAgICAoUmVuZGVyQm94TW9kZWxP YmplY3QpOgorCiAyMDEzLTAyLTAxICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAog ICAgICAgICBDbGVhbiB1cCBjYWxscyB0byBEYXRhYmFzZVRyYWNrZXI6OmFkZC9yZW1vdmVPcGVu RGF0YWJhc2UoKS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2Rl bE9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveE1vZGVsT2JqZWN0LmNwcAkocmV2aXNpb24gMTQxNTA0KQorKysgU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTU4 LDk1ICs1NTgsMTAgQEAgaW50IFJlbmRlckJveE1vZGVsT2JqZWN0OjpwaXhlbFNuYXBwZWRPZgog ICAgIHJldHVybiBzbmFwU2l6ZVRvUGl4ZWwob2Zmc2V0SGVpZ2h0KCksIG9mZnNldFRvcCgpKTsK IH0KIAotTGF5b3V0VW5pdCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Y29tcHV0ZWRDU1NQYWRkaW5n VG9wKCkgY29uc3QKK0xheW91dFVuaXQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmNvbXB1dGVkQ1NT UGFkZGluZyhMZW5ndGggcGFkZGluZykgY29uc3QKIHsKICAgICBMYXlvdXRVbml0IHcgPSAwOwog ICAgIFJlbmRlclZpZXcqIHJlbmRlclZpZXcgPSAwOwotICAgIExlbmd0aCBwYWRkaW5nID0gc3R5 bGUoKS0+cGFkZGluZ1RvcCgpOwotICAgIGlmIChwYWRkaW5nLmlzUGVyY2VudCgpKQotICAgICAg ICB3ID0gY29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudCgpOwotICAgIGVsc2Ug aWYgKHBhZGRpbmcuaXNWaWV3cG9ydFBlcmNlbnRhZ2UoKSkKLSAgICAgICAgcmVuZGVyVmlldyA9 IHZpZXcoKTsKLSAgICByZXR1cm4gbWluaW11bVZhbHVlRm9yTGVuZ3RoKHBhZGRpbmcsIHcsIHJl bmRlclZpZXcpOwotfQotCi1MYXlvdXRVbml0IFJlbmRlckJveE1vZGVsT2JqZWN0Ojpjb21wdXRl ZENTU1BhZGRpbmdCb3R0b20oKSBjb25zdAotewotICAgIExheW91dFVuaXQgdyA9IDA7Ci0gICAg UmVuZGVyVmlldyogcmVuZGVyVmlldyA9IDA7Ci0gICAgTGVuZ3RoIHBhZGRpbmcgPSBzdHlsZSgp LT5wYWRkaW5nQm90dG9tKCk7Ci0gICAgaWYgKHBhZGRpbmcuaXNQZXJjZW50KCkpCi0gICAgICAg IHcgPSBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50KCk7Ci0gICAgZWxzZSBp ZiAocGFkZGluZy5pc1ZpZXdwb3J0UGVyY2VudGFnZSgpKQotICAgICAgICByZW5kZXJWaWV3ID0g dmlldygpOwotICAgIHJldHVybiBtaW5pbXVtVmFsdWVGb3JMZW5ndGgocGFkZGluZywgdywgcmVu ZGVyVmlldyk7Ci19Ci0KLUxheW91dFVuaXQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmNvbXB1dGVk Q1NTUGFkZGluZ0xlZnQoKSBjb25zdAotewotICAgIExheW91dFVuaXQgdyA9IDA7Ci0gICAgUmVu ZGVyVmlldyogcmVuZGVyVmlldyA9IDA7Ci0gICAgTGVuZ3RoIHBhZGRpbmcgPSBzdHlsZSgpLT5w YWRkaW5nTGVmdCgpOwotICAgIGlmIChwYWRkaW5nLmlzUGVyY2VudCgpKQotICAgICAgICB3ID0g Y29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudCgpOwotICAgIGVsc2UgaWYgKHBh ZGRpbmcuaXNWaWV3cG9ydFBlcmNlbnRhZ2UoKSkKLSAgICAgICAgcmVuZGVyVmlldyA9IHZpZXco KTsKLSAgICByZXR1cm4gbWluaW11bVZhbHVlRm9yTGVuZ3RoKHBhZGRpbmcsIHcsIHJlbmRlclZp ZXcpOwotfQotCi1MYXlvdXRVbml0IFJlbmRlckJveE1vZGVsT2JqZWN0Ojpjb21wdXRlZENTU1Bh ZGRpbmdSaWdodCgpIGNvbnN0Ci17Ci0gICAgTGF5b3V0VW5pdCB3ID0gMDsKLSAgICBSZW5kZXJW aWV3KiByZW5kZXJWaWV3ID0gMDsKLSAgICBMZW5ndGggcGFkZGluZyA9IHN0eWxlKCktPnBhZGRp bmdSaWdodCgpOwotICAgIGlmIChwYWRkaW5nLmlzUGVyY2VudCgpKQotICAgICAgICB3ID0gY29u dGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudCgpOwotICAgIGVsc2UgaWYgKHBhZGRp bmcuaXNWaWV3cG9ydFBlcmNlbnRhZ2UoKSkKLSAgICAgICAgcmVuZGVyVmlldyA9IHZpZXcoKTsK LSAgICByZXR1cm4gbWluaW11bVZhbHVlRm9yTGVuZ3RoKHBhZGRpbmcsIHcsIHJlbmRlclZpZXcp OwotfQotCi1MYXlvdXRVbml0IFJlbmRlckJveE1vZGVsT2JqZWN0Ojpjb21wdXRlZENTU1BhZGRp bmdCZWZvcmUoKSBjb25zdAotewotICAgIExheW91dFVuaXQgdyA9IDA7Ci0gICAgUmVuZGVyVmll dyogcmVuZGVyVmlldyA9IDA7Ci0gICAgTGVuZ3RoIHBhZGRpbmcgPSBzdHlsZSgpLT5wYWRkaW5n QmVmb3JlKCk7Ci0gICAgaWYgKHBhZGRpbmcuaXNQZXJjZW50KCkpCi0gICAgICAgIHcgPSBjb250 YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50KCk7Ci0gICAgZWxzZSBpZiAocGFkZGlu Zy5pc1ZpZXdwb3J0UGVyY2VudGFnZSgpKQotICAgICAgICByZW5kZXJWaWV3ID0gdmlldygpOwot ICAgIHJldHVybiBtaW5pbXVtVmFsdWVGb3JMZW5ndGgocGFkZGluZywgdywgcmVuZGVyVmlldyk7 Ci19Ci0KLUxheW91dFVuaXQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmNvbXB1dGVkQ1NTUGFkZGlu Z0FmdGVyKCkgY29uc3QKLXsKLSAgICBMYXlvdXRVbml0IHcgPSAwOwotICAgIFJlbmRlclZpZXcq IHJlbmRlclZpZXcgPSAwOwotICAgIExlbmd0aCBwYWRkaW5nID0gc3R5bGUoKS0+cGFkZGluZ0Fm dGVyKCk7Ci0gICAgaWYgKHBhZGRpbmcuaXNQZXJjZW50KCkpCi0gICAgICAgIHcgPSBjb250YWlu aW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50KCk7Ci0gICAgZWxzZSBpZiAocGFkZGluZy5p c1ZpZXdwb3J0UGVyY2VudGFnZSgpKQotICAgICAgICByZW5kZXJWaWV3ID0gdmlldygpOwotICAg IHJldHVybiBtaW5pbXVtVmFsdWVGb3JMZW5ndGgocGFkZGluZywgdywgcmVuZGVyVmlldyk7Ci19 Ci0KLUxheW91dFVuaXQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmNvbXB1dGVkQ1NTUGFkZGluZ1N0 YXJ0KCkgY29uc3QKLXsKLSAgICBMYXlvdXRVbml0IHcgPSAwOwotICAgIFJlbmRlclZpZXcqIHJl bmRlclZpZXcgPSAwOwotICAgIExlbmd0aCBwYWRkaW5nID0gc3R5bGUoKS0+cGFkZGluZ1N0YXJ0 KCk7Ci0gICAgaWYgKHBhZGRpbmcuaXNQZXJjZW50KCkpCi0gICAgICAgIHcgPSBjb250YWluaW5n QmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50KCk7Ci0gICAgZWxzZSBpZiAocGFkZGluZy5pc1Zp ZXdwb3J0UGVyY2VudGFnZSgpKQotICAgICAgICByZW5kZXJWaWV3ID0gdmlldygpOwotICAgIHJl dHVybiBtaW5pbXVtVmFsdWVGb3JMZW5ndGgocGFkZGluZywgdywgcmVuZGVyVmlldyk7Ci19Ci0K LUxheW91dFVuaXQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmNvbXB1dGVkQ1NTUGFkZGluZ0VuZCgp IGNvbnN0Ci17Ci0gICAgTGF5b3V0VW5pdCB3ID0gMDsKLSAgICBSZW5kZXJWaWV3KiByZW5kZXJW aWV3ID0gMDsKLSAgICBMZW5ndGggcGFkZGluZyA9IHN0eWxlKCktPnBhZGRpbmdFbmQoKTsKICAg ICBpZiAocGFkZGluZy5pc1BlcmNlbnQoKSkKICAgICAgICAgdyA9IGNvbnRhaW5pbmdCbG9ja0xv Z2ljYWxXaWR0aEZvckNvbnRlbnQoKTsKICAgICBlbHNlIGlmIChwYWRkaW5nLmlzVmlld3BvcnRQ ZXJjZW50YWdlKCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9k ZWxPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94TW9kZWxPYmplY3QuaAkocmV2aXNpb24gMTQxNTA0KQorKysgU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTkxLDE0ICs5 MSwxNCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBJbnRSZWN0IGJvcmRlckJvdW5kaW5nQm94KCkg Y29uc3QgPSAwOwogCiAgICAgLy8gVGhlc2UgcmV0dXJuIHRoZSBDU1MgY29tcHV0ZWQgcGFkZGlu ZyB2YWx1ZXMuCi0gICAgTGF5b3V0VW5pdCBjb21wdXRlZENTU1BhZGRpbmdUb3AoKSBjb25zdDsK LSAgICBMYXlvdXRVbml0IGNvbXB1dGVkQ1NTUGFkZGluZ0JvdHRvbSgpIGNvbnN0OwotICAgIExh eW91dFVuaXQgY29tcHV0ZWRDU1NQYWRkaW5nTGVmdCgpIGNvbnN0OwotICAgIExheW91dFVuaXQg Y29tcHV0ZWRDU1NQYWRkaW5nUmlnaHQoKSBjb25zdDsKLSAgICBMYXlvdXRVbml0IGNvbXB1dGVk Q1NTUGFkZGluZ0JlZm9yZSgpIGNvbnN0OwotICAgIExheW91dFVuaXQgY29tcHV0ZWRDU1NQYWRk aW5nQWZ0ZXIoKSBjb25zdDsKLSAgICBMYXlvdXRVbml0IGNvbXB1dGVkQ1NTUGFkZGluZ1N0YXJ0 KCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBjb21wdXRlZENTU1BhZGRpbmdFbmQoKSBjb25zdDsK KyAgICBMYXlvdXRVbml0IGNvbXB1dGVkQ1NTUGFkZGluZ1RvcCgpIGNvbnN0IHsgcmV0dXJuIGNv bXB1dGVkQ1NTUGFkZGluZyhzdHlsZSgpLT5wYWRkaW5nVG9wKCkpOyB9CisgICAgTGF5b3V0VW5p dCBjb21wdXRlZENTU1BhZGRpbmdCb3R0b20oKSBjb25zdCB7IHJldHVybiBjb21wdXRlZENTU1Bh ZGRpbmcoc3R5bGUoKS0+cGFkZGluZ0JvdHRvbSgpKTsgfQorICAgIExheW91dFVuaXQgY29tcHV0 ZWRDU1NQYWRkaW5nTGVmdCgpIGNvbnN0IHsgcmV0dXJuIGNvbXB1dGVkQ1NTUGFkZGluZyhzdHls ZSgpLT5wYWRkaW5nTGVmdCgpKTsgfQorICAgIExheW91dFVuaXQgY29tcHV0ZWRDU1NQYWRkaW5n UmlnaHQoKSBjb25zdCB7IHJldHVybiBjb21wdXRlZENTU1BhZGRpbmcoc3R5bGUoKS0+cGFkZGlu Z1JpZ2h0KCkpOyB9CisgICAgTGF5b3V0VW5pdCBjb21wdXRlZENTU1BhZGRpbmdCZWZvcmUoKSBj b25zdCB7IHJldHVybiBjb21wdXRlZENTU1BhZGRpbmcoc3R5bGUoKS0+cGFkZGluZ0JlZm9yZSgp KTsgfQorICAgIExheW91dFVuaXQgY29tcHV0ZWRDU1NQYWRkaW5nQWZ0ZXIoKSBjb25zdCB7IHJl dHVybiBjb21wdXRlZENTU1BhZGRpbmcoc3R5bGUoKS0+cGFkZGluZ0FmdGVyKCkpOyB9CisgICAg TGF5b3V0VW5pdCBjb21wdXRlZENTU1BhZGRpbmdTdGFydCgpIGNvbnN0IHsgcmV0dXJuIGNvbXB1 dGVkQ1NTUGFkZGluZyhzdHlsZSgpLT5wYWRkaW5nU3RhcnQoKSk7IH0KKyAgICBMYXlvdXRVbml0 IGNvbXB1dGVkQ1NTUGFkZGluZ0VuZCgpIGNvbnN0IHsgcmV0dXJuIGNvbXB1dGVkQ1NTUGFkZGlu ZyhzdHlsZSgpLT5wYWRkaW5nRW5kKCkpOyB9CiAKICAgICAvLyBUaGVzZSBmdW5jdGlvbnMgYXJl IHVzZWQgZHVyaW5nIGxheW91dC4gVGFibGUgY2VsbHMgYW5kIHRoZSBNYXRoTUwKICAgICAvLyBj b2RlIG92ZXJyaWRlIHRoZW0gdG8gaW5jbHVkZSBzb21lIGV4dHJhIGludHJpbnNpYyBwYWRkaW5n LgpAQCAtMjc4LDYgKzI3OCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIG1vdmVDaGlsZHJlblRvKFJl bmRlckJveE1vZGVsT2JqZWN0KiB0b0JveE1vZGVsT2JqZWN0LCBSZW5kZXJPYmplY3QqIHN0YXJ0 Q2hpbGQsIFJlbmRlck9iamVjdCogZW5kQ2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQs IGJvb2wgZnVsbFJlbW92ZUluc2VydCA9IGZhbHNlKTsKIAogcHJpdmF0ZToKKyAgICBMYXlvdXRV bml0IGNvbXB1dGVkQ1NTUGFkZGluZyhMZW5ndGgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBp c0JveE1vZGVsT2JqZWN0KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogICAgIAogICAgIHZpcnR1 YWwgTGF5b3V0UmVjdCBmcmFtZVJlY3RGb3JTdGlja3lQb3NpdGlvbmluZygpIGNvbnN0ID0gMDsK