68968 2011-09-27 21:02:06 -0700 Only resolve direction aware properties when properties are direction aware. 2011-09-28 18:00:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson eric hyatt koivisto macpherson simon.fraser webkit.review.bot oldest_to_newest 474474 0 macpherson 2011-09-27 21:02:06 -0700 Only resolve direction aware properties when properties are direction aware. 474477 1 108957 macpherson 2011-09-27 21:05:20 -0700 Created attachment 108957 Patch 474501 2 eric 2011-09-27 22:28:57 -0700 I'm not entirely sure what this does. How will we know when we get this wrong? How do we know that we are using the correct list of "directionally aware" properties? 474519 3 macpherson 2011-09-27 23:09:20 -0700 (In reply to comment #2) > I'm not entirely sure what this does. How will we know when we get this wrong? How do we know that we are using the correct list of "directionally aware" properties? At the moment we try to resolve all property id's which is unnecessary. We can't really miss any because all properties are listed in the switch in applyProperty(). 474521 4 108957 eric 2011-09-27 23:13:29 -0700 Comment on attachment 108957 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108957&action=review This seems reasonable to make directional properties slower at the cost of making all other properties faster. > Source/WebCore/css/CSSStyleSelector.cpp:3635 > + return applyProperty(CSSProperty::resolveDirectionAwareProperty(id, m_style->direction(), m_style->writingMode()), value); Are we sure we're calling this with the right arguments? 474525 5 108957 macpherson 2011-09-27 23:19:10 -0700 Comment on attachment 108957 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108957&action=review >> Source/WebCore/css/CSSStyleSelector.cpp:3635 >> + return applyProperty(CSSProperty::resolveDirectionAwareProperty(id, m_style->direction(), m_style->writingMode()), value); > > Are we sure we're calling this with the right arguments? Looks ok to me - resolveDirectionAwareProperty just translates the direction aware property id to the appropriate property id for the current context. I might add an ASSERT_NOT_REACHED() to the default case of that function, just to ensure we can't infinite loop here. 474535 6 108971 macpherson 2011-09-27 23:33:09 -0700 Created attachment 108971 Patch 474536 7 108971 eric 2011-09-27 23:40:29 -0700 Comment on attachment 108971 Patch This is much clearer now, thank you. 475048 8 108971 webkit.review.bot 2011-09-28 15:29:34 -0700 Comment on attachment 108971 Patch Rejecting attachment 108971 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: sed 2 diffs from patch file(s). patching file Source/WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/css/CSSStyleSelector.cpp Hunk #1 FAILED at 2360. Hunk #2 succeeded at 3596 (offset -2 lines). Hunk #3 succeeded at 3632 (offset -2 lines). 1 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/css/CSSStyleSelector.cpp.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Eric Seidel', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/9881821 475079 9 109090 macpherson 2011-09-28 16:45:07 -0700 Created attachment 109090 Patch for landing 475142 10 109090 webkit.review.bot 2011-09-28 18:00:20 -0700 Comment on attachment 109090 Patch for landing Clearing flags on attachment: 109090 Committed r96281: <http://trac.webkit.org/changeset/96281> 475143 11 webkit.review.bot 2011-09-28 18:00:25 -0700 All reviewed patches have been landed. Closing bug. 108957 2011-09-27 21:05:20 -0700 2011-09-27 23:33:02 -0700 Patch bug-68968-20110928140518.patch text/plain 2499 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2MTg0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDktMjcgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBPbmx5IHJlc29s dmUgZGlyZWN0aW9uIGF3YXJlIHByb3BlcnRpZXMgd2hlbiBwcm9wZXJ0aWVzIGFyZSBkaXJlY3Rp b24gYXdhcmUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02ODk2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cyAvIG5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlZC4KKworICAgICAgICBQcm9m aWxpbmcgc2hvd2VkIGEgfjglIGltcHJvdmVtZW50IGluIGFwcGx5UHJvcGVydHkgYnkgbm90IGNh bGxpbmcgcmVzb2x2ZURpcmVjdGlvbkF3YXJlUHJvcGVydHkgZm9yIGV2ZXJ5IHByb3BlcnR5Lgor CisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eSk6CisKIDIwMTEtMDktMjcgIEtlbnRhcm8g SGFyYSAgPGhhcmFrZW5AY2hyb21pdW0uY29tPgogCiAgICAgICAgIEltcGxlbWVudCBhIFBhZ2VU cmFuc2l0aW9uRXZlbnQgY29uc3RydWN0b3IgZm9yIFY4CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9j c3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3Nz L0NTU1N0eWxlU2VsZWN0b3IuY3BwCShyZXZpc2lvbiA5NjE3OSkKKysrIFNvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjM2MCw4ICsyMzYw LDYgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAogCiAgICAgYm9v bCBpc0luaGVyaXQgPSBtX3BhcmVudE5vZGUgJiYgdmFsdWVUeXBlID09IENTU1ZhbHVlOjpDU1Nf SU5IRVJJVDsKICAgICBib29sIGlzSW5pdGlhbCA9IHZhbHVlVHlwZSA9PSBDU1NWYWx1ZTo6Q1NT X0lOSVRJQUwgfHwgKCFtX3BhcmVudE5vZGUgJiYgdmFsdWVUeXBlID09IENTU1ZhbHVlOjpDU1Nf SU5IRVJJVCk7Ci0gICAgCi0gICAgaWQgPSBDU1NQcm9wZXJ0eTo6cmVzb2x2ZURpcmVjdGlvbkF3 YXJlUHJvcGVydHkoaWQsIG1fc3R5bGUtPmRpcmVjdGlvbigpLCBtX3N0eWxlLT53cml0aW5nTW9k ZSgpKTsKIAogICAgIGlmIChtX2NoZWNrZXIuaXNNYXRjaGluZ1Zpc2l0ZWRQc2V1ZG9DbGFzcygp ICYmICFpc1ZhbGlkVmlzaXRlZExpbmtQcm9wZXJ0eShpZCkpIHsKICAgICAgICAgLy8gTGltaXQg dGhlIHByb3BlcnRpZXMgdGhhdCBjYW4gYmUgYXBwbGllZCB0byBvbmx5IHRoZSBvbmVzIGhvbm9y ZWQgYnkgOnZpc2l0ZWQuCkBAIC0zNTk4LDcgKzM1OTYsNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0 b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgICAgIHJldHVybjsKICAgICBjYXNlIENTU1Byb3Bl cnR5SW52YWxpZDoKICAgICAgICAgcmV0dXJuOwotICAgIC8vIERpcmVjdGlvbmFsIHByb3BlcnRp ZXMgYXJlIHJlc29sdmVkIGJ5IHJlc29sdmVEaXJlY3Rpb25Bd2FyZVByb3BlcnR5KCkgYmVmb3Jl IHRoZSBzd2l0Y2guCisgICAgLy8gRGlyZWN0aW9uYWwgcHJvcGVydGllcyBhcmUgcmVzb2x2ZWQg YnkgcmVzb2x2ZURpcmVjdGlvbkF3YXJlUHJvcGVydHkoKSBhbmQgdGhlbiByZWFwcGxpZWQuCiAg ICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEJvcmRlckVuZDoKICAgICBjYXNlIENTU1Byb3BlcnR5 V2Via2l0Qm9yZGVyRW5kQ29sb3I6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEJvcmRlckVu ZFN0eWxlOgpAQCAtMzYzNCw4ICszNjMyLDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBs eVByb3BlcnR5KGludAogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRNaW5Mb2dpY2FsSGVpZ2h0 OgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRNYXhMb2dpY2FsV2lkdGg6CiAgICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdE1heExvZ2ljYWxIZWlnaHQ6Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOwotICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJuIGFwcGx5UHJvcGVydHkoQ1NT UHJvcGVydHk6OnJlc29sdmVEaXJlY3Rpb25Bd2FyZVByb3BlcnR5KGlkLCBtX3N0eWxlLT5kaXJl Y3Rpb24oKSwgbV9zdHlsZS0+d3JpdGluZ01vZGUoKSksIHZhbHVlKTsKIAogICAgIGNhc2UgQ1NT UHJvcGVydHlGb250U3RyZXRjaDoKICAgICBjYXNlIENTU1Byb3BlcnR5UGFnZToK 108971 2011-09-27 23:33:09 -0700 2011-09-28 16:45:01 -0700 Patch bug-68968-20110928163307.patch text/plain 2581 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2MTkxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDktMjcgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBPbmx5IHJlc29s dmUgZGlyZWN0aW9uIGF3YXJlIHByb3BlcnRpZXMgd2hlbiBwcm9wZXJ0aWVzIGFyZSBkaXJlY3Rp b24gYXdhcmUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02ODk2OAorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgorCisgICAgICAgIE5v IG5ldyB0ZXN0cyAvIG5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlZC4KKworICAgICAgICBQcm9maWxp bmcgc2hvd2VkIGEgfjglIGltcHJvdmVtZW50IGluIGFwcGx5UHJvcGVydHkgYnkgbm90IGNhbGxp bmcgcmVzb2x2ZURpcmVjdGlvbkF3YXJlUHJvcGVydHkgZm9yIGV2ZXJ5IHByb3BlcnR5LgorCisg ICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NT U3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eSk6CisKIDIwMTEtMDktMjcgIFJ5b3N1a2UgTml3 YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgU2ltcGxpZnkgUmVwbGFjZVNlbGVjdGlv bkNvbW1hbmQ6OnBvc2l0aW9uQXRTdGFydE9mSW5zZXJ0ZWRDb250ZW50CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCShyZXZpc2lvbiA5NjE5MSkKKysrIFNvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjM2 MCw4ICsyMzYwLDYgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAog CiAgICAgYm9vbCBpc0luaGVyaXQgPSBtX3BhcmVudE5vZGUgJiYgdmFsdWVUeXBlID09IENTU1Zh bHVlOjpDU1NfSU5IRVJJVDsKICAgICBib29sIGlzSW5pdGlhbCA9IHZhbHVlVHlwZSA9PSBDU1NW YWx1ZTo6Q1NTX0lOSVRJQUwgfHwgKCFtX3BhcmVudE5vZGUgJiYgdmFsdWVUeXBlID09IENTU1Zh bHVlOjpDU1NfSU5IRVJJVCk7Ci0gICAgCi0gICAgaWQgPSBDU1NQcm9wZXJ0eTo6cmVzb2x2ZURp cmVjdGlvbkF3YXJlUHJvcGVydHkoaWQsIG1fc3R5bGUtPmRpcmVjdGlvbigpLCBtX3N0eWxlLT53 cml0aW5nTW9kZSgpKTsKIAogICAgIGlmIChtX2NoZWNrZXIuaXNNYXRjaGluZ1Zpc2l0ZWRQc2V1 ZG9DbGFzcygpICYmICFpc1ZhbGlkVmlzaXRlZExpbmtQcm9wZXJ0eShpZCkpIHsKICAgICAgICAg Ly8gTGltaXQgdGhlIHByb3BlcnRpZXMgdGhhdCBjYW4gYmUgYXBwbGllZCB0byBvbmx5IHRoZSBv bmVzIGhvbm9yZWQgYnkgOnZpc2l0ZWQuCkBAIC0zNTk4LDcgKzM1OTYsNyBAQCB2b2lkIENTU1N0 eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgICAgIHJldHVybjsKICAgICBjYXNl IENTU1Byb3BlcnR5SW52YWxpZDoKICAgICAgICAgcmV0dXJuOwotICAgIC8vIERpcmVjdGlvbmFs IHByb3BlcnRpZXMgYXJlIHJlc29sdmVkIGJ5IHJlc29sdmVEaXJlY3Rpb25Bd2FyZVByb3BlcnR5 KCkgYmVmb3JlIHRoZSBzd2l0Y2guCisgICAgLy8gRGlyZWN0aW9uYWwgcHJvcGVydGllcyBhcmUg cmVzb2x2ZWQgYnkgcmVzb2x2ZURpcmVjdGlvbkF3YXJlUHJvcGVydHkoKSBhbmQgdGhlbiByZWFw cGxpZWQuCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEJvcmRlckVuZDoKICAgICBjYXNlIENT U1Byb3BlcnR5V2Via2l0Qm9yZGVyRW5kQ29sb3I6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtp dEJvcmRlckVuZFN0eWxlOgpAQCAtMzYzNCw4ICszNjMyLDExIEBAIHZvaWQgQ1NTU3R5bGVTZWxl Y3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWluTG9n aWNhbEhlaWdodDoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWF4TG9naWNhbFdpZHRoOgog ICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRNYXhMb2dpY2FsSGVpZ2h0OgotICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgYnJlYWs7CisgICAgeworICAgICAgICBpbnQgbmV3 SWQgPSBDU1NQcm9wZXJ0eTo6cmVzb2x2ZURpcmVjdGlvbkF3YXJlUHJvcGVydHkoaWQsIG1fc3R5 bGUtPmRpcmVjdGlvbigpLCBtX3N0eWxlLT53cml0aW5nTW9kZSgpKTsKKyAgICAgICAgQVNTRVJU KG5ld0lkICE9IGlkKTsKKyAgICAgICAgcmV0dXJuIGFwcGx5UHJvcGVydHkobmV3SWQsIHZhbHVl KTsKKyAgICB9CiAKICAgICBjYXNlIENTU1Byb3BlcnR5Rm9udFN0cmV0Y2g6CiAgICAgY2FzZSBD U1NQcm9wZXJ0eVBhZ2U6Cg== 109090 2011-09-28 16:45:07 -0700 2011-09-28 18:00:20 -0700 Patch for landing bug-68968-20110929094505.patch text/plain 2185 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2MjY1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDktMjggIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBPbmx5IHJlc29s dmUgZGlyZWN0aW9uIGF3YXJlIHByb3BlcnRpZXMgd2hlbiBwcm9wZXJ0aWVzIGFyZSBkaXJlY3Rp b24gYXdhcmUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02ODk2OAorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgorCisgICAgICAgIE5v IG5ldyB0ZXN0cyAvIG5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlZC4KKworICAgICAgICBQcm9maWxp bmcgc2hvd2VkIGEgfjglIGltcHJvdmVtZW50IGluIGFwcGx5UHJvcGVydHkgYnkgbm90IGNhbGxp bmcgcmVzb2x2ZURpcmVjdGlvbkF3YXJlUHJvcGVydHkgZm9yIGV2ZXJ5IHByb3BlcnR5LgorCisg ICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NT U3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eSk6CisKIDIwMTEtMDktMjggIFNlcmdleSBHbGF6 dW5vdiAgPHNlcmcuZ2xhenVub3ZAZ21haWwuY29tPgogCiAgICAgICAgIEphdmFTY3JpcHQgZ2Vu ZXJhdGVkIGRvY3VtZW50cyBkb24ndCBpbmhlcml0IHRoZSBjb29raWUgVVJMCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCShyZXZpc2lvbiA5NjI2NSkKKysrIFNv dXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjM1NSw4ICsyMzU1LDYgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGlu dAogICAgIGJvb2wgaXNJbmhlcml0ID0gbV9wYXJlbnROb2RlICYmIHZhbHVlVHlwZSA9PSBDU1NW YWx1ZTo6Q1NTX0lOSEVSSVQ7CiAgICAgYm9vbCBpc0luaXRpYWwgPSB2YWx1ZVR5cGUgPT0gQ1NT VmFsdWU6OkNTU19JTklUSUFMIHx8ICghbV9wYXJlbnROb2RlICYmIHZhbHVlVHlwZSA9PSBDU1NW YWx1ZTo6Q1NTX0lOSEVSSVQpOwogCi0gICAgaWQgPSBDU1NQcm9wZXJ0eTo6cmVzb2x2ZURpcmVj dGlvbkF3YXJlUHJvcGVydHkoaWQsIG1fc3R5bGUtPmRpcmVjdGlvbigpLCBtX3N0eWxlLT53cml0 aW5nTW9kZSgpKTsKLQogICAgIGlmIChtX2NoZWNrZXIuaXNNYXRjaGluZ1Zpc2l0ZWRQc2V1ZG9D bGFzcygpICYmICFpc1ZhbGlkVmlzaXRlZExpbmtQcm9wZXJ0eShpZCkpIHsKICAgICAgICAgLy8g TGltaXQgdGhlIHByb3BlcnRpZXMgdGhhdCBjYW4gYmUgYXBwbGllZCB0byBvbmx5IHRoZSBvbmVz IGhvbm9yZWQgYnkgOnZpc2l0ZWQuCiAgICAgICAgIHJldHVybjsKQEAgLTM2MzIsOSArMzYzMCwx MSBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdE1pbkxvZ2ljYWxIZWlnaHQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdl YmtpdE1heExvZ2ljYWxXaWR0aDoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWF4TG9naWNh bEhlaWdodDoKLSAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgIGJyZWFrOwot CisgICAgeworICAgICAgICBpbnQgbmV3SWQgPSBDU1NQcm9wZXJ0eTo6cmVzb2x2ZURpcmVjdGlv bkF3YXJlUHJvcGVydHkoaWQsIG1fc3R5bGUtPmRpcmVjdGlvbigpLCBtX3N0eWxlLT53cml0aW5n TW9kZSgpKTsKKyAgICAgICAgQVNTRVJUKG5ld0lkICE9IGlkKTsKKyAgICAgICAgcmV0dXJuIGFw cGx5UHJvcGVydHkobmV3SWQsIHZhbHVlKTsKKyAgICB9CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZv bnRTdHJldGNoOgogICAgIGNhc2UgQ1NTUHJvcGVydHlQYWdlOgogICAgIGNhc2UgQ1NTUHJvcGVy dHlUZXh0TGluZVRocm91Z2g6Cg==