41201 2010-06-25 02:23:12 -0700 CSS3 background: Number of layers should be determined by background-image element count 2011-03-11 12:17:53 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED DUPLICATE 47159 P2 Normal --- 42173 43592 1 kling webkit-unassigned bdakin benjamin commit-queue hyatt koivisto mitz simon.fraser tonikitoo webkit.review.bot oldest_to_newest 242899 0 kling 2010-06-25 02:23:12 -0700 This test on IE Test Center fails: http://samples.msdn.microsoft.com/ietestcenter/css3/bordersbackgrounds/background_properties_greater_than_images.htm Spec link: http://www.w3.org/TR/css3-background/#layering 242905 1 59745 kling 2010-06-25 02:27:58 -0700 Created attachment 59745 Proposed patch Slightly altered culling logic in FillLayer to discard all layers after (and including) the first one with no image set. Would like some suggestions on how to test this. 242907 2 webkit.review.bot 2010-06-25 02:32:00 -0700 Attachment 59745 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/rendering/style/FillLayer.cpp:253: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] WebCore/rendering/style/FillLayer.cpp:254: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 250112 3 61280 kling 2010-07-12 15:56:56 -0700 Created attachment 61280 Proposed patch v2 I spoke with Antti about this on IRC, he suggested I make the logic a bit more readable. I've also included a manual test. 250430 4 61280 commit-queue 2010-07-13 04:05:06 -0700 Comment on attachment 61280 Proposed patch v2 Clearing flags on attachment: 61280 Committed r63192: <http://trac.webkit.org/changeset/63192> 250431 5 commit-queue 2010-07-13 04:05:10 -0700 All reviewed patches have been landed. Closing bug. 250684 6 tonikitoo 2010-07-13 12:56:52 -0700 Should this be re-opened since bug 42173 reverted it. 250705 7 kling 2010-07-13 13:28:46 -0700 Yeah, reopening. 252467 8 kling 2010-07-16 05:50:26 -0700 We need to fillUnsetProperties() before we cullEmptyLayers() Consider the following scenario: #foo { background-image: url('Layer1'), ('Layer2'); background-repeat: no-repeat; } The previous version of the patch would discard Layer2 since it had no corresponding properties. If we instead fillUnsetProperties() first, we get the correct result: #foo { background-image: url('Layer1'), ('Layer2'); background-repeat: no-repeat, no-repeat; } Now for the reverse scenario: #foo { background-image: url('Layer1'); background-repeat: no-repeat, no-repeat; } cullEmptyLayers() would previously remove the second 'no-repeat' before fillUnsetProperties() had a chance to repeat Layer1. If we swap the order of fillUnsetProperties() and cullEmptyLayers() we need to alter fillUnsetProperties() a bit - it shouldn't repeat image properties. 252469 9 61796 kling 2010-07-16 06:09:53 -0700 Created attachment 61796 Proposed patch v3 253171 10 61796 commit-queue 2010-07-19 07:06:15 -0700 Comment on attachment 61796 Proposed patch v3 Clearing flags on attachment: 61796 Committed r63653: <http://trac.webkit.org/changeset/63653> 253172 11 commit-queue 2010-07-19 07:06:22 -0700 All reviewed patches have been landed. Closing bug. 260914 12 simon.fraser 2010-08-05 15:51:11 -0700 This broke multiple background image: bug 43581. 260956 13 simon.fraser 2010-08-05 16:59:46 -0700 Rolling this out via bug 43592. 285116 14 simon.fraser 2010-09-26 08:38:06 -0700 Reopening, since this was rolled out. 366222 15 kling 2011-03-11 12:17:53 -0800 *** This bug has been marked as a duplicate of bug 47159 *** 59745 2010-06-25 02:27:58 -0700 2010-07-12 15:56:56 -0700 Proposed patch bug-41201.diff text/plain 1939 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Zjg1ZjY2ZC4uOTY1N2RmMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wNi0yNSAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIENTUzMgYmFja2dyb3VuZDogTnVtYmVyIG9mIGxheWVycyBz aG91bGQgYmUgZGV0ZXJtaW5lZCBieSBiYWNrZ3JvdW5kLWltYWdlIGVsZW1lbnQgY291bnQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMjAxCisKKyAg ICAgICAgQ2hhbmdlIEZpbGxMYXllciBjdWxsaW5nIGxvZ2ljIHRvIGRpc2NhcmQgYWxsIGxheWVy cworICAgICAgICBhZnRlciB0aGUgZmlyc3Qgb25lIHdpdGhvdXQgYW4gaW1hZ2Ugc2V0LgorCisg ICAgICAgIFNwZWMgbGluazoKKyAgICAgICAgaHR0cDovL3d3dy53My5vcmcvVFIvY3NzMy1iYWNr Z3JvdW5kLyNsYXllcmluZworCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL0ZpbGxMYXllci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGaWxsTGF5ZXI6OmN1bGxFbXB0eUxheWVycyk6CisKIDIw MTAtMDYtMjUgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHBhcm9nYS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5n L3N0eWxlL0ZpbGxMYXllci5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9GaWxsTGF5ZXIu Y3BwCmluZGV4IDU5ZjNiYjIuLmRjODUyMjMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5n L3N0eWxlL0ZpbGxMYXllci5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvRmlsbExh eWVyLmNwcApAQCAtMjQzLDE1ICsyNDMsMTkgQEAgdm9pZCBGaWxsTGF5ZXI6OmZpbGxVbnNldFBy b3BlcnRpZXMoKQogCiB2b2lkIEZpbGxMYXllcjo6Y3VsbEVtcHR5TGF5ZXJzKCkKIHsKKyAgICAv LyBDU1MzIGJhY2tncm91bmQgbGF5ZXJpbmc6IHRoZSBudW1iZXIgb2YgYmFja2dyb3VuZCBsYXll cnMgaXMgZGV0ZXJtaW5lZAorICAgIC8vIGJ5IHRoZSBudW1iZXIgb2YgdmFsdWVzIGluIHRoZSAn YmFja2dyb3VuZC1pbWFnZScgcHJvcGVydHkuCisgICAgLy8gaHR0cDovL3d3dy53My5vcmcvVFIv Y3NzMy1iYWNrZ3JvdW5kLyNsYXllcmluZworCiAgICAgRmlsbExheWVyKiBuZXh0OwogICAgIGZv ciAoRmlsbExheWVyKiBwID0gdGhpczsgcDsgcCA9IG5leHQpIHsKICAgICAgICAgbmV4dCA9IHAt Pm1fbmV4dDsKLSAgICAgICAgaWYgKG5leHQgJiYgIW5leHQtPmlzSW1hZ2VTZXQoKSAmJgotICAg ICAgICAgICAgIW5leHQtPmlzWFBvc2l0aW9uU2V0KCkgJiYgIW5leHQtPmlzWVBvc2l0aW9uU2V0 KCkgJiYKKyAgICAgICAgaWYgKG5leHQgJiYgKCFuZXh0LT5pc0ltYWdlU2V0KCkgfHwKKyAgICAg ICAgICAgKCFuZXh0LT5pc1hQb3NpdGlvblNldCgpICYmICFuZXh0LT5pc1lQb3NpdGlvblNldCgp ICYmCiAgICAgICAgICAgICAhbmV4dC0+aXNBdHRhY2htZW50U2V0KCkgJiYgIW5leHQtPmlzQ2xp cFNldCgpICYmCiAgICAgICAgICAgICAhbmV4dC0+aXNDb21wb3NpdGVTZXQoKSAmJiAhbmV4dC0+ aXNPcmlnaW5TZXQoKSAmJgogICAgICAgICAgICAgIW5leHQtPmlzUmVwZWF0WFNldCgpICYmICFu ZXh0LT5pc1JlcGVhdFlTZXQoKQotICAgICAgICAgICAgJiYgIW5leHQtPmlzU2l6ZVNldCgpKSB7 CisgICAgICAgICAgICAmJiAhbmV4dC0+aXNTaXplU2V0KCkpKSkgewogICAgICAgICAgICAgZGVs ZXRlIG5leHQ7CiAgICAgICAgICAgICBwLT5tX25leHQgPSAwOwogICAgICAgICAgICAgYnJlYWs7 Cg== 61280 2010-07-12 15:56:56 -0700 2010-07-16 06:09:53 -0700 Proposed patch v2 bug-41201-v2.diff text/plain 4040 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg N2MyMTJkZi4uOWViMTQxZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMSBAQAogMjAxMC0wNy0xMiAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIENTUzMgYmFja2dyb3VuZDogTnVtYmVyIG9mIGxheWVycyBz aG91bGQgYmUgZGV0ZXJtaW5lZCBieSBiYWNrZ3JvdW5kLWltYWdlIGVsZW1lbnQgY291bnQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMjAxCisKKyAg ICAgICAgQ2hhbmdlIEZpbGxMYXllciBjdWxsaW5nIGxvZ2ljIHRvIGRpc2NhcmQgYWxsIGxheWVy cworICAgICAgICBhZnRlciB0aGUgZmlyc3Qgb25lIHdpdGhvdXQgYW4gaW1hZ2Ugc2V0LgorCisg ICAgICAgIE1hbnVhbCB0ZXN0OiBjc3MzLWJhY2tncm91bmQtbGF5ZXItY291bnQuaHRtbAorCisg ICAgICAgICogbWFudWFsLXRlc3RzL2NzczMtYmFja2dyb3VuZC1sYXllci1jb3VudC5odG1sOiBB ZGRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvRmlsbExheWVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkZpbGxMYXllcjo6Y3VsbEVtcHR5TGF5ZXJzKToKKworMjAxMC0wNy0xMiAgQW5k cmVhcyBLbGluZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCiAgICAgICAgIFJldmlld2Vk IGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgogCiAgICAgICAgIFJlbW92ZSBkZXBlbmRl bmN5IG9uIFBsYXRmb3JtU3RyaW5nLmggaW4gQ29sb3IuaApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9t YW51YWwtdGVzdHMvY3NzMy1iYWNrZ3JvdW5kLWxheWVyLWNvdW50Lmh0bWwgYi9XZWJDb3JlL21h bnVhbC10ZXN0cy9jc3MzLWJhY2tncm91bmQtbGF5ZXItY291bnQuaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwLi5mYzIxZmQ3Ci0tLSAvZGV2L251bGwKKysrIGIvV2ViQ29y ZS9tYW51YWwtdGVzdHMvY3NzMy1iYWNrZ3JvdW5kLWxheWVyLWNvdW50Lmh0bWwKQEAgLTAsMCAr MSwzOCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPHRp dGxlPkNTUyBUZXN0OiBOdW1iZXIgb2YgYmFja2dyb3VuZCBwcm9wZXJ0aWVzIGdyZWF0ZXIgdGhh biBudW1iZXIgb2YgYmFja2dyb3VuZCBpbWFnZXM8L3RpdGxlPgorICAgICAgICA8c3R5bGUgdHlw ZT0idGV4dC9jc3MiPgorICAgICAgICAgICAgZGl2CisgICAgICAgICAgICB7CisgICAgICAgICAg ICAgICAgbWFyZ2luOiAxMHB4OworICAgICAgICAgICAgICAgIHdpZHRoOiAyNTBweDsKKyAgICAg ICAgICAgICAgICBoZWlnaHQ6IDI1MHB4OworICAgICAgICAgICAgICAgIGJvcmRlcjogdGhpY2sg c29saWQgYmxhY2s7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAjdGVzdAorICAgICAgICAg ICAgeworICAgICAgICAgICAgICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybCgicmVzb3VyY2VzL25v bi1hbmltYXRlZC5naWYiKSwgdXJsKCJyZXNvdXJjZXMvbm9uLWFuaW1hdGVkLmdpZiIpLCB1cmwo InJlc291cmNlcy9ub24tYW5pbWF0ZWQuZ2lmIik7CisgICAgICAgICAgICAgICAgYmFja2dyb3Vu ZC1wb3NpdGlvbjogcmlnaHQgYm90dG9tLCByaWdodCB0b3AsIGxlZnQgYm90dG9tLCBsZWZ0IGNl bnRlciwgcmlnaHQgY2VudGVyOworICAgICAgICAgICAgICAgIGJhY2tncm91bmQtcmVwZWF0OiBu by1yZXBlYXQsIG5vLXJlcGVhdCwgcmVwZWF0LXgsIHJlcGVhdCwgcmVwZWF0LXk7CisgICAgICAg ICAgICB9CisgICAgICAgICAgICAjcmVmZXJlbmNlCisgICAgICAgICAgICB7CisgICAgICAgICAg ICAgICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCJyZXNvdXJjZXMvbm9uLWFuaW1hdGVkLmdpZiIp LCB1cmwoInJlc291cmNlcy9ub24tYW5pbWF0ZWQuZ2lmIiksIHVybCgicmVzb3VyY2VzL25vbi1h bmltYXRlZC5naWYiKTsKKyAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiByaWdo dCBib3R0b20sIHJpZ2h0IHRvcCwgbGVmdCBib3R0b207CisgICAgICAgICAgICAgICAgYmFja2dy b3VuZC1yZXBlYXQ6IG5vLXJlcGVhdCwgbm8tcmVwZWF0LCByZXBlYXQteDsKKyAgICAgICAgICAg IH0KKyAgICAgICAgPC9zdHlsZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+CisgICAgICAgIDxw PlRlc3QgcGFzc2VzIGlmIHRoZSBjb250ZW50cyBvZiB0aGUgYmxhY2sgYm94ZXMgbG9vayBleGFj dGx5IHRoZSBzYW1lLjwvcD4KKyAgICAgICAgPHRhYmxlPgorICAgICAgICAgICAgPHRkPgorICAg ICAgICAgICAgICAgIDxkaXYgaWQ9InRlc3QiPjwvZGl2PgorICAgICAgICAgICAgPC90ZD4KKyAg ICAgICAgICAgIDx0ZD4KKyAgICAgICAgICAgICAgICA8ZGl2IGlkPSJyZWZlcmVuY2UiPjwvZGl2 PgorICAgICAgICAgICAgPC90ZD4KKyAgICAgICAgPC90YWJsZT4KKyAgICA8L2JvZHk+Cis8L2h0 bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9GaWxsTGF5ZXIuY3BwIGIv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvRmlsbExheWVyLmNwcAppbmRleCA1OWYzYmIyLi41ODA4 ZjNiIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9GaWxsTGF5ZXIuY3BwCisr KyBiL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0ZpbGxMYXllci5jcHAKQEAgLTI0MywxNSArMjQz LDI3IEBAIHZvaWQgRmlsbExheWVyOjpmaWxsVW5zZXRQcm9wZXJ0aWVzKCkKIAogdm9pZCBGaWxs TGF5ZXI6OmN1bGxFbXB0eUxheWVycygpCiB7CisgICAgLy8gQ1NTMyBiYWNrZ3JvdW5kIGxheWVy aW5nOiB0aGUgbnVtYmVyIG9mIGJhY2tncm91bmQgbGF5ZXJzIGlzIGRldGVybWluZWQKKyAgICAv LyBieSB0aGUgbnVtYmVyIG9mIHZhbHVlcyBpbiB0aGUgJ2JhY2tncm91bmQtaW1hZ2UnIHByb3Bl cnR5LgorICAgIC8vIGh0dHA6Ly93d3cudzMub3JnL1RSL2NzczMtYmFja2dyb3VuZC8jbGF5ZXJp bmcKKwogICAgIEZpbGxMYXllciogbmV4dDsKICAgICBmb3IgKEZpbGxMYXllciogcCA9IHRoaXM7 IHA7IHAgPSBuZXh0KSB7CiAgICAgICAgIG5leHQgPSBwLT5tX25leHQ7Ci0gICAgICAgIGlmIChu ZXh0ICYmICFuZXh0LT5pc0ltYWdlU2V0KCkgJiYKLSAgICAgICAgICAgICFuZXh0LT5pc1hQb3Np dGlvblNldCgpICYmICFuZXh0LT5pc1lQb3NpdGlvblNldCgpICYmCi0gICAgICAgICAgICAhbmV4 dC0+aXNBdHRhY2htZW50U2V0KCkgJiYgIW5leHQtPmlzQ2xpcFNldCgpICYmCi0gICAgICAgICAg ICAhbmV4dC0+aXNDb21wb3NpdGVTZXQoKSAmJiAhbmV4dC0+aXNPcmlnaW5TZXQoKSAmJgotICAg ICAgICAgICAgIW5leHQtPmlzUmVwZWF0WFNldCgpICYmICFuZXh0LT5pc1JlcGVhdFlTZXQoKQot ICAgICAgICAgICAgJiYgIW5leHQtPmlzU2l6ZVNldCgpKSB7CisgICAgICAgIGlmICghbmV4dCkK KyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIGJvb2wgYW55QXR0cmlidXRlU2V0ID0gbmV4 dC0+aXNYUG9zaXRpb25TZXQoKQorICAgICAgICAgICAgfHwgbmV4dC0+aXNZUG9zaXRpb25TZXQo KQorICAgICAgICAgICAgfHwgbmV4dC0+aXNBdHRhY2htZW50U2V0KCkKKyAgICAgICAgICAgIHx8 IG5leHQtPmlzQ2xpcFNldCgpCisgICAgICAgICAgICB8fCBuZXh0LT5pc0NvbXBvc2l0ZVNldCgp CisgICAgICAgICAgICB8fCBuZXh0LT5pc09yaWdpblNldCgpCisgICAgICAgICAgICB8fCBuZXh0 LT5pc1JlcGVhdFhTZXQoKQorICAgICAgICAgICAgfHwgbmV4dC0+aXNSZXBlYXRZU2V0KCkKKyAg ICAgICAgICAgIHx8IG5leHQtPmlzU2l6ZVNldCgpOworCisgICAgICAgIGlmICghbmV4dC0+aXNJ bWFnZVNldCgpIHx8ICFhbnlBdHRyaWJ1dGVTZXQpIHsKICAgICAgICAgICAgIGRlbGV0ZSBuZXh0 OwogICAgICAgICAgICAgcC0+bV9uZXh0ID0gMDsKICAgICAgICAgICAgIGJyZWFrOwo= 61796 2010-07-16 06:09:53 -0700 2010-07-19 07:06:14 -0700 Proposed patch v3 bug-41201-v3.diff text/plain 5964 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YjgzYzcwZC4uOWU3OGZjOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMC0wNy0xNiAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIENTUzMgYmFja2dyb3VuZDogTnVtYmVyIG9mIGxheWVycyBz aG91bGQgYmUgZGV0ZXJtaW5lZCBieSBiYWNrZ3JvdW5kLWltYWdlIGVsZW1lbnQgY291bnQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMjAxCisKKyAg ICAgICAgTWFudWFsIHRlc3Q6IGNzczMtYmFja2dyb3VuZC1sYXllci1jb3VudC5odG1sCisKKyAg ICAgICAgU3BlYyBsaW5rOgorICAgICAgICBodHRwOi8vd3d3LnczLm9yZy9UUi9jc3MzLWJhY2tn cm91bmQvI2xheWVyaW5nCisKKyAgICAgICAgKiBtYW51YWwtdGVzdHMvY3NzMy1iYWNrZ3JvdW5k LWxheWVyLWNvdW50Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9GaWxs TGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RmlsbExheWVyOjpmaWxsVW5zZXRQcm9wZXJ0 aWVzKTogRG9uJ3QgcmVwZWF0CisgICAgICAgIGltYWdlIHByb3BlcnRpZXMsIHRoZXkgZGV0ZXJt aW5lIHRoZSB0b3RhbCBudW1iZXIgb2YgbGF5ZXJzLgorICAgICAgICAoV2ViQ29yZTo6RmlsbExh eWVyOjpjdWxsRW1wdHlMYXllcnMpOiBDaGFuZ2UgY3VsbGluZyBsb2dpYworICAgICAgICB0byBk aXNjYXJkIGFsbCBsYXllcnMgYWZ0ZXIgdGhlIGZpcnN0IG9uZSB3aXRob3V0IGFuIGltYWdlIHNl dC4KKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdl YkNvcmU6OkluaGVyaXRlZEZsYWdzOjphZGp1c3RCYWNrZ3JvdW5kTGF5ZXJzKTogQ2FsbAorICAg ICAgICBmaWxsVW5zZXRQcm9wZXJ0aWVzKCkgYmVmb3JlIGN1bGxFbXB0eUxheWVycygpCisgICAg ICAgIChXZWJDb3JlOjpJbmhlcml0ZWRGbGFnczo6YWRqdXN0TWFza0xheWVycyk6IERpdHRvLgor CiAyMDEwLTA3LTE2ICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkByaW0uY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IERpcmsgU2NodWx6ZS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv bWFudWFsLXRlc3RzL2NzczMtYmFja2dyb3VuZC1sYXllci1jb3VudC5odG1sIGIvV2ViQ29yZS9t YW51YWwtdGVzdHMvY3NzMy1iYWNrZ3JvdW5kLWxheWVyLWNvdW50Lmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZmMyMWZkNwotLS0gL2Rldi9udWxsCisrKyBiL1dlYkNv cmUvbWFudWFsLXRlc3RzL2NzczMtYmFja2dyb3VuZC1sYXllci1jb3VudC5odG1sCkBAIC0wLDAg KzEsMzggQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDx0 aXRsZT5DU1MgVGVzdDogTnVtYmVyIG9mIGJhY2tncm91bmQgcHJvcGVydGllcyBncmVhdGVyIHRo YW4gbnVtYmVyIG9mIGJhY2tncm91bmQgaW1hZ2VzPC90aXRsZT4KKyAgICAgICAgPHN0eWxlIHR5 cGU9InRleHQvY3NzIj4KKyAgICAgICAgICAgIGRpdgorICAgICAgICAgICAgeworICAgICAgICAg ICAgICAgIG1hcmdpbjogMTBweDsKKyAgICAgICAgICAgICAgICB3aWR0aDogMjUwcHg7CisgICAg ICAgICAgICAgICAgaGVpZ2h0OiAyNTBweDsKKyAgICAgICAgICAgICAgICBib3JkZXI6IHRoaWNr IHNvbGlkIGJsYWNrOworICAgICAgICAgICAgfQorICAgICAgICAgICAgI3Rlc3QKKyAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoInJlc291cmNlcy9u b24tYW5pbWF0ZWQuZ2lmIiksIHVybCgicmVzb3VyY2VzL25vbi1hbmltYXRlZC5naWYiKSwgdXJs KCJyZXNvdXJjZXMvbm9uLWFuaW1hdGVkLmdpZiIpOworICAgICAgICAgICAgICAgIGJhY2tncm91 bmQtcG9zaXRpb246IHJpZ2h0IGJvdHRvbSwgcmlnaHQgdG9wLCBsZWZ0IGJvdHRvbSwgbGVmdCBj ZW50ZXIsIHJpZ2h0IGNlbnRlcjsKKyAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kLXJlcGVhdDog bm8tcmVwZWF0LCBuby1yZXBlYXQsIHJlcGVhdC14LCByZXBlYXQsIHJlcGVhdC15OworICAgICAg ICAgICAgfQorICAgICAgICAgICAgI3JlZmVyZW5jZQorICAgICAgICAgICAgeworICAgICAgICAg ICAgICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybCgicmVzb3VyY2VzL25vbi1hbmltYXRlZC5naWYi KSwgdXJsKCJyZXNvdXJjZXMvbm9uLWFuaW1hdGVkLmdpZiIpLCB1cmwoInJlc291cmNlcy9ub24t YW5pbWF0ZWQuZ2lmIik7CisgICAgICAgICAgICAgICAgYmFja2dyb3VuZC1wb3NpdGlvbjogcmln aHQgYm90dG9tLCByaWdodCB0b3AsIGxlZnQgYm90dG9tOworICAgICAgICAgICAgICAgIGJhY2tn cm91bmQtcmVwZWF0OiBuby1yZXBlYXQsIG5vLXJlcGVhdCwgcmVwZWF0LXg7CisgICAgICAgICAg ICB9CisgICAgICAgIDwvc3R5bGU+CisgICAgPC9oZWFkPgorICAgIDxib2R5PgorICAgICAgICA8 cD5UZXN0IHBhc3NlcyBpZiB0aGUgY29udGVudHMgb2YgdGhlIGJsYWNrIGJveGVzIGxvb2sgZXhh Y3RseSB0aGUgc2FtZS48L3A+CisgICAgICAgIDx0YWJsZT4KKyAgICAgICAgICAgIDx0ZD4KKyAg ICAgICAgICAgICAgICA8ZGl2IGlkPSJ0ZXN0Ij48L2Rpdj4KKyAgICAgICAgICAgIDwvdGQ+Cisg ICAgICAgICAgICA8dGQ+CisgICAgICAgICAgICAgICAgPGRpdiBpZD0icmVmZXJlbmNlIj48L2Rp dj4KKyAgICAgICAgICAgIDwvdGQ+CisgICAgICAgIDwvdGFibGU+CisgICAgPC9ib2R5PgorPC9o dG1sPgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvRmlsbExheWVyLmNwcCBi L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0ZpbGxMYXllci5jcHAKaW5kZXggNTlmM2JiMi4uMzQ2 OWU5NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvRmlsbExheWVyLmNwcAor KysgYi9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9GaWxsTGF5ZXIuY3BwCkBAIC0xMjksMTcgKzEy OSw2IEBAIGJvb2wgRmlsbExheWVyOjpvcGVyYXRvcj09KGNvbnN0IEZpbGxMYXllciYgbykgY29u c3QKIHZvaWQgRmlsbExheWVyOjpmaWxsVW5zZXRQcm9wZXJ0aWVzKCkKIHsKICAgICBGaWxsTGF5 ZXIqIGN1cnI7Ci0gICAgZm9yIChjdXJyID0gdGhpczsgY3VyciAmJiBjdXJyLT5pc0ltYWdlU2V0 KCk7IGN1cnIgPSBjdXJyLT5uZXh0KCkpIHsgfQotICAgIGlmIChjdXJyICYmIGN1cnIgIT0gdGhp cykgewotICAgICAgICAvLyBXZSBuZWVkIHRvIGZpbGwgaW4gdGhlIHJlbWFpbmluZyB2YWx1ZXMg d2l0aCB0aGUgcGF0dGVybiBzcGVjaWZpZWQuCi0gICAgICAgIGZvciAoRmlsbExheWVyKiBwYXR0 ZXJuID0gdGhpczsgY3VycjsgY3VyciA9IGN1cnItPm5leHQoKSkgewotICAgICAgICAgICAgY3Vy ci0+bV9pbWFnZSA9IHBhdHRlcm4tPm1faW1hZ2U7Ci0gICAgICAgICAgICBwYXR0ZXJuID0gcGF0 dGVybi0+bmV4dCgpOwotICAgICAgICAgICAgaWYgKHBhdHRlcm4gPT0gY3VyciB8fCAhcGF0dGVy bikKLSAgICAgICAgICAgICAgICBwYXR0ZXJuID0gdGhpczsKLSAgICAgICAgfQotICAgIH0KLSAg ICAKICAgICBmb3IgKGN1cnIgPSB0aGlzOyBjdXJyICYmIGN1cnItPmlzWFBvc2l0aW9uU2V0KCk7 IGN1cnIgPSBjdXJyLT5uZXh0KCkpIHsgfQogICAgIGlmIChjdXJyICYmIGN1cnIgIT0gdGhpcykg ewogICAgICAgICAvLyBXZSBuZWVkIHRvIGZpbGwgaW4gdGhlIHJlbWFpbmluZyB2YWx1ZXMgd2l0 aCB0aGUgcGF0dGVybiBzcGVjaWZpZWQuCkBAIC0yNDMsMTUgKzIzMiwyNyBAQCB2b2lkIEZpbGxM YXllcjo6ZmlsbFVuc2V0UHJvcGVydGllcygpCiAKIHZvaWQgRmlsbExheWVyOjpjdWxsRW1wdHlM YXllcnMoKQogeworICAgIC8vIENTUzMgYmFja2dyb3VuZCBsYXllcmluZzogdGhlIG51bWJlciBv ZiBiYWNrZ3JvdW5kIGxheWVycyBpcyBkZXRlcm1pbmVkCisgICAgLy8gYnkgdGhlIG51bWJlciBv ZiB2YWx1ZXMgaW4gdGhlICdiYWNrZ3JvdW5kLWltYWdlJyBwcm9wZXJ0eS4KKyAgICAvLyBodHRw Oi8vd3d3LnczLm9yZy9UUi9jc3MzLWJhY2tncm91bmQvI2xheWVyaW5nCisKICAgICBGaWxsTGF5 ZXIqIG5leHQ7CiAgICAgZm9yIChGaWxsTGF5ZXIqIHAgPSB0aGlzOyBwOyBwID0gbmV4dCkgewog ICAgICAgICBuZXh0ID0gcC0+bV9uZXh0OwotICAgICAgICBpZiAobmV4dCAmJiAhbmV4dC0+aXNJ bWFnZVNldCgpICYmCi0gICAgICAgICAgICAhbmV4dC0+aXNYUG9zaXRpb25TZXQoKSAmJiAhbmV4 dC0+aXNZUG9zaXRpb25TZXQoKSAmJgotICAgICAgICAgICAgIW5leHQtPmlzQXR0YWNobWVudFNl dCgpICYmICFuZXh0LT5pc0NsaXBTZXQoKSAmJgotICAgICAgICAgICAgIW5leHQtPmlzQ29tcG9z aXRlU2V0KCkgJiYgIW5leHQtPmlzT3JpZ2luU2V0KCkgJiYKLSAgICAgICAgICAgICFuZXh0LT5p c1JlcGVhdFhTZXQoKSAmJiAhbmV4dC0+aXNSZXBlYXRZU2V0KCkKLSAgICAgICAgICAgICYmICFu ZXh0LT5pc1NpemVTZXQoKSkgeworICAgICAgICBpZiAoIW5leHQpCisgICAgICAgICAgICBicmVh azsKKworICAgICAgICBib29sIGFueUF0dHJpYnV0ZVNldCA9IG5leHQtPmlzWFBvc2l0aW9uU2V0 KCkKKyAgICAgICAgICAgIHx8IG5leHQtPmlzWVBvc2l0aW9uU2V0KCkKKyAgICAgICAgICAgIHx8 IG5leHQtPmlzQXR0YWNobWVudFNldCgpCisgICAgICAgICAgICB8fCBuZXh0LT5pc0NsaXBTZXQo KQorICAgICAgICAgICAgfHwgbmV4dC0+aXNDb21wb3NpdGVTZXQoKQorICAgICAgICAgICAgfHwg bmV4dC0+aXNPcmlnaW5TZXQoKQorICAgICAgICAgICAgfHwgbmV4dC0+aXNSZXBlYXRYU2V0KCkK KyAgICAgICAgICAgIHx8IG5leHQtPmlzUmVwZWF0WVNldCgpCisgICAgICAgICAgICB8fCBuZXh0 LT5pc1NpemVTZXQoKTsKKworICAgICAgICBpZiAoIW5leHQtPmlzSW1hZ2VTZXQoKSB8fCAhYW55 QXR0cmlidXRlU2V0KSB7CiAgICAgICAgICAgICBkZWxldGUgbmV4dDsKICAgICAgICAgICAgIHAt Pm1fbmV4dCA9IDA7CiAgICAgICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmggYi9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZS5oCmluZGV4IDExZGI5ZTAuLjAzZGJjZjEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuaApAQCAtODcyLDggKzg3Miw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGFkanVz dEJhY2tncm91bmRMYXllcnMoKQogICAgIHsKICAgICAgICAgaWYgKGJhY2tncm91bmRMYXllcnMo KS0+bmV4dCgpKSB7Ci0gICAgICAgICAgICBhY2Nlc3NCYWNrZ3JvdW5kTGF5ZXJzKCktPmN1bGxF bXB0eUxheWVycygpOwogICAgICAgICAgICAgYWNjZXNzQmFja2dyb3VuZExheWVycygpLT5maWxs VW5zZXRQcm9wZXJ0aWVzKCk7CisgICAgICAgICAgICBhY2Nlc3NCYWNrZ3JvdW5kTGF5ZXJzKCkt PmN1bGxFbXB0eUxheWVycygpOwogICAgICAgICB9CiAgICAgfQogCkBAIC04ODMsOCArODgzLDgg QEAgcHVibGljOgogICAgIHZvaWQgYWRqdXN0TWFza0xheWVycygpCiAgICAgewogICAgICAgICBp ZiAobWFza0xheWVycygpLT5uZXh0KCkpIHsKLSAgICAgICAgICAgIGFjY2Vzc01hc2tMYXllcnMo KS0+Y3VsbEVtcHR5TGF5ZXJzKCk7CiAgICAgICAgICAgICBhY2Nlc3NNYXNrTGF5ZXJzKCktPmZp bGxVbnNldFByb3BlcnRpZXMoKTsKKyAgICAgICAgICAgIGFjY2Vzc01hc2tMYXllcnMoKS0+Y3Vs bEVtcHR5TGF5ZXJzKCk7CiAgICAgICAgIH0KICAgICB9CiAK