71203 2011-10-30 21:59:09 -0700 REGRESSION(r96870): WebKit generates background: transparent on blogger.com 2011-11-02 09:22:55 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P1 Normal --- 1 rniwa rniwa abarth darin enrica leviw morrita ojan sullivan tkent tony oldest_to_newest 493147 0 rniwa 2011-10-30 21:59:09 -0700 It appears that one of my changesets to markup.cpp / ReplaceSelectionCommand.cpp introduced a regression. 493148 1 113011 rniwa 2011-10-30 21:59:47 -0700 Created attachment 113011 demo 493163 2 113014 rniwa 2011-10-30 23:23:38 -0700 Created attachment 113014 fixes the bug 493329 3 113014 ojan 2011-10-31 08:42:39 -0700 Comment on attachment 113014 fixes the bug Does this do the right thing for the following case? <div contentEditable> foo <div style="background: transparent">bar</div> baz </div> If you select bar and copy-paste it within the contentEditable element, should we maintain the transparent background? 493354 4 rniwa 2011-10-31 09:30:04 -0700 (In reply to comment #3) > (From update of attachment 113014 [details]) > Does this do the right thing for the following case? > > <div contentEditable> > foo > <div style="background: transparent">bar</div> > baz > </div> > > If you select bar and copy-paste it within the contentEditable element, should we maintain the transparent background? We should not. 493433 5 ojan 2011-10-31 11:59:27 -0700 What about copy-pasting "foo" in the following case? Both the original and the copy-pasted foo should have a transparent background, right? Does that work with the following code? If so, can you add a test for this case as well? <style> .foo { background: blue; } </style> <div contentEditable> a<span class=foo style="background:transparent">foo</span>b </div> 493435 6 rniwa 2011-10-31 12:03:15 -0700 (In reply to comment #5) > What about copy-pasting "foo" in the following case? Both the original and the copy-pasted foo should have a transparent background, right? Does that work with the following code? If so, can you add a test for this case as well? > > <style> > .foo { > background: blue; > } > </style> > <div contentEditable> > a<span class=foo style="background:transparent">foo</span>b > </div> Sure. Let me add that as a test. 493519 7 113089 rniwa 2011-10-31 15:08:10 -0700 Created attachment 113089 Added ojan's test case also fixed a bug 493599 8 113089 ojan 2011-10-31 16:21:44 -0700 Comment on attachment 113089 Added ojan's test case also fixed a bug View in context: https://bugs.webkit.org/attachment.cgi?id=113089&action=review > Source/WebCore/editing/EditingStyle.cpp:1090 > - computedStyle->removePropertiesInElementDefaultStyle(element); > + if (!computedStyle->m_mutableStyle->getPropertyCSSValue(CSSPropertyBackgroundColor)) > + computedStyle->m_mutableStyle->setProperty(CSSPropertyBackgroundColor, CSSValueTransparent); > + > + removePropertiesInStyle(computedStyle->m_mutableStyle.get(), styleFromMatchedRules.get()); This changes from removing styleFromMatchedRules using AllButEmptyCSSRules to styleFromMatchedRules using UAAndUserCSSRules. Is that correct? Should 1087-1088 just be in removePropertiesInElementDefaultStyle? Sorry, I don't know this code well enough to know if this is the right change. 493602 9 rniwa 2011-10-31 16:25:11 -0700 (In reply to comment #8) > (From update of attachment 113089 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=113089&action=review > > > Source/WebCore/editing/EditingStyle.cpp:1090 > > - computedStyle->removePropertiesInElementDefaultStyle(element); > > + if (!computedStyle->m_mutableStyle->getPropertyCSSValue(CSSPropertyBackgroundColor)) > > + computedStyle->m_mutableStyle->setProperty(CSSPropertyBackgroundColor, CSSValueTransparent); > > + > > + removePropertiesInStyle(computedStyle->m_mutableStyle.get(), styleFromMatchedRules.get()); > > This changes from removing styleFromMatchedRules using AllButEmptyCSSRules to styleFromMatchedRules using UAAndUserCSSRules. Is that correct? Yes. That was a bug. Without this change, we'll end up removing background: transparent in your test case. 494356 10 rniwa 2011-11-01 17:37:20 -0700 Any reviewers? 494358 11 rniwa 2011-11-01 17:44:51 -0700 Yay! Thanks for the review. 494658 12 113089 rniwa 2011-11-02 09:22:50 -0700 Comment on attachment 113089 Added ojan's test case also fixed a bug Clearing flags on attachment: 113089 Committed r99067: <http://trac.webkit.org/changeset/99067> 494659 13 rniwa 2011-11-02 09:22:55 -0700 All reviewed patches have been landed. Closing bug. 113011 2011-10-30 21:59:47 -0700 2011-10-30 21:59:47 -0700 demo transparent-background.html text/html 447 rniwa PCFET0NUWVBFIGh0bWw+CjxodG1sIHN0eWxlPSJiYWNrZ3JvdW5kOm5vbmUgdHJhbnNwYXJlbnQ7 Ij4KPGJvZHkgaGlkZWZvY3VzPSJ0cnVlIiBjb250ZW50ZWRpdGFibGU9IiIgY2xhc3M9ImVkaXRh YmxlICI+CjxwIGlkPSJkZXN0aW5hdGlvbiI+aGVsbG88L3A+CjxwIGlkPSJ0YXJnZXQiPndvcmxk PC9wPgo8c2NyaXB0PgoKZG9jdW1lbnQuYm9keS5mb2N1cygpOwp2YXIgdGFyZ2V0ID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoJ3RhcmdldCcpOwpnZXRTZWxlY3Rpb24oKS5jb2xsYXBzZSh0YXJn ZXQsIDApOwpkb2N1bWVudC5leGVjQ29tbWFuZCgnRGVsZXRlJywgZmFsc2UsIG51bGwpOwoKZG9j dW1lbnQud3JpdGVsbihkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCcjZGVzdGluYXRpb24gc3Bhbicp ID8gJ0ZBSUwnIDogJ1BBU1MnKTsKCjwvc2NyaXB0Pgo8L2JvZHk+CjwvaHRtbD4K 113014 2011-10-30 23:23:38 -0700 2011-10-31 15:08:05 -0700 fixes the bug bug-71203-20111030232337.patch text/plain 4763 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4ODM1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTAtMzAgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTihyOTY4NzApOiBX ZWJLaXQgZ2VuZXJhdGVzIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50IG9uIGJsb2dnZXIuY29tCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTIwMworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvbid0IGluY2x1 ZGUgdHJhbnNwYXJlbnQgYmFja2dyb3VuZCBjb2xvciB3aGVuIGdlbmVyYXRpbmcgd3JhcHBpbmcg c3R5bGUgZm9yIHNlcmlhbGl6YXRpb24uCisgICAgICAgIEFsc28gcmVtb3ZlIHRyYW5zcGFyZW50 IGJhY2tncm91bmQgY29sb3IgZnJvbSBpbmxpbmUgc3R5bGUgZGVjbGFyYXRpb25zIGluIHRoZSBw YXN0ZWQgY29udGVudC4KKworICAgICAgICBUZXN0OiBlZGl0aW5nL3Bhc3RlYm9hcmQvbWVyZ2Ut cGFyYWdyYXBocy13aXRoLXRyYW5zcGFyZW50LWJhY2tncm91bmQuaHRtbAorCisgICAgICAgICog ZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdGluZ1N0eWxl Ojp3cmFwcGluZ1N0eWxlRm9yU2VyaWFsaXphdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpFZGl0 aW5nU3R5bGU6OnJlbW92ZVN0eWxlRnJvbVJ1bGVzQW5kQ29udGV4dCk6CisKIDIwMTEtMTAtMjkg IE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtd IFN3aXRjaCB0byBhIGJhY2tpbmcgc3RvcmUgYXBwcm9hY2ggZm9yIHBhaW50aW5nIFdlYktpdFdl YlZpZXcKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAJKHJldmlz aW9uIDk4ODMyKQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC05NjIsNiArOTYyLDkgQEAgUGFzc1JlZlB0cjxFZGl0aW5nU3R5bGU+ IEVkaXRpbmdTdHlsZTo6dwogICAgICAgICB9CiAgICAgfQogCisgICAgaWYgKHdyYXBwaW5nU3R5 bGUtPm1fbXV0YWJsZVN0eWxlICYmIGhhc1RyYW5zcGFyZW50QmFja2dyb3VuZENvbG9yKHdyYXBw aW5nU3R5bGUtPm1fbXV0YWJsZVN0eWxlLmdldCgpKSkKKyAgICAgICAgd3JhcHBpbmdTdHlsZS0+ bV9tdXRhYmxlU3R5bGUtPnJlbW92ZVByb3BlcnR5KENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9y KTsKKwogICAgIHJldHVybiB3cmFwcGluZ1N0eWxlLnJlbGVhc2UoKTsKIH0KIApAQCAtMTA4NSw2 ICsxMDg4LDEwIEBAIHZvaWQgRWRpdGluZ1N0eWxlOjpyZW1vdmVTdHlsZUZyb21SdWxlc0EKICAg ICAgICAgaWYgKCFzdHlsZUZyb21NYXRjaGVkUnVsZXMtPmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NT UHJvcGVydHlGbG9hdCkgJiYgZ2V0SWRlbnRpZmllclZhbHVlKG1fbXV0YWJsZVN0eWxlLmdldCgp LCBDU1NQcm9wZXJ0eUZsb2F0KSA9PSBDU1NWYWx1ZU5vbmUpCiAgICAgICAgICAgICBtX211dGFi bGVTdHlsZS0+cmVtb3ZlUHJvcGVydHkoQ1NTUHJvcGVydHlGbG9hdCk7CiAgICAgfQorCisgICAg Ly8gNC4gUmVtb3ZlIHRyYW5zcGFyZW50IGJhY2tncm91bmQgY29sb3IKKyAgICBpZiAobV9tdXRh YmxlU3R5bGUgJiYgaGFzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kQ29sb3IobV9tdXRhYmxlU3R5bGUu Z2V0KCkpKQorICAgICAgICBtX211dGFibGVTdHlsZS0+cmVtb3ZlUHJvcGVydHkoQ1NTUHJvcGVy dHlCYWNrZ3JvdW5kQ29sb3IpOwogfQogCiB2b2lkIEVkaXRpbmdTdHlsZTo6cmVtb3ZlUHJvcGVy dGllc0luRWxlbWVudERlZmF1bHRTdHlsZShFbGVtZW50KiBlbGVtZW50KQpJbmRleDogTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2 aXNpb24gOTg4MzUpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwxMyBAQAorMjAxMS0xMC0zMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9y Zz4KKworICAgICAgICBSRUdSRVNTSU9OKHI5Njg3MCk6IFdlYktpdCBnZW5lcmF0ZXMgYmFja2dy b3VuZDogdHJhbnNwYXJlbnQgb24gYmxvZ2dlci5jb20KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxMjAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBlZGl0aW5nL3Bhc3RlYm9hcmQvbWVyZ2UtcGFyYWdy YXBocy13aXRoLXRyYW5zcGFyZW50LWJhY2tncm91bmQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBlZGl0aW5nL3Bhc3RlYm9hcmQvbWVyZ2UtcGFyYWdyYXBocy13aXRoLXRyYW5zcGFy ZW50LWJhY2tncm91bmQuaHRtbDogQWRkZWQuCisKIDIwMTEtMTAtMzAgIFl1dGEgS2l0YW11cmEg IDx5dXRha0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViU29ja2V0OiBpZnJhbWUgaW4gcmVs b2FkLWNyYXNoLmh0bWwgcmVsb2FkcyBmb3JldmVyCkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5n L3Bhc3RlYm9hcmQvbWVyZ2UtcGFyYWdyYXBocy13aXRoLXRyYW5zcGFyZW50LWJhY2tncm91bmQt ZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2VkaXRpbmcvcGFzdGVib2Fy ZC9tZXJnZS1wYXJhZ3JhcGhzLXdpdGgtdHJhbnNwYXJlbnQtYmFja2dyb3VuZC1leHBlY3RlZC50 eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL3Bhc3RlYm9hcmQvbWVyZ2Ut cGFyYWdyYXBocy13aXRoLXRyYW5zcGFyZW50LWJhY2tncm91bmQtZXhwZWN0ZWQudHh0CShyZXZp c2lvbiAwKQpAQCAtMCwwICsxLDEwIEBACitUaGlzIHRlc3RzIG1lcmdpbmcgcGFyYWdyYXBocyBp bnNpZGUgYSBkb2N1bWVudCB3aXRoIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50IGluIGh0bWwgZWxl bWVudCdzIGlubGluZSBzdHlsZSBkZWNsYXJhdGlvbi4KK1dlYktpdCBzaG91bGQgbm90IGdlbmVy YXRlIGEgc3BhbiB3aXRoIGJhY2tncm91bmQtY29sb3IgcHJvcGVydHkgaW4gc3VjaCBjYXNlcy4K K3wgIgorIgorfCA8cD4KK3wgICBpZD0iZGVzdGluYXRpb24iCit8ICAgImhlbGxvPCNzZWxlY3Rp b24tY2FyZXQ+IgorfCAgICJ3b3JsZCIKK3wgIgorIgpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGlu Zy9wYXN0ZWJvYXJkL21lcmdlLXBhcmFncmFwaHMtd2l0aC10cmFuc3BhcmVudC1iYWNrZ3JvdW5k Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9wYXN0ZWJvYXJkL21lcmdl LXBhcmFncmFwaHMtd2l0aC10cmFuc3BhcmVudC1iYWNrZ3JvdW5kLmh0bWwJKHJldmlzaW9uIDAp CisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL3Bhc3RlYm9hcmQvbWVyZ2UtcGFyYWdyYXBocy13aXRo LXRyYW5zcGFyZW50LWJhY2tncm91bmQuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyNCBA QAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbCBzdHlsZT0iYmFja2dyb3VuZDogdHJhbnNwYXJlbnQ7 IHRleHQtZGVjb3JhdGlvbjogbm9uZSI+Cis8Ym9keT4KKzxwIGlkPSJkZXNjcmlwdGlvbiI+VGhp cyB0ZXN0cyBtZXJnaW5nIHBhcmFncmFwaHMgaW5zaWRlIGEgZG9jdW1lbnQgd2l0aCBiYWNrZ3Jv dW5kOiB0cmFuc3BhcmVudCBpbiBodG1sIGVsZW1lbnQncyBpbmxpbmUgc3R5bGUgZGVjbGFyYXRp b24uCitXZWJLaXQgc2hvdWxkIG5vdCBnZW5lcmF0ZSBhIHNwYW4gd2l0aCBiYWNrZ3JvdW5kLWNv bG9yIHByb3BlcnR5IGluIHN1Y2ggY2FzZXMuPC9wPgorPGRpdiBpZD0iY29udGFpbmVyIiBjb250 ZW50ZWRpdGFibGU+Cis8cCBpZD0iZGVzdGluYXRpb24iPmhlbGxvPC9wPgorPHAgaWQ9InRhcmdl dCI+d29ybGQ8L3A+Cis8L2Rpdj4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvZHVtcC1h cy1tYXJrdXAuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKworTWFya3VwLmRlc2NyaXB0aW9uKGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCdkZXNjcmlwdGlvbicpLnRleHRDb250ZW50KTsKKworZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2NvbnRhaW5lcicpLmZvY3VzKCk7Cit2YXIgdGFyZ2V0ID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3RhcmdldCcpOworZ2V0U2VsZWN0aW9uKCkuY29sbGFw c2UodGFyZ2V0LCAwKTsKK2RvY3VtZW50LmV4ZWNDb21tYW5kKCdEZWxldGUnLCBmYWxzZSwgbnVs bCk7CisKK01hcmt1cC5kdW1wKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb250YWluZXInKSk7 CisKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo= 113089 2011-10-31 15:08:10 -0700 2011-11-02 09:22:50 -0700 Added ojan's test case also fixed a bug bug-71203-20111031150809.patch text/plain 9260 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4ODg0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTAtMzEgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTihyOTY4NzApOiBX ZWJLaXQgZ2VuZXJhdGVzIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50IG9uIGJsb2dnZXIuY29tCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTIwMworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0aGUg dHJhbnNwYXJlbnQgYmFja2dyb3VuZCBjb2xvciBmcm9tIGlubGluZSBzdHlsZSBkZWNsYXJhdGlv bnMgaW4gdGhlIHBhc3RlZCBjb250ZW50LgorICAgICAgICBBbHNvIGZpeGVkIGEgYnVnIGluIHJl bW92ZVN0eWxlRnJvbVJ1bGVzQW5kQ29udGV4dCB0aGF0IGl0IHJlbW92ZXMgcHJvcGVydGllcyBp biBpbmxpbmUgc3R5bGUKKyAgICAgICAgZGVjbGFyYXRpb25zIGV2ZW4gaWYgdGhvc2UgcHJvcGVy dGllcyB3ZXJlIG92ZXJyaWRkZW4uCisKKyAgICAgICAgVGVzdHM6IGVkaXRpbmcvZGVsZXRpbmcv bWVyZ2UtcGFyYWdyYXBocy13aXRoLXRyYW5zcGFyZW50LWJhY2tncm91bmQuaHRtbAorICAgICAg ICAgICAgICAgZWRpdGluZy9kZWxldGluZy9wYXN0ZS13aXRoLXRyYW5zcGFyZW50LWJhY2tncm91 bmQtY29sb3IuaHRtbAorCisgICAgICAgICogZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6cmVtb3ZlUHJvcGVydGllc0luU3R5bGUpOgorICAgICAgICAoV2ViQ29y ZTo6RWRpdGluZ1N0eWxlOjpyZW1vdmVTdHlsZUZyb21SdWxlc0FuZENvbnRleHQpOgorICAgICAg ICAoV2ViQ29yZTo6RWRpdGluZ1N0eWxlOjpyZW1vdmVQcm9wZXJ0aWVzSW5FbGVtZW50RGVmYXVs dFN0eWxlKToKKwogMjAxMS0xMC0zMSAgRW1pbCBBIEVrbHVuZCAgPGVhZUBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgT3ZlcnJpZGRlbiBMYXlvdXRSZWN0IG1ldGhvZCBzdGlsbCB1c2VzIEludFJl Y3RzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCShyZXZpc2lv biA5ODgzMikKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTA1OSw2ICsxMDU5LDE3IEBAIHZvaWQgRWRpdGluZ1N0eWxlOjptZXJn ZVN0eWxlRnJvbVJ1bGVzRm8KICAgICBtX211dGFibGVTdHlsZS0+bWVyZ2UoZnJvbUNvbXB1dGVk U3R5bGUuZ2V0KCkpOwogfQogCitzdGF0aWMgdm9pZCByZW1vdmVQcm9wZXJ0aWVzSW5TdHlsZShD U1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbiogc3R5bGVUb1JlbW92ZVByb3BlcnRpZXNGcm9tLCBD U1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbiogc3R5bGUpCit7CisgICAgVmVjdG9yPGludD4gcHJv cGVydGllc1RvUmVtb3ZlKHN0eWxlLT5sZW5ndGgoKSk7CisgICAgc2l6ZV90IGkgPSAwOworICAg IENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uOjpjb25zdF9pdGVyYXRvciBlbmQgPSBzdHlsZS0+ ZW5kKCk7CisgICAgZm9yIChDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbjo6Y29uc3RfaXRlcmF0 b3IgaXQgPSBzdHlsZS0+YmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0LCArK2kpCisgICAgICAgIHBy b3BlcnRpZXNUb1JlbW92ZVtpXSA9IGl0LT5pZCgpOworCisgICAgc3R5bGVUb1JlbW92ZVByb3Bl cnRpZXNGcm9tLT5yZW1vdmVQcm9wZXJ0aWVzSW5TZXQocHJvcGVydGllc1RvUmVtb3ZlLmRhdGEo KSwgcHJvcGVydGllc1RvUmVtb3ZlLnNpemUoKSk7Cit9CisKIHZvaWQgRWRpdGluZ1N0eWxlOjpy ZW1vdmVTdHlsZUZyb21SdWxlc0FuZENvbnRleHQoU3R5bGVkRWxlbWVudCogZWxlbWVudCwgTm9k ZSogY29udGV4dCkKIHsKICAgICBBU1NFUlQoZWxlbWVudCk7CkBAIC0xMDczLDcgKzEwODQsMTAg QEAgdm9pZCBFZGl0aW5nU3R5bGU6OnJlbW92ZVN0eWxlRnJvbVJ1bGVzQQogICAgIC8vIDIuIFJl bW92ZSBzdHlsZSBwcmVzZW50IGluIGNvbnRleHQgYW5kIG5vdCBvdmVycmlkZW4gYnkgbWF0Y2hl ZCBydWxlcy4KICAgICBSZWZQdHI8RWRpdGluZ1N0eWxlPiBjb21wdXRlZFN0eWxlID0gRWRpdGlu Z1N0eWxlOjpjcmVhdGUoY29udGV4dCwgRWRpdGluZ1Byb3BlcnRpZXNJbkVmZmVjdCk7CiAgICAg aWYgKGNvbXB1dGVkU3R5bGUtPm1fbXV0YWJsZVN0eWxlKSB7Ci0gICAgICAgIGNvbXB1dGVkU3R5 bGUtPnJlbW92ZVByb3BlcnRpZXNJbkVsZW1lbnREZWZhdWx0U3R5bGUoZWxlbWVudCk7CisgICAg ICAgIGlmICghY29tcHV0ZWRTdHlsZS0+bV9tdXRhYmxlU3R5bGUtPmdldFByb3BlcnR5Q1NTVmFs dWUoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpKQorICAgICAgICAgICAgY29tcHV0ZWRTdHls ZS0+bV9tdXRhYmxlU3R5bGUtPnNldFByb3BlcnR5KENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9y LCBDU1NWYWx1ZVRyYW5zcGFyZW50KTsKKworICAgICAgICByZW1vdmVQcm9wZXJ0aWVzSW5TdHls ZShjb21wdXRlZFN0eWxlLT5tX211dGFibGVTdHlsZS5nZXQoKSwgc3R5bGVGcm9tTWF0Y2hlZFJ1 bGVzLmdldCgpKTsKICAgICAgICAgbV9tdXRhYmxlU3R5bGUgPSBnZXRQcm9wZXJ0aWVzTm90SW4o bV9tdXRhYmxlU3R5bGUuZ2V0KCksIGNvbXB1dGVkU3R5bGUtPm1fbXV0YWJsZVN0eWxlLmdldCgp KTsKICAgICB9CiAKQEAgLTEwOTQsMTMgKzExMDgsNyBAQCB2b2lkIEVkaXRpbmdTdHlsZTo6cmVt b3ZlUHJvcGVydGllc0luRWxlCiAKICAgICBSZWZQdHI8Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRp b24+IGRlZmF1bHRTdHlsZSA9IHN0eWxlRnJvbU1hdGNoZWRSdWxlc0ZvckVsZW1lbnQoZWxlbWVu dCwgQ1NTU3R5bGVTZWxlY3Rvcjo6VUFBbmRVc2VyQ1NTUnVsZXMpOwogCi0gICAgVmVjdG9yPGlu dD4gcHJvcGVydGllc1RvUmVtb3ZlKGRlZmF1bHRTdHlsZS0+bGVuZ3RoKCkpOwotICAgIHNpemVf dCBpID0gMDsKLSAgICBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbjo6Y29uc3RfaXRlcmF0b3Ig ZW5kID0gZGVmYXVsdFN0eWxlLT5lbmQoKTsKLSAgICBmb3IgKENTU011dGFibGVTdHlsZURlY2xh cmF0aW9uOjpjb25zdF9pdGVyYXRvciBpdCA9IGRlZmF1bHRTdHlsZS0+YmVnaW4oKTsgaXQgIT0g ZW5kOyArK2l0LCArK2kpCi0gICAgICAgIHByb3BlcnRpZXNUb1JlbW92ZVtpXSA9IGl0LT5pZCgp OwotCi0gICAgbV9tdXRhYmxlU3R5bGUtPnJlbW92ZVByb3BlcnRpZXNJblNldChwcm9wZXJ0aWVz VG9SZW1vdmUuZGF0YSgpLCBwcm9wZXJ0aWVzVG9SZW1vdmUuc2l6ZSgpKTsKKyAgICByZW1vdmVQ cm9wZXJ0aWVzSW5TdHlsZShtX211dGFibGVTdHlsZS5nZXQoKSwgZGVmYXVsdFN0eWxlLmdldCgp KTsKIH0KIAogdm9pZCBFZGl0aW5nU3R5bGU6OmZvcmNlSW5saW5lKCkKSW5kZXg6IExheW91dFRl c3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlz aW9uIDk4ODg0KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMjEgQEAKKzIwMTEtMTAtMzEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+ CisKKyAgICAgICAgUkVHUkVTU0lPTihyOTY4NzApOiBXZWJLaXQgZ2VuZXJhdGVzIGJhY2tncm91 bmQ6IHRyYW5zcGFyZW50IG9uIGJsb2dnZXIuY29tCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTIwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIGEgdGVzdCB0byBtZXJnZSBwYXJhZ3JhcGhzIGlu c2lkZSBhIGRvY3VtZW50IHdpdGggYmFja2dyb3VuZDogdHJhbnNwYXJlbnQsIGFuZCBhIHRlc3Qg dG8KKyAgICAgICAgY3V0IGFuZCBwYXN0ZSBjb250ZW50cyB3aXRoIGJhY2tncm91bmQ6IHRyYW5z cGFyZW50LCB3aGljaCBpcyBvdmVycmlkaW5nIGEgc3R5bGUgcnVsZSBiYWNrZ3JvdW5kOiBibHVl LgorCisgICAgICAgIFdlYktpdCBzaG91bGQgcHJlc2VydmUgdGhlIGFwcGVhcmFuY2Ugb2YgdGhl IHBhc3RlZCBjb250ZW50IGJ1dCBzaG91bGQgbm90IGFkZCBhIHJlZHVuZGFudAorICAgICAgICBi YWNrZ3JvdW5kOiB0cmFuc3BhcmVudC4KKworICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvbWVy Z2UtcGFyYWdyYXBocy13aXRoLXRyYW5zcGFyZW50LWJhY2tncm91bmQtZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiBlZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFncmFwaHMtd2l0aC10 cmFuc3BhcmVudC1iYWNrZ3JvdW5kLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvZGVs ZXRpbmcvcGFzdGUtd2l0aC10cmFuc3BhcmVudC1iYWNrZ3JvdW5kLWNvbG9yLWV4cGVjdGVkLnR4 dDogQWRkZWQuCisgICAgICAgICogZWRpdGluZy9kZWxldGluZy9wYXN0ZS13aXRoLXRyYW5zcGFy ZW50LWJhY2tncm91bmQtY29sb3IuaHRtbDogQWRkZWQuCisKIDIwMTEtMTAtMzEgIEpvaG4gR3Jl Z2cgIDxqb2hubnlnQGdvb2dsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgbW9yZSBleHBl Y3RhdGlvbnMgY2hhbmdlcyBmb3Igc3ZnLgpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxl dGluZy9tZXJnZS1wYXJhZ3JhcGhzLXdpdGgtdHJhbnNwYXJlbnQtYmFja2dyb3VuZC1leHBlY3Rl ZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9tZXJnZS1w YXJhZ3JhcGhzLXdpdGgtdHJhbnNwYXJlbnQtYmFja2dyb3VuZC1leHBlY3RlZC50eHQJKHJldmlz aW9uIDApCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFncmFwaHMt d2l0aC10cmFuc3BhcmVudC1iYWNrZ3JvdW5kLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAg LTAsMCArMSwxMCBAQAorVGhpcyB0ZXN0cyBtZXJnaW5nIHBhcmFncmFwaHMgaW5zaWRlIGEgZG9j dW1lbnQgd2l0aCBiYWNrZ3JvdW5kOiB0cmFuc3BhcmVudCBpbiBodG1sIGVsZW1lbnQncyBpbmxp bmUgc3R5bGUgZGVjbGFyYXRpb24uCitXZWJLaXQgc2hvdWxkIG5vdCBnZW5lcmF0ZSBhIHNwYW4g d2l0aCBiYWNrZ3JvdW5kLWNvbG9yIHByb3BlcnR5IGluIHN1Y2ggY2FzZXMuCit8ICIKKyIKK3wg PHA+Cit8ICAgaWQ9ImRlc3RpbmF0aW9uIgorfCAgICJoZWxsbzwjc2VsZWN0aW9uLWNhcmV0PiIK K3wgICAid29ybGQiCit8ICIKKyIKSW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcv bWVyZ2UtcGFyYWdyYXBocy13aXRoLXRyYW5zcGFyZW50LWJhY2tncm91bmQuaHRtbAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFncmFwaHMtd2l0 aC10cmFuc3BhcmVudC1iYWNrZ3JvdW5kLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0 cy9lZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFncmFwaHMtd2l0aC10cmFuc3BhcmVudC1iYWNr Z3JvdW5kLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjQgQEAKKzwhRE9DVFlQRSBodG1s PgorPGh0bWwgc3R5bGU9ImJhY2tncm91bmQ6IHRyYW5zcGFyZW50OyB0ZXh0LWRlY29yYXRpb246 IG5vbmUiPgorPGJvZHk+Cis8cCBpZD0iZGVzY3JpcHRpb24iPlRoaXMgdGVzdHMgbWVyZ2luZyBw YXJhZ3JhcGhzIGluc2lkZSBhIGRvY3VtZW50IHdpdGggYmFja2dyb3VuZDogdHJhbnNwYXJlbnQg aW4gaHRtbCBlbGVtZW50J3MgaW5saW5lIHN0eWxlIGRlY2xhcmF0aW9uLgorV2ViS2l0IHNob3Vs ZCBub3QgZ2VuZXJhdGUgYSBzcGFuIHdpdGggYmFja2dyb3VuZC1jb2xvciBwcm9wZXJ0eSBpbiBz dWNoIGNhc2VzLjwvcD4KKzxkaXYgaWQ9ImNvbnRhaW5lciIgY29udGVudGVkaXRhYmxlPgorPHAg aWQ9ImRlc3RpbmF0aW9uIj5oZWxsbzwvcD4KKzxwIGlkPSJ0YXJnZXQiPndvcmxkPC9wPgorPC9k aXY+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2R1bXAtYXMtbWFya3VwLmpzIj48L3Nj cmlwdD4KKzxzY3JpcHQ+CisKK01hcmt1cC5kZXNjcmlwdGlvbihkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgnZGVzY3JpcHRpb24nKS50ZXh0Q29udGVudCk7CisKK2RvY3VtZW50LmdldEVsZW1lbnRC eUlkKCdjb250YWluZXInKS5mb2N1cygpOwordmFyIHRhcmdldCA9IGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCd0YXJnZXQnKTsKK2dldFNlbGVjdGlvbigpLmNvbGxhcHNlKHRhcmdldCwgMCk7Citk b2N1bWVudC5leGVjQ29tbWFuZCgnRGVsZXRlJywgZmFsc2UsIG51bGwpOworCitNYXJrdXAuZHVt cChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29udGFpbmVyJykpOworCis8L3NjcmlwdD4KKzwv Ym9keT4KKzwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvcGFzdGUt d2l0aC10cmFuc3BhcmVudC1iYWNrZ3JvdW5kLWNvbG9yLWV4cGVjdGVkLnR4dAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3Bhc3RlLXdpdGgtdHJhbnNwYXJlbnQt YmFja2dyb3VuZC1jb2xvci1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0 cy9lZGl0aW5nL2RlbGV0aW5nL3Bhc3RlLXdpdGgtdHJhbnNwYXJlbnQtYmFja2dyb3VuZC1jb2xv ci1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjEgQEAKK1RoaXMgdGVzdHMg Y3V0dGluZyBhbmQgcGFzdGluZyBhIGNvbnRlbnQgd2l0aCBpbmxpbmUgImJhY2tncm91bmQ6IHRy YW5zcGFyZW50OyIgaW50byBhIGRvY3VtZW50IHdpdGggYSBzdHlsZSBydWxlIHRoYXQgb3ZlcnJp ZGVzIHRoaXMgc3R5bGUuCitXZWJLaXQgc2hvdWxkIHByZXNlcnZlIHRoZSBpbmxpbmUgc3R5bGUg ZGVjbGFyYXRpb24uIFRvIG1hbnVhbGx5IHRlc3QsIGN1dCBhbmQgcGFzdGUgImhlbGxvIHdvcmxk IFdlYktpdCIgYmVsb3cuICJ3b3JsZCIgc2hvdWxkIG5vdCBiZSBoaWdobGlnaHRlZCBpbiBibHVl LgorCitCZWZvcmUgY3V0IGFuZCBwYXN0ZToKK3wgIjwjc2VsZWN0aW9uLWFuY2hvcj5oZWxsbyAi Cit8IDxzcGFuPgorfCAgIGNsYXNzPSJ0ZXN0IgorfCAgIHN0eWxlPSJiYWNrZ3JvdW5kOiB0cmFu c3BhcmVudDsiCit8ICAgIndvcmxkIgorfCAiIFdlYktpdDwjc2VsZWN0aW9uLWZvY3VzPiIKKwor QWZ0ZXIgY3V0IGFuZCBwYXN0ZToKK3wgImhlbGxvIgorfCAiwqAiCit8IDxzcGFuPgorfCAgIGNs YXNzPSJ0ZXN0IgorfCAgIHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsgIgor fCAgICJ3b3JsZCIKK3wgIsKgIgorfCAiV2ViS2l0PCNzZWxlY3Rpb24tY2FyZXQ+IgorfCA8YnI+ CkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3Bhc3RlLXdpdGgtdHJhbnNwYXJl bnQtYmFja2dyb3VuZC1jb2xvci5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2VkaXRp bmcvZGVsZXRpbmcvcGFzdGUtd2l0aC10cmFuc3BhcmVudC1iYWNrZ3JvdW5kLWNvbG9yLmh0bWwJ KHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3Bhc3RlLXdpdGgt dHJhbnNwYXJlbnQtYmFja2dyb3VuZC1jb2xvci5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsx LDI5IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sIHN0eWxlPSJiYWNrZ3JvdW5kOiB0cmFuc3Bh cmVudDsgdGV4dC1kZWNvcmF0aW9uOiBub25lIj4KKzxib2R5PgorPHAgaWQ9ImRlc2NyaXB0aW9u Ij5UaGlzIHRlc3RzIGN1dHRpbmcgYW5kIHBhc3RpbmcgYSBjb250ZW50IHdpdGggaW5saW5lICJi YWNrZ3JvdW5kOiB0cmFuc3BhcmVudDsiIGludG8gYSBkb2N1bWVudCB3aXRoIGEgc3R5bGUgcnVs ZSB0aGF0IG92ZXJyaWRlcyB0aGlzIHN0eWxlLgorV2ViS2l0IHNob3VsZCBwcmVzZXJ2ZSB0aGUg aW5saW5lIHN0eWxlIGRlY2xhcmF0aW9uLiBUbyBtYW51YWxseSB0ZXN0LCBjdXQgYW5kIHBhc3Rl ICJoZWxsbyB3b3JsZCBXZWJLaXQiIGJlbG93LiAid29ybGQiIHNob3VsZCBub3QgYmUgaGlnaGxp Z2h0ZWQgaW4gYmx1ZS48L3A+Cis8c3R5bGU+CisudGVzdCB7CisgICAgYmFja2dyb3VuZDogYmx1 ZTsKK30KKzwvc3R5bGU+Cis8ZGl2IGlkPSJjb250YWluZXIiIGNvbnRlbnRlZGl0YWJsZT5oZWxs byA8c3BhbiBjbGFzcz10ZXN0IHN0eWxlPSJiYWNrZ3JvdW5kOiB0cmFuc3BhcmVudDsiPndvcmxk PC9zcGFuPiBXZWJLaXQ8L2Rpdj4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvZHVtcC1h cy1tYXJrdXAuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKworTWFya3VwLmRlc2NyaXB0aW9uKGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCdkZXNjcmlwdGlvbicpLnRleHRDb250ZW50KTsKKworZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2NvbnRhaW5lcicpLmZvY3VzKCk7Citkb2N1bWVudC5leGVj Q29tbWFuZCgnU2VsZWN0QWxsJywgZmFsc2UsIG51bGwpOworCitNYXJrdXAuZHVtcChkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgnY29udGFpbmVyJyksICdCZWZvcmUgY3V0IGFuZCBwYXN0ZScpOwor Citkb2N1bWVudC5leGVjQ29tbWFuZCgnQ3V0JywgZmFsc2UsIG51bGwpOworZG9jdW1lbnQuZXhl Y0NvbW1hbmQoJ1Bhc3RlJywgZmFsc2UsIG51bGwpOworCitNYXJrdXAuZHVtcChkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgnY29udGFpbmVyJyksICdBZnRlciBjdXQgYW5kIHBhc3RlJyk7CisKKzwv c2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo=