60303 2011-05-05 14:41:42 -0700 animation-timing-function property with a list uses first item for all animations 2011-06-22 12:57:31 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cmarrin webkit-unassigned dino joybro201 simon.fraser webkit.review.bot oldest_to_newest 399064 0 cmarrin 2011-05-05 14:41:42 -0700 The attached test case shows that a animation-timing-function property with multiple values will use the first timing function for all animations in the list. Looks like we are selecting timing-function item 0 when expanding into separate animations. 399066 1 92474 cmarrin 2011-05-05 14:42:23 -0700 Created attachment 92474 test case 423119 2 joybro201 2011-06-18 09:27:35 -0700 > -webkit-animation: > bouncer 1s ease infinite alternate, > mover 4s ease infinite alternate; Hi, Chris It seems that you made a mistake in the testcase. Shouldn't the two animations have different timing-functions? Apart from the mistake, the bug you told is also reproduced on my environment. 424522 3 98005 joybro201 2011-06-21 10:19:46 -0700 Created attachment 98005 Patch 424524 4 joybro201 2011-06-21 10:26:03 -0700 KeyframeAnimation::fetchIntervalEndpointsForProperty() is always getting a timingFunction from the first animation, even for the calculation of the second animation. This patch makes the function look for the correct animation by the keyframe's name. 424531 5 98005 simon.fraser 2011-06-21 10:32:02 -0700 Comment on attachment 98005 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98005&action=review > LayoutTests/animations/multiple-animations-on-an-element.html:35 > + runAnimationTest(expectedValues, null, null, true); Why does this have to disable the pause API? > Source/WebCore/page/animation/KeyframeAnimation.cpp:153 > + const Animation* matchedAnimation = getAnimationFromStyleByName(fromStyle, name()); > + if (matchedAnimation) We usually write this: if (const Animation* matchedAnimation = getAnimationFrom...) ... 425209 6 98168 joybro201 2011-06-22 07:28:40 -0700 Created attachment 98168 Patch 425211 7 joybro201 2011-06-22 07:30:36 -0700 (In reply to comment #5) > (From update of attachment 98005 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=98005&action=review > > > LayoutTests/animations/multiple-animations-on-an-element.html:35 > > + runAnimationTest(expectedValues, null, null, true); > > Why does this have to disable the pause API? Because the test failed when the pause API is enabled, but I just found out that runAnimationTest always fails if the pause API is enabled and the test target animation has "infinite" iteration count. Is this a bug, too? Anyway, I changed the iteration count and enabled the pause API in the new patch. > > > Source/WebCore/page/animation/KeyframeAnimation.cpp:153 > > + const Animation* matchedAnimation = getAnimationFromStyleByName(fromStyle, name()); > > + if (matchedAnimation) > > We usually write this: > if (const Animation* matchedAnimation = getAnimationFrom...) > ... This is also changed. Thanks :) 425261 8 simon.fraser 2011-06-22 08:39:08 -0700 (In reply to comment #7) > (In reply to comment #5) > > (From update of attachment 98005 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=98005&action=review > > > > > LayoutTests/animations/multiple-animations-on-an-element.html:35 > > > + runAnimationTest(expectedValues, null, null, true); > > > > Why does this have to disable the pause API? > > Because the test failed when the pause API is enabled, but I just found out that runAnimationTest always fails if the pause API is enabled and the test target animation has "infinite" iteration count. > > Is this a bug, too? Probably. You should file a bug on it. > Anyway, I changed the iteration count and enabled the pause API in the new patch. Cool. 425262 9 98168 simon.fraser 2011-06-22 08:40:06 -0700 Comment on attachment 98168 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98168&action=review > LayoutTests/ChangeLog:16 > + * animations/multiple-animations-on-an-element-expected.txt: Added. You should rename the test to multiple-animations-timing-function.html 425291 10 98183 joybro201 2011-06-22 09:23:56 -0700 Created attachment 98183 Patch 425296 11 joybro201 2011-06-22 09:28:05 -0700 (In reply to comment #9) > (From update of attachment 98168 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=98168&action=review > > > LayoutTests/ChangeLog:16 > > + * animations/multiple-animations-on-an-element-expected.txt: Added. > > You should rename the test to multiple-animations-timing-function.html applied to the new patch. 425299 12 98183 simon.fraser 2011-06-22 09:31:39 -0700 Comment on attachment 98183 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98183&action=review > LayoutTests/ChangeLog:17 > + * animations/multiple-animations-on-an-element-expected.txt: Added. > + * animations/multiple-animations-on-an-element.html: Added. Still out of date. > Source/WebCore/ChangeLog:16 > + Test: animations/multiple-animations-on-an-element.html Out of date. 425311 13 98188 joybro201 2011-06-22 09:44:44 -0700 Created attachment 98188 Patch 425314 14 joybro201 2011-06-22 09:47:29 -0700 (In reply to comment #12) > (From update of attachment 98183 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=98183&action=review > > > LayoutTests/ChangeLog:17 > > + * animations/multiple-animations-on-an-element-expected.txt: Added. > > + * animations/multiple-animations-on-an-element.html: Added. > > Still out of date. > > > Source/WebCore/ChangeLog:16 > > + Test: animations/multiple-animations-on-an-element.html > > Out of date. Oops.. I missed it! 425329 15 joybro201 2011-06-22 10:16:13 -0700 (In reply to comment #8) > (In reply to comment #7) > > (In reply to comment #5) > > > (From update of attachment 98005 [details] [details] [details]) > > > View in context: https://bugs.webkit.org/attachment.cgi?id=98005&action=review > > > > > > > LayoutTests/animations/multiple-animations-on-an-element.html:35 > > > > + runAnimationTest(expectedValues, null, null, true); > > > > > > Why does this have to disable the pause API? > > > > Because the test failed when the pause API is enabled, but I just found out that runAnimationTest always fails if the pause API is enabled and the test target animation has "infinite" iteration count. > > > > Is this a bug, too? > > Probably. You should file a bug on it. This is filed as Bug 63152. > > > Anyway, I changed the iteration count and enabled the pause API in the new patch. > > Cool. 425495 16 98188 webkit.review.bot 2011-06-22 12:57:26 -0700 Comment on attachment 98188 Patch Clearing flags on attachment: 98188 Committed r89462: <http://trac.webkit.org/changeset/89462> 425496 17 webkit.review.bot 2011-06-22 12:57:31 -0700 All reviewed patches have been landed. Closing bug. 92474 2011-05-05 14:42:23 -0700 2011-05-05 14:42:23 -0700 test case linear-anim.html text/html 967 cmarrin PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPHRpdGxlPkJvdW5jeTwvdGl0bGU+CjxzdHls ZSB0eXBlPSJ0ZXh0L2NzcyIgbWVkaWE9ImFsbCI+CiNiYWxsIHsKCWhlaWdodDogMWVtOyB3aWR0 aDogNWVtOwoJcGFkZGluZzogM2VtIDFlbTsKCWJhY2tncm91bmQ6IHJlZDsKCXRleHQtYWxpZ246 IGNlbnRlcjsKCgktd2Via2l0LWJvcmRlci1yYWRpdXM6IDEwMDBweDsKCS13ZWJraXQtYm94LXNo YWRvdzogNTBweCA1MHB4IDQwcHggLTIwcHggcmdiYSgwLDAsMCwwLjI1KTsKCQoJLXdlYmtpdC1h bmltYXRpb246CgkJYm91bmNlciAxcyBlYXNlIGluZmluaXRlIGFsdGVybmF0ZSwKCQltb3ZlciA0 cyBlYXNlIGluZmluaXRlIGFsdGVybmF0ZTsKfQoKQC13ZWJraXQta2V5ZnJhbWVzIG1vdmVyIHsK CTAlIHsKCQltYXJnaW4tbGVmdDogMDsKCX0KCTEwMCUgewoJCW1hcmdpbi1sZWZ0OiA5MCU7Cgl9 Cn0KQC13ZWJraXQta2V5ZnJhbWVzIGJvdW5jZXIgewoJMCUgewoJCW1hcmdpbi10b3A6IDA7CgkJ LXdlYmtpdC1ib3gtc2hhZG93OiA1MHB4IDUwcHggNDBweCAtMTBweCByZ2JhKDAsMCwwLDAuMjUp OwoJfQoJMTAwJSB7CgkJbWFyZ2luLXRvcDogNTBweDsKCQktd2Via2l0LWJveC1zaGFkb3c6IDEw cHggMTBweCA1cHggMHB4IHJnYmEoMCwwLDAsMC4yNSk7Cgl9Cn0KPC9zdHlsZT4KPC9oZWFkPgo8 Ym9keT4KClRoZSBiYWxsIGJlbG93IHNob3VsZCAiYm91bmNlIiAoZ2V0IGxhcmdlciBhbmQgc21h bGxlcikgd2l0aCBhIHNtb290aCBlYXNlIGZ1bmN0aW9uIGFuZCBzaG91bGQgbW92ZSBob3Jpem9u dGFsbHkgd2l0aCBhIGxpbmVhciB0aW1pbmcgZnVuY3Rpb24uIEluIFdlYktpdCBUT1QgYm90aCB1 c2UgYW4gZWFzZSBmdW5jdGlvbiAoaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTYwMzAzKQo8ZGl2IGlkPSJiYWxsIj5ib3VuY3k8L2Rpdj4KCjwvYm9keT4KPC9odG1sPg== 98005 2011-06-21 10:19:46 -0700 2011-06-22 07:28:31 -0700 Patch bug-60303-20110622021945.patch text/plain 6626 joybro201 U3VidmVyc2lvbiBSZXZpc2lvbjogODkyMDkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyZWQ2NWRjZjQ1MDkxMjQxMGQ2OGVh YWI5YTZkYzE0ZTdhOWM1OWMyLi4xYTBiYjM5MDM3YmNkYzRkNTI5ZmJmMmZiZDQ0MDBmMmY5OTMx MDQ0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDYtMjEgIFlvdW5nIEhhbiBMZWUgIDxq b3licm9AY29tcGFueTEwMC5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgYW5pbWF0aW9uLXRpbWluZy1mdW5jdGlvbiBwcm9wZXJ0eSB3aXRoIGEg bGlzdCB1c2VzIGZpcnN0IGl0ZW0gZm9yIGFsbCBhbmltYXRpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDMwMworCisgICAgICAgIFdoZW4gYW4g ZWxlbWVudCBoYXMgbXVsdGlwbGUgYW5pbWF0aW9ucyB0aGF0IGhhdmUgZGlmZmVyZW50IHRpbWlu Z0Z1bmN0aW9ucywKKyAgICAgICAgdGhlIHByb2dyZXNzIG9mIGVhY2ggYW5pbWF0aW9uIHNob3Vs ZCBiZSBjYWxjdWxhdGVkIHVzaW5nIGl0cyByZXNwZWN0aXZlIHRpbWluZ0Z1bmN0aW9uLiAKKyAg ICAgICAgQnV0IGF0IHRoaXMgcG9pbnQsIHRoZSB0aW1pbmdGdW5jdGlvbiBvZiB0aGUgZmlyc3Qg YW5pbWF0aW9uIGlzIG9ubHkgdXNlZCBmb3IgdGhlIAorICAgICAgICBjYWxjdWxhdGlvbiwgcmVn YXJkbGVzcyBvZiBob3cgbWFueSBhbmltYXRpb25zIHRoZSBlbGVtZW50IGhhcy4KKworICAgICAg ICBUaGUgY29kZSBmb3IgZ2V0dGluZyBhIHRpbWluZ0Z1bmN0aW9uIGlzIGNoYW5nZWQgYnkgdGhp cyBwYXRjaCAKKyAgICAgICAgc28gdGhhdCB0aGUgdGltaW5nRnVuY3Rpb24gb2YgdGhlIGNvcnJl Y3QgYW5pbWF0aW9uIHNlYXJjaGVkIGJ5IGl0cyBuYW1lIHdpbGwgYmUgdXNlZC4KKworICAgICAg ICAqIGFuaW1hdGlvbnMvbXVsdGlwbGUtYW5pbWF0aW9ucy1vbi1hbi1lbGVtZW50LWV4cGVjdGVk LnR4dDogQWRkZWQuCisgICAgICAgICogYW5pbWF0aW9ucy9tdWx0aXBsZS1hbmltYXRpb25zLW9u LWFuLWVsZW1lbnQuaHRtbDogQWRkZWQuCisKIDIwMTEtMDYtMTggIEFsaWNlIEJveGhhbGwgIDxh Ym94aGFsbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRmxlaXph Y2guCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hbmltYXRpb25zL211bHRpcGxlLWFuaW1hdGlv bnMtb24tYW4tZWxlbWVudC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9hbmltYXRpb25zL211 bHRpcGxlLWFuaW1hdGlvbnMtb24tYW4tZWxlbWVudC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u ZWRkOTM0Y2FkZDNjZTZmMzAxZGFmNTc3N2ZjZWMxNzc3MDQ4MzU1ZAotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2FuaW1hdGlvbnMvbXVsdGlwbGUtYW5pbWF0aW9ucy1vbi1hbi1lbGVt ZW50LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUgQEAKK1BBU1MgLSAibGVmdCIgcHJvcGVydHkg Zm9yICJib3giIGVsZW1lbnQgYXQgMC41cyBzYXcgc29tZXRoaW5nIGNsb3NlIHRvOiAxOAorUEFT UyAtICJ0b3AiIHByb3BlcnR5IGZvciAiYm94IiBlbGVtZW50IGF0IDAuNXMgc2F3IHNvbWV0aGlu ZyBjbG9zZSB0bzogNzUKK1BBU1MgLSAibGVmdCIgcHJvcGVydHkgZm9yICJib3giIGVsZW1lbnQg YXQgMS41cyBzYXcgc29tZXRoaW5nIGNsb3NlIHRvOiAxMjQKK1BBU1MgLSAidG9wIiBwcm9wZXJ0 eSBmb3IgImJveCIgZWxlbWVudCBhdCAxLjVzIHNhdyBzb21ldGhpbmcgY2xvc2UgdG86IDE4MQor CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hbmltYXRpb25zL211bHRpcGxlLWFuaW1hdGlvbnMt b24tYW4tZWxlbWVudC5odG1sIGIvTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9tdWx0aXBsZS1hbmlt YXRpb25zLW9uLWFuLWVsZW1lbnQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44MGU1ODg2NjEzM2JlMWU1NTNh ODgyZmRlY2VhZWY1NmU2ODg0MGNiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYW5p bWF0aW9ucy9tdWx0aXBsZS1hbmltYXRpb25zLW9uLWFuLWVsZW1lbnQuaHRtbApAQCAtMCwwICsx LDQyIEBACis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAgI2JveCB7CisgICAg ICAgICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CisgICAgICAgICAgICBoZWlnaHQ6IDEwMHB4Owor ICAgICAgICAgICAgd2lkdGg6IDEwMHB4OworICAgICAgICAgICAgbWFyZ2luOiAyMHB4OworICAg ICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogcmVkOworICAgICAgICAgICAgLXdlYmtpdC1hbmlt YXRpb246CisgICAgICAgICAgICAgICAgaG9yaXpvbnRhbCAycyBlYXNlLWluIGluZmluaXRlIGFs dGVybmF0ZSwKKyAgICAgICAgICAgICAgICB2ZXJ0aWNhbCAycyBlYXNlLW91dCBpbmZpbml0ZSBh bHRlcm5hdGU7CisgICAgICAgIH0KKworICAgICAgICBALXdlYmtpdC1rZXlmcmFtZXMgaG9yaXpv bnRhbCB7CisgICAgICAgICAgICBmcm9tIHsgbGVmdDogMHB4OyAgIH0KKyAgICAgICAgICAgIHRv ICAgeyBsZWZ0OiAyMDBweDsgfQorICAgICAgICB9CisKKyAgICAgICAgQC13ZWJraXQta2V5ZnJh bWVzIHZlcnRpY2FsIHsKKyAgICAgICAgICAgIGZyb20geyB0b3A6IDBweDsgICB9CisgICAgICAg ICAgICB0byAgIHsgdG9wOiAyMDBweDsgfQorICAgICAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8 c2NyaXB0IHNyYz0icmVzb3VyY2VzL2FuaW1hdGlvbi10ZXN0LWhlbHBlcnMuanMiIHR5cGU9InRl eHQvamF2YXNjcmlwdCIgY2hhcnNldD0idXRmLTgiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgdHlw ZT0idGV4dC9qYXZhc2NyaXB0IiBjaGFyc2V0PSJ1dGYtOCI+CisgICAgICAgIGNvbnN0IGV4cGVj dGVkVmFsdWVzID0gWworICAgICAgICAgIC8vIFthbmltYXRpb24tbmFtZSwgdGltZSwgZWxlbWVu dC1pZCwgcHJvcGVydHksIGV4cGVjdGVkLXZhbHVlLCB0b2xlcmFuY2VdCisgICAgICAgICAgWyJo b3Jpem9udGFsIiwgMC41LCAiYm94IiwgImxlZnQiLCAxOCwgMTBdLAorICAgICAgICAgIFsiaG9y aXpvbnRhbCIsIDEuNSwgImJveCIsICJsZWZ0IiwgMTI0LCAxMF0sCisgICAgICAgICAgWyJ2ZXJ0 aWNhbCIsIDAuNSwgImJveCIsICJ0b3AiLCA3NSwgMTBdLAorICAgICAgICAgIFsidmVydGljYWwi LCAxLjUsICJib3giLCAidG9wIiwgMTgxLCAxMF0sCisgICAgICAgIF07CisKKyAgICAgICAgcnVu QW5pbWF0aW9uVGVzdChleHBlY3RlZFZhbHVlcywgbnVsbCwgbnVsbCwgdHJ1ZSk7CisgICAgPC9z Y3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2IGlkPSJib3giPjwvZGl2PgorICAgIDxk aXYgaWQ9InJlc3VsdCI+PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTVk M2I2NjU4ZWU5NDc3ODUwNTM3Mzc5MjA2ZmQzZTFkMzE1YTI2OC4uNmQ3OGNlOTVhNDQzMmJhMGYz M2JlMGY4NGQzNTk5ZWY4N2U5MTZiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEx LTA2LTIxICBZb3VuZyBIYW4gTGVlICA8am95YnJvQGNvbXBhbnkxMDAubmV0PgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGFuaW1hdGlvbi10aW1pbmct ZnVuY3Rpb24gcHJvcGVydHkgd2l0aCBhIGxpc3QgdXNlcyBmaXJzdCBpdGVtIGZvciBhbGwgYW5p bWF0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjAzMDMKKworICAgICAgICBXaGVuIGFuIGVsZW1lbnQgaGFzIG11bHRpcGxlIGFuaW1hdGlvbnMg dGhhdCBoYXZlIGRpZmZlcmVudCB0aW1pbmdGdW5jdGlvbnMsCisgICAgICAgIHRoZSBwcm9ncmVz cyBvZiBlYWNoIGFuaW1hdGlvbiBzaG91bGQgYmUgY2FsY3VsYXRlZCB1c2luZyBpdHMgcmVzcGVj dGl2ZSB0aW1pbmdGdW5jdGlvbi4gCisgICAgICAgIEJ1dCBhdCB0aGlzIHBvaW50LCB0aGUgdGlt aW5nRnVuY3Rpb24gb2YgdGhlIGZpcnN0IGFuaW1hdGlvbiBpcyBvbmx5IHVzZWQgZm9yIHRoZSAK KyAgICAgICAgY2FsY3VsYXRpb24sIHJlZ2FyZGxlc3Mgb2YgaG93IG1hbnkgYW5pbWF0aW9ucyB0 aGUgZWxlbWVudCBoYXMuCisKKyAgICAgICAgVGhlIGNvZGUgZm9yIGdldHRpbmcgYSB0aW1pbmdG dW5jdGlvbiBpcyBjaGFuZ2VkIGJ5IHRoaXMgcGF0Y2ggCisgICAgICAgIHNvIHRoYXQgdGhlIHRp bWluZ0Z1bmN0aW9uIG9mIHRoZSBjb3JyZWN0IGFuaW1hdGlvbiBzZWFyY2hlZCBieSBpdHMgbmFt ZSB3aWxsIGJlIHVzZWQuCisKKyAgICAgICAgVGVzdDogYW5pbWF0aW9ucy9tdWx0aXBsZS1hbmlt YXRpb25zLW9uLWFuLWVsZW1lbnQuaHRtbAorCisgICAgICAgICogcGFnZS9hbmltYXRpb24vS2V5 ZnJhbWVBbmltYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2V0QW5pbWF0aW9uRnJvbVN0 eWxlQnlOYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lQW5pbWF0aW9uOjpmZXRjaElu dGVydmFsRW5kcG9pbnRzRm9yUHJvcGVydHkpOgorCiAyMDExLTA2LTE4ICBKZXIgTm9ibGUgIDxq ZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vS2V5ZnJhbWVBbmltYXRp b24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vS2V5ZnJhbWVBbmltYXRpb24u Y3BwCmluZGV4IDVmMTlmZTQ2ZjRhZjBmYjQwOWZjYjlmM2FkNDYxZjE4M2FiOTUwOWIuLjU2NWM3 YTM2MmUzNmJlZDdkNTNiYWVhYjUwNDU1MTdkNGY4MDhmNTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9LZXlmcmFtZUFuaW1hdGlvbi5jcHAKQEAgLTY1LDYgKzY1 LDE5IEBAIEtleWZyYW1lQW5pbWF0aW9uOjp+S2V5ZnJhbWVBbmltYXRpb24oKQogICAgICAgICBl bmRBbmltYXRpb24oKTsKIH0KIAorc3RhdGljIGNvbnN0IEFuaW1hdGlvbiogZ2V0QW5pbWF0aW9u RnJvbVN0eWxlQnlOYW1lKGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSwgY29uc3QgQXRvbWljU3Ry aW5nJiBuYW1lKQoreworICAgIGlmICghc3R5bGUtPmFuaW1hdGlvbnMoKSkKKyAgICAgICAgcmV0 dXJuIDA7CisKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHN0eWxlLT5hbmltYXRpb25zKCkt PnNpemUoKTsgaSsrKSB7CisgICAgICAgIGlmIChuYW1lID09IHN0eWxlLT5hbmltYXRpb25zKCkt PmFuaW1hdGlvbihpKS0+bmFtZSgpKQorICAgICAgICAgICAgcmV0dXJuIHN0eWxlLT5hbmltYXRp b25zKCktPmFuaW1hdGlvbihpKTsKKyAgICB9CisKKyAgICByZXR1cm4gMDsKK30KKwogdm9pZCBL ZXlmcmFtZUFuaW1hdGlvbjo6ZmV0Y2hJbnRlcnZhbEVuZHBvaW50c0ZvclByb3BlcnR5KGludCBw cm9wZXJ0eSwgY29uc3QgUmVuZGVyU3R5bGUqJiBmcm9tU3R5bGUsIGNvbnN0IFJlbmRlclN0eWxl KiYgdG9TdHlsZSwgZG91YmxlJiBwcm9nKSBjb25zdAogewogICAgIC8vIEZpbmQgdGhlIGZpcnN0 IGtleQpAQCAtMTM2LDEwICsxNDksOSBAQCB2b2lkIEtleWZyYW1lQW5pbWF0aW9uOjpmZXRjaElu dGVydmFsRW5kcG9pbnRzRm9yUHJvcGVydHkoaW50IHByb3BlcnR5LCBjb25zdCBSZQogICAgIHNj YWxlID0gMS4wIC8gKG5leHRLZXlmcmFtZS5rZXkoKSAtIHByZXZLZXlmcmFtZS5rZXkoKSk7CiAK ICAgICBjb25zdCBUaW1pbmdGdW5jdGlvbiogdGltaW5nRnVuY3Rpb24gPSAwOwotICAgIGlmIChm cm9tU3R5bGUtPmFuaW1hdGlvbnMoKSAmJiBmcm9tU3R5bGUtPmFuaW1hdGlvbnMoKS0+c2l6ZSgp ID4gMCkgewotICAgICAgICAvLyBXZSBnZXQgdGhlIHRpbWluZyBmdW5jdGlvbiBmcm9tIHRoZSBm aXJzdCBhbmltYXRpb24sIGJlY2F1c2Ugd2UndmUgc3ludGhlc2l6ZWQgYSBSZW5kZXJTdHlsZSBm b3IgZWFjaCBrZXlmcmFtZS4KLSAgICAgICAgdGltaW5nRnVuY3Rpb24gPSBmcm9tU3R5bGUtPmFu aW1hdGlvbnMoKS0+YW5pbWF0aW9uKDApLT50aW1pbmdGdW5jdGlvbigpLmdldCgpOwotICAgIH0K KyAgICBjb25zdCBBbmltYXRpb24qIG1hdGNoZWRBbmltYXRpb24gPSBnZXRBbmltYXRpb25Gcm9t U3R5bGVCeU5hbWUoZnJvbVN0eWxlLCBuYW1lKCkpOworICAgIGlmIChtYXRjaGVkQW5pbWF0aW9u KQorICAgICAgICB0aW1pbmdGdW5jdGlvbiA9IG1hdGNoZWRBbmltYXRpb24tPnRpbWluZ0Z1bmN0 aW9uKCkuZ2V0KCk7CiAKICAgICBwcm9nID0gcHJvZ3Jlc3Moc2NhbGUsIG9mZnNldCwgdGltaW5n RnVuY3Rpb24pOwogfQo= 98168 2011-06-22 07:28:40 -0700 2011-06-22 09:23:46 -0700 Patch bug-60303-20110622232838.patch text/plain 6561 joybro201 U3VidmVyc2lvbiBSZXZpc2lvbjogODkyMDkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyZWQ2NWRjZjQ1MDkxMjQxMGQ2OGVh YWI5YTZkYzE0ZTdhOWM1OWMyLi5mNzBiOTcxZWU3YzhhZjZjMGMzNDE2YTI3YjVlMTA5YmVkZTc5 ZmJiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDYtMjEgIFlvdW5nIEhhbiBMZWUgIDxq b3licm9AY29tcGFueTEwMC5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgYW5pbWF0aW9uLXRpbWluZy1mdW5jdGlvbiBwcm9wZXJ0eSB3aXRoIGEg bGlzdCB1c2VzIGZpcnN0IGl0ZW0gZm9yIGFsbCBhbmltYXRpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDMwMworCisgICAgICAgIFdoZW4gYW4g ZWxlbWVudCBoYXMgbXVsdGlwbGUgYW5pbWF0aW9ucyB0aGF0IGhhdmUgZGlmZmVyZW50IHRpbWlu Z0Z1bmN0aW9ucywKKyAgICAgICAgdGhlIHByb2dyZXNzIG9mIGVhY2ggYW5pbWF0aW9uIHNob3Vs ZCBiZSBjYWxjdWxhdGVkIHVzaW5nIGl0cyByZXNwZWN0aXZlIHRpbWluZ0Z1bmN0aW9uLgorICAg ICAgICBCdXQgYXQgdGhpcyBwb2ludCwgdGhlIHRpbWluZ0Z1bmN0aW9uIG9mIHRoZSBmaXJzdCBh bmltYXRpb24gaXMgb25seSB1c2VkIGZvciB0aGUKKyAgICAgICAgY2FsY3VsYXRpb24sIHJlZ2Fy ZGxlc3Mgb2YgaG93IG1hbnkgYW5pbWF0aW9ucyB0aGUgZWxlbWVudCBoYXMuCisKKyAgICAgICAg VGhlIGNvZGUgZm9yIGdldHRpbmcgYSB0aW1pbmdGdW5jdGlvbiBpcyBjaGFuZ2VkIGJ5IHRoaXMg cGF0Y2gKKyAgICAgICAgc28gdGhhdCB0aGUgdGltaW5nRnVuY3Rpb24gb2YgdGhlIGNvcnJlY3Qg YW5pbWF0aW9uIHNlYXJjaGVkIGJ5IGl0cyBuYW1lIHdpbGwgYmUgdXNlZC4KKworICAgICAgICAq IGFuaW1hdGlvbnMvbXVsdGlwbGUtYW5pbWF0aW9ucy1vbi1hbi1lbGVtZW50LWV4cGVjdGVkLnR4 dDogQWRkZWQuCisgICAgICAgICogYW5pbWF0aW9ucy9tdWx0aXBsZS1hbmltYXRpb25zLW9uLWFu LWVsZW1lbnQuaHRtbDogQWRkZWQuCisKIDIwMTEtMDYtMTggIEFsaWNlIEJveGhhbGwgIDxhYm94 aGFsbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRmxlaXphY2gu CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hbmltYXRpb25zL211bHRpcGxlLWFuaW1hdGlvbnMt b24tYW4tZWxlbWVudC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9hbmltYXRpb25zL211bHRp cGxlLWFuaW1hdGlvbnMtb24tYW4tZWxlbWVudC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjlh YWVhMzNhNWNhMTA3ODMyNzc0NDhmMDQyZDBmNDVlZTQ1ODc2OQotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2FuaW1hdGlvbnMvbXVsdGlwbGUtYW5pbWF0aW9ucy1vbi1hbi1lbGVtZW50 LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUgQEAKK1BBU1MgLSAibGVmdCIgcHJvcGVydHkgZm9y ICJib3giIGVsZW1lbnQgYXQgMC41cyBzYXcgc29tZXRoaW5nIGNsb3NlIHRvOiAxOAorUEFTUyAt ICJsZWZ0IiBwcm9wZXJ0eSBmb3IgImJveCIgZWxlbWVudCBhdCAxLjVzIHNhdyBzb21ldGhpbmcg Y2xvc2UgdG86IDEyNAorUEFTUyAtICJ0b3AiIHByb3BlcnR5IGZvciAiYm94IiBlbGVtZW50IGF0 IDAuNXMgc2F3IHNvbWV0aGluZyBjbG9zZSB0bzogNzUKK1BBU1MgLSAidG9wIiBwcm9wZXJ0eSBm b3IgImJveCIgZWxlbWVudCBhdCAxLjVzIHNhdyBzb21ldGhpbmcgY2xvc2UgdG86IDE4MQorCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hbmltYXRpb25zL211bHRpcGxlLWFuaW1hdGlvbnMtb24t YW4tZWxlbWVudC5odG1sIGIvTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9tdWx0aXBsZS1hbmltYXRp b25zLW9uLWFuLWVsZW1lbnQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xOTNkODk2ZThhY2ZkOTlkMDk0Mjdi MGI2YmRmZWRjZmM3NjMwYmU5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYW5pbWF0 aW9ucy9tdWx0aXBsZS1hbmltYXRpb25zLW9uLWFuLWVsZW1lbnQuaHRtbApAQCAtMCwwICsxLDQy IEBACis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAgI2JveCB7CisgICAgICAg ICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CisgICAgICAgICAgICBoZWlnaHQ6IDEwMHB4OworICAg ICAgICAgICAgd2lkdGg6IDEwMHB4OworICAgICAgICAgICAgbWFyZ2luOiAyMHB4OworICAgICAg ICAgICAgYmFja2dyb3VuZC1jb2xvcjogcmVkOworICAgICAgICAgICAgLXdlYmtpdC1hbmltYXRp b246CisgICAgICAgICAgICAgIGhvcml6b250YWwgMnMgZWFzZS1pbiAxIGFsdGVybmF0ZSwKKyAg ICAgICAgICAgICAgdmVydGljYWwgMnMgZWFzZS1vdXQgMSBhbHRlcm5hdGU7CisgICAgICAgIH0K KworICAgICAgICBALXdlYmtpdC1rZXlmcmFtZXMgaG9yaXpvbnRhbCB7CisgICAgICAgICAgICBm cm9tIHsgbGVmdDogMHB4OyAgIH0KKyAgICAgICAgICAgIHRvICAgeyBsZWZ0OiAyMDBweDsgfQor ICAgICAgICB9CisKKyAgICAgICAgQC13ZWJraXQta2V5ZnJhbWVzIHZlcnRpY2FsIHsKKyAgICAg ICAgICAgIGZyb20geyB0b3A6IDBweDsgICB9CisgICAgICAgICAgICB0byAgIHsgdG9wOiAyMDBw eDsgfQorICAgICAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8c2NyaXB0IHNyYz0icmVzb3VyY2Vz L2FuaW1hdGlvbi10ZXN0LWhlbHBlcnMuanMiIHR5cGU9InRleHQvamF2YXNjcmlwdCIgY2hhcnNl dD0idXRmLTgiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBj aGFyc2V0PSJ1dGYtOCI+CisgICAgICAgIGNvbnN0IGV4cGVjdGVkVmFsdWVzID0gWworICAgICAg ICAgIC8vIFthbmltYXRpb24tbmFtZSwgdGltZSwgZWxlbWVudC1pZCwgcHJvcGVydHksIGV4cGVj dGVkLXZhbHVlLCB0b2xlcmFuY2VdCisgICAgICAgICAgWyJob3Jpem9udGFsIiwgMC41LCAiYm94 IiwgImxlZnQiLCAxOCwgMTBdLAorICAgICAgICAgIFsiaG9yaXpvbnRhbCIsIDEuNSwgImJveCIs ICJsZWZ0IiwgMTI0LCAxMF0sCisgICAgICAgICAgWyJ2ZXJ0aWNhbCIsIDAuNSwgImJveCIsICJ0 b3AiLCA3NSwgMTBdLAorICAgICAgICAgIFsidmVydGljYWwiLCAxLjUsICJib3giLCAidG9wIiwg MTgxLCAxMF0sCisgICAgICAgIF07CisKKyAgICAgICAgcnVuQW5pbWF0aW9uVGVzdChleHBlY3Rl ZFZhbHVlcyk7CisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2IGlkPSJi b3giPjwvZGl2PgorICAgIDxkaXYgaWQ9InJlc3VsdCI+PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggYTVkM2I2NjU4ZWU5NDc3ODUwNTM3Mzc5MjA2ZmQzZTFkMzE1YTI2OC4u MTY2ZmQ1MTkyYmI4YzQ2ZTM0MmI4OGEwMTBmNThkNTgxNWRiNDFhMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI0IEBACisyMDExLTA2LTIxICBZb3VuZyBIYW4gTGVlICA8am95YnJvQGNvbXBhbnkx MDAubmV0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGFuaW1hdGlvbi10aW1pbmctZnVuY3Rpb24gcHJvcGVydHkgd2l0aCBhIGxpc3QgdXNlcyBmaXJz dCBpdGVtIGZvciBhbGwgYW5pbWF0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjAzMDMKKworICAgICAgICBXaGVuIGFuIGVsZW1lbnQgaGFzIG11 bHRpcGxlIGFuaW1hdGlvbnMgdGhhdCBoYXZlIGRpZmZlcmVudCB0aW1pbmdGdW5jdGlvbnMsCisg ICAgICAgIHRoZSBwcm9ncmVzcyBvZiBlYWNoIGFuaW1hdGlvbiBzaG91bGQgYmUgY2FsY3VsYXRl ZCB1c2luZyBpdHMgcmVzcGVjdGl2ZSB0aW1pbmdGdW5jdGlvbi4KKyAgICAgICAgQnV0IGF0IHRo aXMgcG9pbnQsIHRoZSB0aW1pbmdGdW5jdGlvbiBvZiB0aGUgZmlyc3QgYW5pbWF0aW9uIGlzIG9u bHkgdXNlZCBmb3IgdGhlCisgICAgICAgIGNhbGN1bGF0aW9uLCByZWdhcmRsZXNzIG9mIGhvdyBt YW55IGFuaW1hdGlvbnMgdGhlIGVsZW1lbnQgaGFzLgorCisgICAgICAgIFRoZSBjb2RlIGZvciBn ZXR0aW5nIGEgdGltaW5nRnVuY3Rpb24gaXMgY2hhbmdlZCBieSB0aGlzIHBhdGNoCisgICAgICAg IHNvIHRoYXQgdGhlIHRpbWluZ0Z1bmN0aW9uIG9mIHRoZSBjb3JyZWN0IGFuaW1hdGlvbiBzZWFy Y2hlZCBieSBpdHMgbmFtZSB3aWxsIGJlIHVzZWQuCisKKyAgICAgICAgVGVzdDogYW5pbWF0aW9u cy9tdWx0aXBsZS1hbmltYXRpb25zLW9uLWFuLWVsZW1lbnQuaHRtbAorCisgICAgICAgICogcGFn ZS9hbmltYXRpb24vS2V5ZnJhbWVBbmltYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2V0 QW5pbWF0aW9uRnJvbVN0eWxlQnlOYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lQW5p bWF0aW9uOjpmZXRjaEludGVydmFsRW5kcG9pbnRzRm9yUHJvcGVydHkpOgorCiAyMDExLTA2LTE4 ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24v S2V5ZnJhbWVBbmltYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vS2V5 ZnJhbWVBbmltYXRpb24uY3BwCmluZGV4IDVmMTlmZTQ2ZjRhZjBmYjQwOWZjYjlmM2FkNDYxZjE4 M2FiOTUwOWIuLjAwYjMwNDdmZmUzNTRmOTU3YzFjZjI3OGY2ZGM2NTI3N2NkNTQ5ZmEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9LZXlmcmFtZUFuaW1hdGlvbi5j cHAKQEAgLTY1LDYgKzY1LDE5IEBAIEtleWZyYW1lQW5pbWF0aW9uOjp+S2V5ZnJhbWVBbmltYXRp b24oKQogICAgICAgICBlbmRBbmltYXRpb24oKTsKIH0KIAorc3RhdGljIGNvbnN0IEFuaW1hdGlv biogZ2V0QW5pbWF0aW9uRnJvbVN0eWxlQnlOYW1lKGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSwg Y29uc3QgQXRvbWljU3RyaW5nJiBuYW1lKQoreworICAgIGlmICghc3R5bGUtPmFuaW1hdGlvbnMo KSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHN0eWxl LT5hbmltYXRpb25zKCktPnNpemUoKTsgaSsrKSB7CisgICAgICAgIGlmIChuYW1lID09IHN0eWxl LT5hbmltYXRpb25zKCktPmFuaW1hdGlvbihpKS0+bmFtZSgpKQorICAgICAgICAgICAgcmV0dXJu IHN0eWxlLT5hbmltYXRpb25zKCktPmFuaW1hdGlvbihpKTsKKyAgICB9CisKKyAgICByZXR1cm4g MDsKK30KKwogdm9pZCBLZXlmcmFtZUFuaW1hdGlvbjo6ZmV0Y2hJbnRlcnZhbEVuZHBvaW50c0Zv clByb3BlcnR5KGludCBwcm9wZXJ0eSwgY29uc3QgUmVuZGVyU3R5bGUqJiBmcm9tU3R5bGUsIGNv bnN0IFJlbmRlclN0eWxlKiYgdG9TdHlsZSwgZG91YmxlJiBwcm9nKSBjb25zdAogewogICAgIC8v IEZpbmQgdGhlIGZpcnN0IGtleQpAQCAtMTM2LDEwICsxNDksOCBAQCB2b2lkIEtleWZyYW1lQW5p bWF0aW9uOjpmZXRjaEludGVydmFsRW5kcG9pbnRzRm9yUHJvcGVydHkoaW50IHByb3BlcnR5LCBj b25zdCBSZQogICAgIHNjYWxlID0gMS4wIC8gKG5leHRLZXlmcmFtZS5rZXkoKSAtIHByZXZLZXlm cmFtZS5rZXkoKSk7CiAKICAgICBjb25zdCBUaW1pbmdGdW5jdGlvbiogdGltaW5nRnVuY3Rpb24g PSAwOwotICAgIGlmIChmcm9tU3R5bGUtPmFuaW1hdGlvbnMoKSAmJiBmcm9tU3R5bGUtPmFuaW1h dGlvbnMoKS0+c2l6ZSgpID4gMCkgewotICAgICAgICAvLyBXZSBnZXQgdGhlIHRpbWluZyBmdW5j dGlvbiBmcm9tIHRoZSBmaXJzdCBhbmltYXRpb24sIGJlY2F1c2Ugd2UndmUgc3ludGhlc2l6ZWQg YSBSZW5kZXJTdHlsZSBmb3IgZWFjaCBrZXlmcmFtZS4KLSAgICAgICAgdGltaW5nRnVuY3Rpb24g PSBmcm9tU3R5bGUtPmFuaW1hdGlvbnMoKS0+YW5pbWF0aW9uKDApLT50aW1pbmdGdW5jdGlvbigp LmdldCgpOwotICAgIH0KKyAgICBpZiAoY29uc3QgQW5pbWF0aW9uKiBtYXRjaGVkQW5pbWF0aW9u ID0gZ2V0QW5pbWF0aW9uRnJvbVN0eWxlQnlOYW1lKGZyb21TdHlsZSwgbmFtZSgpKSkKKyAgICAg ICAgdGltaW5nRnVuY3Rpb24gPSBtYXRjaGVkQW5pbWF0aW9uLT50aW1pbmdGdW5jdGlvbigpLmdl dCgpOwogCiAgICAgcHJvZyA9IHByb2dyZXNzKHNjYWxlLCBvZmZzZXQsIHRpbWluZ0Z1bmN0aW9u KTsKIH0K 98183 2011-06-22 09:23:56 -0700 2011-06-22 09:44:35 -0700 Patch bug-60303-20110623012354.patch text/plain 6577 joybro201 U3VidmVyc2lvbiBSZXZpc2lvbjogODkyMDkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyZWQ2NWRjZjQ1MDkxMjQxMGQ2OGVh YWI5YTZkYzE0ZTdhOWM1OWMyLi5mNzBiOTcxZWU3YzhhZjZjMGMzNDE2YTI3YjVlMTA5YmVkZTc5 ZmJiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDYtMjEgIFlvdW5nIEhhbiBMZWUgIDxq b3licm9AY29tcGFueTEwMC5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgYW5pbWF0aW9uLXRpbWluZy1mdW5jdGlvbiBwcm9wZXJ0eSB3aXRoIGEg bGlzdCB1c2VzIGZpcnN0IGl0ZW0gZm9yIGFsbCBhbmltYXRpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDMwMworCisgICAgICAgIFdoZW4gYW4g ZWxlbWVudCBoYXMgbXVsdGlwbGUgYW5pbWF0aW9ucyB0aGF0IGhhdmUgZGlmZmVyZW50IHRpbWlu Z0Z1bmN0aW9ucywKKyAgICAgICAgdGhlIHByb2dyZXNzIG9mIGVhY2ggYW5pbWF0aW9uIHNob3Vs ZCBiZSBjYWxjdWxhdGVkIHVzaW5nIGl0cyByZXNwZWN0aXZlIHRpbWluZ0Z1bmN0aW9uLgorICAg ICAgICBCdXQgYXQgdGhpcyBwb2ludCwgdGhlIHRpbWluZ0Z1bmN0aW9uIG9mIHRoZSBmaXJzdCBh bmltYXRpb24gaXMgb25seSB1c2VkIGZvciB0aGUKKyAgICAgICAgY2FsY3VsYXRpb24sIHJlZ2Fy ZGxlc3Mgb2YgaG93IG1hbnkgYW5pbWF0aW9ucyB0aGUgZWxlbWVudCBoYXMuCisKKyAgICAgICAg VGhlIGNvZGUgZm9yIGdldHRpbmcgYSB0aW1pbmdGdW5jdGlvbiBpcyBjaGFuZ2VkIGJ5IHRoaXMg cGF0Y2gKKyAgICAgICAgc28gdGhhdCB0aGUgdGltaW5nRnVuY3Rpb24gb2YgdGhlIGNvcnJlY3Qg YW5pbWF0aW9uIHNlYXJjaGVkIGJ5IGl0cyBuYW1lIHdpbGwgYmUgdXNlZC4KKworICAgICAgICAq IGFuaW1hdGlvbnMvbXVsdGlwbGUtYW5pbWF0aW9ucy1vbi1hbi1lbGVtZW50LWV4cGVjdGVkLnR4 dDogQWRkZWQuCisgICAgICAgICogYW5pbWF0aW9ucy9tdWx0aXBsZS1hbmltYXRpb25zLW9uLWFu LWVsZW1lbnQuaHRtbDogQWRkZWQuCisKIDIwMTEtMDYtMTggIEFsaWNlIEJveGhhbGwgIDxhYm94 aGFsbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRmxlaXphY2gu CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hbmltYXRpb25zL211bHRpcGxlLWFuaW1hdGlvbnMt dGltaW5nLWZ1bmN0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2FuaW1hdGlvbnMvbXVs dGlwbGUtYW5pbWF0aW9ucy10aW1pbmctZnVuY3Rpb24tZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LmY5YWFlYTMzYTVjYTEwNzgzMjc3NDQ4ZjA0MmQwZjQ1ZWU0NTg3NjkKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9hbmltYXRpb25zL211bHRpcGxlLWFuaW1hdGlvbnMtdGltaW5nLWZ1 bmN0aW9uLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUgQEAKK1BBU1MgLSAibGVmdCIgcHJvcGVy dHkgZm9yICJib3giIGVsZW1lbnQgYXQgMC41cyBzYXcgc29tZXRoaW5nIGNsb3NlIHRvOiAxOAor UEFTUyAtICJsZWZ0IiBwcm9wZXJ0eSBmb3IgImJveCIgZWxlbWVudCBhdCAxLjVzIHNhdyBzb21l dGhpbmcgY2xvc2UgdG86IDEyNAorUEFTUyAtICJ0b3AiIHByb3BlcnR5IGZvciAiYm94IiBlbGVt ZW50IGF0IDAuNXMgc2F3IHNvbWV0aGluZyBjbG9zZSB0bzogNzUKK1BBU1MgLSAidG9wIiBwcm9w ZXJ0eSBmb3IgImJveCIgZWxlbWVudCBhdCAxLjVzIHNhdyBzb21ldGhpbmcgY2xvc2UgdG86IDE4 MQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hbmltYXRpb25zL211bHRpcGxlLWFuaW1hdGlv bnMtdGltaW5nLWZ1bmN0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9hbmltYXRpb25zL211bHRpcGxl LWFuaW1hdGlvbnMtdGltaW5nLWZ1bmN0aW9uLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjE1N2IxNjRkODg0 OGNiMjFkZDgyYjBlOWE5ZDllYTQ2Y2JhOWIzMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2FuaW1hdGlvbnMvbXVsdGlwbGUtYW5pbWF0aW9ucy10aW1pbmctZnVuY3Rpb24uaHRtbApA QCAtMCwwICsxLDQyIEBACis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAgI2Jv eCB7CisgICAgICAgICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CisgICAgICAgICAgICBoZWlnaHQ6 IDEwMHB4OworICAgICAgICAgICAgd2lkdGg6IDEwMHB4OworICAgICAgICAgICAgbWFyZ2luOiAy MHB4OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogcmVkOworICAgICAgICAgICAgLXdl YmtpdC1hbmltYXRpb246CisgICAgICAgICAgICAgICAgaG9yaXpvbnRhbCAycyBlYXNlLWluIDEg YWx0ZXJuYXRlLAorICAgICAgICAgICAgICAgIHZlcnRpY2FsIDJzIGVhc2Utb3V0IDEgYWx0ZXJu YXRlOworICAgICAgICB9CisKKyAgICAgICAgQC13ZWJraXQta2V5ZnJhbWVzIGhvcml6b250YWwg eworICAgICAgICAgICAgZnJvbSB7IGxlZnQ6IDBweDsgICB9CisgICAgICAgICAgICB0byAgIHsg bGVmdDogMjAwcHg7IH0KKyAgICAgICAgfQorCisgICAgICAgIEAtd2Via2l0LWtleWZyYW1lcyB2 ZXJ0aWNhbCB7CisgICAgICAgICAgICBmcm9tIHsgdG9wOiAwcHg7ICAgfQorICAgICAgICAgICAg dG8gICB7IHRvcDogMjAwcHg7IH0KKyAgICAgICAgfQorICAgIDwvc3R5bGU+CisgICAgPHNjcmlw dCBzcmM9InJlc291cmNlcy9hbmltYXRpb24tdGVzdC1oZWxwZXJzLmpzIiB0eXBlPSJ0ZXh0L2ph dmFzY3JpcHQiIGNoYXJzZXQ9InV0Zi04Ij48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHR5cGU9InRl eHQvamF2YXNjcmlwdCIgY2hhcnNldD0idXRmLTgiPgorICAgICAgICBjb25zdCBleHBlY3RlZFZh bHVlcyA9IFsKKyAgICAgICAgICAvLyBbYW5pbWF0aW9uLW5hbWUsIHRpbWUsIGVsZW1lbnQtaWQs IHByb3BlcnR5LCBleHBlY3RlZC12YWx1ZSwgdG9sZXJhbmNlXQorICAgICAgICAgIFsiaG9yaXpv bnRhbCIsIDAuNSwgImJveCIsICJsZWZ0IiwgMTgsIDEwXSwKKyAgICAgICAgICBbImhvcml6b250 YWwiLCAxLjUsICJib3giLCAibGVmdCIsIDEyNCwgMTBdLAorICAgICAgICAgIFsidmVydGljYWwi LCAwLjUsICJib3giLCAidG9wIiwgNzUsIDEwXSwKKyAgICAgICAgICBbInZlcnRpY2FsIiwgMS41 LCAiYm94IiwgInRvcCIsIDE4MSwgMTBdLAorICAgICAgICBdOworCisgICAgICAgIHJ1bkFuaW1h dGlvblRlc3QoZXhwZWN0ZWRWYWx1ZXMpOworICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+ CisgICAgPGRpdiBpZD0iYm94Ij48L2Rpdj4KKyAgICA8ZGl2IGlkPSJyZXN1bHQiPjwvZGl2Pgor PC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGE1ZDNiNjY1OGVlOTQ3Nzg1MDUzNzM3OTIw NmZkM2UxZDMxNWEyNjguLjE2NmZkNTE5MmJiOGM0NmUzNDJiODhhMDEwZjU4ZDU4MTVkYjQxYTIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMS0wNi0yMSAgWW91bmcgSGFuIExlZSAg PGpveWJyb0Bjb21wYW55MTAwLm5ldD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBhbmltYXRpb24tdGltaW5nLWZ1bmN0aW9uIHByb3BlcnR5IHdpdGgg YSBsaXN0IHVzZXMgZmlyc3QgaXRlbSBmb3IgYWxsIGFuaW1hdGlvbnMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwMzAzCisKKyAgICAgICAgV2hlbiBh biBlbGVtZW50IGhhcyBtdWx0aXBsZSBhbmltYXRpb25zIHRoYXQgaGF2ZSBkaWZmZXJlbnQgdGlt aW5nRnVuY3Rpb25zLAorICAgICAgICB0aGUgcHJvZ3Jlc3Mgb2YgZWFjaCBhbmltYXRpb24gc2hv dWxkIGJlIGNhbGN1bGF0ZWQgdXNpbmcgaXRzIHJlc3BlY3RpdmUgdGltaW5nRnVuY3Rpb24uCisg ICAgICAgIEJ1dCBhdCB0aGlzIHBvaW50LCB0aGUgdGltaW5nRnVuY3Rpb24gb2YgdGhlIGZpcnN0 IGFuaW1hdGlvbiBpcyBvbmx5IHVzZWQgZm9yIHRoZQorICAgICAgICBjYWxjdWxhdGlvbiwgcmVn YXJkbGVzcyBvZiBob3cgbWFueSBhbmltYXRpb25zIHRoZSBlbGVtZW50IGhhcy4KKworICAgICAg ICBUaGUgY29kZSBmb3IgZ2V0dGluZyBhIHRpbWluZ0Z1bmN0aW9uIGlzIGNoYW5nZWQgYnkgdGhp cyBwYXRjaAorICAgICAgICBzbyB0aGF0IHRoZSB0aW1pbmdGdW5jdGlvbiBvZiB0aGUgY29ycmVj dCBhbmltYXRpb24gc2VhcmNoZWQgYnkgaXRzIG5hbWUgd2lsbCBiZSB1c2VkLgorCisgICAgICAg IFRlc3Q6IGFuaW1hdGlvbnMvbXVsdGlwbGUtYW5pbWF0aW9ucy1vbi1hbi1lbGVtZW50Lmh0bWwK KworICAgICAgICAqIHBhZ2UvYW5pbWF0aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmdldEFuaW1hdGlvbkZyb21TdHlsZUJ5TmFtZSk6CisgICAgICAgIChXZWJD b3JlOjpLZXlmcmFtZUFuaW1hdGlvbjo6ZmV0Y2hJbnRlcnZhbEVuZHBvaW50c0ZvclByb3BlcnR5 KToKKwogMjAxMS0wNi0xOCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvYW5pbWF0aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvYW5pbWF0aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNwcAppbmRleCA1ZjE5ZmU0NmY0YWYwZmI0 MDlmY2I5ZjNhZDQ2MWYxODNhYjk1MDliLi4wMGIzMDQ3ZmZlMzU0Zjk1N2MxY2YyNzhmNmRjNjUy NzdjZDU0OWZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9LZXlm cmFtZUFuaW1hdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vS2V5 ZnJhbWVBbmltYXRpb24uY3BwCkBAIC02NSw2ICs2NSwxOSBAQCBLZXlmcmFtZUFuaW1hdGlvbjo6 fktleWZyYW1lQW5pbWF0aW9uKCkKICAgICAgICAgZW5kQW5pbWF0aW9uKCk7CiB9CiAKK3N0YXRp YyBjb25zdCBBbmltYXRpb24qIGdldEFuaW1hdGlvbkZyb21TdHlsZUJ5TmFtZShjb25zdCBSZW5k ZXJTdHlsZSogc3R5bGUsIGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSkKK3sKKyAgICBpZiAoIXN0 eWxlLT5hbmltYXRpb25zKCkpCisgICAgICAgIHJldHVybiAwOworCisgICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBzdHlsZS0+YW5pbWF0aW9ucygpLT5zaXplKCk7IGkrKykgeworICAgICAgICBp ZiAobmFtZSA9PSBzdHlsZS0+YW5pbWF0aW9ucygpLT5hbmltYXRpb24oaSktPm5hbWUoKSkKKyAg ICAgICAgICAgIHJldHVybiBzdHlsZS0+YW5pbWF0aW9ucygpLT5hbmltYXRpb24oaSk7CisgICAg fQorCisgICAgcmV0dXJuIDA7Cit9CisKIHZvaWQgS2V5ZnJhbWVBbmltYXRpb246OmZldGNoSW50 ZXJ2YWxFbmRwb2ludHNGb3JQcm9wZXJ0eShpbnQgcHJvcGVydHksIGNvbnN0IFJlbmRlclN0eWxl KiYgZnJvbVN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSomIHRvU3R5bGUsIGRvdWJsZSYgcHJvZykg Y29uc3QKIHsKICAgICAvLyBGaW5kIHRoZSBmaXJzdCBrZXkKQEAgLTEzNiwxMCArMTQ5LDggQEAg dm9pZCBLZXlmcmFtZUFuaW1hdGlvbjo6ZmV0Y2hJbnRlcnZhbEVuZHBvaW50c0ZvclByb3BlcnR5 KGludCBwcm9wZXJ0eSwgY29uc3QgUmUKICAgICBzY2FsZSA9IDEuMCAvIChuZXh0S2V5ZnJhbWUu a2V5KCkgLSBwcmV2S2V5ZnJhbWUua2V5KCkpOwogCiAgICAgY29uc3QgVGltaW5nRnVuY3Rpb24q IHRpbWluZ0Z1bmN0aW9uID0gMDsKLSAgICBpZiAoZnJvbVN0eWxlLT5hbmltYXRpb25zKCkgJiYg ZnJvbVN0eWxlLT5hbmltYXRpb25zKCktPnNpemUoKSA+IDApIHsKLSAgICAgICAgLy8gV2UgZ2V0 IHRoZSB0aW1pbmcgZnVuY3Rpb24gZnJvbSB0aGUgZmlyc3QgYW5pbWF0aW9uLCBiZWNhdXNlIHdl J3ZlIHN5bnRoZXNpemVkIGEgUmVuZGVyU3R5bGUgZm9yIGVhY2gga2V5ZnJhbWUuCi0gICAgICAg IHRpbWluZ0Z1bmN0aW9uID0gZnJvbVN0eWxlLT5hbmltYXRpb25zKCktPmFuaW1hdGlvbigwKS0+ dGltaW5nRnVuY3Rpb24oKS5nZXQoKTsKLSAgICB9CisgICAgaWYgKGNvbnN0IEFuaW1hdGlvbiog bWF0Y2hlZEFuaW1hdGlvbiA9IGdldEFuaW1hdGlvbkZyb21TdHlsZUJ5TmFtZShmcm9tU3R5bGUs IG5hbWUoKSkpCisgICAgICAgIHRpbWluZ0Z1bmN0aW9uID0gbWF0Y2hlZEFuaW1hdGlvbi0+dGlt aW5nRnVuY3Rpb24oKS5nZXQoKTsKIAogICAgIHByb2cgPSBwcm9ncmVzcyhzY2FsZSwgb2Zmc2V0 LCB0aW1pbmdGdW5jdGlvbik7CiB9Cg== 98188 2011-06-22 09:44:44 -0700 2011-06-22 12:57:25 -0700 Patch bug-60303-20110623014442.patch text/plain 6583 joybro201 U3VidmVyc2lvbiBSZXZpc2lvbjogODkyMDkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyZWQ2NWRjZjQ1MDkxMjQxMGQ2OGVh YWI5YTZkYzE0ZTdhOWM1OWMyLi43MTcyYmNlZjhlZjFlMzJkNjg4M2NhZGM4Y2UwZTNmODU4ZDAz ZmJjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDYtMjEgIFlvdW5nIEhhbiBMZWUgIDxq b3licm9AY29tcGFueTEwMC5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgYW5pbWF0aW9uLXRpbWluZy1mdW5jdGlvbiBwcm9wZXJ0eSB3aXRoIGEg bGlzdCB1c2VzIGZpcnN0IGl0ZW0gZm9yIGFsbCBhbmltYXRpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDMwMworCisgICAgICAgIFdoZW4gYW4g ZWxlbWVudCBoYXMgbXVsdGlwbGUgYW5pbWF0aW9ucyB0aGF0IGhhdmUgZGlmZmVyZW50IHRpbWlu Z0Z1bmN0aW9ucywKKyAgICAgICAgdGhlIHByb2dyZXNzIG9mIGVhY2ggYW5pbWF0aW9uIHNob3Vs ZCBiZSBjYWxjdWxhdGVkIHVzaW5nIGl0cyByZXNwZWN0aXZlIHRpbWluZ0Z1bmN0aW9uLgorICAg ICAgICBCdXQgYXQgdGhpcyBwb2ludCwgdGhlIHRpbWluZ0Z1bmN0aW9uIG9mIHRoZSBmaXJzdCBh bmltYXRpb24gaXMgb25seSB1c2VkIGZvciB0aGUKKyAgICAgICAgY2FsY3VsYXRpb24sIHJlZ2Fy ZGxlc3Mgb2YgaG93IG1hbnkgYW5pbWF0aW9ucyB0aGUgZWxlbWVudCBoYXMuCisKKyAgICAgICAg VGhlIGNvZGUgZm9yIGdldHRpbmcgYSB0aW1pbmdGdW5jdGlvbiBpcyBjaGFuZ2VkIGJ5IHRoaXMg cGF0Y2gKKyAgICAgICAgc28gdGhhdCB0aGUgdGltaW5nRnVuY3Rpb24gb2YgdGhlIGNvcnJlY3Qg YW5pbWF0aW9uIHNlYXJjaGVkIGJ5IGl0cyBuYW1lIHdpbGwgYmUgdXNlZC4KKworICAgICAgICAq IGFuaW1hdGlvbnMvbXVsdGlwbGUtYW5pbWF0aW9ucy10aW1pbmctZnVuY3Rpb24tZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBhbmltYXRpb25zL211bHRpcGxlLWFuaW1hdGlvbnMtdGlt aW5nLWZ1bmN0aW9uLmh0bWw6IEFkZGVkLgorCiAyMDExLTA2LTE4ICBBbGljZSBCb3hoYWxsICA8 YWJveGhhbGxAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IENocmlzIEZsZWl6 YWNoLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9tdWx0aXBsZS1hbmltYXRp b25zLXRpbWluZy1mdW5jdGlvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9hbmltYXRpb25z L211bHRpcGxlLWFuaW1hdGlvbnMtdGltaW5nLWZ1bmN0aW9uLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi5mOWFhZWEzM2E1Y2ExMDc4MzI3NzQ0OGYwNDJkMGY0NWVlNDU4NzY5Ci0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9tdWx0aXBsZS1hbmltYXRpb25zLXRpbWlu Zy1mdW5jdGlvbi1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw1IEBACitQQVNTIC0gImxlZnQiIHBy b3BlcnR5IGZvciAiYm94IiBlbGVtZW50IGF0IDAuNXMgc2F3IHNvbWV0aGluZyBjbG9zZSB0bzog MTgKK1BBU1MgLSAibGVmdCIgcHJvcGVydHkgZm9yICJib3giIGVsZW1lbnQgYXQgMS41cyBzYXcg c29tZXRoaW5nIGNsb3NlIHRvOiAxMjQKK1BBU1MgLSAidG9wIiBwcm9wZXJ0eSBmb3IgImJveCIg ZWxlbWVudCBhdCAwLjVzIHNhdyBzb21ldGhpbmcgY2xvc2UgdG86IDc1CitQQVNTIC0gInRvcCIg cHJvcGVydHkgZm9yICJib3giIGVsZW1lbnQgYXQgMS41cyBzYXcgc29tZXRoaW5nIGNsb3NlIHRv OiAxODEKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9tdWx0aXBsZS1hbmlt YXRpb25zLXRpbWluZy1mdW5jdGlvbi5odG1sIGIvTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9tdWx0 aXBsZS1hbmltYXRpb25zLXRpbWluZy1mdW5jdGlvbi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmYxNTdiMTY0 ZDg4NDhjYjIxZGQ4MmIwZTlhOWQ5ZWE0NmNiYTliMzEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9hbmltYXRpb25zL211bHRpcGxlLWFuaW1hdGlvbnMtdGltaW5nLWZ1bmN0aW9uLmh0 bWwKQEAgLTAsMCArMSw0MiBAQAorPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGU+CisgICAgICAg ICNib3ggeworICAgICAgICAgICAgcG9zaXRpb246IHJlbGF0aXZlOworICAgICAgICAgICAgaGVp Z2h0OiAxMDBweDsKKyAgICAgICAgICAgIHdpZHRoOiAxMDBweDsKKyAgICAgICAgICAgIG1hcmdp bjogMjBweDsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHJlZDsKKyAgICAgICAgICAg IC13ZWJraXQtYW5pbWF0aW9uOgorICAgICAgICAgICAgICAgIGhvcml6b250YWwgMnMgZWFzZS1p biAxIGFsdGVybmF0ZSwKKyAgICAgICAgICAgICAgICB2ZXJ0aWNhbCAycyBlYXNlLW91dCAxIGFs dGVybmF0ZTsKKyAgICAgICAgfQorCisgICAgICAgIEAtd2Via2l0LWtleWZyYW1lcyBob3Jpem9u dGFsIHsKKyAgICAgICAgICAgIGZyb20geyBsZWZ0OiAwcHg7ICAgfQorICAgICAgICAgICAgdG8g ICB7IGxlZnQ6IDIwMHB4OyB9CisgICAgICAgIH0KKworICAgICAgICBALXdlYmtpdC1rZXlmcmFt ZXMgdmVydGljYWwgeworICAgICAgICAgICAgZnJvbSB7IHRvcDogMHB4OyAgIH0KKyAgICAgICAg ICAgIHRvICAgeyB0b3A6IDIwMHB4OyB9CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgorICAgIDxz Y3JpcHQgc3JjPSJyZXNvdXJjZXMvYW5pbWF0aW9uLXRlc3QtaGVscGVycy5qcyIgdHlwZT0idGV4 dC9qYXZhc2NyaXB0IiBjaGFyc2V0PSJ1dGYtOCI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCB0eXBl PSJ0ZXh0L2phdmFzY3JpcHQiIGNoYXJzZXQ9InV0Zi04Ij4KKyAgICAgICAgY29uc3QgZXhwZWN0 ZWRWYWx1ZXMgPSBbCisgICAgICAgICAgLy8gW2FuaW1hdGlvbi1uYW1lLCB0aW1lLCBlbGVtZW50 LWlkLCBwcm9wZXJ0eSwgZXhwZWN0ZWQtdmFsdWUsIHRvbGVyYW5jZV0KKyAgICAgICAgICBbImhv cml6b250YWwiLCAwLjUsICJib3giLCAibGVmdCIsIDE4LCAxMF0sCisgICAgICAgICAgWyJob3Jp em9udGFsIiwgMS41LCAiYm94IiwgImxlZnQiLCAxMjQsIDEwXSwKKyAgICAgICAgICBbInZlcnRp Y2FsIiwgMC41LCAiYm94IiwgInRvcCIsIDc1LCAxMF0sCisgICAgICAgICAgWyJ2ZXJ0aWNhbCIs IDEuNSwgImJveCIsICJ0b3AiLCAxODEsIDEwXSwKKyAgICAgICAgXTsKKworICAgICAgICBydW5B bmltYXRpb25UZXN0KGV4cGVjdGVkVmFsdWVzKTsKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxi b2R5PgorICAgIDxkaXYgaWQ9ImJveCI+PC9kaXY+CisgICAgPGRpdiBpZD0icmVzdWx0Ij48L2Rp dj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhNWQzYjY2NThlZTk0Nzc4NTA1Mzcz NzkyMDZmZDNlMWQzMTVhMjY4Li5jNDJiY2Q4MzNmOWRiZWI4ODk4ZmE0YzI4NDNmOTkzZDkyZmJk ZTJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDYtMjEgIFlvdW5nIEhhbiBM ZWUgIDxqb3licm9AY29tcGFueTEwMC5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgYW5pbWF0aW9uLXRpbWluZy1mdW5jdGlvbiBwcm9wZXJ0eSB3 aXRoIGEgbGlzdCB1c2VzIGZpcnN0IGl0ZW0gZm9yIGFsbCBhbmltYXRpb25zCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDMwMworCisgICAgICAgIFdo ZW4gYW4gZWxlbWVudCBoYXMgbXVsdGlwbGUgYW5pbWF0aW9ucyB0aGF0IGhhdmUgZGlmZmVyZW50 IHRpbWluZ0Z1bmN0aW9ucywKKyAgICAgICAgdGhlIHByb2dyZXNzIG9mIGVhY2ggYW5pbWF0aW9u IHNob3VsZCBiZSBjYWxjdWxhdGVkIHVzaW5nIGl0cyByZXNwZWN0aXZlIHRpbWluZ0Z1bmN0aW9u LgorICAgICAgICBCdXQgYXQgdGhpcyBwb2ludCwgdGhlIHRpbWluZ0Z1bmN0aW9uIG9mIHRoZSBm aXJzdCBhbmltYXRpb24gaXMgb25seSB1c2VkIGZvciB0aGUKKyAgICAgICAgY2FsY3VsYXRpb24s IHJlZ2FyZGxlc3Mgb2YgaG93IG1hbnkgYW5pbWF0aW9ucyB0aGUgZWxlbWVudCBoYXMuCisKKyAg ICAgICAgVGhlIGNvZGUgZm9yIGdldHRpbmcgYSB0aW1pbmdGdW5jdGlvbiBpcyBjaGFuZ2VkIGJ5 IHRoaXMgcGF0Y2gKKyAgICAgICAgc28gdGhhdCB0aGUgdGltaW5nRnVuY3Rpb24gb2YgdGhlIGNv cnJlY3QgYW5pbWF0aW9uIHNlYXJjaGVkIGJ5IGl0cyBuYW1lIHdpbGwgYmUgdXNlZC4KKworICAg ICAgICBUZXN0OiBhbmltYXRpb25zL211bHRpcGxlLWFuaW1hdGlvbnMtdGltaW5nLWZ1bmN0aW9u Lmh0bWwKKworICAgICAgICAqIHBhZ2UvYW5pbWF0aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OmdldEFuaW1hdGlvbkZyb21TdHlsZUJ5TmFtZSk6CisgICAgICAg IChXZWJDb3JlOjpLZXlmcmFtZUFuaW1hdGlvbjo6ZmV0Y2hJbnRlcnZhbEVuZHBvaW50c0ZvclBy b3BlcnR5KToKKwogMjAxMS0wNi0xOCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvYW5pbWF0aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNwcAppbmRleCA1ZjE5ZmU0NmY0 YWYwZmI0MDlmY2I5ZjNhZDQ2MWYxODNhYjk1MDliLi4wMGIzMDQ3ZmZlMzU0Zjk1N2MxY2YyNzhm NmRjNjUyNzdjZDU0OWZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlv bi9LZXlmcmFtZUFuaW1hdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRp b24vS2V5ZnJhbWVBbmltYXRpb24uY3BwCkBAIC02NSw2ICs2NSwxOSBAQCBLZXlmcmFtZUFuaW1h dGlvbjo6fktleWZyYW1lQW5pbWF0aW9uKCkKICAgICAgICAgZW5kQW5pbWF0aW9uKCk7CiB9CiAK K3N0YXRpYyBjb25zdCBBbmltYXRpb24qIGdldEFuaW1hdGlvbkZyb21TdHlsZUJ5TmFtZShjb25z dCBSZW5kZXJTdHlsZSogc3R5bGUsIGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSkKK3sKKyAgICBp ZiAoIXN0eWxlLT5hbmltYXRpb25zKCkpCisgICAgICAgIHJldHVybiAwOworCisgICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBzdHlsZS0+YW5pbWF0aW9ucygpLT5zaXplKCk7IGkrKykgeworICAg ICAgICBpZiAobmFtZSA9PSBzdHlsZS0+YW5pbWF0aW9ucygpLT5hbmltYXRpb24oaSktPm5hbWUo KSkKKyAgICAgICAgICAgIHJldHVybiBzdHlsZS0+YW5pbWF0aW9ucygpLT5hbmltYXRpb24oaSk7 CisgICAgfQorCisgICAgcmV0dXJuIDA7Cit9CisKIHZvaWQgS2V5ZnJhbWVBbmltYXRpb246OmZl dGNoSW50ZXJ2YWxFbmRwb2ludHNGb3JQcm9wZXJ0eShpbnQgcHJvcGVydHksIGNvbnN0IFJlbmRl clN0eWxlKiYgZnJvbVN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSomIHRvU3R5bGUsIGRvdWJsZSYg cHJvZykgY29uc3QKIHsKICAgICAvLyBGaW5kIHRoZSBmaXJzdCBrZXkKQEAgLTEzNiwxMCArMTQ5 LDggQEAgdm9pZCBLZXlmcmFtZUFuaW1hdGlvbjo6ZmV0Y2hJbnRlcnZhbEVuZHBvaW50c0ZvclBy b3BlcnR5KGludCBwcm9wZXJ0eSwgY29uc3QgUmUKICAgICBzY2FsZSA9IDEuMCAvIChuZXh0S2V5 ZnJhbWUua2V5KCkgLSBwcmV2S2V5ZnJhbWUua2V5KCkpOwogCiAgICAgY29uc3QgVGltaW5nRnVu Y3Rpb24qIHRpbWluZ0Z1bmN0aW9uID0gMDsKLSAgICBpZiAoZnJvbVN0eWxlLT5hbmltYXRpb25z KCkgJiYgZnJvbVN0eWxlLT5hbmltYXRpb25zKCktPnNpemUoKSA+IDApIHsKLSAgICAgICAgLy8g V2UgZ2V0IHRoZSB0aW1pbmcgZnVuY3Rpb24gZnJvbSB0aGUgZmlyc3QgYW5pbWF0aW9uLCBiZWNh dXNlIHdlJ3ZlIHN5bnRoZXNpemVkIGEgUmVuZGVyU3R5bGUgZm9yIGVhY2gga2V5ZnJhbWUuCi0g ICAgICAgIHRpbWluZ0Z1bmN0aW9uID0gZnJvbVN0eWxlLT5hbmltYXRpb25zKCktPmFuaW1hdGlv bigwKS0+dGltaW5nRnVuY3Rpb24oKS5nZXQoKTsKLSAgICB9CisgICAgaWYgKGNvbnN0IEFuaW1h dGlvbiogbWF0Y2hlZEFuaW1hdGlvbiA9IGdldEFuaW1hdGlvbkZyb21TdHlsZUJ5TmFtZShmcm9t U3R5bGUsIG5hbWUoKSkpCisgICAgICAgIHRpbWluZ0Z1bmN0aW9uID0gbWF0Y2hlZEFuaW1hdGlv bi0+dGltaW5nRnVuY3Rpb24oKS5nZXQoKTsKIAogICAgIHByb2cgPSBwcm9ncmVzcyhzY2FsZSwg b2Zmc2V0LCB0aW1pbmdGdW5jdGlvbik7CiB9Cg==