116215 2013-05-16 03:01:18 -0700 background-color and text-decoration are not preserved when merging paragraphs 2013-06-20 00:40:07 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 g.czajkowski g.czajkowski commit-queue rniwa oldest_to_newest 889752 0 g.czajkowski 2013-05-16 03:01:18 -0700 CSS properties background-color and text-decoration defined in class are not copied when paragraph is being merged. It works fine when they are defined inline. We already had similar issue for determining typing style (bug 53196). This is probably a regression from http://trac.webkit.org/changeset/130532. 889756 1 g.czajkowski 2013-05-16 03:09:42 -0700 In my opinion, in EditingStyle::mergeInlineAndImplicitStyleOfElement we erroneously copy only CSS inheritable properties via removeNonEditingProperties(). It seems that passing AllEditingProperties (instead of implicit OnlyInheritableEditingProperties) solves this issue. Ryosuke, I'd glad hear your opinion on that. 889757 2 201939 g.czajkowski 2013-05-16 03:34:14 -0700 Created attachment 201939 test case 890227 3 202049 g.czajkowski 2013-05-17 00:06:29 -0700 Created attachment 202049 WIP patch to get Mac layout tests result 890389 4 g.czajkowski 2013-05-17 08:10:12 -0700 (In reply to comment #3) > Created an attachment (id=202049) [details] > WIP patch to get Mac layout tests result This patch needs to distinguish propertyToInlcude in mergeInlineAndImplicitStyleOfElement as we don't want to include non inheritable properties sometimes, for example propertyToInlcude == OnlyEditingInheritableProperties. I'll fix it and add layout test for that issue in the next patch. 891146 5 202264 g.czajkowski 2013-05-20 02:15:40 -0700 Created attachment 202264 proposed patch 891292 6 202264 rniwa 2013-05-20 12:23:39 -0700 Comment on attachment 202264 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=202264&action=review > Source/WebCore/ChangeLog:8 > + New test - editing/deleting/merge-paragraph-from-span-with-style.html Nit: wrong format. This should appear after the long description but before per-file description and should be in the form of: Test: editing/deleting/merge-paragraph-from-span-with-style.html See other change log entries that add tests. > Source/WebCore/editing/EditingStyle.cpp:619 > - m_mutableStyle = copyEditingProperties(m_mutableStyle.get()); > + m_mutableStyle = copyEditingProperties(m_mutableStyle.get(), removeNonInheritableEditingProperties ? OnlyInheritableEditingProperties : AllEditingProperties); Either this boolean means removeInheritableEditingProperties or that this code is wrong. r- because of this. 891596 7 202264 g.czajkowski 2013-05-21 00:00:02 -0700 Comment on attachment 202264 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=202264&action=review >> Source/WebCore/ChangeLog:8 >> + New test - editing/deleting/merge-paragraph-from-span-with-style.html > > Nit: wrong format. This should appear after the long description but before per-file description and should be in the form of: > Test: editing/deleting/merge-paragraph-from-span-with-style.html > > See other change log entries that add tests. Right. I'll move it below the long description and change the format of this entry to the recommended one. >> Source/WebCore/editing/EditingStyle.cpp:619 >> + m_mutableStyle = copyEditingProperties(m_mutableStyle.get(), removeNonInheritableEditingProperties ? OnlyInheritableEditingProperties : AllEditingProperties); > > Either this boolean means removeInheritableEditingProperties or that this code is wrong. r- because of this. My intention was to add possibility of not removing non inheritable editing properties via 'removeNonEditingProperties' method. In context of 'copyEditingProperties' method, 'removeNonInheritableEditingProperties' boolean means copy only inheritable editing properties. I believe, 'preserveNonInheritableEditingProperties' will have a better meaning. 891597 8 202383 g.czajkowski 2013-05-21 00:01:21 -0700 Created attachment 202383 apply Ryosuke's suggestions 891598 9 commit-queue 2013-05-21 00:04:52 -0700 Attachment 202383 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/editing/deleting/merge-paragraph-from-span-with-style-expected.txt', u'LayoutTests/editing/deleting/merge-paragraph-from-span-with-style.html', u'Source/WebCore/ChangeLog', u'Source/WebCore/editing/EditingStyle.cpp', u'Source/WebCore/editing/EditingStyle.h']" exit_code: 1 Source/WebCore/editing/EditingStyle.cpp:619: Extra space before ) [whitespace/parens] [2] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 891604 10 202386 g.czajkowski 2013-05-21 00:15:25 -0700 Created attachment 202386 fix coding style 891606 11 202386 rniwa 2013-05-21 00:32:49 -0700 Comment on attachment 202386 fix coding style View in context: https://bugs.webkit.org/attachment.cgi?id=202386&action=review > LayoutTests/editing/deleting/merge-paragraph-from-span-with-style.html:1 > +<html> Missing DOCTYPE. We also don't indent the markup like it's done here. > LayoutTests/editing/deleting/merge-paragraph-from-span-with-style.html:7 > + .NonInheritableProperties { > + background-color: yellow; > + text-decoration: underline; > + } Why does this need to be in the CSS rule? Can't it be an inline style? > Source/WebCore/editing/EditingStyle.cpp:616 > +void EditingStyle::removeNonEditingProperties(bool preserveNonInheritableEditingProperties) I don't think we should be introducing terms like "preserve". It's confusing. Why can't we call this removeInheritableEditingProperties and negate the condition? 891719 12 g.czajkowski 2013-05-21 05:24:52 -0700 (In reply to comment #11) > (From update of attachment 202386 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=202386&action=review > > > LayoutTests/editing/deleting/merge-paragraph-from-span-with-style.html:1 > > +<html> > > Missing DOCTYPE. We also don't indent the markup like it's done here. Right. Thanks. > > > LayoutTests/editing/deleting/merge-paragraph-from-span-with-style.html:7 > > + .NonInheritableProperties { > > + background-color: yellow; > > + text-decoration: underline; > > + } > > Why does this need to be in the CSS rule? Can't it be an inline style? This bug is not reproducible for an inline style. I mentioned about this in ChangeLog. > > > Source/WebCore/editing/EditingStyle.cpp:616 > > +void EditingStyle::removeNonEditingProperties(bool preserveNonInheritableEditingProperties) > > I don't think we should be introducing terms like "preserve". It's confusing. > Why can't we call this removeInheritableEditingProperties and negate the condition? Do we need to remove inheritable editing properties anywhere? This fix doesn't need it. I am asking as I am little confused what '!removeInheritableEditingProperties' means in context of EditingStyle::copyEditingProperties. Assuming we have two options to copy the styles (OnlyInheritableEditingProperties, AllEditingProperties) the proposed negation should copy AllEditingProperties I guess. That's why I proposed 'preserveNonInheritableEditingProperties' which can be used for both removeNonEditingProperties and copyEditingProperties. Thanks for your review! 900517 13 204705 g.czajkowski 2013-06-14 05:33:45 -0700 Created attachment 204705 passing EditingPropertiesToInclude to removeAllButEditingProperties() 900585 14 204705 darin 2013-06-14 09:29:32 -0700 Comment on attachment 204705 passing EditingPropertiesToInclude to removeAllButEditingProperties() View in context: https://bugs.webkit.org/attachment.cgi?id=204705&action=review Generally looks OK. Would be nice to have more than just the single test. > Source/WebCore/ChangeLog:22 > + Reverse logic to be used after casting PropertiesToInlcude to EditingPropertiesToInclude. Typo "Inlcude" occurs many times in this change log. > Source/WebCore/ChangeLog:38 > + Reorder PropertiesToInlcude values to match EditingPropertiesToInclude to easy cast it. This is a bad design pattern. We don’t want subtle relationships between different enums. > Source/WebCore/editing/EditingStyle.cpp:975 > + styleFromRules->removeAllButEditingProperties(static_cast<EditingPropertiesToInclude>(propertiesToInclude)); How can this cast be correct? One enum has 3 values and the other has 2. Either this won’t do the right thing if propertiesToInclude is AllProperties, or it does the right thing for a strange reason. 901025 15 g.czajkowski 2013-06-17 07:14:14 -0700 (In reply to comment #14) > (From update of attachment 204705 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=204705&action=review > > Generally looks OK. Would be nice to have more than just the single test. > > > Source/WebCore/ChangeLog:22 > > + Reverse logic to be used after casting PropertiesToInlcude to EditingPropertiesToInclude. > > Typo "Inlcude" occurs many times in this change log. > > > Source/WebCore/ChangeLog:38 > > + Reorder PropertiesToInlcude values to match EditingPropertiesToInclude to easy cast it. > > This is a bad design pattern. We don’t want subtle relationships between different enums. > > > Source/WebCore/editing/EditingStyle.cpp:975 > > + styleFromRules->removeAllButEditingProperties(static_cast<EditingPropertiesToInclude>(propertiesToInclude)); > > How can this cast be correct? One enum has 3 values and the other has 2. Either this won’t do the right thing if propertiesToInclude is AllProperties, or it does the right thing for a strange reason. Thanks Darin for review! I'll take it into consideration and submit next patch. 901320 16 204891 g.czajkowski 2013-06-18 02:06:13 -0700 Created attachment 204891 apply Darin's comments 901459 17 204891 rniwa 2013-06-18 11:38:16 -0700 Comment on attachment 204891 apply Darin's comments View in context: https://bugs.webkit.org/attachment.cgi?id=204891&action=review > LayoutTests/editing/deleting/merge-div-from-span-with-style.html:19 > +Markup.description('The span style should be preserved when merging div element.\n' + > + 'The test passes if the bar contatins the yellow background and it\'s underlined.'); Wrong indentation. ' on the second line should appear exactly 4 spaces to the right of Markup. Also + should be at the beginning of the second line, not at the end of the first line. > LayoutTests/editing/deleting/merge-div-from-span-with-style.html:22 > +var spanToMerge = document.getElementById("spanToMerge"); > +spanToMerge.focus(); Why do we need a local variable here? Why not just document.getElementById("spanToMerge").focus()? > LayoutTests/editing/deleting/merge-div-from-span-with-style.html:24 > +var selection = window.getSelection(); > +selection.collapse(spanToMerge, 0); It doesn't seem necessary to define selection here. You can just do getSelection().collapse(spanToMerge, 0); instead. > LayoutTests/editing/deleting/merge-paragraph-from-span-with-style.html:7 > +text-decoration: underline; Please add a test case when we have multiple text-decorations; e.g. underline & strike-through. > LayoutTests/editing/deleting/merge-paragraph-from-span-with-style.html:26 > +Markup.description('The span style should be preserved when merging a pragraph.\n' + > + 'The test passes if the bar contatins the yellow background and it\'s underlined.'); > + > +var spanToMerge = document.getElementById("spanToMerge"); > +spanToMerge.focus(); > +var selection = window.getSelection(); > +selection.collapse(spanToMerge, 0); > +document.execCommand("Delete"); > +Markup.dump(document.getElementById("test")); Ditto. > Source/WebCore/editing/EditingStyle.cpp:1308 > +EditingStyle::EditingPropertiesToInclude EditingStyle::toEditingProperties(PropertiesToInclude properties) This function doesn't need to be a member function. We can just keep it as an inline static function. 901730 18 204985 g.czajkowski 2013-06-19 04:07:03 -0700 Created attachment 204985 apply Ryosuke's review 902040 19 204985 commit-queue 2013-06-20 00:40:04 -0700 Comment on attachment 204985 apply Ryosuke's review Clearing flags on attachment: 204985 Committed r151772: <http://trac.webkit.org/changeset/151772> 902041 20 commit-queue 2013-06-20 00:40:07 -0700 All reviewed patches have been landed. Closing bug. 201939 2013-05-16 03:34:14 -0700 2013-05-16 03:34:14 -0700 test case unexpected_behaviour.html text/html 356 g.czajkowski PEhUTUw+CiAgICA8SEVBRD4KICAgICAgICA8U1RZTEUgdHlwZT0idGV4dC9jc3MiPgogICAgICAg ICAgLmFkZEJhY2tncm91bmRBbmRGb250U2l6ZSB7CiAgICAgICAgICAgICAgYmFja2dyb3VuZC1j b2xvcjogeWVsbG93OwogICAgICAgICAgICAgIGZvbnQtc2l6ZTogMjAwJQogICAgICAgICAgfQog ICAgICAgIDwvU1RZTEU+CiAgICA8L0hFQUQ+CiAgICA8Qk9EWSBjb250ZW50ZWRpdGFibGU9InRy dWUiPgogICAgICAgIDxESVY+dGV4dDE8L0RJVj4KICAgICAgICA8U1BBTiBzdHlsZT0iY29sb3I6 cmVkIiBjbGFzcz0iYWRkQmFja2dyb3VuZEFuZEZvbnRTaXplIj50ZXh0MjwvU1BBTj4KICAgIDwv Qk9EWT4KPC9IVE1MPgo= 202049 2013-05-17 00:06:29 -0700 2013-05-20 02:15:40 -0700 WIP patch to get Mac layout tests result CSS_non_inheritable_properties_are_not_preserved_when_merging_paragraphs.patch text/plain 1853 g.czajkowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyODYxMDNhLi4xYTFiNjZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTMtMDUtMTYgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3Vu Zy5jb20+CisKKyAgICAgICAgTm9uIGluaGVyaXRhYmxlIENDIHByb3BlcnRpZXMgYXJlIG5vdCBw cmVzZXJ2ZWQgd2hlbiBtZXJnaW5nIHBhcmFncmFwaHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjIxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAtIFRPRE8uCisKKyAgICAgICAg YmFja2dyb3VuZC1jb2xvciBhbmQgdGV4dC1kZWNvcmF0aW9uIGRlZmluZWQgaW4gQ1NTIGNsYXNz CisgICAgICAgIGFyZSBub3QgY29waWVkIHdoZW4gcGFyYWdyYXBoIGlzIGJlaW5nIG1lcmdlZC4K KyAgICAgICAgVGhleSBhcmUgcHJvcGVybHkgY29waWVkIHdoZW4gZGVmaW5lZCBpbmxpbmUuCisK KyAgICAgICAgSW4gJ21lcmdlSW5saW5lQW5kSW1wbGljaXRTdHlsZU9mRWxlbWVudCcgd2UgZ2V0 IHN0eWxlIGZyb20gbWF0Y2hlZCBydWxlcy4KKyAgICAgICAgSWYgdGhleSBjb250YWluIGVpdGhl ciBiYWNrZ3JvdW5kLWNvbG9yIG9yIHRleHQtZGVjb3JhdGlvbiB0aGV5IHdpbGwgYmUgcmVtb3Zl ZAorICAgICAgICBpbiByZW1vdmVOb25FZGl0aW5nUHJvcGVydGllcygpIGR1ZSB0byBpbXBsaWNp dCBPbmx5SW5oZXJpdGFibGVFZGl0aW5nUHJvcGVydGllcworICAgICAgICBwYXJhbWV0ZXIuCisg ICAgICAgIFdlIGhhdmUgYWxyZWFkeSBoYWQgc2ltaWxhciBpc3N1ZSBhdCBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTMxOTYKKworICAgICAgICAqIGVkaXRpbmcvRWRp dGluZ1N0eWxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRpbmdTdHlsZTo6cmVtb3ZlTm9u RWRpdGluZ1Byb3BlcnRpZXMpOgorICAgICAgICBQYXNzICdBbGxFZGl0aW5nUHJvcGVydGllcycg dG8gJ2NvcHlFZGl0aW5nUHJvcGVydGllcycuCisKIDIwMTMtMDUtMTUgIEFuZGVycyBDYXJsc3Nv biAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggYSB0aGlua28uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKaW5kZXggMDgxYzVkZS4uMDMwMWU1ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcApAQCAtNjE2LDcgKzYxNiw3IEBA IHZvaWQgRWRpdGluZ1N0eWxlOjpyZW1vdmVTdHlsZUNvbmZsaWN0aW5nV2l0aFN0eWxlT2ZOb2Rl KE5vZGUqIG5vZGUpCiB2b2lkIEVkaXRpbmdTdHlsZTo6cmVtb3ZlTm9uRWRpdGluZ1Byb3BlcnRp ZXMoKQogewogICAgIGlmIChtX211dGFibGVTdHlsZSkKLSAgICAgICAgbV9tdXRhYmxlU3R5bGUg PSBjb3B5RWRpdGluZ1Byb3BlcnRpZXMobV9tdXRhYmxlU3R5bGUuZ2V0KCkpOworICAgICAgICBt X211dGFibGVTdHlsZSA9IGNvcHlFZGl0aW5nUHJvcGVydGllcyhtX211dGFibGVTdHlsZS5nZXQo KSwgQWxsRWRpdGluZ1Byb3BlcnRpZXMpOwogfQogCiB2b2lkIEVkaXRpbmdTdHlsZTo6Y29sbGFw c2VUZXh0RGVjb3JhdGlvblByb3BlcnRpZXMoKQo= 202264 2013-05-20 02:15:40 -0700 2013-05-21 00:01:21 -0700 proposed patch CSS_non_inheritable_properties_are_not_preserved_when_merging_paragraphs.patch text/plain 6462 g.czajkowski ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmYTIwMzNmLi45ZmVmZTdhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMDUt MjAgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3VuZy5jb20+CisKKyAg ICAgICAgYmFja2dyb3VuZC1jb2xvciBhbmQgdGV4dC1kZWNvcmF0aW9uIGFyZSBub3QgcHJlc2Vy dmVkIHdoZW4gbWVyZ2luZyBwYXJhZ3JhcGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYyMTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgYSBuZXcgbGF5b3V0IHRlc3QuCisKKyAgICAgICAgKiBl ZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFncmFwaC1mcm9tLXNwYW4td2l0aC1zdHlsZS1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtcGFyYWdy YXBoLWZyb20tc3Bhbi13aXRoLXN0eWxlLmh0bWw6IEFkZGVkLgorCiAyMDEzLTA1LTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIHN2Zy9iYXRpayB0 ZXN0cyBhcmUgZmxha2V5LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGlu Zy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgtc3R5bGUtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgt c3R5bGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjNh ZjAyNzkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL21l cmdlLXBhcmFncmFwaC1mcm9tLXNwYW4td2l0aC1zdHlsZS1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSw5IEBACitUaGUgc3BhbiBzdHlsZSBzaG91bGQgYmUgcHJlc2VydmVkIHdoZW4gbWVyZ2luZyBh IHByYWdyYXBoLgorVGhlIHRlc3QgcGFzc2VzIGlmIHRoZSBiYXIgY29udGF0aW5zIHRoZSB5ZWxs b3cgYmFja2dyb3VuZCBhbmQgaXQncyB1bmRlcmxpbmVkLgorfCAiCisgICAgICAgICIKK3wgPHA+ Cit8ICAgImZvbzwjc2VsZWN0aW9uLWNhcmV0PiIKK3wgICA8c3Bhbj4KK3wgICAgIHN0eWxlPSJi YWNrZ3JvdW5kLWNvbG9yOiB5ZWxsb3c7IHRleHQtZGVjb3JhdGlvbjogdW5kZXJsaW5lOyIKK3wg ICAgICJiYXIiCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL21lcmdl LXBhcmFncmFwaC1mcm9tLXNwYW4td2l0aC1zdHlsZS5odG1sIGIvTGF5b3V0VGVzdHMvZWRpdGlu Zy9kZWxldGluZy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgtc3R5bGUuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40YzIwMzI1Ci0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFu LXdpdGgtc3R5bGUuaHRtbApAQCAtMCwwICsxLDMxIEBACis8aHRtbD4KKyAgICA8aGVhZD4KKyAg ICAgICAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKyAgICAgICAgICAuTm9uSW5oZXJpdGFibGVQ cm9wZXJ0aWVzIHsKKyAgICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogeWVsbG93OworICAg ICAgICAgICAgICB0ZXh0LWRlY29yYXRpb246IHVuZGVybGluZTsKKyAgICAgICAgICB9CisgICAg ICAgIDwvc3R5bGU+CisgICAgPC9oZWFkPgorCisgICAgPGJvZHk+CisgICAgICAgIDxkaXYgaWQ9 InRlc3QiIGNvbnRlbnRlZGl0YWJsZT0idHJ1ZSI+CisgICAgICAgIDxwPmZvbzwvcD4KKyAgICAg ICAgPHNwYW4gaWQ9InNwYW5Ub01lcmdlIiBjbGFzcz0iTm9uSW5oZXJpdGFibGVQcm9wZXJ0aWVz Ij5iYXI8L3NwYW4+CisgICAgICAgIDwvZGl2PgorCisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi8u Li9yZXNvdXJjZXMvZHVtcC1hcy1tYXJrdXAuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0 PgorICAgICAgICAgICAgTWFya3VwLmRlc2NyaXB0aW9uKCdUaGUgc3BhbiBzdHlsZSBzaG91bGQg YmUgcHJlc2VydmVkIHdoZW4gbWVyZ2luZyBhIHByYWdyYXBoLlxuJyArCisgICAgICAgICAgICAg ICAgJ1RoZSB0ZXN0IHBhc3NlcyBpZiB0aGUgYmFyIGNvbnRhdGlucyB0aGUgeWVsbG93IGJhY2tn cm91bmQgYW5kIGl0XCdzIHVuZGVybGluZWQuJyk7CisKKyAgICAgICAgICAgIHZhciBzcGFuVG9N ZXJnZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzcGFuVG9NZXJnZSIpOworICAgICAgICAg ICAgc3BhblRvTWVyZ2UuZm9jdXMoKTsKKyAgICAgICAgICAgIHZhciBzZWxlY3Rpb24gPSB3aW5k b3cuZ2V0U2VsZWN0aW9uKCk7CisgICAgICAgICAgICBzZWxlY3Rpb24uY29sbGFwc2Uoc3BhblRv TWVyZ2UsIDApOworICAgICAgICAgICAgZG9jdW1lbnQuZXhlY0NvbW1hbmQoIkRlbGV0ZSIpOwor ICAgICAgICAgICAgTWFya3VwLmR1bXAoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRlc3QiKSk7 CisgICAgICAgIDwvc2NyaXB0PgorCisgICAgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IGEwMWM1OGQuLmUwM2ZkMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAxMy0wNS0y MCAgR3J6ZWdvcnogQ3phamtvd3NraSAgPGcuY3phamtvd3NraUBzYW1zdW5nLmNvbT4KKworICAg ICAgICBiYWNrZ3JvdW5kLWNvbG9yIGFuZCB0ZXh0LWRlY29yYXRpb24gYXJlIG5vdCBwcmVzZXJ2 ZWQgd2hlbiBtZXJnaW5nIHBhcmFncmFwaHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNjIxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5ldyB0ZXN0IC0gZWRpdGluZy9kZWxldGluZy9tZXJnZS1wYXJh Z3JhcGgtZnJvbS1zcGFuLXdpdGgtc3R5bGUuaHRtbAorCisgICAgICAgIE5vbiBpbmhlcml0YWJs ZSBDU1MgcHJvcGVydGllcyAoYmFja2dyb3VuZC1jb2xvciBhbmQgdGV4dC1kZWNvcmF0aW9uKSBk ZWZpbmVkIHRocm91Z2gKKyAgICAgICAgQ1NTIGNsYXNzIGFyZSBub3QgY29waWVkIHdoZW4gcGFy YWdyYXBoIGlzIGJlaW5nIG1lcmdlZC4KKyAgICAgICAgVGhleSBhcmUgcHJvcGVybHkgbWVyZ2Vk IHdoZW4gZGVmaW5lZCBpbmxpbmUuCisKKyAgICAgICAgSW4gbWVyZ2VJbmxpbmVBbmRJbXBsaWNp dFN0eWxlT2ZFbGVtZW50IHN0eWxlIGZyb20gbWF0Y2hlZCBydWxlcyBhcmUgcmV0cmlldmVkLgor ICAgICAgICBJZiB0aGV5IGNvbnRhaW4gZWl0aGVyIGJhY2tncm91bmQtY29sb3Igb3IgdGV4dC1k ZWNvcmF0aW9uIHRoZXkgd2lsbCBiZSByZW1vdmVkCisgICAgICAgIGluIHJlbW92ZU5vbkVkaXRp bmdQcm9wZXJ0aWVzKCkgZHVlIHRvIGNvcHlFZGl0aW5nUHJvcGVydGllcyBpbXBsaWNpdAorICAg ICAgICAnT25seUluaGVyaXRhYmxlRWRpdGluZ1Byb3BlcnRpZXMnIHBhcmFtZXRlci4KKyAgICAg ICAgV2UgaGF2ZSBhbHJlYWR5IGhhZCBzaW1pbGFyIGlzc3VlIGF0IGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MzE5NgorCisgICAgICAgICogZWRpdGluZy9FZGl0aW5n U3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdGluZ1N0eWxlOjpyZW1vdmVOb25FZGl0 aW5nUHJvcGVydGllcyk6CisgICAgICAgIEFsbG93IHRvIGtlZXAgbm9uIGluaGVyaXRhYmxlIGVk aXRpbmcgcHJvcGVydGllcy4KKworICAgICAgICAoV2ViQ29yZTo6RWRpdGluZ1N0eWxlOjptZXJn ZUlubGluZUFuZEltcGxpY2l0U3R5bGVPZkVsZW1lbnQpOgorICAgICAgICBDYWxsICdyZW1vdmVO b25FZGl0aW5nUHJvcGVydGllcycgd2l0aCBhbiBhcHByb3ByaWF0ZSB2YWx1ZS4KKworICAgICAg ICAqIGVkaXRpbmcvRWRpdGluZ1N0eWxlLmg6CisgICAgICAgIChFZGl0aW5nU3R5bGUpOgorICAg ICAgICBBZGQgYm9vbCBwYXJhbWV0ZXIgdG8gJ3JlbW92ZU5vbkVkaXRpbmdQcm9wZXJ0aWVzJyB3 aGV0aGVyIHRoZSBub24gaW5oZXJpdGFibGUKKyAgICAgICAgc3R5bGUgc2hvdWxkIGJlIHByZXNl cnZlZCBvciBub3QuCisKIDIwMTMtMDUtMTkgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtNYWNdIEltcHJvdmUgc3RyaW5nIHVzZSBpbiBQYXN0ZWJvYXJkTWFjCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKaW5kZXggMDgxYzVkZS4uOTIzMmZm MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcApAQCAtNjEzLDEwICs2 MTMsMTAgQEAgdm9pZCBFZGl0aW5nU3R5bGU6OnJlbW92ZVN0eWxlQ29uZmxpY3RpbmdXaXRoU3R5 bGVPZk5vZGUoTm9kZSogbm9kZSkKICAgICAgICAgbV9tdXRhYmxlU3R5bGUtPnJlbW92ZVByb3Bl cnR5KG5vZGVTdHlsZS0+cHJvcGVydHlBdChpKS5pZCgpKTsKIH0KIAotdm9pZCBFZGl0aW5nU3R5 bGU6OnJlbW92ZU5vbkVkaXRpbmdQcm9wZXJ0aWVzKCkKK3ZvaWQgRWRpdGluZ1N0eWxlOjpyZW1v dmVOb25FZGl0aW5nUHJvcGVydGllcyhib29sIHJlbW92ZU5vbkluaGVyaXRhYmxlRWRpdGluZ1By b3BlcnRpZXMpCiB7CiAgICAgaWYgKG1fbXV0YWJsZVN0eWxlKQotICAgICAgICBtX211dGFibGVT dHlsZSA9IGNvcHlFZGl0aW5nUHJvcGVydGllcyhtX211dGFibGVTdHlsZS5nZXQoKSk7CisgICAg ICAgIG1fbXV0YWJsZVN0eWxlID0gY29weUVkaXRpbmdQcm9wZXJ0aWVzKG1fbXV0YWJsZVN0eWxl LmdldCgpLCByZW1vdmVOb25Jbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzID8gT25seUluaGVy aXRhYmxlRWRpdGluZ1Byb3BlcnRpZXMgOiBBbGxFZGl0aW5nUHJvcGVydGllcyk7CiB9CiAKIHZv aWQgRWRpdGluZ1N0eWxlOjpjb2xsYXBzZVRleHREZWNvcmF0aW9uUHJvcGVydGllcygpCkBAIC05 NzcsNyArOTc3LDcgQEAgdm9pZCBFZGl0aW5nU3R5bGU6Om1lcmdlSW5saW5lQW5kSW1wbGljaXRT dHlsZU9mRWxlbWVudChTdHlsZWRFbGVtZW50KiBlbGVtZW50LAogewogICAgIFJlZlB0cjxFZGl0 aW5nU3R5bGU+IHN0eWxlRnJvbVJ1bGVzID0gRWRpdGluZ1N0eWxlOjpjcmVhdGUoKTsKICAgICBz dHlsZUZyb21SdWxlcy0+bWVyZ2VTdHlsZUZyb21SdWxlc0ZvclNlcmlhbGl6YXRpb24oZWxlbWVu dCk7Ci0gICAgc3R5bGVGcm9tUnVsZXMtPnJlbW92ZU5vbkVkaXRpbmdQcm9wZXJ0aWVzKCk7Cisg ICAgc3R5bGVGcm9tUnVsZXMtPnJlbW92ZU5vbkVkaXRpbmdQcm9wZXJ0aWVzKHByb3BlcnRpZXNU b0luY2x1ZGUgPT0gT25seUVkaXRpbmdJbmhlcml0YWJsZVByb3BlcnRpZXMpOwogICAgIG1lcmdl U3R5bGUoc3R5bGVGcm9tUnVsZXMtPm1fbXV0YWJsZVN0eWxlLmdldCgpLCBtb2RlKTsKIAogICAg IG1lcmdlSW5saW5lU3R5bGVPZkVsZW1lbnQoZWxlbWVudCwgbW9kZSwgcHJvcGVydGllc1RvSW5j bHVkZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5o IGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuaAppbmRleCBmYWVhODc2Li5l ZjFjNWM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmgKQEAgLTExMSw3ICsx MTEsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZW1vdmVCbG9ja1Byb3BlcnRpZXMoKTsKICAgICB2 b2lkIHJlbW92ZVN0eWxlQWRkZWRCeU5vZGUoTm9kZSopOwogICAgIHZvaWQgcmVtb3ZlU3R5bGVD b25mbGljdGluZ1dpdGhTdHlsZU9mTm9kZShOb2RlKik7Ci0gICAgdm9pZCByZW1vdmVOb25FZGl0 aW5nUHJvcGVydGllcygpOworICAgIHZvaWQgcmVtb3ZlTm9uRWRpdGluZ1Byb3BlcnRpZXMoYm9v bCByZW1vdmVOb25Jbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzID0gdHJ1ZSk7CiAgICAgdm9p ZCBjb2xsYXBzZVRleHREZWNvcmF0aW9uUHJvcGVydGllcygpOwogICAgIGVudW0gU2hvdWxkSWdu b3JlVGV4dE9ubHlQcm9wZXJ0aWVzIHsgSWdub3JlVGV4dE9ubHlQcm9wZXJ0aWVzLCBEb05vdEln bm9yZVRleHRPbmx5UHJvcGVydGllcyB9OwogICAgIFRyaVN0YXRlIHRyaVN0YXRlT2ZTdHlsZShF ZGl0aW5nU3R5bGUqKSBjb25zdDsK 202383 2013-05-21 00:01:21 -0700 2013-05-21 00:15:25 -0700 apply Ryosuke's suggestions CSS_non_inheritable_properties_are_not_preserved_when_merging_paragraphs.patch text/plain 6464 g.czajkowski ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5MWM0ZDczLi5lOTkxOTQ3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMDUt MjAgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3VuZy5jb20+CisKKyAg ICAgICAgYmFja2dyb3VuZC1jb2xvciBhbmQgdGV4dC1kZWNvcmF0aW9uIGFyZSBub3QgcHJlc2Vy dmVkIHdoZW4gbWVyZ2luZyBwYXJhZ3JhcGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYyMTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgYSBuZXcgbGF5b3V0IHRlc3QuCisKKyAgICAgICAgKiBl ZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFncmFwaC1mcm9tLXNwYW4td2l0aC1zdHlsZS1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtcGFyYWdy YXBoLWZyb20tc3Bhbi13aXRoLXN0eWxlLmh0bWw6IEFkZGVkLgorCiAyMDEzLTA1LTIwICBTZW9r anUgS3dvbiAgPHNlb2tqdS5rd29uQGdtYWlsLmNvbT4KIAogICAgICAgICBSZW1vdmUgcmVtYWlu aW5nIGxpbmstcHJlcmVuZGVyIGNvZGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcv ZGVsZXRpbmcvbWVyZ2UtcGFyYWdyYXBoLWZyb20tc3Bhbi13aXRoLXN0eWxlLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtcGFyYWdyYXBoLWZyb20tc3Bh bi13aXRoLXN0eWxlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi4zYWYwMjc5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxl dGluZy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgtc3R5bGUtZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsOSBAQAorVGhlIHNwYW4gc3R5bGUgc2hvdWxkIGJlIHByZXNlcnZlZCB3aGVuIG1l cmdpbmcgYSBwcmFncmFwaC4KK1RoZSB0ZXN0IHBhc3NlcyBpZiB0aGUgYmFyIGNvbnRhdGlucyB0 aGUgeWVsbG93IGJhY2tncm91bmQgYW5kIGl0J3MgdW5kZXJsaW5lZC4KK3wgIgorICAgICAgICAi Cit8IDxwPgorfCAgICJmb288I3NlbGVjdGlvbi1jYXJldD4iCit8ICAgPHNwYW4+Cit8ICAgICBz dHlsZT0iYmFja2dyb3VuZC1jb2xvcjogeWVsbG93OyB0ZXh0LWRlY29yYXRpb246IHVuZGVybGlu ZTsiCit8ICAgICAiYmFyIgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGlu Zy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgtc3R5bGUuaHRtbCBiL0xheW91dFRlc3Rz L2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtcGFyYWdyYXBoLWZyb20tc3Bhbi13aXRoLXN0eWxlLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNGMyMDMyNQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtcGFyYWdyYXBoLWZy b20tc3Bhbi13aXRoLXN0eWxlLmh0bWwKQEAgLTAsMCArMSwzMSBAQAorPGh0bWw+CisgICAgPGhl YWQ+CisgICAgICAgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisgICAgICAgICAgLk5vbkluaGVy aXRhYmxlUHJvcGVydGllcyB7CisgICAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHllbGxv dzsKKyAgICAgICAgICAgICAgdGV4dC1kZWNvcmF0aW9uOiB1bmRlcmxpbmU7CisgICAgICAgICAg fQorICAgICAgICA8L3N0eWxlPgorICAgIDwvaGVhZD4KKworICAgIDxib2R5PgorICAgICAgICA8 ZGl2IGlkPSJ0ZXN0IiBjb250ZW50ZWRpdGFibGU9InRydWUiPgorICAgICAgICA8cD5mb288L3A+ CisgICAgICAgIDxzcGFuIGlkPSJzcGFuVG9NZXJnZSIgY2xhc3M9Ik5vbkluaGVyaXRhYmxlUHJv cGVydGllcyI+YmFyPC9zcGFuPgorICAgICAgICA8L2Rpdj4KKworICAgICAgICA8c2NyaXB0IHNy Yz0iLi4vLi4vcmVzb3VyY2VzL2R1bXAtYXMtbWFya3VwLmpzIj48L3NjcmlwdD4KKyAgICAgICAg PHNjcmlwdD4KKyAgICAgICAgICAgIE1hcmt1cC5kZXNjcmlwdGlvbignVGhlIHNwYW4gc3R5bGUg c2hvdWxkIGJlIHByZXNlcnZlZCB3aGVuIG1lcmdpbmcgYSBwcmFncmFwaC5cbicgKworICAgICAg ICAgICAgICAgICdUaGUgdGVzdCBwYXNzZXMgaWYgdGhlIGJhciBjb250YXRpbnMgdGhlIHllbGxv dyBiYWNrZ3JvdW5kIGFuZCBpdFwncyB1bmRlcmxpbmVkLicpOworCisgICAgICAgICAgICB2YXIg c3BhblRvTWVyZ2UgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic3BhblRvTWVyZ2UiKTsKKyAg ICAgICAgICAgIHNwYW5Ub01lcmdlLmZvY3VzKCk7CisgICAgICAgICAgICB2YXIgc2VsZWN0aW9u ID0gd2luZG93LmdldFNlbGVjdGlvbigpOworICAgICAgICAgICAgc2VsZWN0aW9uLmNvbGxhcHNl KHNwYW5Ub01lcmdlLCAwKTsKKyAgICAgICAgICAgIGRvY3VtZW50LmV4ZWNDb21tYW5kKCJEZWxl dGUiKTsKKyAgICAgICAgICAgIE1hcmt1cC5kdW1wKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0 ZXN0IikpOworICAgICAgICA8L3NjcmlwdD4KKworICAgIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCA4NjViM2IwLi45ZjJjMGNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIw MTMtMDUtMjAgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3VuZy5jb20+ CisKKyAgICAgICAgYmFja2dyb3VuZC1jb2xvciBhbmQgdGV4dC1kZWNvcmF0aW9uIGFyZSBub3Qg cHJlc2VydmVkIHdoZW4gbWVyZ2luZyBwYXJhZ3JhcGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYyMTUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb24gaW5oZXJpdGFibGUgQ1NTIHByb3BlcnRpZXMg KGJhY2tncm91bmQtY29sb3IgYW5kIHRleHQtZGVjb3JhdGlvbikgZGVmaW5lZCB0aHJvdWdoCisg ICAgICAgIENTUyBjbGFzcyBhcmUgbm90IGNvcGllZCB3aGVuIHBhcmFncmFwaCBpcyBiZWluZyBt ZXJnZWQuCisgICAgICAgIFRoZXkgYXJlIHByb3Blcmx5IG1lcmdlZCB3aGVuIGRlZmluZWQgaW5s aW5lLgorCisgICAgICAgIEluIG1lcmdlSW5saW5lQW5kSW1wbGljaXRTdHlsZU9mRWxlbWVudCBz dHlsZSBmcm9tIG1hdGNoZWQgcnVsZXMgYXJlIHJldHJpZXZlZC4KKyAgICAgICAgSWYgdGhleSBj b250YWluIGVpdGhlciBiYWNrZ3JvdW5kLWNvbG9yIG9yIHRleHQtZGVjb3JhdGlvbiB0aGV5IHdp bGwgYmUgcmVtb3ZlZAorICAgICAgICBpbiByZW1vdmVOb25FZGl0aW5nUHJvcGVydGllcygpIGR1 ZSB0byBjb3B5RWRpdGluZ1Byb3BlcnRpZXMgaW1wbGljaXQKKyAgICAgICAgJ09ubHlJbmhlcml0 YWJsZUVkaXRpbmdQcm9wZXJ0aWVzJyBwYXJhbWV0ZXIuCisgICAgICAgIFdlIGhhdmUgYWxyZWFk eSBoYWQgc2ltaWxhciBpc3N1ZSBhdCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTMxOTYKKworICAgICAgICBUZXN0OiBlZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFn cmFwaC1mcm9tLXNwYW4td2l0aC1zdHlsZS5odG1sCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRp bmdTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0aW5nU3R5bGU6OnJlbW92ZU5vbkVk aXRpbmdQcm9wZXJ0aWVzKToKKyAgICAgICAgQWxsb3cgdG8ga2VlcCBub24gaW5oZXJpdGFibGUg ZWRpdGluZyBwcm9wZXJ0aWVzLgorCisgICAgICAgIChXZWJDb3JlOjpFZGl0aW5nU3R5bGU6Om1l cmdlSW5saW5lQW5kSW1wbGljaXRTdHlsZU9mRWxlbWVudCk6CisgICAgICAgIENhbGwgJ3JlbW92 ZU5vbkVkaXRpbmdQcm9wZXJ0aWVzJyB3aXRoIGFuIGFwcHJvcHJpYXRlIHZhbHVlLgorCisgICAg ICAgICogZWRpdGluZy9FZGl0aW5nU3R5bGUuaDoKKyAgICAgICAgKEVkaXRpbmdTdHlsZSk6Cisg ICAgICAgIEFkZCBib29sIHBhcmFtZXRlciB0byAncmVtb3ZlTm9uRWRpdGluZ1Byb3BlcnRpZXMn IHdoZXRoZXIgdGhlIG5vbiBpbmhlcml0YWJsZQorICAgICAgICBzdHlsZSBzaG91bGQgYmUgcHJl c2VydmVkIG9yIG5vdC4KKwogMjAxMy0wNS0yMCAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWlu QGFwcGxlLmNvbT4KIAogICAgICAgICBNaW5vciBTdHJpbmcgZml4ZXMgaW4gQ1NTCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKaW5kZXggMDgxYzVkZS4uYWM3OGMxOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcApAQCAtNjEzLDEwICs2MTMsMTAg QEAgdm9pZCBFZGl0aW5nU3R5bGU6OnJlbW92ZVN0eWxlQ29uZmxpY3RpbmdXaXRoU3R5bGVPZk5v ZGUoTm9kZSogbm9kZSkKICAgICAgICAgbV9tdXRhYmxlU3R5bGUtPnJlbW92ZVByb3BlcnR5KG5v ZGVTdHlsZS0+cHJvcGVydHlBdChpKS5pZCgpKTsKIH0KIAotdm9pZCBFZGl0aW5nU3R5bGU6OnJl bW92ZU5vbkVkaXRpbmdQcm9wZXJ0aWVzKCkKK3ZvaWQgRWRpdGluZ1N0eWxlOjpyZW1vdmVOb25F ZGl0aW5nUHJvcGVydGllcyhib29sIHByZXNlcnZlTm9uSW5oZXJpdGFibGVFZGl0aW5nUHJvcGVy dGllcykKIHsKICAgICBpZiAobV9tdXRhYmxlU3R5bGUpCi0gICAgICAgIG1fbXV0YWJsZVN0eWxl ID0gY29weUVkaXRpbmdQcm9wZXJ0aWVzKG1fbXV0YWJsZVN0eWxlLmdldCgpKTsKKyAgICAgICAg bV9tdXRhYmxlU3R5bGUgPSBjb3B5RWRpdGluZ1Byb3BlcnRpZXMobV9tdXRhYmxlU3R5bGUuZ2V0 KCksIHByZXNlcnZlTm9uSW5oZXJpdGFibGVFZGl0aW5nUHJvcGVydGllcyA/IEFsbEVkaXRpbmdQ cm9wZXJ0aWVzIDogT25seUluaGVyaXRhYmxlRWRpdGluZ1Byb3BlcnRpZXMgKTsKIH0KIAogdm9p ZCBFZGl0aW5nU3R5bGU6OmNvbGxhcHNlVGV4dERlY29yYXRpb25Qcm9wZXJ0aWVzKCkKQEAgLTk3 Nyw3ICs5NzcsNyBAQCB2b2lkIEVkaXRpbmdTdHlsZTo6bWVyZ2VJbmxpbmVBbmRJbXBsaWNpdFN0 eWxlT2ZFbGVtZW50KFN0eWxlZEVsZW1lbnQqIGVsZW1lbnQsCiB7CiAgICAgUmVmUHRyPEVkaXRp bmdTdHlsZT4gc3R5bGVGcm9tUnVsZXMgPSBFZGl0aW5nU3R5bGU6OmNyZWF0ZSgpOwogICAgIHN0 eWxlRnJvbVJ1bGVzLT5tZXJnZVN0eWxlRnJvbVJ1bGVzRm9yU2VyaWFsaXphdGlvbihlbGVtZW50 KTsKLSAgICBzdHlsZUZyb21SdWxlcy0+cmVtb3ZlTm9uRWRpdGluZ1Byb3BlcnRpZXMoKTsKKyAg ICBzdHlsZUZyb21SdWxlcy0+cmVtb3ZlTm9uRWRpdGluZ1Byb3BlcnRpZXMocHJvcGVydGllc1Rv SW5jbHVkZSAhPSBPbmx5RWRpdGluZ0luaGVyaXRhYmxlUHJvcGVydGllcyk7CiAgICAgbWVyZ2VT dHlsZShzdHlsZUZyb21SdWxlcy0+bV9tdXRhYmxlU3R5bGUuZ2V0KCksIG1vZGUpOwogCiAgICAg bWVyZ2VJbmxpbmVTdHlsZU9mRWxlbWVudChlbGVtZW50LCBtb2RlLCBwcm9wZXJ0aWVzVG9JbmNs dWRlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5oCmluZGV4IGZhZWE4NzYuLjNh N2VlMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuaApAQCAtMTExLDcgKzEx MSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlbW92ZUJsb2NrUHJvcGVydGllcygpOwogICAgIHZv aWQgcmVtb3ZlU3R5bGVBZGRlZEJ5Tm9kZShOb2RlKik7CiAgICAgdm9pZCByZW1vdmVTdHlsZUNv bmZsaWN0aW5nV2l0aFN0eWxlT2ZOb2RlKE5vZGUqKTsKLSAgICB2b2lkIHJlbW92ZU5vbkVkaXRp bmdQcm9wZXJ0aWVzKCk7CisgICAgdm9pZCByZW1vdmVOb25FZGl0aW5nUHJvcGVydGllcyhib29s IHByZXNlcnZlTm9uSW5oZXJpdGFibGVFZGl0aW5nUHJvcGVydGllcyA9IGZhbHNlKTsKICAgICB2 b2lkIGNvbGxhcHNlVGV4dERlY29yYXRpb25Qcm9wZXJ0aWVzKCk7CiAgICAgZW51bSBTaG91bGRJ Z25vcmVUZXh0T25seVByb3BlcnRpZXMgeyBJZ25vcmVUZXh0T25seVByb3BlcnRpZXMsIERvTm90 SWdub3JlVGV4dE9ubHlQcm9wZXJ0aWVzIH07CiAgICAgVHJpU3RhdGUgdHJpU3RhdGVPZlN0eWxl KEVkaXRpbmdTdHlsZSopIGNvbnN0Owo= 202386 2013-05-21 00:15:25 -0700 2013-06-14 05:33:45 -0700 fix coding style CSS_non_inheritable_properties_are_not_preserved_when_merging_paragraphs.patch text/plain 6463 g.czajkowski ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5MWM0ZDczLi5lOTkxOTQ3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMDUt MjAgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3VuZy5jb20+CisKKyAg ICAgICAgYmFja2dyb3VuZC1jb2xvciBhbmQgdGV4dC1kZWNvcmF0aW9uIGFyZSBub3QgcHJlc2Vy dmVkIHdoZW4gbWVyZ2luZyBwYXJhZ3JhcGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYyMTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgYSBuZXcgbGF5b3V0IHRlc3QuCisKKyAgICAgICAgKiBl ZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFncmFwaC1mcm9tLXNwYW4td2l0aC1zdHlsZS1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtcGFyYWdy YXBoLWZyb20tc3Bhbi13aXRoLXN0eWxlLmh0bWw6IEFkZGVkLgorCiAyMDEzLTA1LTIwICBTZW9r anUgS3dvbiAgPHNlb2tqdS5rd29uQGdtYWlsLmNvbT4KIAogICAgICAgICBSZW1vdmUgcmVtYWlu aW5nIGxpbmstcHJlcmVuZGVyIGNvZGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcv ZGVsZXRpbmcvbWVyZ2UtcGFyYWdyYXBoLWZyb20tc3Bhbi13aXRoLXN0eWxlLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtcGFyYWdyYXBoLWZyb20tc3Bh bi13aXRoLXN0eWxlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi4zYWYwMjc5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxl dGluZy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgtc3R5bGUtZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsOSBAQAorVGhlIHNwYW4gc3R5bGUgc2hvdWxkIGJlIHByZXNlcnZlZCB3aGVuIG1l cmdpbmcgYSBwcmFncmFwaC4KK1RoZSB0ZXN0IHBhc3NlcyBpZiB0aGUgYmFyIGNvbnRhdGlucyB0 aGUgeWVsbG93IGJhY2tncm91bmQgYW5kIGl0J3MgdW5kZXJsaW5lZC4KK3wgIgorICAgICAgICAi Cit8IDxwPgorfCAgICJmb288I3NlbGVjdGlvbi1jYXJldD4iCit8ICAgPHNwYW4+Cit8ICAgICBz dHlsZT0iYmFja2dyb3VuZC1jb2xvcjogeWVsbG93OyB0ZXh0LWRlY29yYXRpb246IHVuZGVybGlu ZTsiCit8ICAgICAiYmFyIgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGlu Zy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgtc3R5bGUuaHRtbCBiL0xheW91dFRlc3Rz L2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtcGFyYWdyYXBoLWZyb20tc3Bhbi13aXRoLXN0eWxlLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNGMyMDMyNQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtcGFyYWdyYXBoLWZy b20tc3Bhbi13aXRoLXN0eWxlLmh0bWwKQEAgLTAsMCArMSwzMSBAQAorPGh0bWw+CisgICAgPGhl YWQ+CisgICAgICAgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisgICAgICAgICAgLk5vbkluaGVy aXRhYmxlUHJvcGVydGllcyB7CisgICAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHllbGxv dzsKKyAgICAgICAgICAgICAgdGV4dC1kZWNvcmF0aW9uOiB1bmRlcmxpbmU7CisgICAgICAgICAg fQorICAgICAgICA8L3N0eWxlPgorICAgIDwvaGVhZD4KKworICAgIDxib2R5PgorICAgICAgICA8 ZGl2IGlkPSJ0ZXN0IiBjb250ZW50ZWRpdGFibGU9InRydWUiPgorICAgICAgICA8cD5mb288L3A+ CisgICAgICAgIDxzcGFuIGlkPSJzcGFuVG9NZXJnZSIgY2xhc3M9Ik5vbkluaGVyaXRhYmxlUHJv cGVydGllcyI+YmFyPC9zcGFuPgorICAgICAgICA8L2Rpdj4KKworICAgICAgICA8c2NyaXB0IHNy Yz0iLi4vLi4vcmVzb3VyY2VzL2R1bXAtYXMtbWFya3VwLmpzIj48L3NjcmlwdD4KKyAgICAgICAg PHNjcmlwdD4KKyAgICAgICAgICAgIE1hcmt1cC5kZXNjcmlwdGlvbignVGhlIHNwYW4gc3R5bGUg c2hvdWxkIGJlIHByZXNlcnZlZCB3aGVuIG1lcmdpbmcgYSBwcmFncmFwaC5cbicgKworICAgICAg ICAgICAgICAgICdUaGUgdGVzdCBwYXNzZXMgaWYgdGhlIGJhciBjb250YXRpbnMgdGhlIHllbGxv dyBiYWNrZ3JvdW5kIGFuZCBpdFwncyB1bmRlcmxpbmVkLicpOworCisgICAgICAgICAgICB2YXIg c3BhblRvTWVyZ2UgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic3BhblRvTWVyZ2UiKTsKKyAg ICAgICAgICAgIHNwYW5Ub01lcmdlLmZvY3VzKCk7CisgICAgICAgICAgICB2YXIgc2VsZWN0aW9u ID0gd2luZG93LmdldFNlbGVjdGlvbigpOworICAgICAgICAgICAgc2VsZWN0aW9uLmNvbGxhcHNl KHNwYW5Ub01lcmdlLCAwKTsKKyAgICAgICAgICAgIGRvY3VtZW50LmV4ZWNDb21tYW5kKCJEZWxl dGUiKTsKKyAgICAgICAgICAgIE1hcmt1cC5kdW1wKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0 ZXN0IikpOworICAgICAgICA8L3NjcmlwdD4KKworICAgIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCA4NjViM2IwLi45ZjJjMGNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIw MTMtMDUtMjAgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3VuZy5jb20+ CisKKyAgICAgICAgYmFja2dyb3VuZC1jb2xvciBhbmQgdGV4dC1kZWNvcmF0aW9uIGFyZSBub3Qg cHJlc2VydmVkIHdoZW4gbWVyZ2luZyBwYXJhZ3JhcGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYyMTUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb24gaW5oZXJpdGFibGUgQ1NTIHByb3BlcnRpZXMg KGJhY2tncm91bmQtY29sb3IgYW5kIHRleHQtZGVjb3JhdGlvbikgZGVmaW5lZCB0aHJvdWdoCisg ICAgICAgIENTUyBjbGFzcyBhcmUgbm90IGNvcGllZCB3aGVuIHBhcmFncmFwaCBpcyBiZWluZyBt ZXJnZWQuCisgICAgICAgIFRoZXkgYXJlIHByb3Blcmx5IG1lcmdlZCB3aGVuIGRlZmluZWQgaW5s aW5lLgorCisgICAgICAgIEluIG1lcmdlSW5saW5lQW5kSW1wbGljaXRTdHlsZU9mRWxlbWVudCBz dHlsZSBmcm9tIG1hdGNoZWQgcnVsZXMgYXJlIHJldHJpZXZlZC4KKyAgICAgICAgSWYgdGhleSBj b250YWluIGVpdGhlciBiYWNrZ3JvdW5kLWNvbG9yIG9yIHRleHQtZGVjb3JhdGlvbiB0aGV5IHdp bGwgYmUgcmVtb3ZlZAorICAgICAgICBpbiByZW1vdmVOb25FZGl0aW5nUHJvcGVydGllcygpIGR1 ZSB0byBjb3B5RWRpdGluZ1Byb3BlcnRpZXMgaW1wbGljaXQKKyAgICAgICAgJ09ubHlJbmhlcml0 YWJsZUVkaXRpbmdQcm9wZXJ0aWVzJyBwYXJhbWV0ZXIuCisgICAgICAgIFdlIGhhdmUgYWxyZWFk eSBoYWQgc2ltaWxhciBpc3N1ZSBhdCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTMxOTYKKworICAgICAgICBUZXN0OiBlZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFn cmFwaC1mcm9tLXNwYW4td2l0aC1zdHlsZS5odG1sCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRp bmdTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0aW5nU3R5bGU6OnJlbW92ZU5vbkVk aXRpbmdQcm9wZXJ0aWVzKToKKyAgICAgICAgQWxsb3cgdG8ga2VlcCBub24gaW5oZXJpdGFibGUg ZWRpdGluZyBwcm9wZXJ0aWVzLgorCisgICAgICAgIChXZWJDb3JlOjpFZGl0aW5nU3R5bGU6Om1l cmdlSW5saW5lQW5kSW1wbGljaXRTdHlsZU9mRWxlbWVudCk6CisgICAgICAgIENhbGwgJ3JlbW92 ZU5vbkVkaXRpbmdQcm9wZXJ0aWVzJyB3aXRoIGFuIGFwcHJvcHJpYXRlIHZhbHVlLgorCisgICAg ICAgICogZWRpdGluZy9FZGl0aW5nU3R5bGUuaDoKKyAgICAgICAgKEVkaXRpbmdTdHlsZSk6Cisg ICAgICAgIEFkZCBib29sIHBhcmFtZXRlciB0byAncmVtb3ZlTm9uRWRpdGluZ1Byb3BlcnRpZXMn IHdoZXRoZXIgdGhlIG5vbiBpbmhlcml0YWJsZQorICAgICAgICBzdHlsZSBzaG91bGQgYmUgcHJl c2VydmVkIG9yIG5vdC4KKwogMjAxMy0wNS0yMCAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWlu QGFwcGxlLmNvbT4KIAogICAgICAgICBNaW5vciBTdHJpbmcgZml4ZXMgaW4gQ1NTCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKaW5kZXggMDgxYzVkZS4uMzVjNmVkOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcApAQCAtNjEzLDEwICs2MTMsMTAg QEAgdm9pZCBFZGl0aW5nU3R5bGU6OnJlbW92ZVN0eWxlQ29uZmxpY3RpbmdXaXRoU3R5bGVPZk5v ZGUoTm9kZSogbm9kZSkKICAgICAgICAgbV9tdXRhYmxlU3R5bGUtPnJlbW92ZVByb3BlcnR5KG5v ZGVTdHlsZS0+cHJvcGVydHlBdChpKS5pZCgpKTsKIH0KIAotdm9pZCBFZGl0aW5nU3R5bGU6OnJl bW92ZU5vbkVkaXRpbmdQcm9wZXJ0aWVzKCkKK3ZvaWQgRWRpdGluZ1N0eWxlOjpyZW1vdmVOb25F ZGl0aW5nUHJvcGVydGllcyhib29sIHByZXNlcnZlTm9uSW5oZXJpdGFibGVFZGl0aW5nUHJvcGVy dGllcykKIHsKICAgICBpZiAobV9tdXRhYmxlU3R5bGUpCi0gICAgICAgIG1fbXV0YWJsZVN0eWxl ID0gY29weUVkaXRpbmdQcm9wZXJ0aWVzKG1fbXV0YWJsZVN0eWxlLmdldCgpKTsKKyAgICAgICAg bV9tdXRhYmxlU3R5bGUgPSBjb3B5RWRpdGluZ1Byb3BlcnRpZXMobV9tdXRhYmxlU3R5bGUuZ2V0 KCksIHByZXNlcnZlTm9uSW5oZXJpdGFibGVFZGl0aW5nUHJvcGVydGllcyA/IEFsbEVkaXRpbmdQ cm9wZXJ0aWVzIDogT25seUluaGVyaXRhYmxlRWRpdGluZ1Byb3BlcnRpZXMpOwogfQogCiB2b2lk IEVkaXRpbmdTdHlsZTo6Y29sbGFwc2VUZXh0RGVjb3JhdGlvblByb3BlcnRpZXMoKQpAQCAtOTc3 LDcgKzk3Nyw3IEBAIHZvaWQgRWRpdGluZ1N0eWxlOjptZXJnZUlubGluZUFuZEltcGxpY2l0U3R5 bGVPZkVsZW1lbnQoU3R5bGVkRWxlbWVudCogZWxlbWVudCwKIHsKICAgICBSZWZQdHI8RWRpdGlu Z1N0eWxlPiBzdHlsZUZyb21SdWxlcyA9IEVkaXRpbmdTdHlsZTo6Y3JlYXRlKCk7CiAgICAgc3R5 bGVGcm9tUnVsZXMtPm1lcmdlU3R5bGVGcm9tUnVsZXNGb3JTZXJpYWxpemF0aW9uKGVsZW1lbnQp OwotICAgIHN0eWxlRnJvbVJ1bGVzLT5yZW1vdmVOb25FZGl0aW5nUHJvcGVydGllcygpOworICAg IHN0eWxlRnJvbVJ1bGVzLT5yZW1vdmVOb25FZGl0aW5nUHJvcGVydGllcyhwcm9wZXJ0aWVzVG9J bmNsdWRlICE9IE9ubHlFZGl0aW5nSW5oZXJpdGFibGVQcm9wZXJ0aWVzKTsKICAgICBtZXJnZVN0 eWxlKHN0eWxlRnJvbVJ1bGVzLT5tX211dGFibGVTdHlsZS5nZXQoKSwgbW9kZSk7CiAKICAgICBt ZXJnZUlubGluZVN0eWxlT2ZFbGVtZW50KGVsZW1lbnQsIG1vZGUsIHByb3BlcnRpZXNUb0luY2x1 ZGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuaCBi L1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmgKaW5kZXggZmFlYTg3Ni4uM2E3 ZWUyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5oCkBAIC0xMTEsNyArMTEx LDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVtb3ZlQmxvY2tQcm9wZXJ0aWVzKCk7CiAgICAgdm9p ZCByZW1vdmVTdHlsZUFkZGVkQnlOb2RlKE5vZGUqKTsKICAgICB2b2lkIHJlbW92ZVN0eWxlQ29u ZmxpY3RpbmdXaXRoU3R5bGVPZk5vZGUoTm9kZSopOwotICAgIHZvaWQgcmVtb3ZlTm9uRWRpdGlu Z1Byb3BlcnRpZXMoKTsKKyAgICB2b2lkIHJlbW92ZU5vbkVkaXRpbmdQcm9wZXJ0aWVzKGJvb2wg cHJlc2VydmVOb25Jbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzID0gZmFsc2UpOwogICAgIHZv aWQgY29sbGFwc2VUZXh0RGVjb3JhdGlvblByb3BlcnRpZXMoKTsKICAgICBlbnVtIFNob3VsZEln bm9yZVRleHRPbmx5UHJvcGVydGllcyB7IElnbm9yZVRleHRPbmx5UHJvcGVydGllcywgRG9Ob3RJ Z25vcmVUZXh0T25seVByb3BlcnRpZXMgfTsKICAgICBUcmlTdGF0ZSB0cmlTdGF0ZU9mU3R5bGUo RWRpdGluZ1N0eWxlKikgY29uc3Q7Cg== 204705 2013-06-14 05:33:45 -0700 2013-06-18 02:06:13 -0700 passing EditingPropertiesToInclude to removeAllButEditingProperties() CSS_non_inheritable_properties_are_not_preserved_when_merging_paragraphs.patch text/plain 9162 g.czajkowski ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmNzIxZDU2Li40NTEyMDUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMDYt MTMgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3VuZy5jb20+CisKKyAg ICAgICAgYmFja2dyb3VuZC1jb2xvciBhbmQgdGV4dC1kZWNvcmF0aW9uIGFyZSBub3QgcHJlc2Vy dmVkIHdoZW4gbWVyZ2luZyBwYXJhZ3JhcGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYyMTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgYSBuZXcgbGF5b3V0IHRlc3QuCisKKyAgICAgICAgKiBl ZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFncmFwaC1mcm9tLXNwYW4td2l0aC1zdHlsZS1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtcGFyYWdy YXBoLWZyb20tc3Bhbi13aXRoLXN0eWxlLmh0bWw6IEFkZGVkLgorCiAyMDEzLTA2LTE0ICBab2x0 YW4gQXJ2YWkgIDx6YXJ2YWlAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFtRdF0gVW5yZXZp ZXdlZCBnYXJkZW5pbmcuIFJlYmFzZWxpbmluZyBhZnRlciByMTUxMjA1LgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdp dGgtc3R5bGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9tZXJn ZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgtc3R5bGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjMzZjkwZDgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFncmFwaC1mcm9tLXNwYW4td2l0aC1z dHlsZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw5IEBACitUaGUgc3BhbiBzdHlsZSBzaG91bGQg YmUgcHJlc2VydmVkIHdoZW4gbWVyZ2luZyBhIHByYWdyYXBoLgorVGhlIHRlc3QgcGFzc2VzIGlm IHRoZSBiYXIgY29udGF0aW5zIHRoZSB5ZWxsb3cgYmFja2dyb3VuZCBhbmQgaXQncyB1bmRlcmxp bmVkLgorfCAiCisiCit8IDxwPgorfCAgICJmb288I3NlbGVjdGlvbi1jYXJldD4iCit8ICAgPHNw YW4+Cit8ICAgICBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjogeWVsbG93OyB0ZXh0LWRlY29yYXRp b246IHVuZGVybGluZTsiCit8ICAgICAiYmFyIgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRp dGluZy9kZWxldGluZy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgtc3R5bGUuaHRtbCBi L0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtcGFyYWdyYXBoLWZyb20tc3Bhbi13 aXRoLXN0eWxlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWQxNWVk MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2Ut cGFyYWdyYXBoLWZyb20tc3Bhbi13aXRoLXN0eWxlLmh0bWwKQEAgLTAsMCArMSwyOSBAQAorPCFE T0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KKy5O b25Jbmhlcml0YWJsZVByb3BlcnRpZXMgeworYmFja2dyb3VuZC1jb2xvcjogeWVsbG93OwordGV4 dC1kZWNvcmF0aW9uOiB1bmRlcmxpbmU7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+Cis8 ZGl2IGlkPSJ0ZXN0IiBjb250ZW50ZWRpdGFibGU9InRydWUiPgorPHA+Zm9vPC9wPgorPHNwYW4g aWQ9InNwYW5Ub01lcmdlIiBjbGFzcz0iTm9uSW5oZXJpdGFibGVQcm9wZXJ0aWVzIj5iYXI8L3Nw YW4+Cis8L2Rpdj4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvZHVtcC1hcy1tYXJrdXAu anMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK01hcmt1cC5kZXNjcmlwdGlvbignVGhlIHNwYW4gc3R5 bGUgc2hvdWxkIGJlIHByZXNlcnZlZCB3aGVuIG1lcmdpbmcgYSBwcmFncmFwaC5cbicgKworICAg ICAgICAgICAgICAgICAgICdUaGUgdGVzdCBwYXNzZXMgaWYgdGhlIGJhciBjb250YXRpbnMgdGhl IHllbGxvdyBiYWNrZ3JvdW5kIGFuZCBpdFwncyB1bmRlcmxpbmVkLicpOworCit2YXIgc3BhblRv TWVyZ2UgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic3BhblRvTWVyZ2UiKTsKK3NwYW5Ub01l cmdlLmZvY3VzKCk7Cit2YXIgc2VsZWN0aW9uID0gd2luZG93LmdldFNlbGVjdGlvbigpOworc2Vs ZWN0aW9uLmNvbGxhcHNlKHNwYW5Ub01lcmdlLCAwKTsKK2RvY3VtZW50LmV4ZWNDb21tYW5kKCJE ZWxldGUiKTsKK01hcmt1cC5kdW1wKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXN0IikpOwor PC9zY3JpcHQ+CisgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGM5Yjg5ZjMuLjZjNTEz ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MiBAQAorMjAxMy0wNi0xMyAgR3J6ZWdvcnogQ3ph amtvd3NraSAgPGcuY3phamtvd3NraUBzYW1zdW5nLmNvbT4KKworICAgICAgICBiYWNrZ3JvdW5k LWNvbG9yIGFuZCB0ZXh0LWRlY29yYXRpb24gYXJlIG5vdCBwcmVzZXJ2ZWQgd2hlbiBtZXJnaW5n IHBhcmFncmFwaHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNjIxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE5vbiBpbmhlcml0YWJsZSBDU1MgcHJvcGVydGllcyAoYmFja2dyb3VuZC1jb2xvciBhbmQg dGV4dC1kZWNvcmF0aW9uKSBkZWZpbmVkCisgICAgICAgIG5vbi1pbmxpbmUgYXJlIG5vdCBjb3Bp ZWQgd2hlbiBwYXJhZ3JhcGggaXMgYmVpbmcgbWVyZ2VkLgorICAgICAgICBUaGV5IGFyZSBwcm9w ZXJseSBtZXJnZWQgd2hlbiBkZWZpbmVkIGlubGluZS4KKworICAgICAgICBJbiBtZXJnZUlubGlu ZUFuZEltcGxpY2l0U3R5bGVPZkVsZW1lbnQgc3R5bGUgZnJvbSBtYXRjaGVkIHJ1bGVzIGFyZSBy ZXRyaWV2ZWQuCisgICAgICAgIElmIHRoZXkgY29udGFpbiBlaXRoZXIgYmFja2dyb3VuZC1jb2xv ciBvciB0ZXh0LWRlY29yYXRpb24gdGhleSB3aWxsIGJlIHJlbW92ZWQKKyAgICAgICAgYnkgcmVt b3ZlTm9uRWRpdGluZ1Byb3BlcnRpZXMoKSBkdWUgdG8gY29weUVkaXRpbmdQcm9wZXJ0aWVzIGlt cGxpY2l0CisgICAgICAgICdPbmx5SW5oZXJpdGFibGVFZGl0aW5nUHJvcGVydGllcycgcGFyYW1l dGVyLgorICAgICAgICBXZSBoYXZlIGFscmVhZHkgaGFkIHNpbWlsYXIgaXNzdWUgYXQgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzMTk2CisKKyAgICAgICAgVGVzdDog ZWRpdGluZy9kZWxldGluZy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgtc3R5bGUuaHRt bAorCisgICAgICAgICogZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Y29weUVkaXRpbmdQcm9wZXJ0aWVzKToKKyAgICAgICAgUmV2ZXJzZSBsb2dpYyB0byBiZSB1 c2VkIGFmdGVyIGNhc3RpbmcgUHJvcGVydGllc1RvSW5sY3VkZSB0byBFZGl0aW5nUHJvcGVydGll c1RvSW5jbHVkZS4KKworICAgICAgICAoV2ViQ29yZTo6ZWRpdGluZ1N0eWxlRnJvbUNvbXB1dGVk U3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6RWRpdGluZ1N0eWxlOjpyZW1vdmVBbGxCdXRFZGl0 aW5nUHJvcGVydGllcyk6CisgICAgICAgIENoYW5nZSB0aGUgbWV0aG9kIG5hbWUgKGZvcm1lciBy ZW1vdmVOb25FZGl0aW5nUHJvcGVydGllcykuCisgICAgICAgIEFkZCBhIHBhcmFtZXRlciB0byBj aG9vc2Ugd2hpY2ggZWRpdGluZyBwcm9wZXJ0aWVzIHNob3VsZCBiZSBwcmVzZXJ2ZWQgd2hpbGUK KyAgICAgICAgcmVtb3ZpbmcgYWxsIHByb3BlcnRpZXMuCisKKyAgICAgICAgKFdlYkNvcmU6OkVk aXRpbmdTdHlsZTo6bWVyZ2VJbmxpbmVBbmRJbXBsaWNpdFN0eWxlT2ZFbGVtZW50KToKKyAgICAg ICAgQ2FzdCBQcm9wZXJ0aWVzVG9JbmxjdWRlIHRvIEVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRl IGFuZCBjYWxsCisgICAgICAgIHJlbW92ZUFsbEJ1dEVkaXRpbmdQcm9wZXJ0aWVzIHdpdGggZ2l2 ZW4gcGFyYW1ldGVyLgorCisgICAgICAgICogZWRpdGluZy9FZGl0aW5nU3R5bGUuaDoKKyAgICAg ICAgTW92ZSBFZGl0aW5nUHJvcGVydGllc1R5cGUgdG8gdGhlIGhlYWRlciBhcyBpdCdzIG5lZWRl ZCBieSByZW1vdmVBbGxCdXRFZGl0aW5nUHJvcGVydGllcy4KKyAgICAgICAgQ2hhbmdlIHRoZSBl bnVtIG5hbWUgdG8gdGhlIEVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRlIHRvIGJlIGNvbnNpc3Rl bnQgd2l0aAorICAgICAgICBQcm9wZXJ0aWVzVG9JbmxjdWRlLgorICAgICAgICBSZW9yZGVyIFBy b3BlcnRpZXNUb0lubGN1ZGUgdmFsdWVzIHRvIG1hdGNoIEVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNs dWRlIHRvIGVhc3kgY2FzdCBpdC4KKwogMjAxMy0wNi0xNCAgTWljaGHFgiBQYWt1xYJhIHZlbCBS dXRrYSAgPG0ucGFrdWxhQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdIEZpeCBidWlsZCB3 aGVuIERSQUdfU1VQUE9SVCBpcyBzZXQgT0ZGCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdT dHlsZS5jcHAKaW5kZXggYWRkNTM0NS4uMjIyNmM2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv RWRpdGluZ1N0eWxlLmNwcApAQCAtODMsMTQgKzgzLDEyIEBAIHN0YXRpYyBjb25zdCBDU1NQcm9w ZXJ0eUlEIGVkaXRpbmdQcm9wZXJ0aWVzW10gPSB7CiAgICAgQ1NTUHJvcGVydHlXZWJraXRUZXh0 U3Ryb2tlV2lkdGgsCiB9OwogCi1lbnVtIEVkaXRpbmdQcm9wZXJ0aWVzVHlwZSB7IE9ubHlJbmhl cml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzLCBBbGxFZGl0aW5nUHJvcGVydGllcyB9OwotCiB0ZW1w bGF0ZSA8Y2xhc3MgU3R5bGVEZWNsYXJhdGlvblR5cGU+Ci1zdGF0aWMgUGFzc1JlZlB0cjxNdXRh YmxlU3R5bGVQcm9wZXJ0eVNldD4gY29weUVkaXRpbmdQcm9wZXJ0aWVzKFN0eWxlRGVjbGFyYXRp b25UeXBlKiBzdHlsZSwgRWRpdGluZ1Byb3BlcnRpZXNUeXBlIHR5cGUgPSBPbmx5SW5oZXJpdGFi bGVFZGl0aW5nUHJvcGVydGllcykKK3N0YXRpYyBQYXNzUmVmUHRyPE11dGFibGVTdHlsZVByb3Bl cnR5U2V0PiBjb3B5RWRpdGluZ1Byb3BlcnRpZXMoU3R5bGVEZWNsYXJhdGlvblR5cGUqIHN0eWxl LCBFZGl0aW5nU3R5bGU6OkVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRlIHR5cGUgPSBFZGl0aW5n U3R5bGU6Ok9ubHlJbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzKQogewotICAgIGlmICh0eXBl ID09IEFsbEVkaXRpbmdQcm9wZXJ0aWVzKQotICAgICAgICByZXR1cm4gc3R5bGUtPmNvcHlQcm9w ZXJ0aWVzSW5TZXQoZWRpdGluZ1Byb3BlcnRpZXMsIFdURl9BUlJBWV9MRU5HVEgoZWRpdGluZ1By b3BlcnRpZXMpKTsKLSAgICByZXR1cm4gc3R5bGUtPmNvcHlQcm9wZXJ0aWVzSW5TZXQoZWRpdGlu Z1Byb3BlcnRpZXMgKyAyLCBXVEZfQVJSQVlfTEVOR1RIKGVkaXRpbmdQcm9wZXJ0aWVzKSAtIDIp OworICAgIGlmICh0eXBlID09IEVkaXRpbmdTdHlsZTo6T25seUluaGVyaXRhYmxlRWRpdGluZ1By b3BlcnRpZXMpCisgICAgICAgIHJldHVybiBzdHlsZS0+Y29weVByb3BlcnRpZXNJblNldChlZGl0 aW5nUHJvcGVydGllcyArIDIsIFdURl9BUlJBWV9MRU5HVEgoZWRpdGluZ1Byb3BlcnRpZXMpIC0g Mik7CisgICAgcmV0dXJuIHN0eWxlLT5jb3B5UHJvcGVydGllc0luU2V0KGVkaXRpbmdQcm9wZXJ0 aWVzLCBXVEZfQVJSQVlfTEVOR1RIKGVkaXRpbmdQcm9wZXJ0aWVzKSk7CiB9CiAKIHN0YXRpYyBp bmxpbmUgYm9vbCBpc0VkaXRpbmdQcm9wZXJ0eShpbnQgaWQpCkBAIC0xMDIsNyArMTAwLDcgQEAg c3RhdGljIGlubGluZSBib29sIGlzRWRpdGluZ1Byb3BlcnR5KGludCBpZCkKICAgICByZXR1cm4g ZmFsc2U7CiB9CiAKLXN0YXRpYyBQYXNzUmVmUHRyPE11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBl ZGl0aW5nU3R5bGVGcm9tQ29tcHV0ZWRTdHlsZShQYXNzUmVmUHRyPE5vZGU+IG5vZGUsIEVkaXRp bmdQcm9wZXJ0aWVzVHlwZSB0eXBlID0gT25seUluaGVyaXRhYmxlRWRpdGluZ1Byb3BlcnRpZXMp CitzdGF0aWMgUGFzc1JlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gZWRpdGluZ1N0eWxl RnJvbUNvbXB1dGVkU3R5bGUoUGFzc1JlZlB0cjxOb2RlPiBub2RlLCBFZGl0aW5nU3R5bGU6OkVk aXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRlIHR5cGUgPSBFZGl0aW5nU3R5bGU6Ok9ubHlJbmhlcml0 YWJsZUVkaXRpbmdQcm9wZXJ0aWVzKQogewogICAgIENvbXB1dGVkU3R5bGVFeHRyYWN0b3IgY29t cHV0ZWRTdHlsZShub2RlKTsKICAgICByZXR1cm4gY29weUVkaXRpbmdQcm9wZXJ0aWVzKCZjb21w dXRlZFN0eWxlLCB0eXBlKTsKQEAgLTYwOCwxMCArNjA2LDEwIEBAIHZvaWQgRWRpdGluZ1N0eWxl OjpyZW1vdmVTdHlsZUNvbmZsaWN0aW5nV2l0aFN0eWxlT2ZOb2RlKE5vZGUqIG5vZGUpCiAgICAg ICAgIG1fbXV0YWJsZVN0eWxlLT5yZW1vdmVQcm9wZXJ0eShub2RlU3R5bGUtPnByb3BlcnR5QXQo aSkuaWQoKSk7CiB9CiAKLXZvaWQgRWRpdGluZ1N0eWxlOjpyZW1vdmVOb25FZGl0aW5nUHJvcGVy dGllcygpCit2b2lkIEVkaXRpbmdTdHlsZTo6cmVtb3ZlQWxsQnV0RWRpdGluZ1Byb3BlcnRpZXMo RWRpdGluZ1Byb3BlcnRpZXNUb0luY2x1ZGUgcHJvcGVydGllc1RvSW5jbHVkZSkKIHsKICAgICBp ZiAobV9tdXRhYmxlU3R5bGUpCi0gICAgICAgIG1fbXV0YWJsZVN0eWxlID0gY29weUVkaXRpbmdQ cm9wZXJ0aWVzKG1fbXV0YWJsZVN0eWxlLmdldCgpKTsKKyAgICAgICAgbV9tdXRhYmxlU3R5bGUg PSBjb3B5RWRpdGluZ1Byb3BlcnRpZXMobV9tdXRhYmxlU3R5bGUuZ2V0KCksIHByb3BlcnRpZXNU b0luY2x1ZGUpOwogfQogCiB2b2lkIEVkaXRpbmdTdHlsZTo6Y29sbGFwc2VUZXh0RGVjb3JhdGlv blByb3BlcnRpZXMoKQpAQCAtOTc0LDcgKzk3Miw3IEBAIHZvaWQgRWRpdGluZ1N0eWxlOjptZXJn ZUlubGluZUFuZEltcGxpY2l0U3R5bGVPZkVsZW1lbnQoU3R5bGVkRWxlbWVudCogZWxlbWVudCwK IHsKICAgICBSZWZQdHI8RWRpdGluZ1N0eWxlPiBzdHlsZUZyb21SdWxlcyA9IEVkaXRpbmdTdHls ZTo6Y3JlYXRlKCk7CiAgICAgc3R5bGVGcm9tUnVsZXMtPm1lcmdlU3R5bGVGcm9tUnVsZXNGb3JT ZXJpYWxpemF0aW9uKGVsZW1lbnQpOwotICAgIHN0eWxlRnJvbVJ1bGVzLT5yZW1vdmVOb25FZGl0 aW5nUHJvcGVydGllcygpOworICAgIHN0eWxlRnJvbVJ1bGVzLT5yZW1vdmVBbGxCdXRFZGl0aW5n UHJvcGVydGllcyhzdGF0aWNfY2FzdDxFZGl0aW5nUHJvcGVydGllc1RvSW5jbHVkZT4ocHJvcGVy dGllc1RvSW5jbHVkZSkpOwogICAgIG1lcmdlU3R5bGUoc3R5bGVGcm9tUnVsZXMtPm1fbXV0YWJs ZVN0eWxlLmdldCgpLCBtb2RlKTsKIAogICAgIG1lcmdlSW5saW5lU3R5bGVPZkVsZW1lbnQoZWxl bWVudCwgbW9kZSwgcHJvcGVydGllc1RvSW5jbHVkZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0 aW5nU3R5bGUuaAppbmRleCBlMDE0NTE5Li5kYzJlZDJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv RWRpdGluZ1N0eWxlLmgKQEAgLTYyLDcgKzYyLDkgQEAgY2xhc3MgVmlzaWJsZVNlbGVjdGlvbjsK IGNsYXNzIEVkaXRpbmdTdHlsZSA6IHB1YmxpYyBSZWZDb3VudGVkPEVkaXRpbmdTdHlsZT4gewog cHVibGljOgogCi0gICAgZW51bSBQcm9wZXJ0aWVzVG9JbmNsdWRlIHsgQWxsUHJvcGVydGllcywg T25seUVkaXRpbmdJbmhlcml0YWJsZVByb3BlcnRpZXMsIEVkaXRpbmdQcm9wZXJ0aWVzSW5FZmZl Y3QgfTsKKyAgICBlbnVtIFByb3BlcnRpZXNUb0luY2x1ZGUgeyBPbmx5RWRpdGluZ0luaGVyaXRh YmxlUHJvcGVydGllcywgRWRpdGluZ1Byb3BlcnRpZXNJbkVmZmVjdCwgQWxsUHJvcGVydGllc307 CisgICAgZW51bSBFZGl0aW5nUHJvcGVydGllc1RvSW5jbHVkZSB7IE9ubHlJbmhlcml0YWJsZUVk aXRpbmdQcm9wZXJ0aWVzLCBBbGxFZGl0aW5nUHJvcGVydGllcyB9OworCiAgICAgZW51bSBTaG91 bGRQcmVzZXJ2ZVdyaXRpbmdEaXJlY3Rpb24geyBQcmVzZXJ2ZVdyaXRpbmdEaXJlY3Rpb24sIERv Tm90UHJlc2VydmVXcml0aW5nRGlyZWN0aW9uIH07CiAgICAgZW51bSBTaG91bGRFeHRyYWN0TWF0 Y2hpbmdTdHlsZSB7IEV4dHJhY3RNYXRjaGluZ1N0eWxlLCBEb05vdEV4dHJhY3RNYXRjaGluZ1N0 eWxlIH07CiAgICAgc3RhdGljIGZsb2F0IE5vRm9udERlbHRhOwpAQCAtMTA2LDcgKzEwOCw3IEBA IHB1YmxpYzoKICAgICB2b2lkIHJlbW92ZUJsb2NrUHJvcGVydGllcygpOwogICAgIHZvaWQgcmVt b3ZlU3R5bGVBZGRlZEJ5Tm9kZShOb2RlKik7CiAgICAgdm9pZCByZW1vdmVTdHlsZUNvbmZsaWN0 aW5nV2l0aFN0eWxlT2ZOb2RlKE5vZGUqKTsKLSAgICB2b2lkIHJlbW92ZU5vbkVkaXRpbmdQcm9w ZXJ0aWVzKCk7CisgICAgdm9pZCByZW1vdmVBbGxCdXRFZGl0aW5nUHJvcGVydGllcyhFZGl0aW5n UHJvcGVydGllc1RvSW5jbHVkZSA9IE9ubHlJbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzKTsK ICAgICB2b2lkIGNvbGxhcHNlVGV4dERlY29yYXRpb25Qcm9wZXJ0aWVzKCk7CiAgICAgZW51bSBT aG91bGRJZ25vcmVUZXh0T25seVByb3BlcnRpZXMgeyBJZ25vcmVUZXh0T25seVByb3BlcnRpZXMs IERvTm90SWdub3JlVGV4dE9ubHlQcm9wZXJ0aWVzIH07CiAgICAgVHJpU3RhdGUgdHJpU3RhdGVP ZlN0eWxlKEVkaXRpbmdTdHlsZSopIGNvbnN0OwotLSAKMS43LjkuNQoK 204891 2013-06-18 02:06:13 -0700 2013-06-19 04:07:03 -0700 apply Darin's comments CSS_non_inheritable_properties_are_not_preserved_when_merging_paragraphs.patch text/plain 12114 g.czajkowski ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwNDc3NGYzLi4xNTI2ZTZhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTMtMDYt MTggIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3VuZy5jb20+CisKKyAg ICAgICAgYmFja2dyb3VuZC1jb2xvciBhbmQgdGV4dC1kZWNvcmF0aW9uIGFyZSBub3QgcHJlc2Vy dmVkIHdoZW4gbWVyZ2luZyBwYXJhZ3JhcGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYyMTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGRlZCB0ZXN0cyBmb3IgdmVyaWZ5aW5nIG1lcmdlIG9mIHBh cmFncmFwaC9kaXYgZnJvbSBzcGFuIHdpdGggbm9uLWlubGluZSBzdHlsZXMuCisKKyAgICAgICAg KiBlZGl0aW5nL2RlbGV0aW5nL21lcmdlLWRpdi1mcm9tLXNwYW4td2l0aC1zdHlsZS1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtZGl2LWZyb20t c3Bhbi13aXRoLXN0eWxlLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcv bWVyZ2UtcGFyYWdyYXBoLWZyb20tc3Bhbi13aXRoLXN0eWxlLWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogZWRpdGluZy9kZWxldGluZy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdp dGgtc3R5bGUuaHRtbDogQWRkZWQuCisKIDIwMTMtMDYtMTcgIEJyZW50IEZ1bGdoYW0gIDxiZnVs Z2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dpbmRvd3NdIFVucmV2aWV3ZWQgQVggZ2FyZGVu aW5nIG9mIHdpbmRvd3Mtc3BlY2lmaWMgcmVzdWx0cy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtZGl2LWZyb20tc3Bhbi13aXRoLXN0eWxlLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtZGl2LWZyb20tc3Bhbi13 aXRoLXN0eWxlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw Li5mZGNhYmI3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGlu Zy9tZXJnZS1kaXYtZnJvbS1zcGFuLXdpdGgtc3R5bGUtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEs OSBAQAorVGhlIHNwYW4gc3R5bGUgc2hvdWxkIGJlIHByZXNlcnZlZCB3aGVuIG1lcmdpbmcgZGl2 IGVsZW1lbnQuCitUaGUgdGVzdCBwYXNzZXMgaWYgdGhlIGJhciBjb250YXRpbnMgdGhlIHllbGxv dyBiYWNrZ3JvdW5kIGFuZCBpdCdzIHVuZGVybGluZWQuCit8ICIKKyIKK3wgPGRpdj4KK3wgICAi Zm9vPCNzZWxlY3Rpb24tY2FyZXQ+IgorfCAgIDxzcGFuPgorfCAgICAgc3R5bGU9ImJhY2tncm91 bmQtY29sb3I6IHllbGxvdzsgdGV4dC1kZWNvcmF0aW9uOiB1bmRlcmxpbmU7IgorfCAgICAgImJh ciIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtZGl2LWZy b20tc3Bhbi13aXRoLXN0eWxlLmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL21l cmdlLWRpdi1mcm9tLXNwYW4td2l0aC1zdHlsZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAuLmIzMzJkMmEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0 aW5nL2RlbGV0aW5nL21lcmdlLWRpdi1mcm9tLXNwYW4td2l0aC1zdHlsZS5odG1sCkBAIC0wLDAg KzEsMjkgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZSB0eXBlPSJ0 ZXh0L2NzcyI+CisuTm9uSW5oZXJpdGFibGVQcm9wZXJ0aWVzIHsKK2JhY2tncm91bmQtY29sb3I6 IHllbGxvdzsKK3RleHQtZGVjb3JhdGlvbjogdW5kZXJsaW5lOworfQorPC9zdHlsZT4KKzwvaGVh ZD4KKzxib2R5PgorPGRpdiBpZD0idGVzdCIgY29udGVudGVkaXRhYmxlPSJ0cnVlIj4KKzxkaXY+ Zm9vPC9kaXY+Cis8c3BhbiBpZD0ic3BhblRvTWVyZ2UiIGNsYXNzPSJOb25Jbmhlcml0YWJsZVBy b3BlcnRpZXMiPmJhcjwvc3Bhbj4KKzwvZGl2PgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNl cy9kdW1wLWFzLW1hcmt1cC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorTWFya3VwLmRlc2NyaXB0 aW9uKCdUaGUgc3BhbiBzdHlsZSBzaG91bGQgYmUgcHJlc2VydmVkIHdoZW4gbWVyZ2luZyBkaXYg ZWxlbWVudC5cbicgKworICAgICAgICAgICAgICAgICAgICdUaGUgdGVzdCBwYXNzZXMgaWYgdGhl IGJhciBjb250YXRpbnMgdGhlIHllbGxvdyBiYWNrZ3JvdW5kIGFuZCBpdFwncyB1bmRlcmxpbmVk LicpOworCit2YXIgc3BhblRvTWVyZ2UgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic3BhblRv TWVyZ2UiKTsKK3NwYW5Ub01lcmdlLmZvY3VzKCk7Cit2YXIgc2VsZWN0aW9uID0gd2luZG93Lmdl dFNlbGVjdGlvbigpOworc2VsZWN0aW9uLmNvbGxhcHNlKHNwYW5Ub01lcmdlLCAwKTsKK2RvY3Vt ZW50LmV4ZWNDb21tYW5kKCJEZWxldGUiKTsKK01hcmt1cC5kdW1wKGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCJ0ZXN0IikpOworPC9zY3JpcHQ+CisgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFu LXdpdGgtc3R5bGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9t ZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgtc3R5bGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjMzZjkwZDgKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFncmFwaC1mcm9tLXNwYW4td2l0 aC1zdHlsZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw5IEBACitUaGUgc3BhbiBzdHlsZSBzaG91 bGQgYmUgcHJlc2VydmVkIHdoZW4gbWVyZ2luZyBhIHByYWdyYXBoLgorVGhlIHRlc3QgcGFzc2Vz IGlmIHRoZSBiYXIgY29udGF0aW5zIHRoZSB5ZWxsb3cgYmFja2dyb3VuZCBhbmQgaXQncyB1bmRl cmxpbmVkLgorfCAiCisiCit8IDxwPgorfCAgICJmb288I3NlbGVjdGlvbi1jYXJldD4iCit8ICAg PHNwYW4+Cit8ICAgICBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjogeWVsbG93OyB0ZXh0LWRlY29y YXRpb246IHVuZGVybGluZTsiCit8ICAgICAiYmFyIgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZWRpdGluZy9kZWxldGluZy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgtc3R5bGUuaHRt bCBiL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtcGFyYWdyYXBoLWZyb20tc3Bh bi13aXRoLXN0eWxlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWQx NWVkMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVy Z2UtcGFyYWdyYXBoLWZyb20tc3Bhbi13aXRoLXN0eWxlLmh0bWwKQEAgLTAsMCArMSwyOSBAQAor PCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlIHR5cGU9InRleHQvY3NzIj4K Ky5Ob25Jbmhlcml0YWJsZVByb3BlcnRpZXMgeworYmFja2dyb3VuZC1jb2xvcjogeWVsbG93Owor dGV4dC1kZWNvcmF0aW9uOiB1bmRlcmxpbmU7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+ Cis8ZGl2IGlkPSJ0ZXN0IiBjb250ZW50ZWRpdGFibGU9InRydWUiPgorPHA+Zm9vPC9wPgorPHNw YW4gaWQ9InNwYW5Ub01lcmdlIiBjbGFzcz0iTm9uSW5oZXJpdGFibGVQcm9wZXJ0aWVzIj5iYXI8 L3NwYW4+Cis8L2Rpdj4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvZHVtcC1hcy1tYXJr dXAuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK01hcmt1cC5kZXNjcmlwdGlvbignVGhlIHNwYW4g c3R5bGUgc2hvdWxkIGJlIHByZXNlcnZlZCB3aGVuIG1lcmdpbmcgYSBwcmFncmFwaC5cbicgKwor ICAgICAgICAgICAgICAgICAgICdUaGUgdGVzdCBwYXNzZXMgaWYgdGhlIGJhciBjb250YXRpbnMg dGhlIHllbGxvdyBiYWNrZ3JvdW5kIGFuZCBpdFwncyB1bmRlcmxpbmVkLicpOworCit2YXIgc3Bh blRvTWVyZ2UgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic3BhblRvTWVyZ2UiKTsKK3NwYW5U b01lcmdlLmZvY3VzKCk7Cit2YXIgc2VsZWN0aW9uID0gd2luZG93LmdldFNlbGVjdGlvbigpOwor c2VsZWN0aW9uLmNvbGxhcHNlKHNwYW5Ub01lcmdlLCAwKTsKK2RvY3VtZW50LmV4ZWNDb21tYW5k KCJEZWxldGUiKTsKK01hcmt1cC5kdW1wKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXN0Iikp OworPC9zY3JpcHQ+CisgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGNhYjQxMmMuLjg5 N2Y3YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0NSBAQAorMjAxMy0wNi0xOCAgR3J6ZWdvcnog Q3phamtvd3NraSAgPGcuY3phamtvd3NraUBzYW1zdW5nLmNvbT4KKworICAgICAgICBiYWNrZ3Jv dW5kLWNvbG9yIGFuZCB0ZXh0LWRlY29yYXRpb24gYXJlIG5vdCBwcmVzZXJ2ZWQgd2hlbiBtZXJn aW5nIHBhcmFncmFwaHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExNjIxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE5vbiBpbmhlcml0YWJsZSBDU1MgcHJvcGVydGllcyAoYmFja2dyb3VuZC1jb2xvciBh bmQgdGV4dC1kZWNvcmF0aW9uKSBkZWZpbmVkCisgICAgICAgIG5vbi1pbmxpbmUgYXJlIG5vdCBj b3BpZWQgd2hlbiBwYXJhZ3JhcGggaXMgYmVpbmcgbWVyZ2VkLgorICAgICAgICBUaGV5IGFyZSBw cm9wZXJseSBtZXJnZWQgd2hlbiBkZWZpbmVkIGlubGluZS4KKworICAgICAgICBJbiBtZXJnZUlu bGluZUFuZEltcGxpY2l0U3R5bGVPZkVsZW1lbnQoKSwgc3R5bGUgZnJvbSBtYXRjaGVkIHJ1bGVz IGFyZSByZXRyaWV2ZWQuCisgICAgICAgIElmIHRoZXkgY29udGFpbiBlaXRoZXIgYmFja2dyb3Vu ZC1jb2xvciBvciB0ZXh0LWRlY29yYXRpb24gdGhleSB3aWxsIGJlIHJlbW92ZWQKKyAgICAgICAg YnkgcmVtb3ZlTm9uRWRpdGluZ1Byb3BlcnRpZXMoKSBkdWUgdG8gY29weUVkaXRpbmdQcm9wZXJ0 aWVzKCkgaW1wbGljaXQKKyAgICAgICAgJ09ubHlJbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVz JyBwYXJhbWV0ZXIuCisgICAgICAgIFdlIGhhdmUgYWxyZWFkeSBoYWQgc2ltaWxhciBpc3N1ZSBh dCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTMxOTYKKworICAgICAg ICBUZXN0czogZWRpdGluZy9kZWxldGluZy9tZXJnZS1kaXYtZnJvbS1zcGFuLXdpdGgtc3R5bGUu aHRtbAorICAgICAgICAgICAgICAgZWRpdGluZy9kZWxldGluZy9tZXJnZS1wYXJhZ3JhcGgtZnJv bS1zcGFuLXdpdGgtc3R5bGUuaHRtbAorCisgICAgICAgICogZWRpdGluZy9FZGl0aW5nU3R5bGUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29weUVkaXRpbmdQcm9wZXJ0aWVzKToKKyAgICAgICAg KFdlYkNvcmU6OmVkaXRpbmdTdHlsZUZyb21Db21wdXRlZFN0eWxlKToKKyAgICAgICAgQWRkIEVk aXRpbmdTdHlsZTo6IGR1ZSB0byBtb3ZlIEVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRlIHRvIEVk aXRpbmdTdHlsZS5oLgorCisgICAgICAgIChXZWJDb3JlOjpFZGl0aW5nU3R5bGU6OnJlbW92ZUFs bEJ1dEVkaXRpbmdQcm9wZXJ0aWVzKToKKyAgICAgICAgQWRkIGEgcGFyYW1ldGVyIHRvIGNob29z ZSB3aGljaCBlZGl0aW5nIHByb3BlcnRpZXMgc2hvdWxkIGJlIHByZXNlcnZlZCB3aGlsZQorICAg ICAgICByZW1vdmluZyBhbGwgcHJvcGVydGllcyAoT25seUluaGVyaXRhYmxlRWRpdGluZ1Byb3Bl cnRpZXMgaW1wbGljaXRlKS4KKworICAgICAgICAoV2ViQ29yZTo6RWRpdGluZ1N0eWxlOjptZXJn ZUlubGluZUFuZEltcGxpY2l0U3R5bGVPZkVsZW1lbnQpOgorICAgICAgICBDYWxsIHJlbW92ZUFs bEJ1dEVkaXRpbmdQcm9wZXJ0aWVzIHdpdGggcGFyYW1ldGVyLgorCisgICAgICAgIChXZWJDb3Jl OjpFZGl0aW5nU3R5bGU6OnRvRWRpdGluZ1Byb3BlcnRpZXMpOgorICAgICAgICBBZGQgYSBwcml2 YXRlIGhlbHBlciB0byBlYXN5IGNvbnZlcnQgUHJvcGVydGllc1RvSW5jbHVkZSB0byBFZGl0aW5n UHJvcGVydGllc1RvSW5jbHVkZSwKKyAgICAgICAgbmVlZGVkIGluIG1lcmdlSW5saW5lQW5kSW1w bGljaXRTdHlsZU9mRWxlbWVudCBtZXRob2QuCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRpbmdT dHlsZS5oOgorICAgICAgICBNb3ZlIEVkaXRpbmdQcm9wZXJ0aWVzVHlwZSB0byB0aGUgaGVhZGVy IGFzIGl0J3MgbmVlZGVkIGJ5IHJlbW92ZUFsbEJ1dEVkaXRpbmdQcm9wZXJ0aWVzKCkuCisgICAg ICAgIENoYW5nZSBFZGl0aW5nUHJvcGVydGllc1R5cGUgdG8gRWRpdGluZ1Byb3BlcnRpZXNUb0lu Y2x1ZGUgdG8gYmUgY29uc2lzdGVudCB3aXRoCisgICAgICAgIFByb3BlcnRpZXNUb0luY2x1ZGUu CisgICAgICAgIENoYW5nZSByZW1vdmVOb25FZGl0aW5nUHJvcGVydGllcygpIHRvIHJlbW92ZUFs bEJ1dEVkaXRpbmdQcm9wZXJ0aWVzKCkuCisKIDIwMTMtMDYtMTcgIFBldGVyIEdhbCAgPGdhbHBl dGVyQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAgICBbY3VybF0gU2V0IHRoZSBodHRwIHJlc3Bv bnNlIHN0YXR1cyB0ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRp bmdTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKaW5k ZXggYWRkNTM0NS4uYzMxMGVjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9F ZGl0aW5nU3R5bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxl LmNwcApAQCAtODMsMTIgKzgzLDEwIEBAIHN0YXRpYyBjb25zdCBDU1NQcm9wZXJ0eUlEIGVkaXRp bmdQcm9wZXJ0aWVzW10gPSB7CiAgICAgQ1NTUHJvcGVydHlXZWJraXRUZXh0U3Ryb2tlV2lkdGgs CiB9OwogCi1lbnVtIEVkaXRpbmdQcm9wZXJ0aWVzVHlwZSB7IE9ubHlJbmhlcml0YWJsZUVkaXRp bmdQcm9wZXJ0aWVzLCBBbGxFZGl0aW5nUHJvcGVydGllcyB9OwotCiB0ZW1wbGF0ZSA8Y2xhc3Mg U3R5bGVEZWNsYXJhdGlvblR5cGU+Ci1zdGF0aWMgUGFzc1JlZlB0cjxNdXRhYmxlU3R5bGVQcm9w ZXJ0eVNldD4gY29weUVkaXRpbmdQcm9wZXJ0aWVzKFN0eWxlRGVjbGFyYXRpb25UeXBlKiBzdHls ZSwgRWRpdGluZ1Byb3BlcnRpZXNUeXBlIHR5cGUgPSBPbmx5SW5oZXJpdGFibGVFZGl0aW5nUHJv cGVydGllcykKK3N0YXRpYyBQYXNzUmVmUHRyPE11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBjb3B5 RWRpdGluZ1Byb3BlcnRpZXMoU3R5bGVEZWNsYXJhdGlvblR5cGUqIHN0eWxlLCBFZGl0aW5nU3R5 bGU6OkVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRlIHR5cGUgPSBFZGl0aW5nU3R5bGU6Ok9ubHlJ bmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzKQogewotICAgIGlmICh0eXBlID09IEFsbEVkaXRp bmdQcm9wZXJ0aWVzKQorICAgIGlmICh0eXBlID09IEVkaXRpbmdTdHlsZTo6QWxsRWRpdGluZ1By b3BlcnRpZXMpCiAgICAgICAgIHJldHVybiBzdHlsZS0+Y29weVByb3BlcnRpZXNJblNldChlZGl0 aW5nUHJvcGVydGllcywgV1RGX0FSUkFZX0xFTkdUSChlZGl0aW5nUHJvcGVydGllcykpOwogICAg IHJldHVybiBzdHlsZS0+Y29weVByb3BlcnRpZXNJblNldChlZGl0aW5nUHJvcGVydGllcyArIDIs IFdURl9BUlJBWV9MRU5HVEgoZWRpdGluZ1Byb3BlcnRpZXMpIC0gMik7CiB9CkBAIC0xMDIsNyAr MTAwLDcgQEAgc3RhdGljIGlubGluZSBib29sIGlzRWRpdGluZ1Byb3BlcnR5KGludCBpZCkKICAg ICByZXR1cm4gZmFsc2U7CiB9CiAKLXN0YXRpYyBQYXNzUmVmUHRyPE11dGFibGVTdHlsZVByb3Bl cnR5U2V0PiBlZGl0aW5nU3R5bGVGcm9tQ29tcHV0ZWRTdHlsZShQYXNzUmVmUHRyPE5vZGU+IG5v ZGUsIEVkaXRpbmdQcm9wZXJ0aWVzVHlwZSB0eXBlID0gT25seUluaGVyaXRhYmxlRWRpdGluZ1By b3BlcnRpZXMpCitzdGF0aWMgUGFzc1JlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gZWRp dGluZ1N0eWxlRnJvbUNvbXB1dGVkU3R5bGUoUGFzc1JlZlB0cjxOb2RlPiBub2RlLCBFZGl0aW5n U3R5bGU6OkVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRlIHR5cGUgPSBFZGl0aW5nU3R5bGU6Ok9u bHlJbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzKQogewogICAgIENvbXB1dGVkU3R5bGVFeHRy YWN0b3IgY29tcHV0ZWRTdHlsZShub2RlKTsKICAgICByZXR1cm4gY29weUVkaXRpbmdQcm9wZXJ0 aWVzKCZjb21wdXRlZFN0eWxlLCB0eXBlKTsKQEAgLTYwOCwxMCArNjA2LDEwIEBAIHZvaWQgRWRp dGluZ1N0eWxlOjpyZW1vdmVTdHlsZUNvbmZsaWN0aW5nV2l0aFN0eWxlT2ZOb2RlKE5vZGUqIG5v ZGUpCiAgICAgICAgIG1fbXV0YWJsZVN0eWxlLT5yZW1vdmVQcm9wZXJ0eShub2RlU3R5bGUtPnBy b3BlcnR5QXQoaSkuaWQoKSk7CiB9CiAKLXZvaWQgRWRpdGluZ1N0eWxlOjpyZW1vdmVOb25FZGl0 aW5nUHJvcGVydGllcygpCit2b2lkIEVkaXRpbmdTdHlsZTo6cmVtb3ZlQWxsQnV0RWRpdGluZ1By b3BlcnRpZXMoRWRpdGluZ1Byb3BlcnRpZXNUb0luY2x1ZGUgcHJvcGVydGllc1RvSW5jbHVkZSkK IHsKICAgICBpZiAobV9tdXRhYmxlU3R5bGUpCi0gICAgICAgIG1fbXV0YWJsZVN0eWxlID0gY29w eUVkaXRpbmdQcm9wZXJ0aWVzKG1fbXV0YWJsZVN0eWxlLmdldCgpKTsKKyAgICAgICAgbV9tdXRh YmxlU3R5bGUgPSBjb3B5RWRpdGluZ1Byb3BlcnRpZXMobV9tdXRhYmxlU3R5bGUuZ2V0KCksIHBy b3BlcnRpZXNUb0luY2x1ZGUpOwogfQogCiB2b2lkIEVkaXRpbmdTdHlsZTo6Y29sbGFwc2VUZXh0 RGVjb3JhdGlvblByb3BlcnRpZXMoKQpAQCAtOTc0LDcgKzk3Miw3IEBAIHZvaWQgRWRpdGluZ1N0 eWxlOjptZXJnZUlubGluZUFuZEltcGxpY2l0U3R5bGVPZkVsZW1lbnQoU3R5bGVkRWxlbWVudCog ZWxlbWVudCwKIHsKICAgICBSZWZQdHI8RWRpdGluZ1N0eWxlPiBzdHlsZUZyb21SdWxlcyA9IEVk aXRpbmdTdHlsZTo6Y3JlYXRlKCk7CiAgICAgc3R5bGVGcm9tUnVsZXMtPm1lcmdlU3R5bGVGcm9t UnVsZXNGb3JTZXJpYWxpemF0aW9uKGVsZW1lbnQpOwotICAgIHN0eWxlRnJvbVJ1bGVzLT5yZW1v dmVOb25FZGl0aW5nUHJvcGVydGllcygpOworICAgIHN0eWxlRnJvbVJ1bGVzLT5yZW1vdmVBbGxC dXRFZGl0aW5nUHJvcGVydGllcyh0b0VkaXRpbmdQcm9wZXJ0aWVzKHByb3BlcnRpZXNUb0luY2x1 ZGUpKTsKICAgICBtZXJnZVN0eWxlKHN0eWxlRnJvbVJ1bGVzLT5tX211dGFibGVTdHlsZS5nZXQo KSwgbW9kZSk7CiAKICAgICBtZXJnZUlubGluZVN0eWxlT2ZFbGVtZW50KGVsZW1lbnQsIG1vZGUs IHByb3BlcnRpZXNUb0luY2x1ZGUpOwpAQCAtMTMwNyw2ICsxMzA1LDIwIEBAIFdyaXRpbmdEaXJl Y3Rpb24gRWRpdGluZ1N0eWxlOjp0ZXh0RGlyZWN0aW9uRm9yU2VsZWN0aW9uKGNvbnN0IFZpc2li bGVTZWxlY3Rpb24mCiAgICAgcmV0dXJuIGZvdW5kRGlyZWN0aW9uOwogfQogCitFZGl0aW5nU3R5 bGU6OkVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRlIEVkaXRpbmdTdHlsZTo6dG9FZGl0aW5nUHJv cGVydGllcyhQcm9wZXJ0aWVzVG9JbmNsdWRlIHByb3BlcnRpZXMpCit7CisgICAgc3dpdGNoIChw cm9wZXJ0aWVzKSB7CisgICAgY2FzZSBBbGxQcm9wZXJ0aWVzOgorICAgIGNhc2UgRWRpdGluZ1By b3BlcnRpZXNJbkVmZmVjdDoKKyAgICAgICAgcmV0dXJuIEFsbEVkaXRpbmdQcm9wZXJ0aWVzOwor ICAgIGNhc2UgT25seUVkaXRpbmdJbmhlcml0YWJsZVByb3BlcnRpZXM6CisgICAgICAgIHJldHVy biBPbmx5SW5oZXJpdGFibGVFZGl0aW5nUHJvcGVydGllczsKKyAgICB9CisKKyAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gT25seUluaGVyaXRhYmxlRWRpdGluZ1Byb3BlcnRp ZXM7Cit9CisKIHN0YXRpYyB2b2lkIHJlY29uY2lsZVRleHREZWNvcmF0aW9uUHJvcGVydGllcyhN dXRhYmxlU3R5bGVQcm9wZXJ0eVNldCogc3R5bGUpCiB7ICAgIAogICAgIFJlZlB0cjxDU1NWYWx1 ZT4gdGV4dERlY29yYXRpb25zSW5FZmZlY3QgPSBzdHlsZS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShD U1NQcm9wZXJ0eVdlYmtpdFRleHREZWNvcmF0aW9uc0luRWZmZWN0KTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmggYi9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0VkaXRpbmdTdHlsZS5oCmluZGV4IGUwMTQ1MTkuLjg2OGRhYTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9FZGl0aW5nU3R5bGUuaApAQCAtNjMsNiArNjMsOCBAQCBjbGFzcyBFZGl0aW5nU3R5 bGUgOiBwdWJsaWMgUmVmQ291bnRlZDxFZGl0aW5nU3R5bGU+IHsKIHB1YmxpYzoKIAogICAgIGVu dW0gUHJvcGVydGllc1RvSW5jbHVkZSB7IEFsbFByb3BlcnRpZXMsIE9ubHlFZGl0aW5nSW5oZXJp dGFibGVQcm9wZXJ0aWVzLCBFZGl0aW5nUHJvcGVydGllc0luRWZmZWN0IH07CisgICAgZW51bSBF ZGl0aW5nUHJvcGVydGllc1RvSW5jbHVkZSB7IE9ubHlJbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0 aWVzLCBBbGxFZGl0aW5nUHJvcGVydGllcyB9OworCiAgICAgZW51bSBTaG91bGRQcmVzZXJ2ZVdy aXRpbmdEaXJlY3Rpb24geyBQcmVzZXJ2ZVdyaXRpbmdEaXJlY3Rpb24sIERvTm90UHJlc2VydmVX cml0aW5nRGlyZWN0aW9uIH07CiAgICAgZW51bSBTaG91bGRFeHRyYWN0TWF0Y2hpbmdTdHlsZSB7 IEV4dHJhY3RNYXRjaGluZ1N0eWxlLCBEb05vdEV4dHJhY3RNYXRjaGluZ1N0eWxlIH07CiAgICAg c3RhdGljIGZsb2F0IE5vRm9udERlbHRhOwpAQCAtMTA2LDcgKzEwOCw3IEBAIHB1YmxpYzoKICAg ICB2b2lkIHJlbW92ZUJsb2NrUHJvcGVydGllcygpOwogICAgIHZvaWQgcmVtb3ZlU3R5bGVBZGRl ZEJ5Tm9kZShOb2RlKik7CiAgICAgdm9pZCByZW1vdmVTdHlsZUNvbmZsaWN0aW5nV2l0aFN0eWxl T2ZOb2RlKE5vZGUqKTsKLSAgICB2b2lkIHJlbW92ZU5vbkVkaXRpbmdQcm9wZXJ0aWVzKCk7Cisg ICAgdm9pZCByZW1vdmVBbGxCdXRFZGl0aW5nUHJvcGVydGllcyhFZGl0aW5nUHJvcGVydGllc1Rv SW5jbHVkZSA9IE9ubHlJbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzKTsKICAgICB2b2lkIGNv bGxhcHNlVGV4dERlY29yYXRpb25Qcm9wZXJ0aWVzKCk7CiAgICAgZW51bSBTaG91bGRJZ25vcmVU ZXh0T25seVByb3BlcnRpZXMgeyBJZ25vcmVUZXh0T25seVByb3BlcnRpZXMsIERvTm90SWdub3Jl VGV4dE9ubHlQcm9wZXJ0aWVzIH07CiAgICAgVHJpU3RhdGUgdHJpU3RhdGVPZlN0eWxlKEVkaXRp bmdTdHlsZSopIGNvbnN0OwpAQCAtMTU3LDYgKzE1OSw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBj b25mbGljdHNXaXRoSW5saW5lU3R5bGVPZkVsZW1lbnQoU3R5bGVkRWxlbWVudCosIEVkaXRpbmdT dHlsZSogZXh0cmFjdGVkU3R5bGUsIFZlY3RvcjxDU1NQcm9wZXJ0eUlEPiogY29uZmxpY3RpbmdQ cm9wZXJ0aWVzKSBjb25zdDsKICAgICB2b2lkIG1lcmdlSW5saW5lQW5kSW1wbGljaXRTdHlsZU9m RWxlbWVudChTdHlsZWRFbGVtZW50KiwgQ1NTUHJvcGVydHlPdmVycmlkZU1vZGUsIFByb3BlcnRp ZXNUb0luY2x1ZGUpOwogICAgIHZvaWQgbWVyZ2VTdHlsZShjb25zdCBTdHlsZVByb3BlcnR5U2V0 KiwgQ1NTUHJvcGVydHlPdmVycmlkZU1vZGUpOworICAgIEVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNs dWRlIHRvRWRpdGluZ1Byb3BlcnRpZXMoUHJvcGVydGllc1RvSW5jbHVkZSk7CiAKICAgICBSZWZQ dHI8TXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ+IG1fbXV0YWJsZVN0eWxlOwogICAgIGJvb2wgbV9z aG91bGRVc2VGaXhlZERlZmF1bHRGb250U2l6ZTsK 204985 2013-06-19 04:07:03 -0700 2013-06-20 00:40:04 -0700 apply Ryosuke's review CSS_non_inheritable_properties_are_not_preserved_when_merging_paragraphs.patch text/plain 13405 g.czajkowski ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlNzNkNDUxLi4zNzM1YjM1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTMtMDYt MTkgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3VuZy5jb20+CisKKyAg ICAgICAgYmFja2dyb3VuZC1jb2xvciBhbmQgdGV4dC1kZWNvcmF0aW9uIGFyZSBub3QgcHJlc2Vy dmVkIHdoZW4gbWVyZ2luZyBwYXJhZ3JhcGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYyMTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGRlZCB0ZXN0cyBmb3IgdmVyaWZ5aW5nIG1lcmdlIG9mIHBh cmFncmFwaC9kaXYgZnJvbSBzcGFuIHdpdGggbm9uLWlubGluZSBzdHlsZXMuCisKKyAgICAgICAg KiBlZGl0aW5nL2RlbGV0aW5nL21lcmdlLWRpdi1mcm9tLXNwYW4td2l0aC1zdHlsZS1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtZGl2LWZyb20t c3Bhbi13aXRoLXN0eWxlLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcv bWVyZ2UtcGFyYWdyYXBoLWZyb20tc3Bhbi13aXRoLW11bHRpcGxlLXRleHQtZGVjb3JhdGlvbi1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtcGFy YWdyYXBoLWZyb20tc3Bhbi13aXRoLW11bHRpcGxlLXRleHQtZGVjb3JhdGlvbi5odG1sOiBBZGRl ZC4KKyAgICAgICAgKiBlZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFncmFwaC1mcm9tLXNwYW4t d2l0aC1zdHlsZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvZGVsZXRp bmcvbWVyZ2UtcGFyYWdyYXBoLWZyb20tc3Bhbi13aXRoLXN0eWxlLmh0bWw6IEFkZGVkLgorCiAy MDEzLTA2LTE4ICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZCwgRUZMIGdhcmRlbmluZy4gQWRkZWQgbmV3IGJhc2VsaW5lcyBmb3Ig c29tZSBvZiBlZGl0aW5nL2RlbGV0ZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9k ZWxldGluZy9tZXJnZS1kaXYtZnJvbS1zcGFuLXdpdGgtc3R5bGUtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9tZXJnZS1kaXYtZnJvbS1zcGFuLXdpdGgtc3R5bGUt ZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjUzNTQ3OGMK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL21lcmdlLWRp di1mcm9tLXNwYW4td2l0aC1zdHlsZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw5IEBACitUaGUg c3BhbiBzdHlsZSBzaG91bGQgYmUgcHJlc2VydmVkIHdoZW4gbWVyZ2luZyBkaXYgZWxlbWVudC4K K1RoZSB0ZXN0IHBhc3NlcyBpZiAiYmFyIiBjb250YXRpbnMgdGhlIHllbGxvdyBiYWNrZ3JvdW5k IGFuZCBpdCdzIHVuZGVybGluZWQuCit8ICIKKyIKK3wgPGRpdj4KK3wgICAiZm9vPCNzZWxlY3Rp b24tY2FyZXQ+IgorfCAgIDxzcGFuPgorfCAgICAgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6IHll bGxvdzsgdGV4dC1kZWNvcmF0aW9uOiB1bmRlcmxpbmU7IgorfCAgICAgImJhciIKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtZGl2LWZyb20tc3Bhbi13aXRo LXN0eWxlLmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL21lcmdlLWRpdi1mcm9t LXNwYW4td2l0aC1zdHlsZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LmM3NDcxYzQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5n L21lcmdlLWRpdi1mcm9tLXNwYW4td2l0aC1zdHlsZS5odG1sCkBAIC0wLDAgKzEsMjggQEAKKzwh RE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+Cisu Tm9uSW5oZXJpdGFibGVQcm9wZXJ0aWVzIHsKK2JhY2tncm91bmQtY29sb3I6IHllbGxvdzsKK3Rl eHQtZGVjb3JhdGlvbjogdW5kZXJsaW5lOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5Pgor PGRpdiBpZD0idGVzdCIgY29udGVudGVkaXRhYmxlPSJ0cnVlIj4KKzxkaXY+Zm9vPC9kaXY+Cis8 c3BhbiBpZD0ic3BhblRvTWVyZ2UiIGNsYXNzPSJOb25Jbmhlcml0YWJsZVByb3BlcnRpZXMiPmJh cjwvc3Bhbj4KKzwvZGl2PgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9kdW1wLWFzLW1h cmt1cC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorTWFya3VwLmRlc2NyaXB0aW9uKCdUaGUgc3Bh biBzdHlsZSBzaG91bGQgYmUgcHJlc2VydmVkIHdoZW4gbWVyZ2luZyBkaXYgZWxlbWVudC5cbicK KyAgICArICdUaGUgdGVzdCBwYXNzZXMgaWYgImJhciIgY29udGF0aW5zIHRoZSB5ZWxsb3cgYmFj a2dyb3VuZCBhbmQgaXRcJ3MgdW5kZXJsaW5lZC4nKTsKKwordmFyIHNwYW5Ub01lcmdlID0gZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNwYW5Ub01lcmdlIik7CitzcGFuVG9NZXJnZS5mb2N1cygp OworZ2V0U2VsZWN0aW9uKCkuY29sbGFwc2Uoc3BhblRvTWVyZ2UsIDApOworZG9jdW1lbnQuZXhl Y0NvbW1hbmQoIkRlbGV0ZSIpOworTWFya3VwLmR1bXAoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo InRlc3QiKSk7Cis8L3NjcmlwdD4KKyA8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFncmFwaC1mcm9tLXNwYW4td2l0aC1t dWx0aXBsZS10ZXh0LWRlY29yYXRpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGlu Zy9kZWxldGluZy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgtbXVsdGlwbGUtdGV4dC1k ZWNvcmF0aW9uLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw Li4yYmI2NDI1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGlu Zy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgtbXVsdGlwbGUtdGV4dC1kZWNvcmF0aW9u LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDkgQEAKK1RoZSBzcGFuIHN0eWxlIHNob3VsZCBiZSBw cmVzZXJ2ZWQgd2hlbiBtZXJnaW5nIGEgcHJhZ3JhcGguCitUaGUgdGVzdCBwYXNzZXMgaWYgdGhl ICJiYXIiIGhhcyB1bmRlcmxpbmUsIG92ZXJsaW5lIGFuZCBsaW5lIHRocm91Z2guCit8ICIKKyIK K3wgPHA+Cit8ICAgImZvbzwjc2VsZWN0aW9uLWNhcmV0PiIKK3wgICA8c3Bhbj4KK3wgICAgIHN0 eWxlPSJ0ZXh0LWRlY29yYXRpb246IHVuZGVybGluZSBvdmVybGluZSBsaW5lLXRocm91Z2g7Igor fCAgICAgImJhciIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVy Z2UtcGFyYWdyYXBoLWZyb20tc3Bhbi13aXRoLW11bHRpcGxlLXRleHQtZGVjb3JhdGlvbi5odG1s IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFu LXdpdGgtbXVsdGlwbGUtdGV4dC1kZWNvcmF0aW9uLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMC4uZWM3NjZlYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Vk aXRpbmcvZGVsZXRpbmcvbWVyZ2UtcGFyYWdyYXBoLWZyb20tc3Bhbi13aXRoLW11bHRpcGxlLXRl eHQtZGVjb3JhdGlvbi5odG1sCkBAIC0wLDAgKzEsMjcgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0 bWw+Cis8aGVhZD4KKzxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisuTXVsdGlwbGVUZXh0RGVjb3Jh dGlvbnMgewordGV4dC1kZWNvcmF0aW9uOiB1bmRlcmxpbmUgb3ZlcmxpbmUgbGluZS10aHJvdWdo OworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPGRpdiBpZD0idGVzdCIgY29udGVudGVk aXRhYmxlPSJ0cnVlIj4KKzxwPmZvbzwvcD4KKzxzcGFuIGlkPSJzcGFuVG9NZXJnZSIgY2xhc3M9 Ik11bHRpcGxlVGV4dERlY29yYXRpb25zIj5iYXI8L3NwYW4+Cis8L2Rpdj4KKzxzY3JpcHQgc3Jj PSIuLi8uLi9yZXNvdXJjZXMvZHVtcC1hcy1tYXJrdXAuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4K K01hcmt1cC5kZXNjcmlwdGlvbignVGhlIHNwYW4gc3R5bGUgc2hvdWxkIGJlIHByZXNlcnZlZCB3 aGVuIG1lcmdpbmcgYSBwcmFncmFwaC5cbicKKyAgICArICdUaGUgdGVzdCBwYXNzZXMgaWYgdGhl ICJiYXIiIGhhcyB1bmRlcmxpbmUsIG92ZXJsaW5lIGFuZCBsaW5lIHRocm91Z2guJyk7CisKK3Zh ciBzcGFuVG9NZXJnZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzcGFuVG9NZXJnZSIpOwor c3BhblRvTWVyZ2UuZm9jdXMoKTsKK2dldFNlbGVjdGlvbigpLmNvbGxhcHNlKHNwYW5Ub01lcmdl LCAwKTsKK2RvY3VtZW50LmV4ZWNDb21tYW5kKCJEZWxldGUiKTsKK01hcmt1cC5kdW1wKGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXN0IikpOworPC9zY3JpcHQ+CisgPC9ib2R5PgorPC9odG1s PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9tZXJnZS1wYXJhZ3Jh cGgtZnJvbS1zcGFuLXdpdGgtc3R5bGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGlu Zy9kZWxldGluZy9tZXJnZS1wYXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgtc3R5bGUtZXhwZWN0ZWQu dHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE5YjRjYzgKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFncmFwaC1m cm9tLXNwYW4td2l0aC1zdHlsZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw5IEBACitUaGUgc3Bh biBzdHlsZSBzaG91bGQgYmUgcHJlc2VydmVkIHdoZW4gbWVyZ2luZyBhIHByYWdyYXBoLgorVGhl IHRlc3QgcGFzc2VzIGlmICJiYXIiIGNvbnRhdGlucyB0aGUgeWVsbG93IGJhY2tncm91bmQgYW5k IGl0J3MgdW5kZXJsaW5lZC4KK3wgIgorIgorfCA8cD4KK3wgICAiZm9vPCNzZWxlY3Rpb24tY2Fy ZXQ+IgorfCAgIDxzcGFuPgorfCAgICAgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6IHllbGxvdzsg dGV4dC1kZWNvcmF0aW9uOiB1bmRlcmxpbmU7IgorfCAgICAgImJhciIKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvbWVyZ2UtcGFyYWdyYXBoLWZyb20tc3Bhbi13aXRo LXN0eWxlLmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFncmFw aC1mcm9tLXNwYW4td2l0aC1zdHlsZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLmMxYmFiMzkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2Rl bGV0aW5nL21lcmdlLXBhcmFncmFwaC1mcm9tLXNwYW4td2l0aC1zdHlsZS5odG1sCkBAIC0wLDAg KzEsMjggQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZSB0eXBlPSJ0 ZXh0L2NzcyI+CisuTm9uSW5oZXJpdGFibGVQcm9wZXJ0aWVzIHsKK2JhY2tncm91bmQtY29sb3I6 IHllbGxvdzsKK3RleHQtZGVjb3JhdGlvbjogdW5kZXJsaW5lOworfQorPC9zdHlsZT4KKzwvaGVh ZD4KKzxib2R5PgorPGRpdiBpZD0idGVzdCIgY29udGVudGVkaXRhYmxlPSJ0cnVlIj4KKzxwPmZv bzwvcD4KKzxzcGFuIGlkPSJzcGFuVG9NZXJnZSIgY2xhc3M9Ik5vbkluaGVyaXRhYmxlUHJvcGVy dGllcyI+YmFyPC9zcGFuPgorPC9kaXY+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2R1 bXAtYXMtbWFya3VwLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitNYXJrdXAuZGVzY3JpcHRpb24o J1RoZSBzcGFuIHN0eWxlIHNob3VsZCBiZSBwcmVzZXJ2ZWQgd2hlbiBtZXJnaW5nIGEgcHJhZ3Jh cGguXG4nCisgICAgKyAnVGhlIHRlc3QgcGFzc2VzIGlmICJiYXIiIGNvbnRhdGlucyB0aGUgeWVs bG93IGJhY2tncm91bmQgYW5kIGl0XCdzIHVuZGVybGluZWQuJyk7CisKK3ZhciBzcGFuVG9NZXJn ZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzcGFuVG9NZXJnZSIpOworc3BhblRvTWVyZ2Uu Zm9jdXMoKTsKK2dldFNlbGVjdGlvbigpLmNvbGxhcHNlKHNwYW5Ub01lcmdlLCAwKTsKK2RvY3Vt ZW50LmV4ZWNDb21tYW5kKCJEZWxldGUiKTsKK01hcmt1cC5kdW1wKGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCJ0ZXN0IikpOworPC9zY3JpcHQ+CisgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IDNlMmVjZWMuLmUwZGU2YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MiBAQAorMjAxMy0w Ni0xOSAgR3J6ZWdvcnogQ3phamtvd3NraSAgPGcuY3phamtvd3NraUBzYW1zdW5nLmNvbT4KKwor ICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yIGFuZCB0ZXh0LWRlY29yYXRpb24gYXJlIG5vdCBwcmVz ZXJ2ZWQgd2hlbiBtZXJnaW5nIHBhcmFncmFwaHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjIxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEluIG1lcmdlSW5saW5lQW5kSW1wbGljaXRTdHlsZU9mRWxl bWVudCgpLCBzdHlsZSBmcm9tIG1hdGNoZWQgcnVsZXMgYXJlIHJldHJpZXZlZC4KKyAgICAgICAg SWYgdGhleSBjb250YWluIGVpdGhlciBiYWNrZ3JvdW5kLWNvbG9yIG9yIHRleHQtZGVjb3JhdGlv biB0aGV5IHdpbGwgYmUgcmVtb3ZlZAorICAgICAgICBieSByZW1vdmVOb25FZGl0aW5nUHJvcGVy dGllcygpIGR1ZSB0byBjb3B5RWRpdGluZ1Byb3BlcnRpZXMoKSBpbXBsaWNpdAorICAgICAgICAn T25seUluaGVyaXRhYmxlRWRpdGluZ1Byb3BlcnRpZXMnIHBhcmFtZXRlci4KKyAgICAgICAgV2Ug aGF2ZSBhbHJlYWR5IGhhZCBzaW1pbGFyIGlzc3VlIGF0IGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01MzE5NgorCisgICAgICAgIFRlc3RzOiBlZGl0aW5nL2RlbGV0aW5n L21lcmdlLWRpdi1mcm9tLXNwYW4td2l0aC1zdHlsZS5odG1sCisgICAgICAgICAgICAgICBlZGl0 aW5nL2RlbGV0aW5nL21lcmdlLXBhcmFncmFwaC1mcm9tLXNwYW4td2l0aC1tdWx0aXBsZS10ZXh0 LWRlY29yYXRpb24uaHRtbAorICAgICAgICAgICAgICAgZWRpdGluZy9kZWxldGluZy9tZXJnZS1w YXJhZ3JhcGgtZnJvbS1zcGFuLXdpdGgtc3R5bGUuaHRtbAorCisgICAgICAgICogZWRpdGluZy9F ZGl0aW5nU3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29weUVkaXRpbmdQcm9wZXJ0aWVz KToKKyAgICAgICAgKFdlYkNvcmU6OmVkaXRpbmdTdHlsZUZyb21Db21wdXRlZFN0eWxlKToKKyAg ICAgICAgQWRkIEVkaXRpbmdTdHlsZTo6IGR1ZSB0byBtb3ZlIEVkaXRpbmdQcm9wZXJ0aWVzVG9J bmNsdWRlIHRvIEVkaXRpbmdTdHlsZS5oLgorCisgICAgICAgIChXZWJDb3JlOjp0b0VkaXRpbmdQ cm9wZXJ0aWVzKToKKyAgICAgICAgQWRkIGEgaGVscGVyIHRvIGVhc3kgY29udmVydCBQcm9wZXJ0 aWVzVG9JbmNsdWRlIHRvIEVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRlLAorICAgICAgICBuZWVk ZWQgaW4gbWVyZ2VJbmxpbmVBbmRJbXBsaWNpdFN0eWxlT2ZFbGVtZW50KCkuCisKKyAgICAgICAg KFdlYkNvcmU6OkVkaXRpbmdTdHlsZTo6cmVtb3ZlQWxsQnV0RWRpdGluZ1Byb3BlcnRpZXMpOgor ICAgICAgICBBZGQgYSBwYXJhbWV0ZXIgdG8gY2hvb3NlIHdoaWNoIGVkaXRpbmcgcHJvcGVydGll cyBzaG91bGQgYmUgcHJlc2VydmVkIHdoaWxlCisgICAgICAgIHJlbW92aW5nIGFsbCBwcm9wZXJ0 aWVzIChPbmx5SW5oZXJpdGFibGVFZGl0aW5nUHJvcGVydGllcyBpbXBsaWNpdGUpLgorCisgICAg ICAgIChXZWJDb3JlOjpFZGl0aW5nU3R5bGU6Om1lcmdlSW5saW5lQW5kSW1wbGljaXRTdHlsZU9m RWxlbWVudCk6CisgICAgICAgIENhbGwgcmVtb3ZlQWxsQnV0RWRpdGluZ1Byb3BlcnRpZXMgd2l0 aCBwYXJhbWV0ZXIuCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRpbmdTdHlsZS5oOgorICAgICAg ICBNb3ZlIEVkaXRpbmdQcm9wZXJ0aWVzVHlwZSB0byB0aGUgaGVhZGVyIGFzIGl0J3MgbmVlZGVk IGJ5IHJlbW92ZUFsbEJ1dEVkaXRpbmdQcm9wZXJ0aWVzKCkuCisgICAgICAgIENoYW5nZSBFZGl0 aW5nUHJvcGVydGllc1R5cGUgdG8gRWRpdGluZ1Byb3BlcnRpZXNUb0luY2x1ZGUgdG8gYmUgY29u c2lzdGVudCB3aXRoCisgICAgICAgIFByb3BlcnRpZXNUb0luY2x1ZGUuCisgICAgICAgIENoYW5n ZSByZW1vdmVOb25FZGl0aW5nUHJvcGVydGllcygpIHRvIHJlbW92ZUFsbEJ1dEVkaXRpbmdQcm9w ZXJ0aWVzKCkuCisKIDIwMTMtMDYtMTggIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dz a2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgQ29udGV4dCBtZW51IGdyYW1tYXIgY2hlY2tpbmcg aXRlbXMgYXJlIGF2YWlsYWJsZSB3aGVuIEdSQU1NQVJfQ0hFQ0tJTkcgbWFjcm8gaXMgb2ZmCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKaW5kZXggYWRkNTM0NS4uYTYyMDRl NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcApAQCAtODMsMTIgKzgz LDEwIEBAIHN0YXRpYyBjb25zdCBDU1NQcm9wZXJ0eUlEIGVkaXRpbmdQcm9wZXJ0aWVzW10gPSB7 CiAgICAgQ1NTUHJvcGVydHlXZWJraXRUZXh0U3Ryb2tlV2lkdGgsCiB9OwogCi1lbnVtIEVkaXRp bmdQcm9wZXJ0aWVzVHlwZSB7IE9ubHlJbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzLCBBbGxF ZGl0aW5nUHJvcGVydGllcyB9OwotCiB0ZW1wbGF0ZSA8Y2xhc3MgU3R5bGVEZWNsYXJhdGlvblR5 cGU+Ci1zdGF0aWMgUGFzc1JlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gY29weUVkaXRp bmdQcm9wZXJ0aWVzKFN0eWxlRGVjbGFyYXRpb25UeXBlKiBzdHlsZSwgRWRpdGluZ1Byb3BlcnRp ZXNUeXBlIHR5cGUgPSBPbmx5SW5oZXJpdGFibGVFZGl0aW5nUHJvcGVydGllcykKK3N0YXRpYyBQ YXNzUmVmUHRyPE11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBjb3B5RWRpdGluZ1Byb3BlcnRpZXMo U3R5bGVEZWNsYXJhdGlvblR5cGUqIHN0eWxlLCBFZGl0aW5nU3R5bGU6OkVkaXRpbmdQcm9wZXJ0 aWVzVG9JbmNsdWRlIHR5cGUgPSBFZGl0aW5nU3R5bGU6Ok9ubHlJbmhlcml0YWJsZUVkaXRpbmdQ cm9wZXJ0aWVzKQogewotICAgIGlmICh0eXBlID09IEFsbEVkaXRpbmdQcm9wZXJ0aWVzKQorICAg IGlmICh0eXBlID09IEVkaXRpbmdTdHlsZTo6QWxsRWRpdGluZ1Byb3BlcnRpZXMpCiAgICAgICAg IHJldHVybiBzdHlsZS0+Y29weVByb3BlcnRpZXNJblNldChlZGl0aW5nUHJvcGVydGllcywgV1RG X0FSUkFZX0xFTkdUSChlZGl0aW5nUHJvcGVydGllcykpOwogICAgIHJldHVybiBzdHlsZS0+Y29w eVByb3BlcnRpZXNJblNldChlZGl0aW5nUHJvcGVydGllcyArIDIsIFdURl9BUlJBWV9MRU5HVEgo ZWRpdGluZ1Byb3BlcnRpZXMpIC0gMik7CiB9CkBAIC0xMDIsNyArMTAwLDcgQEAgc3RhdGljIGlu bGluZSBib29sIGlzRWRpdGluZ1Byb3BlcnR5KGludCBpZCkKICAgICByZXR1cm4gZmFsc2U7CiB9 CiAKLXN0YXRpYyBQYXNzUmVmUHRyPE11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBlZGl0aW5nU3R5 bGVGcm9tQ29tcHV0ZWRTdHlsZShQYXNzUmVmUHRyPE5vZGU+IG5vZGUsIEVkaXRpbmdQcm9wZXJ0 aWVzVHlwZSB0eXBlID0gT25seUluaGVyaXRhYmxlRWRpdGluZ1Byb3BlcnRpZXMpCitzdGF0aWMg UGFzc1JlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gZWRpdGluZ1N0eWxlRnJvbUNvbXB1 dGVkU3R5bGUoUGFzc1JlZlB0cjxOb2RlPiBub2RlLCBFZGl0aW5nU3R5bGU6OkVkaXRpbmdQcm9w ZXJ0aWVzVG9JbmNsdWRlIHR5cGUgPSBFZGl0aW5nU3R5bGU6Ok9ubHlJbmhlcml0YWJsZUVkaXRp bmdQcm9wZXJ0aWVzKQogewogICAgIENvbXB1dGVkU3R5bGVFeHRyYWN0b3IgY29tcHV0ZWRTdHls ZShub2RlKTsKICAgICByZXR1cm4gY29weUVkaXRpbmdQcm9wZXJ0aWVzKCZjb21wdXRlZFN0eWxl LCB0eXBlKTsKQEAgLTExOCw2ICsxMTYsMjAgQEAgc3RhdGljIFBhc3NSZWZQdHI8Q1NTVmFsdWU+ IGV4dHJhY3RQcm9wZXJ0eVZhbHVlKENvbXB1dGVkU3R5bGVFeHRyYWN0b3IqIGNvbXB1dGUKICAg ICByZXR1cm4gY29tcHV0ZWRTdHlsZS0+cHJvcGVydHlWYWx1ZShwcm9wZXJ0eUlEKTsKIH0KIAor c3RhdGljIGlubGluZSBFZGl0aW5nU3R5bGU6OkVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRlIHRv RWRpdGluZ1Byb3BlcnRpZXMoRWRpdGluZ1N0eWxlOjpQcm9wZXJ0aWVzVG9JbmNsdWRlIHByb3Bl cnRpZXMpCit7CisgICAgc3dpdGNoIChwcm9wZXJ0aWVzKSB7CisgICAgY2FzZSBFZGl0aW5nU3R5 bGU6OkFsbFByb3BlcnRpZXM6CisgICAgY2FzZSBFZGl0aW5nU3R5bGU6OkVkaXRpbmdQcm9wZXJ0 aWVzSW5FZmZlY3Q6CisgICAgICAgIHJldHVybiBFZGl0aW5nU3R5bGU6OkFsbEVkaXRpbmdQcm9w ZXJ0aWVzOworICAgIGNhc2UgRWRpdGluZ1N0eWxlOjpPbmx5RWRpdGluZ0luaGVyaXRhYmxlUHJv cGVydGllczoKKyAgICAgICAgcmV0dXJuIEVkaXRpbmdTdHlsZTo6T25seUluaGVyaXRhYmxlRWRp dGluZ1Byb3BlcnRpZXM7CisgICAgfQorCisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAg cmV0dXJuIEVkaXRpbmdTdHlsZTo6T25seUluaGVyaXRhYmxlRWRpdGluZ1Byb3BlcnRpZXM7Cit9 CisKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CiBpbnQgaWRlbnRpZmllckZvclN0eWxlUHJvcGVydHko VCogc3R5bGUsIENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCkKIHsKQEAgLTYwOCwxMCArNjIwLDEw IEBAIHZvaWQgRWRpdGluZ1N0eWxlOjpyZW1vdmVTdHlsZUNvbmZsaWN0aW5nV2l0aFN0eWxlT2ZO b2RlKE5vZGUqIG5vZGUpCiAgICAgICAgIG1fbXV0YWJsZVN0eWxlLT5yZW1vdmVQcm9wZXJ0eShu b2RlU3R5bGUtPnByb3BlcnR5QXQoaSkuaWQoKSk7CiB9CiAKLXZvaWQgRWRpdGluZ1N0eWxlOjpy ZW1vdmVOb25FZGl0aW5nUHJvcGVydGllcygpCit2b2lkIEVkaXRpbmdTdHlsZTo6cmVtb3ZlQWxs QnV0RWRpdGluZ1Byb3BlcnRpZXMoRWRpdGluZ1Byb3BlcnRpZXNUb0luY2x1ZGUgcHJvcGVydGll c1RvSW5jbHVkZSkKIHsKICAgICBpZiAobV9tdXRhYmxlU3R5bGUpCi0gICAgICAgIG1fbXV0YWJs ZVN0eWxlID0gY29weUVkaXRpbmdQcm9wZXJ0aWVzKG1fbXV0YWJsZVN0eWxlLmdldCgpKTsKKyAg ICAgICAgbV9tdXRhYmxlU3R5bGUgPSBjb3B5RWRpdGluZ1Byb3BlcnRpZXMobV9tdXRhYmxlU3R5 bGUuZ2V0KCksIHByb3BlcnRpZXNUb0luY2x1ZGUpOwogfQogCiB2b2lkIEVkaXRpbmdTdHlsZTo6 Y29sbGFwc2VUZXh0RGVjb3JhdGlvblByb3BlcnRpZXMoKQpAQCAtOTc0LDcgKzk4Niw3IEBAIHZv aWQgRWRpdGluZ1N0eWxlOjptZXJnZUlubGluZUFuZEltcGxpY2l0U3R5bGVPZkVsZW1lbnQoU3R5 bGVkRWxlbWVudCogZWxlbWVudCwKIHsKICAgICBSZWZQdHI8RWRpdGluZ1N0eWxlPiBzdHlsZUZy b21SdWxlcyA9IEVkaXRpbmdTdHlsZTo6Y3JlYXRlKCk7CiAgICAgc3R5bGVGcm9tUnVsZXMtPm1l cmdlU3R5bGVGcm9tUnVsZXNGb3JTZXJpYWxpemF0aW9uKGVsZW1lbnQpOwotICAgIHN0eWxlRnJv bVJ1bGVzLT5yZW1vdmVOb25FZGl0aW5nUHJvcGVydGllcygpOworICAgIHN0eWxlRnJvbVJ1bGVz LT5yZW1vdmVBbGxCdXRFZGl0aW5nUHJvcGVydGllcyh0b0VkaXRpbmdQcm9wZXJ0aWVzKHByb3Bl cnRpZXNUb0luY2x1ZGUpKTsKICAgICBtZXJnZVN0eWxlKHN0eWxlRnJvbVJ1bGVzLT5tX211dGFi bGVTdHlsZS5nZXQoKSwgbW9kZSk7CiAKICAgICBtZXJnZUlubGluZVN0eWxlT2ZFbGVtZW50KGVs ZW1lbnQsIG1vZGUsIHByb3BlcnRpZXNUb0luY2x1ZGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuaCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRp dGluZ1N0eWxlLmgKaW5kZXggZTAxNDUxOS4uOTQ4Y2NkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5n L0VkaXRpbmdTdHlsZS5oCkBAIC02Myw2ICs2Myw4IEBAIGNsYXNzIEVkaXRpbmdTdHlsZSA6IHB1 YmxpYyBSZWZDb3VudGVkPEVkaXRpbmdTdHlsZT4gewogcHVibGljOgogCiAgICAgZW51bSBQcm9w ZXJ0aWVzVG9JbmNsdWRlIHsgQWxsUHJvcGVydGllcywgT25seUVkaXRpbmdJbmhlcml0YWJsZVBy b3BlcnRpZXMsIEVkaXRpbmdQcm9wZXJ0aWVzSW5FZmZlY3QgfTsKKyAgICBlbnVtIEVkaXRpbmdQ cm9wZXJ0aWVzVG9JbmNsdWRlIHsgT25seUluaGVyaXRhYmxlRWRpdGluZ1Byb3BlcnRpZXMsIEFs bEVkaXRpbmdQcm9wZXJ0aWVzIH07CisKICAgICBlbnVtIFNob3VsZFByZXNlcnZlV3JpdGluZ0Rp cmVjdGlvbiB7IFByZXNlcnZlV3JpdGluZ0RpcmVjdGlvbiwgRG9Ob3RQcmVzZXJ2ZVdyaXRpbmdE aXJlY3Rpb24gfTsKICAgICBlbnVtIFNob3VsZEV4dHJhY3RNYXRjaGluZ1N0eWxlIHsgRXh0cmFj dE1hdGNoaW5nU3R5bGUsIERvTm90RXh0cmFjdE1hdGNoaW5nU3R5bGUgfTsKICAgICBzdGF0aWMg ZmxvYXQgTm9Gb250RGVsdGE7CkBAIC0xMDYsNyArMTA4LDcgQEAgcHVibGljOgogICAgIHZvaWQg cmVtb3ZlQmxvY2tQcm9wZXJ0aWVzKCk7CiAgICAgdm9pZCByZW1vdmVTdHlsZUFkZGVkQnlOb2Rl KE5vZGUqKTsKICAgICB2b2lkIHJlbW92ZVN0eWxlQ29uZmxpY3RpbmdXaXRoU3R5bGVPZk5vZGUo Tm9kZSopOwotICAgIHZvaWQgcmVtb3ZlTm9uRWRpdGluZ1Byb3BlcnRpZXMoKTsKKyAgICB2b2lk IHJlbW92ZUFsbEJ1dEVkaXRpbmdQcm9wZXJ0aWVzKEVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRl ID0gT25seUluaGVyaXRhYmxlRWRpdGluZ1Byb3BlcnRpZXMpOwogICAgIHZvaWQgY29sbGFwc2VU ZXh0RGVjb3JhdGlvblByb3BlcnRpZXMoKTsKICAgICBlbnVtIFNob3VsZElnbm9yZVRleHRPbmx5 UHJvcGVydGllcyB7IElnbm9yZVRleHRPbmx5UHJvcGVydGllcywgRG9Ob3RJZ25vcmVUZXh0T25s eVByb3BlcnRpZXMgfTsKICAgICBUcmlTdGF0ZSB0cmlTdGF0ZU9mU3R5bGUoRWRpdGluZ1N0eWxl KikgY29uc3Q7Cg==