96704 2012-09-13 16:23:12 -0700 Simplify some code in RenderBox::computePercentageLogicalHeight 2012-09-14 11:42:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth eric hyatt tony oldest_to_newest 720089 0 ojan 2012-09-13 16:23:12 -0700 Simplify some code in RenderBox::computePercentageLogicalHeight 720090 1 163996 ojan 2012-09-13 16:24:18 -0700 Created attachment 163996 Patch 720858 2 163996 tony 2012-09-14 09:58:21 -0700 Comment on attachment 163996 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=163996&action=review > Source/WebCore/rendering/RenderBox.cpp:-2129 > - // In quirks mode, blocks with auto height are skipped, and we keep looking for an enclosing > - // block that may have a specified height and then use it. In strict mode, this violates the > - // specification, which states that percentage heights just revert to auto if the containing > - // block has an auto height. We still skip anonymous containing blocks in both modes, though, and look I kind of like the comment about how quirks mode and standards mode are different. Maybe just rewrite it into a shorter sentence? > Source/WebCore/rendering/RenderBox.cpp:2130 > + while ((document()->inQuirksMode() || cb->isAnonymousBlock()) > + && !cb->isRenderView() && !cb->isTableCell() && !cb->isOutOfFlowPositioned() && cb->style()->logicalHeight().isAuto() && isHorizontalWritingMode() == cb->isHorizontalWritingMode()) { I find this impossible to read, even the old code was easier to read. Can we make a helper function or something? 720867 3 tony 2012-09-14 10:04:08 -0700 (In reply to comment #2) > (From update of attachment 163996 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=163996&action=review > > > Source/WebCore/rendering/RenderBox.cpp:2130 > > + while ((document()->inQuirksMode() || cb->isAnonymousBlock()) > > + && !cb->isRenderView() && !cb->isTableCell() && !cb->isOutOfFlowPositioned() && cb->style()->logicalHeight().isAuto() && isHorizontalWritingMode() == cb->isHorizontalWritingMode()) { > > I find this impossible to read, even the old code was easier to read. Can we make a helper function or something? Something like, bool shouldTraverseParentForPercentHeight() { return document()->inQuirksMode() || cb->isAnonymousBlock(); } and bool useParentHeightForPrecentHeight() { return !cb->isTableCell() && !cb->isOutOfFlowPositioned() && cb->style()->logicalHeight().isAuto() && isHorizontalWritingMode() == cb->isHorizontalWritingMode(); } So the while would be: while (!cb->isRenderView() && shouldTraverseParentForPercentHeight() && useParentHeightForPercentHeight()) { ... } 720965 4 164195 ojan 2012-09-14 11:17:39 -0700 Created attachment 164195 Patch 720987 5 ojan 2012-09-14 11:42:26 -0700 Committed r128633: <http://trac.webkit.org/changeset/128633> 163996 2012-09-13 16:24:18 -0700 2012-09-14 11:17:38 -0700 Patch bug-96704-20120913162350.patch text/plain 6140 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDg2YTVmMjQzYjM0ZDA4 MTFjOGVlMzg2OWQzNzk5MzBjMThiYTkyOC4uMjNiZjM3MmY3ZDVkZWZiZTk0MDllMjA1ZDAzMTYw MDAzZjMxMGUyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDEyLTA5LTEzICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgU2ltcGxpZnkgc29tZSBjb2Rl IGluIFJlbmRlckJveDo6Y29tcHV0ZVBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjcwNAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgc3RyaWN0bHkgY29k ZSBjbGVhbnVwLiBObyBiZWhhdmlvciBjaGFuZ2UuCisgICAgICAgIEFsc28gcmVtb3ZlZCBzb21l IGNvbW1lbnRzIHRoYXQgd2VyZSB3aGF0IGNvbW1lbnRzIGFuZC9vciB3ZXJlCisgICAgICAgIGdl dHRpbmcgc3RhbGUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZVBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0KToK KworMjAxMi0wOS0xMyAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAg IHBlcmNlbnRhZ2UgaGVpZ2h0cyBpbiBxdWlya3MgbW9kZSB3aXRoIGF1dG8tc2l6ZWQgYm9keSBh cmUgY29tcHV0ZWQgaW5jb3JyZWN0bHkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTk2NDI2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j cHAKaW5kZXggMmMzMzc1ZGEwZjU4NDI3MjI3NjJiYjg5YjU1ZjBlODhmMmZmMmUxNi4uYmMzZWNh ZjBkMzdlNDQ5ZGEzZjIzZDg5NzVhYmYwNTRlNjkyZDhmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5jcHAKQEAgLTIxMjMsMTcgKzIxMjMsMTEgQEAgTGF5b3V0VW5pdCBSZW5k ZXJCb3g6OmNvbXB1dGVQZXJjZW50YWdlTG9naWNhbEhlaWdodChjb25zdCBMZW5ndGgmIGhlaWdo dCkgY29uc3QKIHsKICAgICBMYXlvdXRVbml0IGF2YWlsYWJsZUhlaWdodCA9IC0xOwogICAgIAot ICAgIC8vIEluIHF1aXJrcyBtb2RlLCBibG9ja3Mgd2l0aCBhdXRvIGhlaWdodCBhcmUgc2tpcHBl ZCwgYW5kIHdlIGtlZXAgbG9va2luZyBmb3IgYW4gZW5jbG9zaW5nCi0gICAgLy8gYmxvY2sgdGhh dCBtYXkgaGF2ZSBhIHNwZWNpZmllZCBoZWlnaHQgYW5kIHRoZW4gdXNlIGl0LiBJbiBzdHJpY3Qg bW9kZSwgdGhpcyB2aW9sYXRlcyB0aGUKLSAgICAvLyBzcGVjaWZpY2F0aW9uLCB3aGljaCBzdGF0 ZXMgdGhhdCBwZXJjZW50YWdlIGhlaWdodHMganVzdCByZXZlcnQgdG8gYXV0byBpZiB0aGUgY29u dGFpbmluZwotICAgIC8vIGJsb2NrIGhhcyBhbiBhdXRvIGhlaWdodC4gV2Ugc3RpbGwgc2tpcCBh bm9ueW1vdXMgY29udGFpbmluZyBibG9ja3MgaW4gYm90aCBtb2RlcywgdGhvdWdoLCBhbmQgbG9v awotICAgIC8vIG9ubHkgYXQgZXhwbGljaXQgY29udGFpbmVycy4KICAgICBib29sIHNraXBwZWRB dXRvSGVpZ2h0Q29udGFpbmluZ0Jsb2NrID0gZmFsc2U7CiAgICAgUmVuZGVyQmxvY2sqIGNiID0g Y29udGFpbmluZ0Jsb2NrKCk7CiAgICAgTGF5b3V0VW5pdCByb290TWFyZ2luQm9yZGVyUGFkZGlu Z0hlaWdodCA9IDA7Ci0gICAgd2hpbGUgKCFjYi0+aXNSZW5kZXJWaWV3KCkgJiYgIWNiLT5pc1Rh YmxlQ2VsbCgpICYmICFjYi0+aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgY2ItPnN0eWxlKCkt PmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKSAmJiBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09 IGNiLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKSB7Ci0gICAgICAgIGlmICghZG9jdW1lbnQo KS0+aW5RdWlya3NNb2RlKCkgJiYgIWNiLT5pc0Fub255bW91c0Jsb2NrKCkpCi0gICAgICAgICAg ICBicmVhazsKKyAgICB3aGlsZSAoKGRvY3VtZW50KCktPmluUXVpcmtzTW9kZSgpIHx8IGNiLT5p c0Fub255bW91c0Jsb2NrKCkpCisgICAgICAgICYmICFjYi0+aXNSZW5kZXJWaWV3KCkgJiYgIWNi LT5pc1RhYmxlQ2VsbCgpICYmICFjYi0+aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgY2ItPnN0 eWxlKCktPmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKSAmJiBpc0hvcml6b250YWxXcml0aW5nTW9k ZSgpID09IGNiLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKSB7CiAgICAgICAgIGlmIChjYi0+ aXNCb2R5KCkgfHwgY2ItPmlzUm9vdCgpKQogICAgICAgICAgICAgcm9vdE1hcmdpbkJvcmRlclBh ZGRpbmdIZWlnaHQgKz0gY2ItPm1hcmdpbkJlZm9yZSgpICsgY2ItPm1hcmdpbkFmdGVyKCkgKyBj Yi0+Ym9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgc2tpcHBlZEF1dG9I ZWlnaHRDb250YWluaW5nQmxvY2sgPSB0cnVlOwpAQCAtMjE1MywyOSArMjE0NywyNiBAQCBMYXlv dXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZVBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0KGNvbnN0IExl bmd0aCYgaGVpZ2h0KSBjb25zdAogCiAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkg IT0gY2ItPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCiAgICAgICAgIGF2YWlsYWJsZUhlaWdo dCA9IGNiLT5jb250ZW50TG9naWNhbFdpZHRoKCk7Ci0gICAgZWxzZSBpZiAoY2ItPmlzVGFibGVD ZWxsKCkpIHsKKyAgICBlbHNlIGlmIChjYi0+aXNUYWJsZUNlbGwoKSAmJiAhc2tpcHBlZEF1dG9I ZWlnaHRDb250YWluaW5nQmxvY2spIHsKICAgICAgICAgLy8gVGFibGUgY2VsbHMgdmlvbGF0ZSB3 aGF0IHRoZSBDU1Mgc3BlYyBzYXlzIHRvIGRvIHdpdGggaGVpZ2h0cy4gQmFzaWNhbGx5IHdlCiAg ICAgICAgIC8vIGRvbid0IGNhcmUgaWYgdGhlIGNlbGwgc3BlY2lmaWVkIGEgaGVpZ2h0IG9yIG5v dC4gV2UganVzdCBhbHdheXMgbWFrZSBvdXJzZWx2ZXMKICAgICAgICAgLy8gYmUgYSBwZXJjZW50 YWdlIG9mIHRoZSBjZWxsJ3MgY3VycmVudCBjb250ZW50IGhlaWdodC4KLSAgICAgICAgaWYgKCFz a2lwcGVkQXV0b0hlaWdodENvbnRhaW5pbmdCbG9jaykgewotICAgICAgICAgICAgaWYgKCFjYi0+ aGFzT3ZlcnJpZGVIZWlnaHQoKSkgewotICAgICAgICAgICAgICAgIC8vIE5vcm1hbGx5IHdlIHdv dWxkIGxldCB0aGUgY2VsbCBzaXplIGludHJpbnNpY2FsbHksIGJ1dCBzY3JvbGxpbmcgb3ZlcmZs b3cgaGFzIHRvIGJlCi0gICAgICAgICAgICAgICAgLy8gdHJlYXRlZCBkaWZmZXJlbnRseSwgc2lu Y2UgV2luSUUgbGV0cyBzY3JvbGxlZCBvdmVyZmxvdyByZWdpb25zIHNocmluayBhcyBuZWVkZWQu Ci0gICAgICAgICAgICAgICAgLy8gV2hpbGUgd2UgY2FuJ3QgZ2V0IGFsbCBjYXNlcyByaWdodCwg d2UgY2FuIGF0IGxlYXN0IGRldGVjdCB3aGVuIHRoZSBjZWxsIGhhcyBhIHNwZWNpZmllZAotICAg ICAgICAgICAgICAgIC8vIGhlaWdodCBvciB3aGVuIHRoZSB0YWJsZSBoYXMgYSBzcGVjaWZpZWQg aGVpZ2h0LiAgSW4gdGhlc2UgY2FzZXMgd2Ugd2FudCB0byBpbml0aWFsbHkgaGF2ZQotICAgICAg ICAgICAgICAgIC8vIG5vIHNpemUgYW5kIGFsbG93IHRoZSBmbGV4aW5nIG9mIHRoZSB0YWJsZSBv ciB0aGUgY2VsbCB0byBpdHMgc3BlY2lmaWVkIGhlaWdodCB0byBjYXVzZSB1cwotICAgICAgICAg ICAgICAgIC8vIHRvIGdyb3cgdG8gZmlsbCB0aGUgc3BhY2UuICBUaGlzIGNvdWxkIGVuZCB1cCBi ZWluZyB3cm9uZyBpbiBzb21lIGNhc2VzLCBidXQgaXQgaXMKLSAgICAgICAgICAgICAgICAvLyBw cmVmZXJhYmxlIHRvIHRoZSBhbHRlcm5hdGl2ZSAoc2l6aW5nIGludHJpbnNpY2FsbHkgYW5kIG1h a2luZyB0aGUgcm93IGVuZCB1cCB0b28gYmlnKS4KLSAgICAgICAgICAgICAgICBSZW5kZXJUYWJs ZUNlbGwqIGNlbGwgPSB0b1JlbmRlclRhYmxlQ2VsbChjYik7Ci0gICAgICAgICAgICAgICAgaWYg KHNjcm9sbHNPdmVyZmxvd1koKSAmJiAoIWNlbGwtPnN0eWxlKCktPmxvZ2ljYWxIZWlnaHQoKS5p c0F1dG8oKSB8fCAhY2VsbC0+dGFibGUoKS0+c3R5bGUoKS0+bG9naWNhbEhlaWdodCgpLmlzQXV0 bygpKSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIDA7Ci0gICAgICAgICAgICAgICAgcmV0 dXJuIC0xOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgYXZhaWxhYmxlSGVpZ2h0ID0gY2It Pm92ZXJyaWRlTG9naWNhbENvbnRlbnRIZWlnaHQoKTsKLSAgICAgICAgICAgIGluY2x1ZGVCb3Jk ZXJQYWRkaW5nID0gdHJ1ZTsKKyAgICAgICAgaWYgKCFjYi0+aGFzT3ZlcnJpZGVIZWlnaHQoKSkg eworICAgICAgICAgICAgLy8gTm9ybWFsbHkgd2Ugd291bGQgbGV0IHRoZSBjZWxsIHNpemUgaW50 cmluc2ljYWxseSwgYnV0IHNjcm9sbGluZyBvdmVyZmxvdyBoYXMgdG8gYmUKKyAgICAgICAgICAg IC8vIHRyZWF0ZWQgZGlmZmVyZW50bHksIHNpbmNlIFdpbklFIGxldHMgc2Nyb2xsZWQgb3ZlcmZs b3cgcmVnaW9ucyBzaHJpbmsgYXMgbmVlZGVkLgorICAgICAgICAgICAgLy8gV2hpbGUgd2UgY2Fu J3QgZ2V0IGFsbCBjYXNlcyByaWdodCwgd2UgY2FuIGF0IGxlYXN0IGRldGVjdCB3aGVuIHRoZSBj ZWxsIGhhcyBhIHNwZWNpZmllZAorICAgICAgICAgICAgLy8gaGVpZ2h0IG9yIHdoZW4gdGhlIHRh YmxlIGhhcyBhIHNwZWNpZmllZCBoZWlnaHQuIEluIHRoZXNlIGNhc2VzIHdlIHdhbnQgdG8gaW5p dGlhbGx5IGhhdmUKKyAgICAgICAgICAgIC8vIG5vIHNpemUgYW5kIGFsbG93IHRoZSBmbGV4aW5n IG9mIHRoZSB0YWJsZSBvciB0aGUgY2VsbCB0byBpdHMgc3BlY2lmaWVkIGhlaWdodCB0byBjYXVz ZSB1cworICAgICAgICAgICAgLy8gdG8gZ3JvdyB0byBmaWxsIHRoZSBzcGFjZS4gVGhpcyBjb3Vs ZCBlbmQgdXAgYmVpbmcgd3JvbmcgaW4gc29tZSBjYXNlcywgYnV0IGl0IGlzCisgICAgICAgICAg ICAvLyBwcmVmZXJhYmxlIHRvIHRoZSBhbHRlcm5hdGl2ZSAoc2l6aW5nIGludHJpbnNpY2FsbHkg YW5kIG1ha2luZyB0aGUgcm93IGVuZCB1cCB0b28gYmlnKS4KKyAgICAgICAgICAgIFJlbmRlclRh YmxlQ2VsbCogY2VsbCA9IHRvUmVuZGVyVGFibGVDZWxsKGNiKTsKKyAgICAgICAgICAgIGlmIChz Y3JvbGxzT3ZlcmZsb3dZKCkgJiYgKCFjZWxsLT5zdHlsZSgpLT5sb2dpY2FsSGVpZ2h0KCkuaXNB dXRvKCkgfHwgIWNlbGwtPnRhYmxlKCktPnN0eWxlKCktPmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8o KSkpCisgICAgICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgICAgICByZXR1cm4gLTE7CiAg ICAgICAgIH0KKyAgICAgICAgYXZhaWxhYmxlSGVpZ2h0ID0gY2ItPm92ZXJyaWRlTG9naWNhbENv bnRlbnRIZWlnaHQoKTsKKyAgICAgICAgaW5jbHVkZUJvcmRlclBhZGRpbmcgPSB0cnVlOwogICAg IH0gZWxzZSBpZiAoY2JzdHlsZS0+bG9naWNhbEhlaWdodCgpLmlzRml4ZWQoKSkgewotICAgICAg ICAvLyBPdGhlcndpc2Ugd2Ugb25seSB1c2Ugb3VyIHBlcmNlbnRhZ2UgaGVpZ2h0IGlmIG91ciBj b250YWluaW5nIGJsb2NrIGhhZCBhIHNwZWNpZmllZCBoZWlnaHQuCiAgICAgICAgIExheW91dFVu aXQgY29udGVudEJveEhlaWdodFdpdGhTY3JvbGxiYXIgPSBjYi0+YWRqdXN0Q29udGVudEJveExv Z2ljYWxIZWlnaHRGb3JCb3hTaXppbmcoY2JzdHlsZS0+bG9naWNhbEhlaWdodCgpLnZhbHVlKCkp OwogICAgICAgICBhdmFpbGFibGVIZWlnaHQgPSBtYXg8TGF5b3V0VW5pdD4oMCwgY29udGVudEJv eEhlaWdodFdpdGhTY3JvbGxiYXIgLSBjYi0+c2Nyb2xsYmFyTG9naWNhbEhlaWdodCgpKTsKICAg ICB9IGVsc2UgaWYgKGNic3R5bGUtPmxvZ2ljYWxIZWlnaHQoKS5pc1BlcmNlbnQoKSAmJiAhaXNP dXRPZkZsb3dQb3NpdGlvbmVkV2l0aFNwZWNpZmllZEhlaWdodCkgewo= 164195 2012-09-14 11:17:39 -0700 2012-09-14 11:26:44 -0700 Patch bug-96704-20120914111711.patch text/plain 7594 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NjI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDE5YzIzYmVjYTgyYTUz ZWJmMWQyMGU2MzdmMzk4MjM3NmY3OGViOS4uMTU1NGM5NzA2MjQ0Y2Q5OGI5NDE4ZjE2NjY5Njll MzViMGQ3YzNjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA5LTE0ICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgU2ltcGxpZnkgc29tZSBjb2Rl IGluIFJlbmRlckJveDo6Y29tcHV0ZVBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjcwNAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgc3RyaWN0bHkgY29k ZSBjbGVhbnVwLiBObyBiZWhhdmlvciBjaGFuZ2UuCisgICAgICAgIEFsc28gcmVtb3ZlZCBzb21l IGNvbW1lbnRzIHRoYXQgd2VyZSB3aGF0IGNvbW1lbnRzIGFuZC9vciB3ZXJlCisgICAgICAgIGdl dHRpbmcgc3RhbGUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckJveDo6c2tpcENvbnRhaW5pbmdCbG9ja0ZvclBlcmNlbnRIZWln aHRDYWxjdWxhdGlvbik6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJveDo6Y29tcHV0ZVBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0KToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyQm94Lmg6CisgICAgICAgIChSZW5kZXJCb3gpOgorCiAyMDEyLTA5LTE0ICBU b3IgQXJuZSBWZXN0YsO4ICA8dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4KIAogICAgICAgICBb UXRdIFJlbW92ZSBvbGQgY3J1ZnQgZnJvbSB0aGUgcW1ha2UgYnVpbGQgc3lzdGVtCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDJjMzM3NWRhMGY1ODQyNzIyNzYyYmI4 OWI1NWYwZTg4ZjJmZjJlMTYuLjM5OTM4Yjk0ZGEyYmJiMjY4M2RiNDg2NTQ1ZDQ4ZWNhODUyMzcx ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0yMTE5LDIxICsy MTE5LDIzIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlQ29udGVudEFuZFNjcm9sbGJh ckxvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlwZSBoZWlnCiAgICAgcmV0dXJuIC0xOwogfQogCiti b29sIFJlbmRlckJveDo6c2tpcENvbnRhaW5pbmdCbG9ja0ZvclBlcmNlbnRIZWlnaHRDYWxjdWxh dGlvbihjb25zdCBSZW5kZXJCb3gqIGNvbnRhaW5pbmdCbG9jaykgY29uc3QKK3sKKyAgICAvLyBG b3IgcXVpcmtzIG1vZGUgYW5kIGFub255bW91cyBibG9ja3MsIHdlIHNraXAgYXV0by1oZWlnaHQg Y29udGFpbmluZ0Jsb2NrcyB3aGVuIGNvbXB1dGluZyBwZXJjZW50YWdlcy4KKyAgICAvLyBGb3Ig c3RhbmRhcmRzIG1vZGUsIHdlIHRyZWF0IHRoZSBwZXJjZW50YWdlIGFzIGF1dG8gaWYgaXQgaGFz IGFuIGF1dG8taGVpZ2h0IGNvbnRhaW5pbmcgYmxvY2suCisgICAgaWYgKCFkb2N1bWVudCgpLT5p blF1aXJrc01vZGUoKSAmJiAhY29udGFpbmluZ0Jsb2NrLT5pc0Fub255bW91c0Jsb2NrKCkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gIWNvbnRhaW5pbmdCbG9jay0+aXNUYWJs ZUNlbGwoKSAmJiAhY29udGFpbmluZ0Jsb2NrLT5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSAmJiBj b250YWluaW5nQmxvY2stPnN0eWxlKCktPmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKSAmJiBpc0hv cml6b250YWxXcml0aW5nTW9kZSgpID09IGNvbnRhaW5pbmdCbG9jay0+aXNIb3Jpem9udGFsV3Jp dGluZ01vZGUoKTsKK30KKwogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVQZXJjZW50YWdl TG9naWNhbEhlaWdodChjb25zdCBMZW5ndGgmIGhlaWdodCkgY29uc3QKIHsKICAgICBMYXlvdXRV bml0IGF2YWlsYWJsZUhlaWdodCA9IC0xOwogICAgIAotICAgIC8vIEluIHF1aXJrcyBtb2RlLCBi bG9ja3Mgd2l0aCBhdXRvIGhlaWdodCBhcmUgc2tpcHBlZCwgYW5kIHdlIGtlZXAgbG9va2luZyBm b3IgYW4gZW5jbG9zaW5nCi0gICAgLy8gYmxvY2sgdGhhdCBtYXkgaGF2ZSBhIHNwZWNpZmllZCBo ZWlnaHQgYW5kIHRoZW4gdXNlIGl0LiBJbiBzdHJpY3QgbW9kZSwgdGhpcyB2aW9sYXRlcyB0aGUK LSAgICAvLyBzcGVjaWZpY2F0aW9uLCB3aGljaCBzdGF0ZXMgdGhhdCBwZXJjZW50YWdlIGhlaWdo dHMganVzdCByZXZlcnQgdG8gYXV0byBpZiB0aGUgY29udGFpbmluZwotICAgIC8vIGJsb2NrIGhh cyBhbiBhdXRvIGhlaWdodC4gV2Ugc3RpbGwgc2tpcCBhbm9ueW1vdXMgY29udGFpbmluZyBibG9j a3MgaW4gYm90aCBtb2RlcywgdGhvdWdoLCBhbmQgbG9vawotICAgIC8vIG9ubHkgYXQgZXhwbGlj aXQgY29udGFpbmVycy4KICAgICBib29sIHNraXBwZWRBdXRvSGVpZ2h0Q29udGFpbmluZ0Jsb2Nr ID0gZmFsc2U7CiAgICAgUmVuZGVyQmxvY2sqIGNiID0gY29udGFpbmluZ0Jsb2NrKCk7CiAgICAg TGF5b3V0VW5pdCByb290TWFyZ2luQm9yZGVyUGFkZGluZ0hlaWdodCA9IDA7Ci0gICAgd2hpbGUg KCFjYi0+aXNSZW5kZXJWaWV3KCkgJiYgIWNiLT5pc1RhYmxlQ2VsbCgpICYmICFjYi0+aXNPdXRP ZkZsb3dQb3NpdGlvbmVkKCkgJiYgY2ItPnN0eWxlKCktPmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8o KSAmJiBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IGNiLT5pc0hvcml6b250YWxXcml0aW5n TW9kZSgpKSB7Ci0gICAgICAgIGlmICghZG9jdW1lbnQoKS0+aW5RdWlya3NNb2RlKCkgJiYgIWNi LT5pc0Fub255bW91c0Jsb2NrKCkpCi0gICAgICAgICAgICBicmVhazsKKyAgICB3aGlsZSAoIWNi LT5pc1JlbmRlclZpZXcoKSAmJiBza2lwQ29udGFpbmluZ0Jsb2NrRm9yUGVyY2VudEhlaWdodENh bGN1bGF0aW9uKGNiKSkgewogICAgICAgICBpZiAoY2ItPmlzQm9keSgpIHx8IGNiLT5pc1Jvb3Qo KSkKICAgICAgICAgICAgIHJvb3RNYXJnaW5Cb3JkZXJQYWRkaW5nSGVpZ2h0ICs9IGNiLT5tYXJn aW5CZWZvcmUoKSArIGNiLT5tYXJnaW5BZnRlcigpICsgY2ItPmJvcmRlckFuZFBhZGRpbmdMb2dp Y2FsSGVpZ2h0KCk7CiAgICAgICAgIHNraXBwZWRBdXRvSGVpZ2h0Q29udGFpbmluZ0Jsb2NrID0g dHJ1ZTsKQEAgLTIxNTMsMjkgKzIxNTUsMjYgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1 dGVQZXJjZW50YWdlTG9naWNhbEhlaWdodChjb25zdCBMZW5ndGgmIGhlaWdodCkgY29uc3QKIAog ICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpICE9IGNiLT5pc0hvcml6b250YWxXcml0 aW5nTW9kZSgpKQogICAgICAgICBhdmFpbGFibGVIZWlnaHQgPSBjYi0+Y29udGVudExvZ2ljYWxX aWR0aCgpOwotICAgIGVsc2UgaWYgKGNiLT5pc1RhYmxlQ2VsbCgpKSB7CisgICAgZWxzZSBpZiAo Y2ItPmlzVGFibGVDZWxsKCkgJiYgIXNraXBwZWRBdXRvSGVpZ2h0Q29udGFpbmluZ0Jsb2NrKSB7 CiAgICAgICAgIC8vIFRhYmxlIGNlbGxzIHZpb2xhdGUgd2hhdCB0aGUgQ1NTIHNwZWMgc2F5cyB0 byBkbyB3aXRoIGhlaWdodHMuIEJhc2ljYWxseSB3ZQogICAgICAgICAvLyBkb24ndCBjYXJlIGlm IHRoZSBjZWxsIHNwZWNpZmllZCBhIGhlaWdodCBvciBub3QuIFdlIGp1c3QgYWx3YXlzIG1ha2Ug b3Vyc2VsdmVzCiAgICAgICAgIC8vIGJlIGEgcGVyY2VudGFnZSBvZiB0aGUgY2VsbCdzIGN1cnJl bnQgY29udGVudCBoZWlnaHQuCi0gICAgICAgIGlmICghc2tpcHBlZEF1dG9IZWlnaHRDb250YWlu aW5nQmxvY2spIHsKLSAgICAgICAgICAgIGlmICghY2ItPmhhc092ZXJyaWRlSGVpZ2h0KCkpIHsK LSAgICAgICAgICAgICAgICAvLyBOb3JtYWxseSB3ZSB3b3VsZCBsZXQgdGhlIGNlbGwgc2l6ZSBp bnRyaW5zaWNhbGx5LCBidXQgc2Nyb2xsaW5nIG92ZXJmbG93IGhhcyB0byBiZQotICAgICAgICAg ICAgICAgIC8vIHRyZWF0ZWQgZGlmZmVyZW50bHksIHNpbmNlIFdpbklFIGxldHMgc2Nyb2xsZWQg b3ZlcmZsb3cgcmVnaW9ucyBzaHJpbmsgYXMgbmVlZGVkLgotICAgICAgICAgICAgICAgIC8vIFdo aWxlIHdlIGNhbid0IGdldCBhbGwgY2FzZXMgcmlnaHQsIHdlIGNhbiBhdCBsZWFzdCBkZXRlY3Qg d2hlbiB0aGUgY2VsbCBoYXMgYSBzcGVjaWZpZWQKLSAgICAgICAgICAgICAgICAvLyBoZWlnaHQg b3Igd2hlbiB0aGUgdGFibGUgaGFzIGEgc3BlY2lmaWVkIGhlaWdodC4gIEluIHRoZXNlIGNhc2Vz IHdlIHdhbnQgdG8gaW5pdGlhbGx5IGhhdmUKLSAgICAgICAgICAgICAgICAvLyBubyBzaXplIGFu ZCBhbGxvdyB0aGUgZmxleGluZyBvZiB0aGUgdGFibGUgb3IgdGhlIGNlbGwgdG8gaXRzIHNwZWNp ZmllZCBoZWlnaHQgdG8gY2F1c2UgdXMKLSAgICAgICAgICAgICAgICAvLyB0byBncm93IHRvIGZp bGwgdGhlIHNwYWNlLiAgVGhpcyBjb3VsZCBlbmQgdXAgYmVpbmcgd3JvbmcgaW4gc29tZSBjYXNl cywgYnV0IGl0IGlzCi0gICAgICAgICAgICAgICAgLy8gcHJlZmVyYWJsZSB0byB0aGUgYWx0ZXJu YXRpdmUgKHNpemluZyBpbnRyaW5zaWNhbGx5IGFuZCBtYWtpbmcgdGhlIHJvdyBlbmQgdXAgdG9v IGJpZykuCi0gICAgICAgICAgICAgICAgUmVuZGVyVGFibGVDZWxsKiBjZWxsID0gdG9SZW5kZXJU YWJsZUNlbGwoY2IpOwotICAgICAgICAgICAgICAgIGlmIChzY3JvbGxzT3ZlcmZsb3dZKCkgJiYg KCFjZWxsLT5zdHlsZSgpLT5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCkgfHwgIWNlbGwtPnRhYmxl KCktPnN0eWxlKCktPmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKSkpCi0gICAgICAgICAgICAgICAg ICAgIHJldHVybiAwOwotICAgICAgICAgICAgICAgIHJldHVybiAtMTsKLSAgICAgICAgICAgIH0K LSAgICAgICAgICAgIGF2YWlsYWJsZUhlaWdodCA9IGNiLT5vdmVycmlkZUxvZ2ljYWxDb250ZW50 SGVpZ2h0KCk7Ci0gICAgICAgICAgICBpbmNsdWRlQm9yZGVyUGFkZGluZyA9IHRydWU7CisgICAg ICAgIGlmICghY2ItPmhhc092ZXJyaWRlSGVpZ2h0KCkpIHsKKyAgICAgICAgICAgIC8vIE5vcm1h bGx5IHdlIHdvdWxkIGxldCB0aGUgY2VsbCBzaXplIGludHJpbnNpY2FsbHksIGJ1dCBzY3JvbGxp bmcgb3ZlcmZsb3cgaGFzIHRvIGJlCisgICAgICAgICAgICAvLyB0cmVhdGVkIGRpZmZlcmVudGx5 LCBzaW5jZSBXaW5JRSBsZXRzIHNjcm9sbGVkIG92ZXJmbG93IHJlZ2lvbnMgc2hyaW5rIGFzIG5l ZWRlZC4KKyAgICAgICAgICAgIC8vIFdoaWxlIHdlIGNhbid0IGdldCBhbGwgY2FzZXMgcmlnaHQs IHdlIGNhbiBhdCBsZWFzdCBkZXRlY3Qgd2hlbiB0aGUgY2VsbCBoYXMgYSBzcGVjaWZpZWQKKyAg ICAgICAgICAgIC8vIGhlaWdodCBvciB3aGVuIHRoZSB0YWJsZSBoYXMgYSBzcGVjaWZpZWQgaGVp Z2h0LiBJbiB0aGVzZSBjYXNlcyB3ZSB3YW50IHRvIGluaXRpYWxseSBoYXZlCisgICAgICAgICAg ICAvLyBubyBzaXplIGFuZCBhbGxvdyB0aGUgZmxleGluZyBvZiB0aGUgdGFibGUgb3IgdGhlIGNl bGwgdG8gaXRzIHNwZWNpZmllZCBoZWlnaHQgdG8gY2F1c2UgdXMKKyAgICAgICAgICAgIC8vIHRv IGdyb3cgdG8gZmlsbCB0aGUgc3BhY2UuIFRoaXMgY291bGQgZW5kIHVwIGJlaW5nIHdyb25nIGlu IHNvbWUgY2FzZXMsIGJ1dCBpdCBpcworICAgICAgICAgICAgLy8gcHJlZmVyYWJsZSB0byB0aGUg YWx0ZXJuYXRpdmUgKHNpemluZyBpbnRyaW5zaWNhbGx5IGFuZCBtYWtpbmcgdGhlIHJvdyBlbmQg dXAgdG9vIGJpZykuCisgICAgICAgICAgICBSZW5kZXJUYWJsZUNlbGwqIGNlbGwgPSB0b1JlbmRl clRhYmxlQ2VsbChjYik7CisgICAgICAgICAgICBpZiAoc2Nyb2xsc092ZXJmbG93WSgpICYmICgh Y2VsbC0+c3R5bGUoKS0+bG9naWNhbEhlaWdodCgpLmlzQXV0bygpIHx8ICFjZWxsLT50YWJsZSgp LT5zdHlsZSgpLT5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCkpKQorICAgICAgICAgICAgICAgIHJl dHVybiAwOworICAgICAgICAgICAgcmV0dXJuIC0xOwogICAgICAgICB9CisgICAgICAgIGF2YWls YWJsZUhlaWdodCA9IGNiLT5vdmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KCk7CisgICAgICAg IGluY2x1ZGVCb3JkZXJQYWRkaW5nID0gdHJ1ZTsKICAgICB9IGVsc2UgaWYgKGNic3R5bGUtPmxv Z2ljYWxIZWlnaHQoKS5pc0ZpeGVkKCkpIHsKLSAgICAgICAgLy8gT3RoZXJ3aXNlIHdlIG9ubHkg dXNlIG91ciBwZXJjZW50YWdlIGhlaWdodCBpZiBvdXIgY29udGFpbmluZyBibG9jayBoYWQgYSBz cGVjaWZpZWQgaGVpZ2h0LgogICAgICAgICBMYXlvdXRVbml0IGNvbnRlbnRCb3hIZWlnaHRXaXRo U2Nyb2xsYmFyID0gY2ItPmFkanVzdENvbnRlbnRCb3hMb2dpY2FsSGVpZ2h0Rm9yQm94U2l6aW5n KGNic3R5bGUtPmxvZ2ljYWxIZWlnaHQoKS52YWx1ZSgpKTsKICAgICAgICAgYXZhaWxhYmxlSGVp Z2h0ID0gbWF4PExheW91dFVuaXQ+KDAsIGNvbnRlbnRCb3hIZWlnaHRXaXRoU2Nyb2xsYmFyIC0g Y2ItPnNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKSk7CiAgICAgfSBlbHNlIGlmIChjYnN0eWxlLT5s b2dpY2FsSGVpZ2h0KCkuaXNQZXJjZW50KCkgJiYgIWlzT3V0T2ZGbG93UG9zaXRpb25lZFdpdGhT cGVjaWZpZWRIZWlnaHQpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCA1 OTA4NzVhOGIzOWIyMDRiODQ5OGI4OTA5M2QwN2RmMDQ5M2FjMjJlLi5lZWM1MmRhOGIxZmRjNjAz MDVhYWIzOTY5ODk0NGRmYWY3MzNlMGFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5oCkBAIC01ODMsNiArNTgzLDggQEAgcHJpdmF0ZToKIAogICAgIC8vIFJldHVybnMgdHJ1ZSBp ZiB3ZSBkaWQgYSBmdWxsIHJlcGFpbnQKICAgICBib29sIHJlcGFpbnRMYXllclJlY3RzRm9ySW1h Z2UoV3JhcHBlZEltYWdlUHRyIGltYWdlLCBjb25zdCBGaWxsTGF5ZXIqIGxheWVycywgYm9vbCBk cmF3aW5nQmFja2dyb3VuZCk7CisKKyAgICBib29sIHNraXBDb250YWluaW5nQmxvY2tGb3JQZXJj ZW50SGVpZ2h0Q2FsY3VsYXRpb24oY29uc3QgUmVuZGVyQm94KiBjb250YWluaW5nQmxvY2spIGNv bnN0OwogICAgCiAgICAgTGF5b3V0VW5pdCBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JQ b3NpdGlvbmVkKGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0KiBjb250YWluaW5nQmxvY2ssIFJl bmRlclJlZ2lvbiogPSAwLAogICAgICAgICBMYXlvdXRVbml0IG9mZnNldEZyb21Mb2dpY2FsVG9w T2ZGaXJzdFBhZ2UgPSAwLCBib29sIGNoZWNrRm9yUGVycGVuZGljdWxhcldyaXRpbmdNb2RlID0g dHJ1ZSkgY29uc3Q7Cg==