183187 2018-02-27 15:24:46 -0800 Remove RenderElement::s_affectsParentBlock 2018-02-28 08:31:39 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue fred.wang koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1402444 0 zalan 2018-02-27 15:24:46 -0800 This is a hack to track state change between styleWillChange and styleDidChange. 1402465 1 webkit-bug-importer 2018-02-27 16:14:09 -0800 <rdar://problem/37961079> 1402466 2 334712 zalan 2018-02-27 16:19:46 -0800 Created attachment 334712 Patch 1402515 3 334724 zalan 2018-02-27 19:22:10 -0800 Created attachment 334724 Patch 1402595 4 334724 fred.wang 2018-02-28 07:15:55 -0800 Comment on attachment 334724 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=334724&action=review > Source/WebCore/rendering/RenderElement.cpp:-97 > -bool RenderElement::s_affectsParentBlock = false; Any reason why you do the removal of s_noLongerAffectsParentBlock in the separate bug 183196? Or it's just to be careful and do smaller changes? > Source/WebCore/rendering/RenderElement.cpp:-773 > - s_affectsParentBlock = false; Normally you should remove braces per https://webkit.org/code-style-guidelines/#braces-one-line although I understand this else will eventually go away. > Source/WebCore/rendering/RenderElement.cpp:812 > + && parent() && (parent()->isRenderBlockFlow() || parent()->isRenderInline())) { I wonder whether keeping a local affectsParentBlock variable would help making the meaning of this big conditional more explicit or whether the comment is enough. 1402597 5 koivisto 2018-02-28 07:19:23 -0800 r=me 1402601 6 zalan 2018-02-28 07:30:35 -0800 (In reply to Frédéric Wang (:fredw) from comment #4) > Comment on attachment 334724 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=334724&action=review > > > Source/WebCore/rendering/RenderElement.cpp:-97 > > -bool RenderElement::s_affectsParentBlock = false; > > Any reason why you do the removal of s_noLongerAffectsParentBlock in the > separate bug 183196? Or it's just to be careful and do smaller changes? > just being careful (moving the s_noLongerAffectsParentBlock needs a bit more work since it has a bit of a dependency) > > Source/WebCore/rendering/RenderElement.cpp:-773 > > - s_affectsParentBlock = false; > > Normally you should remove braces per > https://webkit.org/code-style-guidelines/#braces-one-line although I > understand this else will eventually go away. Yeah, I'll remove the braces anyway. > > > Source/WebCore/rendering/RenderElement.cpp:812 > > + && parent() && (parent()->isRenderBlockFlow() || parent()->isRenderInline())) { > > I wonder whether keeping a local affectsParentBlock variable would help > making the meaning of this big conditional more explicit or whether the > comment is enough. I was thinking about that too but for some reason I decided not to. but now I am leaning towards having the variable there. 1402609 7 zalan 2018-02-28 07:53:50 -0800 (In reply to zalan from comment #6) > (In reply to Frédéric Wang (:fredw) from comment #4) > > Comment on attachment 334724 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=334724&action=review > > > > > Source/WebCore/rendering/RenderElement.cpp:-97 > > > -bool RenderElement::s_affectsParentBlock = false; > > > > Any reason why you do the removal of s_noLongerAffectsParentBlock in the > > separate bug 183196? Or it's just to be careful and do smaller changes? > > > just being careful (moving the s_noLongerAffectsParentBlock needs a bit more > work since it has a bit of a dependency) > > > > Source/WebCore/rendering/RenderElement.cpp:-773 > > > - s_affectsParentBlock = false; > > > > Normally you should remove braces per > > https://webkit.org/code-style-guidelines/#braces-one-line although I > > understand this else will eventually go away. > Yeah, I'll remove the braces anyway. > > > > > > Source/WebCore/rendering/RenderElement.cpp:812 > > > + && parent() && (parent()->isRenderBlockFlow() || parent()->isRenderInline())) { > > > > I wonder whether keeping a local affectsParentBlock variable would help > > making the meaning of this big conditional more explicit or whether the > > comment is enough. > I was thinking about that too but for some reason I decided not to. but now > I am leaning towards having the variable there. Though this is all temporary anyway since the point of this exercise is to move the mutation logic to the tree updater. 1402610 8 334744 zalan 2018-02-28 07:56:04 -0800 Created attachment 334744 Patch 1402612 9 334744 commit-queue 2018-02-28 08:31:38 -0800 Comment on attachment 334744 Patch Clearing flags on attachment: 334744 Committed r229091: <https://trac.webkit.org/changeset/229091> 1402613 10 commit-queue 2018-02-28 08:31:39 -0800 All reviewed patches have been landed. Closing bug. 334712 2018-02-27 16:19:46 -0800 2018-02-27 19:22:09 -0800 Patch bug-183187-20180227161945.patch text/plain 3801 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4OTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjIwYWM5NDFhOGM0ODE0 NmY2OTEwYzVkNTNmOTJmZGY3MmJhZDhkMS4uYjZiOTAxNjc4ZGQ3ZTkyMDk4NTY1NmJjYThkMmZj MDAwMTM4YjVmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTAyLTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIFJlbmRlckVsZW1l bnQ6OnNfYWZmZWN0c1BhcmVudEJsb2NrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODMxODcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM3OTYxMDc5 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdJUAor CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyRWxlbWVudDo6c3R5bGVXaWxsQ2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckVsZW1lbnQ6OnN0eWxlRGlkQ2hhbmdlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy RWxlbWVudC5oOgorCiAyMDE4LTAyLTIzICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVyXSBNb3ZlIFJlbmRlckZ1bGxTY3JlZW46OmNy ZWF0ZVBsYWNlaG9sZGVyIHRvIFJlbmRlclRyZWVCdWlsZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKaW5kZXggMjRjZTExNjFkZWE2ZmE0Y2UzNGI0MmVjMGI0 NWZmYTQxMzdkMmZkZi4uMmI4YjZhYzA1ZmVlODRhMmZmZmJjN2Y3NjdiMmNiYzU3MWYzMTEwYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcApAQCAtOTQsNyAr OTQsNiBAQCBzdHJ1Y3QgU2FtZVNpemVBc1JlbmRlckVsZW1lbnQgOiBwdWJsaWMgUmVuZGVyT2Jq ZWN0IHsKIAogc3RhdGljX2Fzc2VydChzaXplb2YoUmVuZGVyRWxlbWVudCkgPT0gc2l6ZW9mKFNh bWVTaXplQXNSZW5kZXJFbGVtZW50KSwgIlJlbmRlckVsZW1lbnQgc2hvdWxkIHN0YXkgc21hbGwi KTsKIAotYm9vbCBSZW5kZXJFbGVtZW50OjpzX2FmZmVjdHNQYXJlbnRCbG9jayA9IGZhbHNlOwog Ym9vbCBSZW5kZXJFbGVtZW50OjpzX25vTG9uZ2VyQWZmZWN0c1BhcmVudEJsb2NrID0gZmFsc2U7 CiAgICAgCiBpbmxpbmUgUmVuZGVyRWxlbWVudDo6UmVuZGVyRWxlbWVudChDb250YWluZXJOb2Rl JiBlbGVtZW50T3JEb2N1bWVudCwgUmVuZGVyU3R5bGUmJiBzdHlsZSwgQmFzZVR5cGVGbGFncyBi YXNlVHlwZUZsYWdzKQpAQCAtNzQ5LDEwICs3NDgsNiBAQCB2b2lkIFJlbmRlckVsZW1lbnQ6OnN0 eWxlV2lsbENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUmIG5l dwogICAgICAgICAgICAgZG93bmNhc3Q8UmVuZGVyQm94PigqdGhpcykucmVtb3ZlRmxvYXRpbmdP clBvc2l0aW9uZWRDaGlsZEZyb21CbG9ja0xpc3RzKCk7CiAgICAgICAgIH0KIAotICAgICAgICBz X2FmZmVjdHNQYXJlbnRCbG9jayA9IGlzRmxvYXRpbmdPck91dE9mRmxvd1Bvc2l0aW9uZWQoKQot ICAgICAgICAgICAgJiYgKCFuZXdTdHlsZS5pc0Zsb2F0aW5nKCkgJiYgIW5ld1N0eWxlLmhhc091 dE9mRmxvd1Bvc2l0aW9uKCkpCi0gICAgICAgICAgICAmJiBwYXJlbnQoKSAmJiAocGFyZW50KCkt PmlzUmVuZGVyQmxvY2tGbG93KCkgfHwgcGFyZW50KCktPmlzUmVuZGVySW5saW5lKCkpOwotCiAg ICAgICAgIHNfbm9Mb25nZXJBZmZlY3RzUGFyZW50QmxvY2sgPSAoKCFpc0Zsb2F0aW5nKCkgJiYg bmV3U3R5bGUuaXNGbG9hdGluZygpKSB8fCAoIWlzT3V0T2ZGbG93UG9zaXRpb25lZCgpICYmIG5l d1N0eWxlLmhhc091dE9mRmxvd1Bvc2l0aW9uKCkpKQogICAgICAgICAgICAgJiYgcGFyZW50KCkg JiYgcGFyZW50KCktPmlzUmVuZGVyQmxvY2soKTsKIApAQCAtNzcwLDcgKzc2NSw2IEBAIHZvaWQg UmVuZGVyRWxlbWVudDo6c3R5bGVXaWxsQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25z dCBSZW5kZXJTdHlsZSYgbmV3CiAgICAgICAgIHNldEhhc1RyYW5zZm9ybVJlbGF0ZWRQcm9wZXJ0 eShmYWxzZSk7CiAgICAgICAgIHNldEhhc1JlZmxlY3Rpb24oZmFsc2UpOwogICAgIH0gZWxzZSB7 Ci0gICAgICAgIHNfYWZmZWN0c1BhcmVudEJsb2NrID0gZmFsc2U7CiAgICAgICAgIHNfbm9Mb25n ZXJBZmZlY3RzUGFyZW50QmxvY2sgPSBmYWxzZTsKICAgICB9CiAKQEAgLTgxMyw3ICs4MDcsOSBA QCB2b2lkIFJlbmRlckVsZW1lbnQ6OnN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZm LCBjb25zdCBSZW5kZXJTdHlsZSogb2xkUwogICAgIHVwZGF0ZUltYWdlKG9sZFN0eWxlID8gb2xk U3R5bGUtPm1hc2tCb3hJbWFnZSgpLmltYWdlKCkgOiBudWxscHRyLCBtX3N0eWxlLm1hc2tCb3hJ bWFnZSgpLmltYWdlKCkpOwogICAgIHVwZGF0ZVNoYXBlSW1hZ2Uob2xkU3R5bGUgPyBvbGRTdHls ZS0+c2hhcGVPdXRzaWRlKCkgOiBudWxscHRyLCBtX3N0eWxlLnNoYXBlT3V0c2lkZSgpKTsKIAot ICAgIGlmIChzX2FmZmVjdHNQYXJlbnRCbG9jaykgeworICAgIGlmIChvbGRTdHlsZSAmJiAob2xk U3R5bGUtPmlzRmxvYXRpbmcoKSB8fCBvbGRTdHlsZS0+aGFzT3V0T2ZGbG93UG9zaXRpb24oKSkK KyAgICAgICAgJiYgIXN0eWxlKCkuaXNGbG9hdGluZygpICYmICFzdHlsZSgpLmhhc091dE9mRmxv d1Bvc2l0aW9uKCkKKyAgICAgICAgJiYgcGFyZW50KCkgJiYgKHBhcmVudCgpLT5pc1JlbmRlckJs b2NrRmxvdygpIHx8IHBhcmVudCgpLT5pc1JlbmRlcklubGluZSgpKSkgewogICAgICAgICAvLyBX ZSBoYXZlIGdvbmUgZnJvbSBub3QgYWZmZWN0aW5nIHRoZSBpbmxpbmUgc3RhdHVzIG9mIHRoZSBw YXJlbnQgZmxvdyB0byBzdWRkZW5seQogICAgICAgICAvLyBoYXZpbmcgYW4gaW1wYWN0LiBTZWUg aWYgdGhlcmUgaXMgYSBtaXNtYXRjaCBiZXR3ZWVuIHRoZSBwYXJlbnQgZmxvdydzCiAgICAgICAg IC8vIGNoaWxkcmVuSW5saW5lKCkgc3RhdGUgYW5kIG91ciBzdGF0ZS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oCmluZGV4IGFmOTVlM2U5YjQ0NTEzZDM1OTU0Y2Y2ZWUw NWQ3YTFiYjk0MGU1MTIuLjE2MWNmY2I4ZTZiNWJhZDAwYTEwNTRkYzZhMTk4MDM4ZmQ3OGEwMWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaApAQCAtMzUxLDcgKzM1 MSw2IEBAIHByaXZhdGU6CiAKICAgICAvLyBGSVhNRTogR2V0IHJpZCBvZiB0aGlzIGhhY2suCiAg ICAgLy8gU3RvcmUgc3RhdGUgYmV0d2VlbiBzdHlsZVdpbGxDaGFuZ2UgYW5kIHN0eWxlRGlkQ2hh bmdlCi0gICAgc3RhdGljIGJvb2wgc19hZmZlY3RzUGFyZW50QmxvY2s7CiAgICAgc3RhdGljIGJv b2wgc19ub0xvbmdlckFmZmVjdHNQYXJlbnRCbG9jazsKIH07CiAK 334724 2018-02-27 19:22:10 -0800 2018-02-28 07:56:03 -0800 Patch bug-183187-20180227192209.patch text/plain 3933 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4OTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjIwYWM5NDFhOGM0ODE0 NmY2OTEwYzVkNTNmOTJmZGY3MmJhZDhkMS4uYjdiYTBjOTk4YWQwYmZmYmQyNGY4MTZiZGJlNmM3 ZDU0OTBiNjcwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTAyLTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIFJlbmRlckVsZW1l bnQ6OnNfYWZmZWN0c1BhcmVudEJsb2NrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODMxODcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM3OTYxMDc5 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92 ZSB0aGUgaGFjayB0byB0cmFjayBmbG9hdGluZy9vdXQtb2YtZmxvdyBjaGFuZ2VzIGJldHdlZW4g c3R5bGVXaWxsQ2hhbmdlIGFuZCBzdHlsZURpZENoYW5nZS4KKworICAgICAgICBDb3ZlcmVkIGJ5 IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVudDo6c3R5bGVXaWxsQ2hhbmdlKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckVsZW1lbnQ6OnN0eWxlRGlkQ2hhbmdlKToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oOgorCiAyMDE4LTAyLTIzICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVyXSBNb3ZlIFJl bmRlckZ1bGxTY3JlZW46OmNyZWF0ZVBsYWNlaG9sZGVyIHRvIFJlbmRlclRyZWVCdWlsZGVyCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKaW5kZXggMjRjZTExNjFk ZWE2ZmE0Y2UzNGI0MmVjMGI0NWZmYTQxMzdkMmZkZi4uMmI4YjZhYzA1ZmVlODRhMmZmZmJjN2Y3 NjdiMmNiYzU3MWYzMTEwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVt ZW50LmNwcApAQCAtOTQsNyArOTQsNiBAQCBzdHJ1Y3QgU2FtZVNpemVBc1JlbmRlckVsZW1lbnQg OiBwdWJsaWMgUmVuZGVyT2JqZWN0IHsKIAogc3RhdGljX2Fzc2VydChzaXplb2YoUmVuZGVyRWxl bWVudCkgPT0gc2l6ZW9mKFNhbWVTaXplQXNSZW5kZXJFbGVtZW50KSwgIlJlbmRlckVsZW1lbnQg c2hvdWxkIHN0YXkgc21hbGwiKTsKIAotYm9vbCBSZW5kZXJFbGVtZW50OjpzX2FmZmVjdHNQYXJl bnRCbG9jayA9IGZhbHNlOwogYm9vbCBSZW5kZXJFbGVtZW50OjpzX25vTG9uZ2VyQWZmZWN0c1Bh cmVudEJsb2NrID0gZmFsc2U7CiAgICAgCiBpbmxpbmUgUmVuZGVyRWxlbWVudDo6UmVuZGVyRWxl bWVudChDb250YWluZXJOb2RlJiBlbGVtZW50T3JEb2N1bWVudCwgUmVuZGVyU3R5bGUmJiBzdHls ZSwgQmFzZVR5cGVGbGFncyBiYXNlVHlwZUZsYWdzKQpAQCAtNzQ5LDEwICs3NDgsNiBAQCB2b2lk IFJlbmRlckVsZW1lbnQ6OnN0eWxlV2lsbENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29u c3QgUmVuZGVyU3R5bGUmIG5ldwogICAgICAgICAgICAgZG93bmNhc3Q8UmVuZGVyQm94PigqdGhp cykucmVtb3ZlRmxvYXRpbmdPclBvc2l0aW9uZWRDaGlsZEZyb21CbG9ja0xpc3RzKCk7CiAgICAg ICAgIH0KIAotICAgICAgICBzX2FmZmVjdHNQYXJlbnRCbG9jayA9IGlzRmxvYXRpbmdPck91dE9m Rmxvd1Bvc2l0aW9uZWQoKQotICAgICAgICAgICAgJiYgKCFuZXdTdHlsZS5pc0Zsb2F0aW5nKCkg JiYgIW5ld1N0eWxlLmhhc091dE9mRmxvd1Bvc2l0aW9uKCkpCi0gICAgICAgICAgICAmJiBwYXJl bnQoKSAmJiAocGFyZW50KCktPmlzUmVuZGVyQmxvY2tGbG93KCkgfHwgcGFyZW50KCktPmlzUmVu ZGVySW5saW5lKCkpOwotCiAgICAgICAgIHNfbm9Mb25nZXJBZmZlY3RzUGFyZW50QmxvY2sgPSAo KCFpc0Zsb2F0aW5nKCkgJiYgbmV3U3R5bGUuaXNGbG9hdGluZygpKSB8fCAoIWlzT3V0T2ZGbG93 UG9zaXRpb25lZCgpICYmIG5ld1N0eWxlLmhhc091dE9mRmxvd1Bvc2l0aW9uKCkpKQogICAgICAg ICAgICAgJiYgcGFyZW50KCkgJiYgcGFyZW50KCktPmlzUmVuZGVyQmxvY2soKTsKIApAQCAtNzcw LDcgKzc2NSw2IEBAIHZvaWQgUmVuZGVyRWxlbWVudDo6c3R5bGVXaWxsQ2hhbmdlKFN0eWxlRGlm ZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3CiAgICAgICAgIHNldEhhc1RyYW5z Zm9ybVJlbGF0ZWRQcm9wZXJ0eShmYWxzZSk7CiAgICAgICAgIHNldEhhc1JlZmxlY3Rpb24oZmFs c2UpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIHNfYWZmZWN0c1BhcmVudEJsb2NrID0gZmFsc2U7 CiAgICAgICAgIHNfbm9Mb25nZXJBZmZlY3RzUGFyZW50QmxvY2sgPSBmYWxzZTsKICAgICB9CiAK QEAgLTgxMyw3ICs4MDcsOSBAQCB2b2lkIFJlbmRlckVsZW1lbnQ6OnN0eWxlRGlkQ2hhbmdlKFN0 eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSogb2xkUwogICAgIHVwZGF0ZUlt YWdlKG9sZFN0eWxlID8gb2xkU3R5bGUtPm1hc2tCb3hJbWFnZSgpLmltYWdlKCkgOiBudWxscHRy LCBtX3N0eWxlLm1hc2tCb3hJbWFnZSgpLmltYWdlKCkpOwogICAgIHVwZGF0ZVNoYXBlSW1hZ2Uo b2xkU3R5bGUgPyBvbGRTdHlsZS0+c2hhcGVPdXRzaWRlKCkgOiBudWxscHRyLCBtX3N0eWxlLnNo YXBlT3V0c2lkZSgpKTsKIAotICAgIGlmIChzX2FmZmVjdHNQYXJlbnRCbG9jaykgeworICAgIGlm IChvbGRTdHlsZSAmJiAob2xkU3R5bGUtPmlzRmxvYXRpbmcoKSB8fCBvbGRTdHlsZS0+aGFzT3V0 T2ZGbG93UG9zaXRpb24oKSkKKyAgICAgICAgJiYgIXN0eWxlKCkuaXNGbG9hdGluZygpICYmICFz dHlsZSgpLmhhc091dE9mRmxvd1Bvc2l0aW9uKCkKKyAgICAgICAgJiYgcGFyZW50KCkgJiYgKHBh cmVudCgpLT5pc1JlbmRlckJsb2NrRmxvdygpIHx8IHBhcmVudCgpLT5pc1JlbmRlcklubGluZSgp KSkgewogICAgICAgICAvLyBXZSBoYXZlIGdvbmUgZnJvbSBub3QgYWZmZWN0aW5nIHRoZSBpbmxp bmUgc3RhdHVzIG9mIHRoZSBwYXJlbnQgZmxvdyB0byBzdWRkZW5seQogICAgICAgICAvLyBoYXZp bmcgYW4gaW1wYWN0LiBTZWUgaWYgdGhlcmUgaXMgYSBtaXNtYXRjaCBiZXR3ZWVuIHRoZSBwYXJl bnQgZmxvdydzCiAgICAgICAgIC8vIGNoaWxkcmVuSW5saW5lKCkgc3RhdGUgYW5kIG91ciBzdGF0 ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oCmluZGV4IGFmOTVlM2U5 YjQ0NTEzZDM1OTU0Y2Y2ZWUwNWQ3YTFiYjk0MGU1MTIuLjE2MWNmY2I4ZTZiNWJhZDAwYTEwNTRk YzZhMTk4MDM4ZmQ3OGEwMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1l bnQuaApAQCAtMzUxLDcgKzM1MSw2IEBAIHByaXZhdGU6CiAKICAgICAvLyBGSVhNRTogR2V0IHJp ZCBvZiB0aGlzIGhhY2suCiAgICAgLy8gU3RvcmUgc3RhdGUgYmV0d2VlbiBzdHlsZVdpbGxDaGFu Z2UgYW5kIHN0eWxlRGlkQ2hhbmdlCi0gICAgc3RhdGljIGJvb2wgc19hZmZlY3RzUGFyZW50Qmxv Y2s7CiAgICAgc3RhdGljIGJvb2wgc19ub0xvbmdlckFmZmVjdHNQYXJlbnRCbG9jazsKIH07CiAK 334744 2018-02-28 07:56:04 -0800 2018-02-28 08:31:38 -0800 Patch bug-183187-20180228075604.patch text/plain 4155 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5MDg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGRlZTI4NGI3NGVjNDhl M2U0OTQ4M2Y0NWZiZTk1ZTdkNjY3YTMwZS4uMjcxOGExYWZmY2VhZDFhZGY3Nzc5ZDVhZTlhMDJm Mzg1ZDc1OTIwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTAyLTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIFJlbmRlckVsZW1l bnQ6OnNfYWZmZWN0c1BhcmVudEJsb2NrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODMxODcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM3OTYxMDc5 PgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFJlbW92 ZSB0aGUgaGFjayB0byB0cmFjayBmbG9hdGluZy9vdXQtb2YtZmxvdyBjaGFuZ2VzIGJldHdlZW4g c3R5bGVXaWxsQ2hhbmdlIGFuZCBzdHlsZURpZENoYW5nZS4KKworICAgICAgICBDb3ZlcmVkIGJ5 IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVudDo6c3R5bGVXaWxsQ2hhbmdlKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckVsZW1lbnQ6OnN0eWxlRGlkQ2hhbmdlKToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oOgorCiAyMDE4LTAyLTI3ICBTZXJnaW8gVmlsbGFy IFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXZWJWUl0gQ29udmVydCBW UlBsYXRmb3JtRGlzcGxheUluZm8gaW50byBhIGNsYXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRWxlbWVudC5jcHAKaW5kZXggMjRjZTExNjFkZWE2ZmE0Y2UzNGI0MmVjMGI0NWZm YTQxMzdkMmZkZi4uNDExYTAyYmVkMjA5OGM3NzA4ZDM1ODg3YWRlNDU4NWIwYWNkNmExMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcApAQCAtOTQsNyArOTQs NiBAQCBzdHJ1Y3QgU2FtZVNpemVBc1JlbmRlckVsZW1lbnQgOiBwdWJsaWMgUmVuZGVyT2JqZWN0 IHsKIAogc3RhdGljX2Fzc2VydChzaXplb2YoUmVuZGVyRWxlbWVudCkgPT0gc2l6ZW9mKFNhbWVT aXplQXNSZW5kZXJFbGVtZW50KSwgIlJlbmRlckVsZW1lbnQgc2hvdWxkIHN0YXkgc21hbGwiKTsK IAotYm9vbCBSZW5kZXJFbGVtZW50OjpzX2FmZmVjdHNQYXJlbnRCbG9jayA9IGZhbHNlOwogYm9v bCBSZW5kZXJFbGVtZW50OjpzX25vTG9uZ2VyQWZmZWN0c1BhcmVudEJsb2NrID0gZmFsc2U7CiAg ICAgCiBpbmxpbmUgUmVuZGVyRWxlbWVudDo6UmVuZGVyRWxlbWVudChDb250YWluZXJOb2RlJiBl bGVtZW50T3JEb2N1bWVudCwgUmVuZGVyU3R5bGUmJiBzdHlsZSwgQmFzZVR5cGVGbGFncyBiYXNl VHlwZUZsYWdzKQpAQCAtNzQ5LDEwICs3NDgsNiBAQCB2b2lkIFJlbmRlckVsZW1lbnQ6OnN0eWxl V2lsbENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUmIG5ldwog ICAgICAgICAgICAgZG93bmNhc3Q8UmVuZGVyQm94PigqdGhpcykucmVtb3ZlRmxvYXRpbmdPclBv c2l0aW9uZWRDaGlsZEZyb21CbG9ja0xpc3RzKCk7CiAgICAgICAgIH0KIAotICAgICAgICBzX2Fm ZmVjdHNQYXJlbnRCbG9jayA9IGlzRmxvYXRpbmdPck91dE9mRmxvd1Bvc2l0aW9uZWQoKQotICAg ICAgICAgICAgJiYgKCFuZXdTdHlsZS5pc0Zsb2F0aW5nKCkgJiYgIW5ld1N0eWxlLmhhc091dE9m Rmxvd1Bvc2l0aW9uKCkpCi0gICAgICAgICAgICAmJiBwYXJlbnQoKSAmJiAocGFyZW50KCktPmlz UmVuZGVyQmxvY2tGbG93KCkgfHwgcGFyZW50KCktPmlzUmVuZGVySW5saW5lKCkpOwotCiAgICAg ICAgIHNfbm9Mb25nZXJBZmZlY3RzUGFyZW50QmxvY2sgPSAoKCFpc0Zsb2F0aW5nKCkgJiYgbmV3 U3R5bGUuaXNGbG9hdGluZygpKSB8fCAoIWlzT3V0T2ZGbG93UG9zaXRpb25lZCgpICYmIG5ld1N0 eWxlLmhhc091dE9mRmxvd1Bvc2l0aW9uKCkpKQogICAgICAgICAgICAgJiYgcGFyZW50KCkgJiYg cGFyZW50KCktPmlzUmVuZGVyQmxvY2soKTsKIApAQCAtNzY5LDEwICs3NjQsOCBAQCB2b2lkIFJl bmRlckVsZW1lbnQ6OnN0eWxlV2lsbENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3Qg UmVuZGVyU3R5bGUmIG5ldwogICAgICAgICBzZXRIYXNPdmVyZmxvd0NsaXAoZmFsc2UpOwogICAg ICAgICBzZXRIYXNUcmFuc2Zvcm1SZWxhdGVkUHJvcGVydHkoZmFsc2UpOwogICAgICAgICBzZXRI YXNSZWZsZWN0aW9uKGZhbHNlKTsKLSAgICB9IGVsc2UgewotICAgICAgICBzX2FmZmVjdHNQYXJl bnRCbG9jayA9IGZhbHNlOworICAgIH0gZWxzZQogICAgICAgICBzX25vTG9uZ2VyQWZmZWN0c1Bh cmVudEJsb2NrID0gZmFsc2U7Ci0gICAgfQogCiAgICAgYm9vbCBuZXdTdHlsZVNsb3dTY3JvbGwg PSBmYWxzZTsKICAgICBpZiAobmV3U3R5bGUuaGFzRml4ZWRCYWNrZ3JvdW5kSW1hZ2UoKSAmJiAh c2V0dGluZ3MoKS5maXhlZEJhY2tncm91bmRzUGFpbnRSZWxhdGl2ZVRvRG9jdW1lbnQoKSkgewpA QCAtODEzLDcgKzgwNiwxMCBAQCB2b2lkIFJlbmRlckVsZW1lbnQ6OnN0eWxlRGlkQ2hhbmdlKFN0 eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSogb2xkUwogICAgIHVwZGF0ZUlt YWdlKG9sZFN0eWxlID8gb2xkU3R5bGUtPm1hc2tCb3hJbWFnZSgpLmltYWdlKCkgOiBudWxscHRy LCBtX3N0eWxlLm1hc2tCb3hJbWFnZSgpLmltYWdlKCkpOwogICAgIHVwZGF0ZVNoYXBlSW1hZ2Uo b2xkU3R5bGUgPyBvbGRTdHlsZS0+c2hhcGVPdXRzaWRlKCkgOiBudWxscHRyLCBtX3N0eWxlLnNo YXBlT3V0c2lkZSgpKTsKIAotICAgIGlmIChzX2FmZmVjdHNQYXJlbnRCbG9jaykgeworICAgIGJv b2wgYWZmZWN0c1BhcmVudEJsb2NrID0gb2xkU3R5bGUgJiYgKG9sZFN0eWxlLT5pc0Zsb2F0aW5n KCkgfHwgb2xkU3R5bGUtPmhhc091dE9mRmxvd1Bvc2l0aW9uKCkpCisgICAgICAgICYmICFzdHls ZSgpLmlzRmxvYXRpbmcoKSAmJiAhc3R5bGUoKS5oYXNPdXRPZkZsb3dQb3NpdGlvbigpCisgICAg ICAgICYmIHBhcmVudCgpICYmIChwYXJlbnQoKS0+aXNSZW5kZXJCbG9ja0Zsb3coKSB8fCBwYXJl bnQoKS0+aXNSZW5kZXJJbmxpbmUoKSk7CisgICAgaWYgKGFmZmVjdHNQYXJlbnRCbG9jaykgewog ICAgICAgICAvLyBXZSBoYXZlIGdvbmUgZnJvbSBub3QgYWZmZWN0aW5nIHRoZSBpbmxpbmUgc3Rh dHVzIG9mIHRoZSBwYXJlbnQgZmxvdyB0byBzdWRkZW5seQogICAgICAgICAvLyBoYXZpbmcgYW4g aW1wYWN0LiBTZWUgaWYgdGhlcmUgaXMgYSBtaXNtYXRjaCBiZXR3ZWVuIHRoZSBwYXJlbnQgZmxv dydzCiAgICAgICAgIC8vIGNoaWxkcmVuSW5saW5lKCkgc3RhdGUgYW5kIG91ciBzdGF0ZS4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmggYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oCmluZGV4IGFmOTVlM2U5YjQ0NTEz ZDM1OTU0Y2Y2ZWUwNWQ3YTFiYjk0MGU1MTIuLjE2MWNmY2I4ZTZiNWJhZDAwYTEwNTRkYzZhMTk4 MDM4ZmQ3OGEwMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJF bGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaApA QCAtMzUxLDcgKzM1MSw2IEBAIHByaXZhdGU6CiAKICAgICAvLyBGSVhNRTogR2V0IHJpZCBvZiB0 aGlzIGhhY2suCiAgICAgLy8gU3RvcmUgc3RhdGUgYmV0d2VlbiBzdHlsZVdpbGxDaGFuZ2UgYW5k IHN0eWxlRGlkQ2hhbmdlCi0gICAgc3RhdGljIGJvb2wgc19hZmZlY3RzUGFyZW50QmxvY2s7CiAg ICAgc3RhdGljIGJvb2wgc19ub0xvbmdlckFmZmVjdHNQYXJlbnRCbG9jazsKIH07CiAK