61454 2011-05-25 11:44:09 -0700 CSSStyleSelector should provide a way to obtain rules from non-author stylesheets 2011-05-25 23:41:35 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 34564 1 rniwa rniwa ap darin dglazkov enrica eric inferno jamesr koivisto simon.fraser oldest_to_newest 409786 0 rniwa 2011-05-25 11:44:09 -0700 When serializing DOM, we need to know the default styles of elements in order to avoid overriding them by computed style. 409859 1 94840 rniwa 2011-05-25 12:44:38 -0700 Created attachment 94840 Patch 409867 2 94840 jamesr 2011-05-25 13:00:17 -0700 Comment on attachment 94840 Patch R=me 409887 3 rniwa 2011-05-25 13:32:42 -0700 Committed r87317: <http://trac.webkit.org/changeset/87317> 409974 4 eric 2011-05-25 15:34:57 -0700 The inspector must already know how to do this kind of thing. No? 410225 5 ap 2011-05-25 23:23:43 -0700 Does this change what rules JavaScript code can see, and thus re-introduce bug 46853? 410228 6 rniwa 2011-05-25 23:32:55 -0700 (In reply to comment #5) > Does this change what rules JavaScript code can see, and thus re-introduce bug 46853? I don't think so. This bug is about letting StylizedMarkupAccumulator know of the default UA + user stylesheets so that we don't override style rules from UA+user stylesheets when we're serializing DOM; e.g. when serializing pre, we shouldn't be overriding whitespace property unless it's specified in inline style declaration or some CSS rules. 94840 2011-05-25 12:44:38 -0700 2011-05-25 13:00:17 -0700 Patch bug-61454-20110525124437.patch text/plain 10385 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3MzE1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDUtMjUgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQ1NTU3R5bGVTZWxlY3RvciBzaG91bGQgcHJvdmlkZSBhIHdheSB0 byBvYnRhaW4gcnVsZXMgZnJvbSBub24tYXV0aG9yIHN0eWxlc2hlZXRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTQ1NAorCisgICAgICAgIFJlcGxh Y2VkIGJvb2wgYW5kIGVudW0gYXJndW1lbnRzIG9mIHN0eWxlUnVsZXNGb3JFbGVtZW50IGFuZCBw c2V1ZG9TdHlsZVJ1bGVzRm9yRWxlbWVudAorICAgICAgICBieSBvbmUgZW51bSwgYW5kIHByb3Zp ZGVkIGEgd2F5IHRvIG9idGFpbiBydWxlcyBmcm9tIFVBL3VzZXIgc3R5bGVzaGVldHMuCisKKyAg ICAgICAgKiBjc3MvQ1NTUnVsZS5oOiBSZW1vdmVkIENTU1J1bGVGaWx0ZXIuCisgICAgICAgICog Y3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxl Y3Rvcjo6c3R5bGVSdWxlc0ZvckVsZW1lbnQpOiBTZWUgYWJvdmUuCisgICAgICAgIChXZWJDb3Jl OjpDU1NTdHlsZVNlbGVjdG9yOjpwc2V1ZG9TdHlsZVJ1bGVzRm9yRWxlbWVudCk6IERpdHRvLgor ICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmg6IE1vdmVkIENTU1J1bGVGaWx0ZXIgaGVy ZS4KKyAgICAgICAgKiBlZGl0aW5nL21hcmt1cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzdHls ZUZyb21NYXRjaGVkUnVsZXNGb3JFbGVtZW50KTogQ2FsbHMgc3R5bGVSdWxlc0ZvckVsZW1lbnQu CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckNTU0FnZW50OjpnZXRTdHlsZXNGb3JOb2RlKTogRGl0dG8uCisgICAg ICAgICogcGFnZS9ET01XaW5kb3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RE9NV2luZG93Ojpn ZXRNYXRjaGVkQ1NTUnVsZXMpOiBEaXR0by4KKwogMjAxMS0wNS0yNSAgQ2FpbyBNYXJjZWxvIGRl IE9saXZlaXJhIEZpbGhvICA8Y2Fpby5vbGl2ZWlyYUBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEFuZHJlYXMgS2xpbmcuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NT UnVsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NSdWxlLmgJKHJldmlz aW9uIDg3MjQ5KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1J1bGUuaAkod29ya2luZyBjb3B5 KQpAQCAtMzAsMTEgKzMwLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiB0eXBlZGVmIGludCBF eGNlcHRpb25Db2RlOwogCi1lbnVtIENTU1J1bGVGaWx0ZXIgewotICAgIEFsbENTU1J1bGVzLAot ICAgIFNhbWVPcmlnaW5DU1NSdWxlc09ubHkKLX07IAotCiBjbGFzcyBDU1NSdWxlIDogcHVibGlj IFN0eWxlQmFzZSB7CiBwdWJsaWM6CiAgICAgLy8gRklYTUU6IENoYW5nZSBuYW1lIHRvIFR5cGUu CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCShyZXZpc2lvbiA4 NzI0OSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTk5MSwxMiArMTk5MSwxMiBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmNh Y2hlQm9yZGVyQW5kQmFjCiAgICAgfQogfQogCi1QYXNzUmVmUHRyPENTU1J1bGVMaXN0PiBDU1NT dHlsZVNlbGVjdG9yOjpzdHlsZVJ1bGVzRm9yRWxlbWVudChFbGVtZW50KiBlLCBib29sIGF1dGhv ck9ubHksIGJvb2wgaW5jbHVkZUVtcHR5UnVsZXMsIENTU1J1bGVGaWx0ZXIgZmlsdGVyKQorUGFz c1JlZlB0cjxDU1NSdWxlTGlzdD4gQ1NTU3R5bGVTZWxlY3Rvcjo6c3R5bGVSdWxlc0ZvckVsZW1l bnQoRWxlbWVudCogZSwgdW5zaWduZWQgcnVsZXNUb0luY2x1ZGUpCiB7Ci0gICAgcmV0dXJuIHBz ZXVkb1N0eWxlUnVsZXNGb3JFbGVtZW50KGUsIE5PUFNFVURPLCBhdXRob3JPbmx5LCBpbmNsdWRl RW1wdHlSdWxlcywgZmlsdGVyKTsKKyAgICByZXR1cm4gcHNldWRvU3R5bGVSdWxlc0ZvckVsZW1l bnQoZSwgTk9QU0VVRE8sIHJ1bGVzVG9JbmNsdWRlKTsKIH0KIAotUGFzc1JlZlB0cjxDU1NSdWxl TGlzdD4gQ1NTU3R5bGVTZWxlY3Rvcjo6cHNldWRvU3R5bGVSdWxlc0ZvckVsZW1lbnQoRWxlbWVu dCogZSwgUHNldWRvSWQgcHNldWRvSWQsIGJvb2wgYXV0aG9yT25seSwgYm9vbCBpbmNsdWRlRW1w dHlSdWxlcywgQ1NTUnVsZUZpbHRlciBmaWx0ZXIpCitQYXNzUmVmUHRyPENTU1J1bGVMaXN0PiBD U1NTdHlsZVNlbGVjdG9yOjpwc2V1ZG9TdHlsZVJ1bGVzRm9yRWxlbWVudChFbGVtZW50KiBlLCBQ c2V1ZG9JZCBwc2V1ZG9JZCwgdW5zaWduZWQgcnVsZXNUb0luY2x1ZGUpCiB7CiAgICAgaWYgKCFl IHx8ICFlLT5kb2N1bWVudCgpLT5oYXZlU3R5bGVzaGVldHNMb2FkZWQoKSkKICAgICAgICAgcmV0 dXJuIDA7CkBAIC0yMDA2LDcgKzIwMDYsNyBAQCBQYXNzUmVmUHRyPENTU1J1bGVMaXN0PiBDU1NT dHlsZVNlbGVjdG9yCiAgICAgaW5pdEVsZW1lbnQoZSk7CiAgICAgaW5pdEZvclN0eWxlUmVzb2x2 ZShlLCAwLCBwc2V1ZG9JZCk7CiAKLSAgICBpZiAoIWF1dGhvck9ubHkpIHsKKyAgICBpZiAocnVs ZXNUb0luY2x1ZGUgJiBVQUFuZFVzZXJDU1NSdWxlcykgewogICAgICAgICBpbnQgZmlyc3RVQVJ1 bGUgPSAtMSwgbGFzdFVBUnVsZSA9IC0xOwogICAgICAgICAvLyBGaXJzdCB3ZSBtYXRjaCBydWxl cyBmcm9tIHRoZSB1c2VyIGFnZW50IHNoZWV0LgogICAgICAgICBtYXRjaFVBUnVsZXMoZmlyc3RV QVJ1bGUsIGxhc3RVQVJ1bGUpOwpAQCAtMjAxNCwxNiArMjAxNCwxNiBAQCBQYXNzUmVmUHRyPENT U1J1bGVMaXN0PiBDU1NTdHlsZVNlbGVjdG9yCiAgICAgICAgIC8vIE5vdyB3ZSBjaGVjayB1c2Vy IHNoZWV0IHJ1bGVzLgogICAgICAgICBpZiAobV9tYXRjaEF1dGhvckFuZFVzZXJTdHlsZXMpIHsK ICAgICAgICAgICAgIGludCBmaXJzdFVzZXJSdWxlID0gLTEsIGxhc3RVc2VyUnVsZSA9IC0xOwot ICAgICAgICAgICAgbWF0Y2hSdWxlcyhtX3VzZXJTdHlsZS5nZXQoKSwgZmlyc3RVc2VyUnVsZSwg bGFzdFVzZXJSdWxlLCBpbmNsdWRlRW1wdHlSdWxlcyk7CisgICAgICAgICAgICBtYXRjaFJ1bGVz KG1fdXNlclN0eWxlLmdldCgpLCBmaXJzdFVzZXJSdWxlLCBsYXN0VXNlclJ1bGUsIHJ1bGVzVG9J bmNsdWRlICYgRW1wdHlDU1NSdWxlcyk7CiAgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAobV9t YXRjaEF1dGhvckFuZFVzZXJTdHlsZXMpIHsKLSAgICAgICAgbV9jaGVja2VyLm1fc2FtZU9yaWdp bk9ubHkgPSAoZmlsdGVyID09IFNhbWVPcmlnaW5DU1NSdWxlc09ubHkpOworICAgICAgICBtX2No ZWNrZXIubV9zYW1lT3JpZ2luT25seSA9ICEocnVsZXNUb0luY2x1ZGUgJiBDcm9zc09yaWdpbkNT U1J1bGVzKTsKIAogICAgICAgICAvLyBDaGVjayB0aGUgcnVsZXMgaW4gYXV0aG9yIHNoZWV0cy4K ICAgICAgICAgaW50IGZpcnN0QXV0aG9yUnVsZSA9IC0xLCBsYXN0QXV0aG9yUnVsZSA9IC0xOwot ICAgICAgICBtYXRjaFJ1bGVzKG1fYXV0aG9yU3R5bGUuZ2V0KCksIGZpcnN0QXV0aG9yUnVsZSwg bGFzdEF1dGhvclJ1bGUsIGluY2x1ZGVFbXB0eVJ1bGVzKTsKKyAgICAgICAgbWF0Y2hSdWxlcyht X2F1dGhvclN0eWxlLmdldCgpLCBmaXJzdEF1dGhvclJ1bGUsIGxhc3RBdXRob3JSdWxlLCBydWxl c1RvSW5jbHVkZSAmIEVtcHR5Q1NTUnVsZXMpOwogCiAgICAgICAgIG1fY2hlY2tlci5tX3NhbWVP cmlnaW5Pbmx5ID0gZmFsc2U7CiAgICAgfQpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0 eWxlU2VsZWN0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVT ZWxlY3Rvci5oCShyZXZpc2lvbiA4NzI0OSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHls ZVNlbGVjdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyOCw4ICsxMjgsMTYgQEAgcHVibGljOgog CiAgICAgcHVibGljOgogICAgICAgICAvLyBUaGVzZSBtZXRob2RzIHdpbGwgZ2l2ZSBiYWNrIHRo ZSBzZXQgb2YgcnVsZXMgdGhhdCBtYXRjaGVkIGZvciBhIGdpdmVuIGVsZW1lbnQgKG9yIGEgcHNl dWRvLWVsZW1lbnQpLgotICAgICAgICBQYXNzUmVmUHRyPENTU1J1bGVMaXN0PiBzdHlsZVJ1bGVz Rm9yRWxlbWVudChFbGVtZW50KiwgYm9vbCBhdXRob3JPbmx5LCBib29sIGluY2x1ZGVFbXB0eVJ1 bGVzID0gZmFsc2UsIENTU1J1bGVGaWx0ZXIgZmlsdGVyID0gQWxsQ1NTUnVsZXMpOwotICAgICAg ICBQYXNzUmVmUHRyPENTU1J1bGVMaXN0PiBwc2V1ZG9TdHlsZVJ1bGVzRm9yRWxlbWVudChFbGVt ZW50KiwgUHNldWRvSWQsIGJvb2wgYXV0aG9yT25seSwgYm9vbCBpbmNsdWRlRW1wdHlSdWxlcyA9 IGZhbHNlLCBDU1NSdWxlRmlsdGVyIGZpbHRlciA9IEFsbENTU1J1bGVzKTsKKyAgICAgICAgZW51 bSBDU1NSdWxlRmlsdGVyIHsKKyAgICAgICAgICAgIFVBQW5kVXNlckNTU1J1bGVzICAgPSAxIDw8 IDEsCisgICAgICAgICAgICBBdXRob3JDU1NSdWxlcyAgICAgID0gMSA8PCAyLAorICAgICAgICAg ICAgRW1wdHlDU1NSdWxlcyAgICAgICA9IDEgPDwgMywKKyAgICAgICAgICAgIENyb3NzT3JpZ2lu Q1NTUnVsZXMgPSAxIDw8IDQsCisgICAgICAgICAgICBBbGxCdXRFbXB0eUNTU1J1bGVzID0gVUFB bmRVc2VyQ1NTUnVsZXMgfCBBdXRob3JDU1NSdWxlcyB8IENyb3NzT3JpZ2luQ1NTUnVsZXMsCisg ICAgICAgICAgICBBbGxDU1NSdWxlcyAgICAgICAgID0gQWxsQnV0RW1wdHlDU1NSdWxlcyB8IEVt cHR5Q1NTUnVsZXMsCisgICAgICAgIH07CisgICAgICAgIFBhc3NSZWZQdHI8Q1NTUnVsZUxpc3Q+ IHN0eWxlUnVsZXNGb3JFbGVtZW50KEVsZW1lbnQqLCB1bnNpZ25lZCBydWxlc1RvSW5jbHVkZSA9 IEFsbEJ1dEVtcHR5Q1NTUnVsZXMpOworICAgICAgICBQYXNzUmVmUHRyPENTU1J1bGVMaXN0PiBw c2V1ZG9TdHlsZVJ1bGVzRm9yRWxlbWVudChFbGVtZW50KiwgUHNldWRvSWQsIHVuc2lnbmVkIHJ1 bGVzVG9JbmNsdWRlID0gQWxsQnV0RW1wdHlDU1NSdWxlcyk7CiAKICAgICAgICAgLy8gR2l2ZW4g YSBDU1Mga2V5d29yZCBpbiB0aGUgcmFuZ2UgKHh4LXNtYWxsIHRvIC13ZWJraXQteHh4LWxhcmdl KSwgdGhpcyBmdW5jdGlvbiB3aWxsIHJldHVybgogICAgICAgICAvLyB0aGUgY29ycmVjdCBmb250 IHNpemUgc2NhbGVkIHJlbGF0aXZlIHRvIHRoZSB1c2VyJ3MgZGVmYXVsdCAobWVkaXVtKS4KSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFya3VwLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5jcHAJKHJldmlzaW9uIDg3MjQ5KQorKysgU291cmNl L1dlYkNvcmUvZWRpdGluZy9tYXJrdXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzksMTAgKzIz OSwxMSBAQCBTdHJpbmcgU3R5bGVkTWFya3VwQWNjdW11bGF0b3I6OnN0cmluZ1ZhCiAgICAgcmV0 dXJuIHN0cjsKIH0KIAotc3RhdGljIFBhc3NSZWZQdHI8Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRp b24+IHN0eWxlRnJvbU1hdGNoZWRSdWxlc0ZvckVsZW1lbnQoRWxlbWVudCogZWxlbWVudCwgYm9v bCBhdXRob3JPbmx5ID0gdHJ1ZSkKK3N0YXRpYyBQYXNzUmVmUHRyPENTU011dGFibGVTdHlsZURl Y2xhcmF0aW9uPiBzdHlsZUZyb21NYXRjaGVkUnVsZXNGb3JFbGVtZW50KEVsZW1lbnQqIGVsZW1l bnQpCiB7CiAgICAgUmVmUHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uPiBzdHlsZSA9IENT U011dGFibGVTdHlsZURlY2xhcmF0aW9uOjpjcmVhdGUoKTsKLSAgICBSZWZQdHI8Q1NTUnVsZUxp c3Q+IG1hdGNoZWRSdWxlcyA9IGVsZW1lbnQtPmRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+ c3R5bGVSdWxlc0ZvckVsZW1lbnQoZWxlbWVudCwgYXV0aG9yT25seSk7CisgICAgUmVmUHRyPENT U1J1bGVMaXN0PiBtYXRjaGVkUnVsZXMgPSBlbGVtZW50LT5kb2N1bWVudCgpLT5zdHlsZVNlbGVj dG9yKCktPnN0eWxlUnVsZXNGb3JFbGVtZW50KGVsZW1lbnQsCisgICAgICAgIENTU1N0eWxlU2Vs ZWN0b3I6OkF1dGhvckNTU1J1bGVzIHwgQ1NTU3R5bGVTZWxlY3Rvcjo6Q3Jvc3NPcmlnaW5DU1NS dWxlcyk7CiAgICAgaWYgKG1hdGNoZWRSdWxlcykgewogICAgICAgICBmb3IgKHVuc2lnbmVkIGkg PSAwOyBpIDwgbWF0Y2hlZFJ1bGVzLT5sZW5ndGgoKTsgaSsrKSB7CiAgICAgICAgICAgICBpZiAo bWF0Y2hlZFJ1bGVzLT5pdGVtKGkpLT50eXBlKCkgPT0gQ1NTUnVsZTo6U1RZTEVfUlVMRSkgewpJ bmRleDogU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3Bw CShyZXZpc2lvbiA4NzI0OSkKKysrIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD U1NBZ2VudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5OSwxNCArMTk5LDE0IEBAIHZvaWQgSW5z cGVjdG9yQ1NTQWdlbnQ6OmdldFN0eWxlc0Zvck5vZGUKICAgICByZXN1bHRPYmplY3QtPnNldE9i amVjdCgiY29tcHV0ZWRTdHlsZSIsIGNvbXB1dGVkSW5zcGVjdG9yU3R5bGUtPmJ1aWxkT2JqZWN0 Rm9yU3R5bGUoKSk7CiAKICAgICBDU1NTdHlsZVNlbGVjdG9yKiBzZWxlY3RvciA9IGVsZW1lbnQt Pm93bmVyRG9jdW1lbnQoKS0+c3R5bGVTZWxlY3RvcigpOwotICAgIFJlZlB0cjxDU1NSdWxlTGlz dD4gbWF0Y2hlZFJ1bGVzID0gc2VsZWN0b3ItPnN0eWxlUnVsZXNGb3JFbGVtZW50KGVsZW1lbnQs IGZhbHNlLCB0cnVlKTsKKyAgICBSZWZQdHI8Q1NTUnVsZUxpc3Q+IG1hdGNoZWRSdWxlcyA9IHNl bGVjdG9yLT5zdHlsZVJ1bGVzRm9yRWxlbWVudChlbGVtZW50LCBDU1NTdHlsZVNlbGVjdG9yOjpB bGxDU1NSdWxlcyk7CiAgICAgcmVzdWx0T2JqZWN0LT5zZXRBcnJheSgibWF0Y2hlZENTU1J1bGVz IiwgYnVpbGRBcnJheUZvclJ1bGVMaXN0KG1hdGNoZWRSdWxlcy5nZXQoKSkpOwogCiAgICAgcmVz dWx0T2JqZWN0LT5zZXRBcnJheSgic3R5bGVBdHRyaWJ1dGVzIiwgYnVpbGRBcnJheUZvckF0dHJp YnV0ZVN0eWxlcyhlbGVtZW50KSk7CiAKICAgICBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IHBzZXVk b0VsZW1lbnRzID0gSW5zcGVjdG9yQXJyYXk6OmNyZWF0ZSgpOwogICAgIGZvciAoUHNldWRvSWQg cHNldWRvSWQgPSBGSVJTVF9QVUJMSUNfUFNFVURPSUQ7IHBzZXVkb0lkIDwgQUZURVJfTEFTVF9J TlRFUk5BTF9QU0VVRE9JRDsgcHNldWRvSWQgPSBzdGF0aWNfY2FzdDxQc2V1ZG9JZD4ocHNldWRv SWQgKyAxKSkgewotICAgICAgICBSZWZQdHI8Q1NTUnVsZUxpc3Q+IG1hdGNoZWRSdWxlcyA9IHNl bGVjdG9yLT5wc2V1ZG9TdHlsZVJ1bGVzRm9yRWxlbWVudChlbGVtZW50LCBwc2V1ZG9JZCwgZmFs c2UsIHRydWUpOworICAgICAgICBSZWZQdHI8Q1NTUnVsZUxpc3Q+IG1hdGNoZWRSdWxlcyA9IHNl bGVjdG9yLT5wc2V1ZG9TdHlsZVJ1bGVzRm9yRWxlbWVudChlbGVtZW50LCBwc2V1ZG9JZCwgQ1NT U3R5bGVTZWxlY3Rvcjo6QWxsQ1NTUnVsZXMpOwogICAgICAgICBpZiAobWF0Y2hlZFJ1bGVzICYm IG1hdGNoZWRSdWxlcy0+bGVuZ3RoKCkpIHsKICAgICAgICAgICAgIFJlZlB0cjxJbnNwZWN0b3JP YmplY3Q+IHBzZXVkb1N0eWxlcyA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7CiAgICAgICAg ICAgICBwc2V1ZG9TdHlsZXMtPnNldE51bWJlcigicHNldWRvSWQiLCBzdGF0aWNfY2FzdDxpbnQ+ KHBzZXVkb0lkKSk7CkBAIC0yMjcsNyArMjI3LDcgQEAgdm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6 Z2V0U3R5bGVzRm9yTm9kZQogICAgICAgICB9CiAKICAgICAgICAgQ1NTU3R5bGVTZWxlY3Rvciog cGFyZW50U2VsZWN0b3IgPSBwYXJlbnRFbGVtZW50LT5vd25lckRvY3VtZW50KCktPnN0eWxlU2Vs ZWN0b3IoKTsKLSAgICAgICAgUmVmUHRyPENTU1J1bGVMaXN0PiBwYXJlbnRNYXRjaGVkUnVsZXMg PSBwYXJlbnRTZWxlY3Rvci0+c3R5bGVSdWxlc0ZvckVsZW1lbnQocGFyZW50RWxlbWVudCwgZmFs c2UsIHRydWUpOworICAgICAgICBSZWZQdHI8Q1NTUnVsZUxpc3Q+IHBhcmVudE1hdGNoZWRSdWxl cyA9IHBhcmVudFNlbGVjdG9yLT5zdHlsZVJ1bGVzRm9yRWxlbWVudChwYXJlbnRFbGVtZW50LCBD U1NTdHlsZVNlbGVjdG9yOjpBbGxDU1NSdWxlcyk7CiAgICAgICAgIHBhcmVudFN0eWxlLT5zZXRB cnJheSgibWF0Y2hlZENTU1J1bGVzIiwgYnVpbGRBcnJheUZvclJ1bGVMaXN0KHBhcmVudE1hdGNo ZWRSdWxlcy5nZXQoKSkpOwogICAgICAgICBpbmhlcml0ZWRTdHlsZXMtPnB1c2hPYmplY3QocGFy ZW50U3R5bGUucmVsZWFzZSgpKTsKICAgICAgICAgcGFyZW50RWxlbWVudCA9IHBhcmVudEVsZW1l bnQtPnBhcmVudEVsZW1lbnQoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAJKHJl dmlzaW9uIDg3MjQ5KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMjkxLDEzICsxMjkxLDIwIEBAIFBhc3NSZWZQdHI8Q1NTU3R5bGVEZWNs YXJhdGlvbj4gRE9NV2luZG8KICAgICByZXR1cm4gY29tcHV0ZWRTdHlsZShlbHQsIGZhbHNlLCBw c2V1ZG9FbHQpOwogfQogCi1QYXNzUmVmUHRyPENTU1J1bGVMaXN0PiBET01XaW5kb3c6OmdldE1h dGNoZWRDU1NSdWxlcyhFbGVtZW50KiBlbHQsIGNvbnN0IFN0cmluZyYsIGJvb2wgYXV0aG9yT25s eSkgY29uc3QKK1Bhc3NSZWZQdHI8Q1NTUnVsZUxpc3Q+IERPTVdpbmRvdzo6Z2V0TWF0Y2hlZENT U1J1bGVzKEVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IFN0cmluZyYsIGJvb2wgYXV0aG9yT25seSkg Y29uc3QKIHsKICAgICBpZiAoIW1fZnJhbWUpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAgU2V0 dGluZ3MqIHNldHRpbmdzID0gbV9mcmFtZS0+c2V0dGluZ3MoKTsKLSAgICByZXR1cm4gbV9mcmFt ZS0+ZG9jdW1lbnQoKS0+c3R5bGVTZWxlY3RvcigpLT5zdHlsZVJ1bGVzRm9yRWxlbWVudChlbHQs IGF1dGhvck9ubHksIGZhbHNlLCBzZXR0aW5ncyAmJiBzZXR0aW5ncy0+Y3Jvc3NPcmlnaW5DaGVj a0luR2V0TWF0Y2hlZENTU1J1bGVzRGlzYWJsZWQoKSA/IEFsbENTU1J1bGVzIDogU2FtZU9yaWdp bkNTU1J1bGVzT25seSk7CisgICAgdW5zaWduZWQgcnVsZXNUb0luY2x1ZGUgPSBDU1NTdHlsZVNl bGVjdG9yOjpBdXRob3JDU1NSdWxlczsKKyAgICBpZiAoIWF1dGhvck9ubHkpCisgICAgICAgIHJ1 bGVzVG9JbmNsdWRlIHw9IENTU1N0eWxlU2VsZWN0b3I6OlVBQW5kVXNlckNTU1J1bGVzOworICAg IGlmIChTZXR0aW5ncyogc2V0dGluZ3MgPSBtX2ZyYW1lLT5zZXR0aW5ncygpKSB7CisgICAgICAg IGlmIChzZXR0aW5ncy0+Y3Jvc3NPcmlnaW5DaGVja0luR2V0TWF0Y2hlZENTU1J1bGVzRGlzYWJs ZWQoKSkKKyAgICAgICAgICAgIHJ1bGVzVG9JbmNsdWRlIHw9IENTU1N0eWxlU2VsZWN0b3I6OkNy b3NzT3JpZ2luQ1NTUnVsZXM7CisgICAgfQorCisgICAgcmV0dXJuIG1fZnJhbWUtPmRvY3VtZW50 KCktPnN0eWxlU2VsZWN0b3IoKS0+c3R5bGVSdWxlc0ZvckVsZW1lbnQoZWxlbWVudCwgcnVsZXNU b0luY2x1ZGUpOwogfQogCiBQYXNzUmVmUHRyPFdlYktpdFBvaW50PiBET01XaW5kb3c6OndlYmtp dENvbnZlcnRQb2ludEZyb21Ob2RlVG9QYWdlKE5vZGUqIG5vZGUsIGNvbnN0IFdlYktpdFBvaW50 KiBwKSBjb25zdAo=