97760 2012-09-26 23:59:09 -0700 CSSComputedStyleDeclaration::getPropertyCSSValue() triggering unnecessary relayouts and style recalcs 2017-05-27 00:12:35 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned cmarcelo dglazkov eric kling macpherson menard ojan simon.fraser webkit-bug-importer webkit.review.bot oldest_to_newest 729259 0 koivisto 2012-09-26 23:59:09 -0700 Currently getPropertyCSSValue() (which is also used to implement the more common getPropertyValue()) calls Document::updateLayoutIgnorePendingStylesheets() unconditionally. However only a few properties are actually layout dependent, making many of these relayouts unnecessary. Moreover, triggering full style recalc is also often unnecessary as the current node may already have valid style even if some other parts of the tree require recalc. 729266 1 165941 koivisto 2012-09-27 00:08:52 -0700 Created attachment 165941 patch 729269 2 koivisto 2012-09-27 00:09:49 -0700 No performance test, the autocompleted title lied. 729271 3 webkit-bug-importer 2012-09-27 00:12:58 -0700 <rdar://problem/12384306> 729273 4 165941 gyuyoung.kim 2012-09-27 00:17:04 -0700 Comment on attachment 165941 patch Attachment 165941 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/13964087 729336 5 165941 buildbot 2012-09-27 02:18:37 -0700 Comment on attachment 165941 patch Attachment 165941 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/13967078 New failing tests: http/tests/misc/acid3.html fast/frames/seamless/seamless-css-cascade.html 729384 6 165941 webkit.review.bot 2012-09-27 03:22:59 -0700 Comment on attachment 165941 patch Attachment 165941 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14003039 New failing tests: fast/dom/shadow/shadow-nested-pseudo-id.html fast/dom/shadow/link-in-shadow-tree.html editing/shadow/contenteditable-propagation-at-shadow-boundary.html fast/css/style-scoped/style-scoped-apply-author-styles.html fast/frames/seamless/seamless-css-cascade.html 729414 7 165941 webkit.review.bot 2012-09-27 04:24:34 -0700 Comment on attachment 165941 patch Attachment 165941 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14018911 New failing tests: fast/dom/shadow/shadow-nested-pseudo-id.html fast/dom/shadow/link-in-shadow-tree.html editing/shadow/contenteditable-propagation-at-shadow-boundary.html fast/css/style-scoped/style-scoped-apply-author-styles.html fast/frames/seamless/seamless-css-cascade.html 730034 8 166099 koivisto 2012-09-27 17:06:51 -0700 Created attachment 166099 updated patch 730097 9 166099 webkit.review.bot 2012-09-27 18:26:54 -0700 Comment on attachment 166099 updated patch Attachment 166099 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14038873 New failing tests: css3/filters/custom/custom-filter-property-computed-style.html 730110 10 166099 kling 2012-09-27 19:05:00 -0700 Comment on attachment 166099 updated patch Kickass! r=me with the test cr-ews complains about fixed. 730132 11 166099 webkit.review.bot 2012-09-27 19:22:23 -0700 Comment on attachment 166099 updated patch Attachment 166099 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14065029 New failing tests: css3/filters/custom/custom-filter-property-computed-style.html 730207 12 koivisto 2012-09-27 20:51:58 -0700 http://trac.webkit.org/changeset/129844 730270 13 166099 eric 2012-09-27 23:12:00 -0700 Comment on attachment 166099 updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=166099&action=review Sounds great. :) > Source/WebCore/css/CSSComputedStyleDeclaration.cpp:1389 > +static bool isLayoutDependentProperty(CSSPropertyID propertyID) Slightly scary that this is a whitelist. Might be better to list all properties to force those adding a property to make a choice as to if it depends on Layout or not. 731149 14 koivisto 2012-09-28 20:45:43 -0700 (In reply to comment #13) > Slightly scary that this is a whitelist. Might be better to list all properties to force those adding a property to make a choice as to if it depends on Layout or not. I would agree in most cases but new layout dependent properties are very rare (and should generally be avoided). Also basic testing for newly added properties is likely reveal if this has been omitted. On balance I thought it was not worth having a giant switch here. 732319 15 ojan 2012-10-01 23:29:58 -0700 Looks like this was a 40% improvement on the Chromium Win7 bot for dromaeo_jslibstylejquery! http://build.chromium.org/f/chromium/perf/chromium-rel-win7-webkit/dromaeo_jslibstylejquery/report.html?history=100&rev=159617 1313355 16 simon.fraser 2017-05-26 20:47:17 -0700 Antti, do you recall why CSSPropertyFilter is layout-dependent here? 1313385 17 koivisto 2017-05-27 00:09:55 -0700 I don't. Reading the code I don't see any reason for it to be layout dependent either. 1313387 18 koivisto 2017-05-27 00:12:35 -0700 Well, I see ews complained about css3/filters/custom/custom-filter-property-computed-style.html above so I suppose it was added to fix that. But it might be just full style recalc that it needed. 165941 2012-09-27 00:08:52 -0700 2012-09-27 17:06:51 -0700 patch computed-style-relayout.patch text/plain 4913 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyOTcyOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA5LTI2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBDU1NDb21wdXRlZFN0eWxlRGVj bGFyYXRpb246OmdldFByb3BlcnR5Q1NTVmFsdWUoKSB0cmlnZ2VyaW5nIHVubmVjZXNzYXJ5IHJl bGF5b3V0cyBhbmQgc3R5bGUgcmVjYWxjcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTc3NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDdXJyZW50bHkgZ2V0UHJvcGVydHlDU1NWYWx1ZSgpICh3aGljaCBp cyBhbHNvIHVzZWQgdG8gaW1wbGVtZW50IHRoZSBtb3JlIGNvbW1vbiBnZXRQcm9wZXJ0eVZhbHVl KCkpIAorICAgICAgICBjYWxscyBEb2N1bWVudDo6dXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0 eWxlc2hlZXRzKCkgdW5jb25kaXRpb25hbGx5LiBIb3dldmVyIG9ubHkgYSBmZXcgcHJvcGVydGll cyAKKyAgICAgICAgYXJlIGFjdHVhbGx5IGxheW91dCBkZXBlbmRlbnQsIG1ha2luZyBtYW55IG9m IHRoZXNlIHJlbGF5b3V0cyB1bm5lY2Vzc2FyeS4gTW9yZW92ZXIsIHRyaWdnZXJpbmcgZnVsbCAK KyAgICAgICAgc3R5bGUgcmVjYWxjIGlzIGFsc28gb2Z0ZW4gdW5uZWNlc3NhcnkgYXMgdGhlIGN1 cnJlbnQgbm9kZSBtYXkgYWxyZWFkeSBoYXZlIHZhbGlkIHN0eWxlIGV2ZW4gaWYgc29tZSAKKyAg ICAgICAgb3RoZXIgcGFydHMgb2YgdGhlIHRyZWUgcmVxdWlyZSByZWNhbGMuCisgICAgICAgIAor ICAgICAgICAtIE9ubHkgdHJpZ2dlciByZWxheW91dHMgZm9yIGxheW91dCBkZXBlbmRlbnQgcHJv cGVydGllcy4KKyAgICAgICAgLSBUcmlnZ2VyIHN0eWxlIHJlY2FsYyBvbmx5IGlmIHRoZSBzdHls ZSBvZiB0aGUgY3VycmVudCBlbGVtZW50IG9yIGl0cyBhbmNlc3RvcnMgaXMgZGlydHkuCisgICAg ICAgIAorICAgICAgICBUaGlzIGlzIGEgc2lnbmlmaWNhbnQgKHNldmVyYWwgcGVyY2VudCkgcHJv Z3Jlc3Npb24gb24gc29tZSByZWFsIHdvcmxkIHdlYiBjb250ZW50IGJhc2VkIHBhZ2UgbG9hZGlu ZworICAgICAgICBiZW5jaG1hcmtzLgorCisgICAgICAgICogY3NzL0NTU0NvbXB1dGVkU3R5bGVE ZWNsYXJhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc0xheW91dERlcGVuZGVudFByb3Bl cnR5KToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTQ29tcHV0ZWRT dHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0eUNTU1ZhbHVlKToKKyAgICAgICAgKiBkb20vRG9j dW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6Omhhc1BlbmRpbmdGb3JjZWRT dHlsZVJlY2FsYyk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBkb20vRG9jdW1lbnQu aDoKKyAgICAgICAgKERvY3VtZW50KToKKwogMjAxMi0wOS0yNiAgWW9zaGlmdW1pIElub3VlICA8 eW9zaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtGb3Jtc10gTW92ZSBtdWx0aXBsZSBmaWVs ZHMgcmVsYXRlZCBmdW5jdGlvbnMgdG8gQmFzZURhdGVBbmRUaW1lSW5wdXRUeXBlIGZyb20gVGlt ZUlucHV0VHlwZQpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNs YXJhdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVk U3R5bGVEZWNsYXJhdGlvbi5jcHAJKHJldmlzaW9uIDEyOTY4NCkKKysrIFNvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x Mzg0LDE1ICsxMzg0LDQ4IEBAIHN0YXRpYyBQYXNzUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBm b24KICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1Zh bHVlTm9ybWFsKTsKIH0KIAorc3RhdGljIGJvb2wgaXNMYXlvdXREZXBlbmRlbnRQcm9wZXJ0eShD U1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQpCit7CisgICAgc3dpdGNoIChwcm9wZXJ0eUlEKSB7Cisg ICAgY2FzZSBDU1NQcm9wZXJ0eVdpZHRoOgorICAgIGNhc2UgQ1NTUHJvcGVydHlIZWlnaHQ6Cisg ICAgY2FzZSBDU1NQcm9wZXJ0eU1hcmdpbjoKKyAgICBjYXNlIENTU1Byb3BlcnR5TWFyZ2luVG9w OgorICAgIGNhc2UgQ1NTUHJvcGVydHlNYXJnaW5Cb3R0b206CisgICAgY2FzZSBDU1NQcm9wZXJ0 eU1hcmdpbkxlZnQ6CisgICAgY2FzZSBDU1NQcm9wZXJ0eU1hcmdpblJpZ2h0OgorICAgIGNhc2Ug Q1NTUHJvcGVydHlQYWRkaW5nOgorICAgIGNhc2UgQ1NTUHJvcGVydHlQYWRkaW5nVG9wOgorICAg IGNhc2UgQ1NTUHJvcGVydHlQYWRkaW5nQm90dG9tOgorICAgIGNhc2UgQ1NTUHJvcGVydHlQYWRk aW5nTGVmdDoKKyAgICBjYXNlIENTU1Byb3BlcnR5UGFkZGluZ1JpZ2h0OgorICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRQZXJzcGVjdGl2ZU9yaWdpbjoKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Vi a2l0VHJhbnNmb3JtT3JpZ2luOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRUcmFuc2Zvcm06 CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZpbHRlcjoKKyAgICAgICAgcmV0dXJuIHRydWU7 CisgICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KK30KKwogUGFzc1Jl ZlB0cjxDU1NWYWx1ZT4gQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0eUNT U1ZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCwgRVVwZGF0ZUxheW91dCB1cGRhdGVMYXlv dXQpIGNvbnN0CiB7CiAgICAgTm9kZSogbm9kZSA9IG1fbm9kZS5nZXQoKTsKICAgICBpZiAoIW5v ZGUpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAgLy8gTWFrZSBzdXJlIG91ciBsYXlvdXQgaXMg dXAgdG8gZGF0ZSBiZWZvcmUgd2UgYWxsb3cgYSBxdWVyeSBvbiB0aGVzZSBhdHRyaWJ1dGVzLgot ICAgIGlmICh1cGRhdGVMYXlvdXQpCi0gICAgICAgIG5vZGUtPmRvY3VtZW50KCktPnVwZGF0ZUxh eW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOworICAgIGlmICh1cGRhdGVMYXlvdXQpIHsK KyAgICAgICAgaWYgKGlzTGF5b3V0RGVwZW5kZW50UHJvcGVydHkocHJvcGVydHlJRCkpCisgICAg ICAgICAgICBub2RlLT5kb2N1bWVudCgpLT51cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVz aGVldHMoKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBib29sIG5lZWRzU3R5bGVSZWNh bGMgPSBtX25vZGUtPmRvY3VtZW50KCktPmhhc1BlbmRpbmdGb3JjZWRTdHlsZVJlY2FsYygpOwor ICAgICAgICAgICAgZm9yIChOb2RlKiBuID0gbV9ub2RlLmdldCgpOyBuICYmICFuZWVkc1N0eWxl UmVjYWxjOyBuID0gbi0+cGFyZW50Tm9kZSgpKQorICAgICAgICAgICAgICAgIG5lZWRzU3R5bGVS ZWNhbGMgPSBuLT5uZWVkc1N0eWxlUmVjYWxjKCk7CisgICAgICAgICAgICBpZiAobmVlZHNTdHls ZVJlY2FsYykKKyAgICAgICAgICAgICAgICBub2RlLT5kb2N1bWVudCgpLT51cGRhdGVTdHlsZUlm TmVlZGVkKCk7CisgICAgICAgIH0KKyAgICB9CiAKICAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVy ID0gbm9kZS0+cmVuZGVyZXIoKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCShyZXZp c2lvbiAxMjk2ODQpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xNzgwLDYgKzE3ODAsMTEgQEAgYm9vbCBEb2N1bWVudDo6aXNQZW5kaW5nU3R5 bGVSZWNhbGMoKSBjbwogICAgIHJldHVybiBtX3N0eWxlUmVjYWxjVGltZXIuaXNBY3RpdmUoKSAm JiAhbV9pblN0eWxlUmVjYWxjOwogfQogCitib29sIERvY3VtZW50OjpoYXNQZW5kaW5nRm9yY2Vk U3R5bGVSZWNhbGMoKSBjb25zdAoreworICAgIHJldHVybiBtX3N0eWxlUmVjYWxjVGltZXIuaXNB Y3RpdmUoKSAmJiBtX3BlbmRpbmdTdHlsZVJlY2FsY1Nob3VsZEZvcmNlOworfQorCiB2b2lkIERv Y3VtZW50OjpzdHlsZVJlY2FsY1RpbWVyRmlyZWQoVGltZXI8RG9jdW1lbnQ+KikKIHsKICAgICB1 cGRhdGVTdHlsZUlmTmVlZGVkKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAkocmV2aXNpb24g MTI5Njg0KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgJKHdvcmtpbmcgY29weSkK QEAgLTcxNCw2ICs3MTQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzY2hlZHVsZVN0eWxlUmVjYWxj KCk7CiAgICAgdm9pZCB1bnNjaGVkdWxlU3R5bGVSZWNhbGMoKTsKICAgICBib29sIGlzUGVuZGlu Z1N0eWxlUmVjYWxjKCkgY29uc3Q7CisgICAgYm9vbCBoYXNQZW5kaW5nRm9yY2VkU3R5bGVSZWNh bGMoKSBjb25zdDsKICAgICB2b2lkIHN0eWxlUmVjYWxjVGltZXJGaXJlZChUaW1lcjxEb2N1bWVu dD4qKTsKIAogICAgIHZvaWQgcmVnaXN0ZXJOb2RlTGlzdENhY2hlKER5bmFtaWNOb2RlTGlzdENh Y2hlQmFzZSopOwo= 166099 2012-09-27 17:06:51 -0700 2012-09-27 23:12:00 -0700 updated patch computed-style-relayout-2.patch text/plain 7571 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyOTgyMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQwIEBACisyMDEyLTA5LTI2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBDU1NDb21wdXRlZFN0eWxlRGVj bGFyYXRpb246OmdldFByb3BlcnR5Q1NTVmFsdWUoKSB0cmlnZ2VyaW5nIHVubmVjZXNzYXJ5IHJl bGF5b3V0cyBhbmQgc3R5bGUgcmVjYWxjcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTc3NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDdXJyZW50bHkgZ2V0UHJvcGVydHlDU1NWYWx1ZSgpICh3aGljaCBp cyBhbHNvIHVzZWQgdG8gaW1wbGVtZW50IHRoZSBtb3JlIGNvbW1vbiBnZXRQcm9wZXJ0eVZhbHVl KCkpIAorICAgICAgICBjYWxscyBEb2N1bWVudDo6dXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0 eWxlc2hlZXRzKCkgdW5jb25kaXRpb25hbGx5LiBIb3dldmVyIG9ubHkgYSBmZXcgcHJvcGVydGll cyAKKyAgICAgICAgYXJlIGFjdHVhbGx5IGxheW91dCBkZXBlbmRlbnQsIG1ha2luZyBtYW55IG9m IHRoZXNlIHJlbGF5b3V0cyB1bm5lY2Vzc2FyeS4gTW9yZW92ZXIsIHRyaWdnZXJpbmcgZnVsbCAK KyAgICAgICAgc3R5bGUgcmVjYWxjIGlzIGFsc28gb2Z0ZW4gdW5uZWNlc3NhcnkgYXMgdGhlIGN1 cnJlbnQgbm9kZSBtYXkgYWxyZWFkeSBoYXZlIHZhbGlkIHN0eWxlIGV2ZW4gaWYgc29tZSAKKyAg ICAgICAgb3RoZXIgcGFydHMgb2YgdGhlIHRyZWUgcmVxdWlyZSByZWNhbGMuCisgICAgICAgIAor ICAgICAgICAtIE9ubHkgdHJpZ2dlciByZWxheW91dHMgZm9yIGxheW91dCBkZXBlbmRlbnQgcHJv cGVydGllcy4KKyAgICAgICAgLSBUcmlnZ2VyIHN0eWxlIHJlY2FsYyBvbmx5IGlmIHRoZSBzdHls ZSBvZiB0aGUgY3VycmVudCBlbGVtZW50IG9yIGl0cyBhbmNlc3RvcnMgaXMgZGlydHkuCisgICAg ICAgIAorICAgICAgICBUaGlzIGlzIGEgc2lnbmlmaWNhbnQgKHNldmVyYWwgcGVyY2VudCkgcHJv Z3Jlc3Npb24gb24gc29tZSByZWFsIHdvcmxkIHdlYiBjb250ZW50IGJhc2VkIHBhZ2UgbG9hZGlu ZworICAgICAgICBiZW5jaG1hcmtzLgorCisgICAgICAgICogY3NzL0NTU0NvbXB1dGVkU3R5bGVE ZWNsYXJhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc0xheW91dERlcGVuZGVudFByb3Bl cnR5KToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTQ29tcHV0ZWRT dHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0eUNTU1ZhbHVlKToKKyAgICAgICAgKiBjc3MvU3R5 bGVSZXNvbHZlci5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVSZXNvbHZlcjo6aGFzVmlld3Bv cnREZXBlbmRlbnRNZWRpYVF1ZXJpZXMpOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6aGFzUGVuZGluZ1N0eWxlUmVjYWxjKToKKyAgICAg ICAgCisgICAgICAgICAgICBSZW5hbWVkIGZvciBjb25zaXN0ZW5jeS4KKworICAgICAgICAoV2Vi Q29yZTo6RG9jdW1lbnQ6Omhhc1BlbmRpbmdGb3JjZWRTdHlsZVJlY2FsYyk6CisgICAgICAgIChX ZWJDb3JlKToKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuaDoKKyAgICAgICAgKERvY3VtZW50KToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVySW1hZ2U6OmltYWdlQ2hhbmdlZCk6CisKIDIwMTItMDktMjcgIExldmkgV2VpbnRyYXVi ICA8bGV2aXdAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjEyOTE4Nik6IFBy ZXNzaW5nIGVudGVyIGF0IHRoZSBlbmQgb2YgYSBsaW5lIGRlbGV0ZXMgdGhlIGxpbmUKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24u Y3BwCShyZXZpc2lvbiAxMjk2ODQpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRT dHlsZURlY2xhcmF0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDksNiArNDksNyBAQAogI2lu Y2x1ZGUgIkZvbnRGZWF0dXJlU2V0dGluZ3MuaCIKICNpbmNsdWRlICJGb250RmVhdHVyZVZhbHVl LmgiCiAjaW5jbHVkZSAiRm9udFZhbHVlLmgiCisjaW5jbHVkZSAiSFRNTEZyYW1lT3duZXJFbGVt ZW50LmgiCiAjaW5jbHVkZSAiUGFpci5oIgogI2luY2x1ZGUgIlJlY3QuaCIKICNpbmNsdWRlICJS ZW5kZXJCb3guaCIKQEAgLTU4LDYgKzU5LDcgQEAKICNpbmNsdWRlICJTdHlsZUluaGVyaXRlZERh dGEuaCIKICNpbmNsdWRlICJTdHlsZVByb3BlcnR5U2V0LmgiCiAjaW5jbHVkZSAiU3R5bGVQcm9w ZXJ0eVNob3J0aGFuZC5oIgorI2luY2x1ZGUgIlN0eWxlUmVzb2x2ZXIuaCIKICNpbmNsdWRlICJX ZWJDb3JlTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgiCiAjaW5jbHVkZSAiV2ViS2l0Q1NTVHJhbnNm b3JtVmFsdWUuaCIKICNpbmNsdWRlICJXZWJLaXRGb250RmFtaWx5TmFtZXMuaCIKQEAgLTEzODQs MTUgKzEzODYsNTUgQEAgc3RhdGljIFBhc3NSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGZvbgog ICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVO b3JtYWwpOwogfQogCitzdGF0aWMgYm9vbCBpc0xheW91dERlcGVuZGVudFByb3BlcnR5KENTU1By b3BlcnR5SUQgcHJvcGVydHlJRCkKK3sKKyAgICBzd2l0Y2ggKHByb3BlcnR5SUQpIHsKKyAgICBj YXNlIENTU1Byb3BlcnR5V2lkdGg6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUhlaWdodDoKKyAgICBj YXNlIENTU1Byb3BlcnR5TWFyZ2luOgorICAgIGNhc2UgQ1NTUHJvcGVydHlNYXJnaW5Ub3A6Cisg ICAgY2FzZSBDU1NQcm9wZXJ0eU1hcmdpbkJvdHRvbToKKyAgICBjYXNlIENTU1Byb3BlcnR5TWFy Z2luTGVmdDoKKyAgICBjYXNlIENTU1Byb3BlcnR5TWFyZ2luUmlnaHQ6CisgICAgY2FzZSBDU1NQ cm9wZXJ0eVBhZGRpbmc6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVBhZGRpbmdUb3A6CisgICAgY2Fz ZSBDU1NQcm9wZXJ0eVBhZGRpbmdCb3R0b206CisgICAgY2FzZSBDU1NQcm9wZXJ0eVBhZGRpbmdM ZWZ0OgorICAgIGNhc2UgQ1NTUHJvcGVydHlQYWRkaW5nUmlnaHQ6CisgICAgY2FzZSBDU1NQcm9w ZXJ0eVdlYmtpdFBlcnNwZWN0aXZlT3JpZ2luOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRU cmFuc2Zvcm1PcmlnaW46CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFRyYW5zZm9ybToKKyNp ZiBFTkFCTEUoQ1NTX0ZJTFRFUlMpCisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZpbHRlcjoK KyNlbmRpZgorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBkZWZhdWx0OgorICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgfQorfQorCiBQYXNzUmVmUHRyPENTU1ZhbHVlPiBDU1NDb21wdXRlZFN0 eWxlRGVjbGFyYXRpb246OmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0 eUlELCBFVXBkYXRlTGF5b3V0IHVwZGF0ZUxheW91dCkgY29uc3QKIHsKICAgICBOb2RlKiBub2Rl ID0gbV9ub2RlLmdldCgpOwogICAgIGlmICghbm9kZSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAg ICAvLyBNYWtlIHN1cmUgb3VyIGxheW91dCBpcyB1cCB0byBkYXRlIGJlZm9yZSB3ZSBhbGxvdyBh IHF1ZXJ5IG9uIHRoZXNlIGF0dHJpYnV0ZXMuCi0gICAgaWYgKHVwZGF0ZUxheW91dCkKLSAgICAg ICAgbm9kZS0+ZG9jdW1lbnQoKS0+dXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRz KCk7CisgICAgaWYgKHVwZGF0ZUxheW91dCkgeworICAgICAgICAvLyBGSVhNRTogU29tZSBvZiB0 aGVzZSBjYXNlcyBjb3VsZCBuYXJyb3dlZCBkb3duIG9yIG9wdGltaXplZCBiZXR0ZXIuCisgICAg ICAgIGJvb2wgZm9yY2VGdWxsTGF5b3V0ID0gbm9kZS0+aXNJblNoYWRvd1RyZWUoKQorICAgICAg ICAgICAgfHwgKG5vZGUtPmRvY3VtZW50KCktPnN0eWxlUmVzb2x2ZXIoKS0+aGFzVmlld3BvcnRE ZXBlbmRlbnRNZWRpYVF1ZXJpZXMoKSAmJiBub2RlLT5kb2N1bWVudCgpLT5vd25lckVsZW1lbnQo KSkKKyAgICAgICAgICAgIHx8IG5vZGUtPmRvY3VtZW50KCktPnNlYW1sZXNzUGFyZW50SUZyYW1l KCk7CisKKyAgICAgICAgaWYgKGZvcmNlRnVsbExheW91dCB8fCBpc0xheW91dERlcGVuZGVudFBy b3BlcnR5KHByb3BlcnR5SUQpKQorICAgICAgICAgICAgbm9kZS0+ZG9jdW1lbnQoKS0+dXBkYXRl TGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7CisgICAgICAgIGVsc2UgeworICAgICAg ICAgICAgYm9vbCBuZWVkc1N0eWxlUmVjYWxjID0gbV9ub2RlLT5kb2N1bWVudCgpLT5oYXNQZW5k aW5nRm9yY2VkU3R5bGVSZWNhbGMoKTsKKyAgICAgICAgICAgIGZvciAoTm9kZSogbiA9IG1fbm9k ZS5nZXQoKTsgbiAmJiAhbmVlZHNTdHlsZVJlY2FsYzsgbiA9IG4tPnBhcmVudE5vZGUoKSkKKyAg ICAgICAgICAgICAgICBuZWVkc1N0eWxlUmVjYWxjID0gbi0+bmVlZHNTdHlsZVJlY2FsYygpOwor ICAgICAgICAgICAgaWYgKG5lZWRzU3R5bGVSZWNhbGMpCisgICAgICAgICAgICAgICAgbm9kZS0+ ZG9jdW1lbnQoKS0+dXBkYXRlU3R5bGVJZk5lZWRlZCgpOworICAgICAgICB9CisgICAgfQogCiAg ICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG5vZGUtPnJlbmRlcmVyKCk7CiAKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuaAkocmV2aXNpb24gMTI5Njg0KQorKysgU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMjMyLDcgKzIzMiw3 IEBAIHB1YmxpYzoKICAgICBDU1NGb250U2VsZWN0b3IqIGZvbnRTZWxlY3RvcigpIGNvbnN0IHsg cmV0dXJuIG1fZm9udFNlbGVjdG9yLmdldCgpOyB9CiAKICAgICB2b2lkIGFkZFZpZXdwb3J0RGVw ZW5kZW50TWVkaWFRdWVyeVJlc3VsdChjb25zdCBNZWRpYVF1ZXJ5RXhwKiwgYm9vbCByZXN1bHQp OwotCisgICAgYm9vbCBoYXNWaWV3cG9ydERlcGVuZGVudE1lZGlhUXVlcmllcygpIGNvbnN0IHsg cmV0dXJuICFtX3ZpZXdwb3J0RGVwZW5kZW50TWVkaWFRdWVyeVJlc3VsdHMuaXNFbXB0eSgpOyB9 CiAgICAgYm9vbCBhZmZlY3RlZEJ5Vmlld3BvcnRDaGFuZ2UoKSBjb25zdDsKIAogICAgIHZvaWQg YWxsVmlzaXRlZFN0YXRlQ2hhbmdlZCgpIHsgbV9jaGVja2VyLmFsbFZpc2l0ZWRTdGF0ZUNoYW5n ZWQoKTsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCShyZXZpc2lvbiAxMjk2ODQpCisr KyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzc1 LDExICsxNzc1LDE2IEBAIHZvaWQgRG9jdW1lbnQ6OnVuc2NoZWR1bGVTdHlsZVJlY2FsYygpCiAg ICAgbV9wZW5kaW5nU3R5bGVSZWNhbGNTaG91bGRGb3JjZSA9IGZhbHNlOwogfQogCi1ib29sIERv Y3VtZW50Ojppc1BlbmRpbmdTdHlsZVJlY2FsYygpIGNvbnN0Citib29sIERvY3VtZW50OjpoYXNQ ZW5kaW5nU3R5bGVSZWNhbGMoKSBjb25zdAogewogICAgIHJldHVybiBtX3N0eWxlUmVjYWxjVGlt ZXIuaXNBY3RpdmUoKSAmJiAhbV9pblN0eWxlUmVjYWxjOwogfQogCitib29sIERvY3VtZW50Ojpo YXNQZW5kaW5nRm9yY2VkU3R5bGVSZWNhbGMoKSBjb25zdAoreworICAgIHJldHVybiBtX3N0eWxl UmVjYWxjVGltZXIuaXNBY3RpdmUoKSAmJiBtX3BlbmRpbmdTdHlsZVJlY2FsY1Nob3VsZEZvcmNl OworfQorCiB2b2lkIERvY3VtZW50OjpzdHlsZVJlY2FsY1RpbWVyRmlyZWQoVGltZXI8RG9jdW1l bnQ+KikKIHsKICAgICB1cGRhdGVTdHlsZUlmTmVlZGVkKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9kb20vRG9jdW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuaAkocmV2aXNpb24gMTI5Njg0KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgJ KHdvcmtpbmcgY29weSkKQEAgLTcxMyw3ICs3MTMsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzY2hl ZHVsZUZvcmNlZFN0eWxlUmVjYWxjKCk7CiAgICAgdm9pZCBzY2hlZHVsZVN0eWxlUmVjYWxjKCk7 CiAgICAgdm9pZCB1bnNjaGVkdWxlU3R5bGVSZWNhbGMoKTsKLSAgICBib29sIGlzUGVuZGluZ1N0 eWxlUmVjYWxjKCkgY29uc3Q7CisgICAgYm9vbCBoYXNQZW5kaW5nU3R5bGVSZWNhbGMoKSBjb25z dDsKKyAgICBib29sIGhhc1BlbmRpbmdGb3JjZWRTdHlsZVJlY2FsYygpIGNvbnN0OwogICAgIHZv aWQgc3R5bGVSZWNhbGNUaW1lckZpcmVkKFRpbWVyPERvY3VtZW50PiopOwogCiAgICAgdm9pZCBy ZWdpc3Rlck5vZGVMaXN0Q2FjaGUoRHluYW1pY05vZGVMaXN0Q2FjaGVCYXNlKik7CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHAJKHJldmlzaW9uIDEyOTY4NCkK KysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE3Myw3ICsxNzMsNyBAQCB2b2lkIFJlbmRlckltYWdlOjppbWFnZUNoYW5nZWQoV3Jh cHBlZEltCiAKICAgICAvLyBTZXQgaW1hZ2UgZGltZW5zaW9ucywgdGFraW5nIGludG8gYWNjb3Vu dCB0aGUgc2l6ZSBvZiB0aGUgYWx0IHRleHQuCiAgICAgaWYgKG1faW1hZ2VSZXNvdXJjZS0+ZXJy b3JPY2N1cnJlZCgpKSB7Ci0gICAgICAgIGlmICghbV9hbHRUZXh0LmlzRW1wdHkoKSAmJiBkb2N1 bWVudCgpLT5pc1BlbmRpbmdTdHlsZVJlY2FsYygpKSB7CisgICAgICAgIGlmICghbV9hbHRUZXh0 LmlzRW1wdHkoKSAmJiBkb2N1bWVudCgpLT5oYXNQZW5kaW5nU3R5bGVSZWNhbGMoKSkgewogICAg ICAgICAgICAgQVNTRVJUKG5vZGUoKSk7CiAgICAgICAgICAgICBpZiAobm9kZSgpKSB7CiAgICAg ICAgICAgICAgICAgbV9uZWVkc1RvU2V0U2l6ZUZvckFsdFRleHQgPSB0cnVlOwo=