40841 2010-06-18 09:08:07 -0700 [Qt] Node that have both an opacity and a transform animation on them seem not to fire 2011-05-17 11:58:00 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 smagnuso kling ademar alessandro.portale ariya.hidayat commit-queue eric jarred kling laszlo.gombos noam oldest_to_newest 239962 0 smagnuso 2010-06-18 09:08:07 -0700 I have attached a manual test case that reproduces the problem on my page as well as a proposed fix. The timing is not correct either, but I will submit that as a separate bug once I determine what is going on there. 239979 1 59122 smagnuso 2010-06-18 09:31:06 -0700 Created attachment 59122 Proposed patch (with testcase) 239980 2 59123 smagnuso 2010-06-18 09:32:21 -0700 Created attachment 59123 Test case tar'd up. 240232 3 noam 2010-06-18 17:38:34 -0700 Ah, that explains a few things I was seeing :) Good patch. 241517 4 59438 smagnuso 2010-06-22 16:12:49 -0700 Created attachment 59438 Rediff against trunk 261928 5 ariya.hidayat 2010-08-08 12:57:58 -0700 Sam, why the patch does not include the test? 264668 6 59438 kenneth 2010-08-14 07:35:26 -0700 Comment on attachment 59438 Rediff against trunk WebCore/platform/graphics/qt/GraphicsLayerQt.cpp:634 + else if (!m_state.drawsContent && m_layer->drawsContent()) Is this an important differencial? WebCore/platform/graphics/qt/GraphicsLayerQt.cpp:1194 + virtual AnimatedPropertyID getAnimatedProperty() const = 0; We normally do not use get. Maybe just call it animatedProperty() 294231 7 eric 2010-10-14 11:35:05 -0700 Are there plans to update this patch? 297707 8 smagnuso 2010-10-21 16:25:26 -0700 (In reply to comment #6) > (From update of attachment 59438 [details]) > WebCore/platform/graphics/qt/GraphicsLayerQt.cpp:634 > + else if (!m_state.drawsContent && m_layer->drawsContent()) > Is this an important differencial? > For the duration of this function, yes. It sync's the two at the end of the function but this conditional just notices that the state has changed and what action to take. > WebCore/platform/graphics/qt/GraphicsLayerQt.cpp:1194 > + virtual AnimatedPropertyID getAnimatedProperty() const = 0; > We normally do not use get. Maybe just call it animatedProperty() Fair enough, will rename. 297724 9 71509 smagnuso 2010-10-21 16:50:17 -0700 Created attachment 71509 Patch 298350 10 noam 2010-10-23 01:19:07 -0700 Sam, this looks like a good patch - would you like it committed or are you waiting for another patch? 298614 11 71509 commit-queue 2010-10-24 10:01:47 -0700 Comment on attachment 71509 Patch Rejecting patch 71509 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']" exit_code: 2 Last 500 characters of output: ests/websocket/tests/workers ...... http/tests/workers ..... http/tests/xhtmlmp . http/tests/xmlhttprequest ........................................................................................................................................................................... http/tests/xmlhttprequest/web-apps ............... http/tests/xmlhttprequest/workers ......... 547.40s total testing time 21631 test cases (99%) succeeded 1 test case (<1%) was new 11 test cases (<1%) had stderr output Full output: http://queues.webkit.org/results/4615058 322263 12 71509 eric 2010-12-14 15:14:22 -0800 Comment on attachment 71509 Patch An updated patch is needed which includes -expected.txt files. 405110 13 kling 2011-05-17 09:58:45 -0700 *** Bug 59198 has been marked as a duplicate of this bug. *** 405117 14 kling 2011-05-17 10:12:28 -0700 I'll generate the missing -expected.txt and land this. 405124 15 kling 2011-05-17 10:17:30 -0700 Committed r86680: <http://trac.webkit.org/changeset/86680> 405208 16 ademar 2011-05-17 11:57:47 -0700 Revision r86680 cherry-picked into qtwebkit-2.2 with commit 4495597 <http://gitorious.org/webkit/qtwebkit/commit/4495597> 59122 2010-06-18 09:31:06 -0700 2010-06-22 16:12:49 -0700 Proposed patch (with testcase) bug-40841.patch text/plain 10594 smagnuso RnJvbSBjYzg1NDI4YzYxMzVmYTRhNDVlMGM4YWZlMmNjMDhlNGE0OWJlNWZkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTYW0gTWFnbnVzb24gPHNtYWdudXNvbkBuZXRmbGl4LmNvbT4K RGF0ZTogRnJpLCAxOCBKdW4gMjAxMCAwOToyODo1NSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gTm9kZSB0aGF0IGhhdmUgYm90aCBhbiBvcGFjaXR5IGFuZCBhIHRyYW5zZm9ybSBhbmltYXRp b24gb24gdGhlbSBzZWVtIG5vdCB0byBmaXJlCiBidWctNDA4NDEKCi0tLQogTGF5b3V0VGVzdHMv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEyICsrKwogLi4uL2Nv bXBvc2l0aW5nL2FuaW1hdGlvbi9idXN5LWluZGljYXRvci1uby5wbmcgICAgfCAgQmluIDAgLT4g MTY4IGJ5dGVzCiAuLi4vY29tcG9zaXRpbmcvYW5pbWF0aW9uL2J1c3ktaW5kaWNhdG9yLmh0bWwg ICAgICB8ICAgOTMgKysrKysrKysrKysrKysrKysrKysKIC4uLi9jb21wb3NpdGluZy9hbmltYXRp b24vYnVzeS1pbmRpY2F0b3IucG5nICAgICAgIHwgIEJpbiAwIC0+IDE5MCBieXRlcwogV2ViQ29y ZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE4ICsrKysK IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcCAgIHwgICAy MCArKystCiA2IGZpbGVzIGNoYW5nZWQsIDEzOCBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygt KQogY3JlYXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL2NvbXBvc2l0aW5nL2FuaW1hdGlvbi9i dXN5LWluZGljYXRvci1uby5wbmcKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9jb21w b3NpdGluZy9hbmltYXRpb24vYnVzeS1pbmRpY2F0b3IuaHRtbAogY3JlYXRlIG1vZGUgMTAwNjQ0 IExheW91dFRlc3RzL2NvbXBvc2l0aW5nL2FuaW1hdGlvbi9idXN5LWluZGljYXRvci5wbmcKCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggNmMzNjQ0MC4uYWEwMmYzZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEwLTA2LTE4 ICBTYW0gTWFnbnVzb24gIDxzbWFnbnVzb25AbmV0ZmxpeC5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBOb2RlIHRoYXQgaGF2ZSBib3Ro IGFuIG9wYWNpdHkgYW5kIGEgdHJhbnNmb3JtIGFuaW1hdGlvbiBvbgorICAgICAgICB0aGVtIHNl ZW0gbm90IHRvIGZpcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTQwODQxCisKKyAgICAgICAgKiBjb21wb3NpdGluZy9hbmltYXRpb24vYnVzeS1pbmRp Y2F0b3Itbm8ucG5nOiBBZGRlZC4KKyAgICAgICAgKiBjb21wb3NpdGluZy9hbmltYXRpb24vYnVz eS1pbmRpY2F0b3IuaHRtbDogQWRkZWQuCisgICAgICAgICogY29tcG9zaXRpbmcvYW5pbWF0aW9u L2J1c3ktaW5kaWNhdG9yLnBuZzogQWRkZWQuCisKIDIwMTAtMDYtMDIgIE5pY28gV2ViZXIgIDx0 aGFraXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2FuaW1hdGlvbi9idXN5LWluZGlj YXRvci1uby5wbmcgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9hbmltYXRpb24vYnVzeS1pbmRp Y2F0b3Itbm8ucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdkM2ZkMWI2NGUzYjUxMjU4MWFhMzQyM2ZmNTNlMDM2 ZTZlMmNkYmQKR0lUIGJpbmFyeSBwYXRjaApsaXRlcmFsIDE2OAp6Y21lQVNATj8ob2xIeWB1VkJx IWlhMHZwXjVrTUA7ITNIRGAxIzdrZURhakpvaD8zeV53MzcwfnFFclVRbD5EU3IKejE8JX5YXndn bCMjRldheWxjX2Q5TVA4bVJqdipEZC1kdEc3JWIqfkA7PChfKHw1XktAS0IjYzhiVlhMNT8waExg CnpjLXVBZnMoKkNhdVVrXlN7PihmUTh5SnxgYlBoQnlhdkxOdHZoaFNURmZ4bEo5SnMlb01TPytF UzE5QGlYUjk7TgpPUjBkQzFLYkxoKjJ+N1p0SCFfRi0KCmxpdGVyYWwgMApIY21WP2QwMDAwMQoK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2FuaW1hdGlvbi9idXN5LWluZGlj YXRvci5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvYW5pbWF0aW9uL2J1c3ktaW5kaWNh dG9yLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMWRlM2EzMQotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2FuaW1hdGlvbi9idXN5LWlu ZGljYXRvci5odG1sCkBAIC0wLDAgKzEsOTMgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cisg ICAgPGhlYWQ+CisgICAgICAgIDx0aXRsZT5CdXN5ITwvdGl0bGU+CisgICAgICAgIDxzdHlsZSB0 eXBlPSJ0ZXh0L2NzcyIgbWVkaWE9InNjcmVlbiI+CisgICAgICAgICAgICAgLmFwcC1zdGFydHVw ICNhcHAtbG9hZGluZyB7CisgICAgICAgICAgICAgICB3aWR0aDogMzAwcHg7CisgICAgICAgICAg ICAgICBoZWlnaHQ6IDEwMHB4OworICAgICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOwor ICAgICAgICAgICAgICAgYmFja2dyb3VuZDogIzAwRkYwMDsKKyAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgLmFwcC1zdGFydHVwICNhcHAtbG9hZGluZy1wcm9ncmVzcyB7CisgICAgICAgICAg ICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAgICAgICAgICB0b3A6IDMwcHg7CisgICAg ICAgICAgICAgICBsZWZ0OiAxMDBweDsKKyAgICAgICAgICAgICB9CisgICAgICAgICAgICAucHJv Z3Jlc3MtaW5kaWNhdG9yIHsKKyAgICAgICAgICAgICAgIHdpZHRoOiA5NHB4OworICAgICAgICAg ICAgICAgaGVpZ2h0OiAzMHB4OworICAgICAgICAgICAgICAgYmFja2dyb3VuZDogdXJsKGJ1c3kt aW5kaWNhdG9yLW5vLnBuZykgbm8tcmVwZWF0IGNlbnRlciBjZW50ZXI7CisgICAgICAgICAgICAg ICBkaXNwbGF5OiBub25lOworICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAucHJvZ3Jlc3Mt aW5kaWNhdG9yID4gZGl2IHsKKyAgICAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAg ICAgICAgICAgICAgIGJhY2tncm91bmQ6IHVybChidXN5LWluZGljYXRvci5wbmcpIG5vLXJlcGVh dDsKKyAgICAgICAgICAgICAgIHdpZHRoOiAxOHB4OworICAgICAgICAgICAgICAgaGVpZ2h0OiAz MHB4OworICAgICAgICAgICAgICAgb3BhY2l0eTogMDsKKyAgICAgICAgICAgICAgIC13ZWJraXQt YW5pbWF0aW9uLWR1cmF0aW9uOiAyLjRzOworICAgICAgICAgICAgICAgLXdlYmtpdC1hbmltYXRp b24taXRlcmF0aW9uLWNvdW50OiBpbmZpbml0ZTsKKyAgICAgICAgICAgICB9CisgICAgICAgICAg ICAgLnByb2dyZXNzLWluZGljYXRvci52aXNpYmxlIC5wcm9ncmVzcy1pbmRpY2F0b3IwIHsKKyAg ICAgICAgICAgICAgIGxlZnQ6IDBweDsKKyAgICAgICAgICAgICAgIC13ZWJraXQtYW5pbWF0aW9u LWRlbGF5OiAwLjRzOworICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAucHJvZ3Jlc3MtaW5k aWNhdG9yLnZpc2libGUgLnByb2dyZXNzLWluZGljYXRvcjEgeworICAgICAgICAgICAgICAgbGVm dDogMTlweDsKKyAgICAgICAgICAgICAgIC13ZWJraXQtYW5pbWF0aW9uLWRlbGF5OiAwLjhzOwor ICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAucHJvZ3Jlc3MtaW5kaWNhdG9yLnZpc2libGUg LnByb2dyZXNzLWluZGljYXRvcjIgeworICAgICAgICAgICAgICAgbGVmdDogMzhweDsKKyAgICAg ICAgICAgICAgIC13ZWJraXQtYW5pbWF0aW9uLWRlbGF5OiAxLjJzOworICAgICAgICAgICAgIH0K KyAgICAgICAgICAgICAucHJvZ3Jlc3MtaW5kaWNhdG9yLnZpc2libGUgLnByb2dyZXNzLWluZGlj YXRvcjMgeworICAgICAgICAgICAgICAgbGVmdDogNTdweDsKKyAgICAgICAgICAgICAgIC13ZWJr aXQtYW5pbWF0aW9uLWRlbGF5OiAxLjZzOworICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAu cHJvZ3Jlc3MtaW5kaWNhdG9yLnZpc2libGUgLnByb2dyZXNzLWluZGljYXRvcjQgeworICAgICAg ICAgICAgICAgbGVmdDogNzZweDsKKyAgICAgICAgICAgICAgIC13ZWJraXQtYW5pbWF0aW9uLWRl bGF5OiAyczsKKyAgICAgICAgICAgICB9CisgICAgICAgICAgICAgLnByb2dyZXNzLWluZGljYXRv ci52aXNpYmxlIHsgZGlzcGxheTogYmxvY2s7IH0KKyAgICAgICAgICAgICAucHJvZ3Jlc3MtaW5k aWNhdG9yLnZpc2libGUgPiBkaXYgeyAtd2Via2l0LWFuaW1hdGlvbi1wbGF5LXN0YXRlOiBydW5u aW5nOyB9CisKKyAgICAgICAgICAgICBALXdlYmtpdC1rZXlmcmFtZXMgc3Bpbm5lciB7CisgICAg ICAgICAgICAgICAgIDAlIHsKKyAgICAgICAgICAgICAgICAgICAgIC13ZWJraXQtdHJhbnNmb3Jt OiBzY2FsZSgwLjcpOworICAgICAgICAgICAgICAgICAgICAgb3BhY2l0eTogMTsKKyAgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgICAgICAxMCUgeworICAgICAgICAgICAgICAgICAgICAg LXdlYmtpdC10cmFuc2Zvcm06IHNjYWxlKDEpOworICAgICAgICAgICAgICAgICAgICAgb3BhY2l0 eTogMTsKKyAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAyNSUgeworICAgICAg ICAgICAgICAgICAgICAgLXdlYmtpdC10cmFuc2Zvcm06IHNjYWxlKDAuNyk7CisgICAgICAgICAg ICAgICAgICAgICBvcGFjaXR5OiAxOworICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAg ICAgIDMwJSB7CisgICAgICAgICAgICAgICAgICAgICAtd2Via2l0LXRyYW5zZm9ybTogc2NhbGUo MC43KTsKKyAgICAgICAgICAgICAgICAgICAgIG9wYWNpdHk6IDA7CisgICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgICAgMTAwJSB7CisgICAgICAgICAgICAgICAgICAgICAtd2Via2l0 LXRyYW5zZm9ybTogc2NhbGUoMC43KTsKKyAgICAgICAgICAgICAgICAgICAgIG9wYWNpdHk6IDA7 CisgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICB9CisgICAgICAgICAgICAgLnByb2dy ZXNzLWluZGljYXRvci52aXNpYmxlID4gZGl2IHsKKyAgICAgICAgICAgICAgICAgLXdlYmtpdC1h bmltYXRpb24tbmFtZTogc3Bpbm5lcjsKKyAgICAgICAgICAgICB9CisgICAgPC9zdHlsZT4KKyAg ICA8L2hlYWQ+CisgICAgPGJvZHkgY2xhc3M9ImFwcC1zdGFydHVwIj4KKyAgICAgICAgPGRpdiBp ZD0iYXBwLWxvYWRpbmciPgorICAgICAgICAgICAgPGRpdiBpZD0iYXBwLWxvYWRpbmctcHJvZ3Jl c3MiIGNsYXNzPSJwcm9ncmVzcy1pbmRpY2F0b3IgdmlzaWJsZSI+CisgICAgICAgICAgICAgICAg PGRpdiBjbGFzcz0icHJvZ3Jlc3MtaW5kaWNhdG9yMCI+PC9kaXY+CisgICAgICAgICAgICAgICAg PGRpdiBjbGFzcz0icHJvZ3Jlc3MtaW5kaWNhdG9yMSI+PC9kaXY+CisgICAgICAgICAgICAgICAg PGRpdiBjbGFzcz0icHJvZ3Jlc3MtaW5kaWNhdG9yMiI+PC9kaXY+CisgICAgICAgICAgICAgICAg PGRpdiBjbGFzcz0icHJvZ3Jlc3MtaW5kaWNhdG9yMyI+PC9kaXY+CisgICAgICAgICAgICAgICAg PGRpdiBjbGFzcz0icHJvZ3Jlc3MtaW5kaWNhdG9yNCI+PC9kaXY+CisgICAgICAgICAgICA8L2Rp dj4KKyAgICAgICAgPC9kaXY+CisgICAgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvY29tcG9zaXRpbmcvYW5pbWF0aW9uL2J1c3ktaW5kaWNhdG9yLnBuZyBiL0xheW91 dFRlc3RzL2NvbXBvc2l0aW5nL2FuaW1hdGlvbi9idXN5LWluZGljYXRvci5wbmcKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uYzIwZDU1M2I2ODQzNmQwOWVlYjI0ZDAzYWQwY2E4M2MyMWMzYjdiZQpHSVQgYmluYXJ5IHBh dGNoCmxpdGVyYWwgMTkwCnpjbWVBU0BOPyhvbEh5YHVWQnEhaWEwdnBeTE8/OVghMn40Tjw9dzBY UWojVUU1aGNPLVgoaT19TVgzeXFEZnZtTQp6M1pBKSU+OFV9Zmk3QXpaQ3NTPkppVnszczk3OEhA Q0c5REZlUWtnSnw5e1BsYX5nUmp1cXgpVHY5WVBLWkRLZSoKei1AZCtNMyhMOC1FYWYyNklsUHk/ ZVNhVVg2cT54ZmNSfCppejlafFU/b009Qjwjd157c0BiMiE/bVgjXzdqMzJUCms3a0BNWjVwS058 JXAzKmBSP2hwJlImS1U/MEpNdzIpNzgmcW9sYDsrME96RGVFJnU9awoKbGl0ZXJhbCAwCkhjbVY/ ZDAwMDAxCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCAxZDlkNzM5Li43YWI5MzgwIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEwLTA2LTE4ICBTYW0g TWFnbnVzb24gIDxzbWFnbnVzb25AbmV0ZmxpeC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBOb2RlIHRoYXQgaGF2ZSBib3RoIGFuIG9w YWNpdHkgYW5kIGEgdHJhbnNmb3JtIGFuaW1hdGlvbiBvbgorICAgICAgICB0aGVtIHNlZW0gbm90 IHRvIGZpcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQwODQxCisKKyAgICAgICAgVGVzdDogY29tcG9zaXRpbmcvYW5pbWF0aW9uL2J1c3ktaW5kaWNh dG9yLmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJR dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyUXRJbXBsOjpyZWNhY2hlKToK KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJRdEltcGw6OmZsdXNoQ2hhbmdlcyk6Cisg ICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyUXQ6OnNldENvbnRlbnRzVG9JbWFnZSk6Cisg ICAgICAgIChXZWJDb3JlOjpUcmFuc2Zvcm1BbmltYXRpb25RdDo6Z2V0QW5pbWF0ZWRQcm9wZXJ0 eSk6CisgICAgICAgIChXZWJDb3JlOjpPcGFjaXR5QW5pbWF0aW9uUXQ6OmdldEFuaW1hdGVkUHJv cGVydHkpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclF0OjphZGRBbmltYXRpb24p OgorCiAyMDEwLTA2LTA3ICBKb2NlbHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tp YS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRpZmYgLS1naXQg YS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAgYi9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAKaW5kZXggYWQyZWM5 Yy4uZWEwNTFiNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFw aGljc0xheWVyUXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhp Y3NMYXllclF0LmNwcApAQCAtMzMyLDcgKzMzMiw3IEBAIFFQaXhtYXAgR3JhcGhpY3NMYXllclF0 SW1wbDo6cmVjYWNoZShjb25zdCBRUmVnaW9uJiByZWdpb25Ub1VwZGF0ZSkKICAgICBtX2xheWVy LT5wYWludEdyYXBoaWNzTGF5ZXJDb250ZW50cyhnYywgcmVnaW9uLmJvdW5kaW5nUmVjdCgpKTsK ICAgICBwYWludGVyLmVuZCgpOwogCi0gICAgbV9iYWNraW5nU3RvcmVLZXkgPSBRUGl4bWFwQ2Fj aGU6Omluc2VydChwaXhtYXApOyAgICAKKyAgICBtX2JhY2tpbmdTdG9yZUtleSA9IFFQaXhtYXBD YWNoZTo6aW5zZXJ0KHBpeG1hcCk7CiAgICAgcmV0dXJuIHBpeG1hcDsKIH0KIApAQCAtNTc5LDcg KzU3OSw3IEBAIHZvaWQgR3JhcGhpY3NMYXllclF0SW1wbDo6Zmx1c2hDaGFuZ2VzKGJvb2wgcmVj dXJzaXZlLCBib29sIGZvcmNlVXBkYXRlVHJhbnNmb3JtCiAgICAgICAgIGNhc2UgSFRNTENvbnRl bnRUeXBlOgogICAgICAgICAgICAgaWYgKG1fcGVuZGluZ0NvbnRlbnQuY29udGVudFR5cGUgIT0g bV9jdXJyZW50Q29udGVudC5jb250ZW50VHlwZSkKICAgICAgICAgICAgICAgICB1cGRhdGUoKTsK LSAgICAgICAgICAgIGlmICghbV9zdGF0ZS5kcmF3c0NvbnRlbnQgJiYgbV9sYXllci0+ZHJhd3ND b250ZW50KCkpCisgICAgICAgICAgICBlbHNlIGlmICghbV9zdGF0ZS5kcmF3c0NvbnRlbnQgJiYg bV9sYXllci0+ZHJhd3NDb250ZW50KCkpCiAgICAgICAgICAgICAgICAgdXBkYXRlKCk7CiAKICAg ICAgICAgICAgIHNldEZsYWcoSXRlbUhhc05vQ29udGVudHMsICFtX2xheWVyLT5kcmF3c0NvbnRl bnQoKSk7CkBAIC02NTUsNyArNjU1LDcgQEAgYWZ0ZXJMYXllckNoYW5nZXM6CiAgICAgICAgIHVw ZGF0ZVRyYW5zZm9ybSgpOwogCiAgICAgaWYgKCFyZWN1cnNpdmUpCi0gICAgICAgIHJldHVybjsg ICAgCisgICAgICAgIHJldHVybjsKIAogICAgIFFMaXN0PFFHcmFwaGljc0l0ZW0qPiBjaGlsZHJl biA9IGNoaWxkSXRlbXMoKTsKICAgICBpZiAobV9zdGF0ZS5tYXNrTGF5ZXIpCkBAIC05MjksNyAr OTI5LDcgQEAgdm9pZCBHcmFwaGljc0xheWVyUXQ6OnNldENvbnRlbnRzVG9JbWFnZShJbWFnZSog aW1hZ2UpCiAgICAgICAgICAgICBtX2ltcGwtPm1fcGVuZGluZ0NvbnRlbnQucGl4bWFwID0gKnB4 bTsKICAgICAgICAgICAgIG1faW1wbC0+bV9wZW5kaW5nQ29udGVudC5jb250ZW50VHlwZSA9IEdy YXBoaWNzTGF5ZXJRdEltcGw6OlBpeG1hcENvbnRlbnRUeXBlOwogICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICB9ICAgICAgICAKKyAgICAgICAgfQogICAgIH0KICAgICBtX2ltcGwtPm1fcGVu ZGluZ0NvbnRlbnQucGl4bWFwID0gUVBpeG1hcCgpOwogfQpAQCAtMTA3MSw2ICsxMDcxLDkgQEAg cHVibGljOgogICAgIHsKICAgICB9CiAKKworICAgIHZpcnR1YWwgQW5pbWF0ZWRQcm9wZXJ0eUlE IGdldEFuaW1hdGVkUHJvcGVydHkoKSBjb25zdCA9IDA7CisKICAgICB2aXJ0dWFsIHZvaWQgdXBk YXRlU3RhdGUoUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSBuZXdTdGF0ZSwgUUFic3RyYWN0QW5p bWF0aW9uOjpTdGF0ZSBvbGRTdGF0ZSkKICAgICB7CiAgICAgICAgIFFBYnN0cmFjdEFuaW1hdGlv bjo6dXBkYXRlU3RhdGUobmV3U3RhdGUsIG9sZFN0YXRlKTsKQEAgLTExODAsNiArMTE4Myw4IEBA IHB1YmxpYzoKICAgICAgICAgICAgIHNldEN1cnJlbnRUaW1lKDEpOwogICAgIH0KIAorICAgIHZp cnR1YWwgQW5pbWF0ZWRQcm9wZXJ0eUlEIGdldEFuaW1hdGVkUHJvcGVydHkoKSBjb25zdCB7IHJl dHVybiBBbmltYXRlZFByb3BlcnR5V2Via2l0VHJhbnNmb3JtOyB9CisKICAgICAvLyB0aGUgaWRl YSBpcyB0aGF0IHdlIGxldCBXZWJDb3JlIG1hbmFnZSB0aGUgdHJhbnNmb3JtLW9wZXJhdGlvbnMK ICAgICAvLyBhbmQgUXQganVzdCBtYW5hZ2VzIHRoZSBhbmltYXRpb24gaGVhcnRiZWF0IGFuZCB0 aGUgYm90dG9tLWxpbmUgUVRyYW5zZm9ybQogICAgIC8vIHdlIGdldCB0aGUgcGVyZm9ybWFuY2Ug bm90IGJ5IHVzaW5nIFFUcmFuc2Zvcm0gaW5zdGVhZCBvZiBUcmFuc2Zvcm1hdGlvbk1hdHJpeCwg YnV0IGJ5IHByb3BlciBjYWNoaW5nIG9mCkBAIC0xMjQ4LDYgKzEyNTMsOCBAQCBwdWJsaWM6CiAg ICAgICAgICAgICBzZXRDdXJyZW50VGltZSgxKTsKICAgICB9CiAKKyAgICB2aXJ0dWFsIEFuaW1h dGVkUHJvcGVydHlJRCBnZXRBbmltYXRlZFByb3BlcnR5KCkgY29uc3QgeyByZXR1cm4gQW5pbWF0 ZWRQcm9wZXJ0eU9wYWNpdHk7IH0KKwogICAgIHZpcnR1YWwgdm9pZCBhcHBseUZyYW1lKGNvbnN0 IHFyZWFsJiBmcm9tVmFsdWUsIGNvbnN0IHFyZWFsJiB0b1ZhbHVlLCBxcmVhbCBwcm9ncmVzcykK ICAgICB7CiAgICAgICAgIHFyZWFsIG9wYWNpdHkgPSBxQm91bmQocXJlYWwoMCksIGZyb21WYWx1 ZSArICh0b1ZhbHVlLWZyb21WYWx1ZSkqcHJvZ3Jlc3MsIHFyZWFsKDEpKTsKQEAgLTEyODgsOCAr MTI5NSwxMSBAQCBib29sIEdyYXBoaWNzTGF5ZXJRdDo6YWRkQW5pbWF0aW9uKGNvbnN0IEtleWZy YW1lVmFsdWVMaXN0JiB2YWx1ZXMsIGNvbnN0IEludFNpegogICAgIGZvciAoUUxpc3Q8UVdlYWtQ b2ludGVyPFFBYnN0cmFjdEFuaW1hdGlvbj4gPjo6aXRlcmF0b3IgaXQgPSBtX2ltcGwtPm1fYW5p bWF0aW9ucy5iZWdpbigpOyBpdCAhPSBtX2ltcGwtPm1fYW5pbWF0aW9ucy5lbmQoKTsgKytpdCkg ewogICAgICAgICBpZiAoKml0KSB7CiAgICAgICAgICAgICBBbmltYXRpb25RdEJhc2UqIGN1ckFu aW1hdGlvbiA9IHN0YXRpY19jYXN0PEFuaW1hdGlvblF0QmFzZSo+KGl0LT5kYXRhKCkpOwotICAg ICAgICAgICAgaWYgKGN1ckFuaW1hdGlvbiAmJiBjdXJBbmltYXRpb24tPm1fd2Via2l0QW5pbWF0 aW9uID09IGFuaW0pCisgICAgICAgICAgICBpZiAoY3VyQW5pbWF0aW9uICYmIGN1ckFuaW1hdGlv bi0+bV93ZWJraXRBbmltYXRpb24gPT0gYW5pbQorICAgICAgICAgICAgICAgICYmIHZhbHVlcy5w cm9wZXJ0eSgpID09IGN1ckFuaW1hdGlvbi0+Z2V0QW5pbWF0ZWRQcm9wZXJ0eSgpKSB7CiAgICAg ICAgICAgICAgICAgbmV3QW5pbSA9IGN1ckFuaW1hdGlvbjsKKyAgICAgICAgICAgICAgICBicmVh azsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KIAotLSAKMS43LjEKCg== 59123 2010-06-18 09:32:21 -0700 2010-06-18 09:32:21 -0700 Test case tar'd up. bug-40841-test.tgz application/x-gzip 1155 smagnuso H4sIAHOfG0wAA+1XX2gcRRjfmHjEmoAWlJqCTC4qDXh3s/e3vV5O01yiEWxK2kJqH8zc7tzdNHuz 685ckiOUVsVglYq+SsCKT/rQigp9EVvElyKIFSpaEX0VBe2Lioh19v7kLrd7zd31bFD3B7dzu/N9 M7/vt/PNfpMusKKPUJUoiOumP8fzmtRtQIFoOGy1ciwC69tSVzAEJVkOw2hMjsnBoATlSESGEoBd Z+KAAuPIBEBieZSlBabTJnab9f9LkRhOzUwcOnJgElivPrktUW6AQCKHkVr+W7rlhGs4uU8smOFE oHxT62S8qGHAiwYe83K8zAMKY16QxypBY16mmBhTb828BD8yDJ+lPi8YYMS60XSkEpoFKxsNAVgi Ks/FQQhCY3lvY2cOk2yOx4Hs2GvojHCi0zhAaaZrBY5tJmmkLGRNvUDVOBiBcGoKwgab4y0y9xmm njUxY/YQWuDBdcOK0SEIDWeaBLiRmb86fy2lm4q5J3wDLR1Z1OtUMLVd6Q17h4/qfoNmRwHVfSY2 MOJAwZRjs9LYhlMJMzRUjAsH2ihGo+AOcSXFAIsd6XzjOBqCsHlX5JN3tyufbiCFcBFv4+oCwLeE 0wuE+xAleWSx96kFE5XDCPrDrAUHIiQu/1NEZIIDoRlCiS38zZX1LxJG0iKbHfqgXfDy2nQK2CEq XHrh0B7SzdGSm9GS97THa3d3eQWb8Qo5rZ6mvGR/sLu8Qs14RWLt8Yp2l1e4Ga9YtB1eN6PWSm1f Smu6srC3HefKnuTAzBrR+mRwHAdmgVLxsbBG3jj0o1W/BVzMmCiPGWAGoRQ77OIAwAedntYLw01E WUY383HAFKThXdAfG7XJWMb67iQ7GBy3P5I7mF7u1uTByJbGHvqHpLd/GJpIv3Xzt58M9iHt2UHF Wo9X17pj7iYCpQqzUpkGaqVpIq2rRaBoiLExb11dVldtJiweRC13Vyq1hmLUyWS9mPNWh3eoQirB Nta21SGbOkJvMhEQFu36yR36BTv0C3XoF3b0a3hUd5sIWO9RnD8C5QPIVp+L/i9wrOG7PMcm538Y jKyf/6MyjFrn/1go5p7/bwVOHdj/2OC2ISvfBqcfT82Kdk787un3iOvHB0dXRXMfn5zjB/UMX0Im lsZVPY3BtJADz4pduPjMJZwQRk9Mp8YPLV/96fM3ByVwV9/4ma+uv/7RU7880N/30pGVS6d+uFv+ ZvLwlZmjmT+uDj050zuw412p1/PwxZM9d8L5Hs/A3Mme3nvnL353vm+HtNO3/ejvd7wwYfGbntyf Ortv/rmtU+i/DfvZt/tzbJr/sWhj/odCETf/bwUc8n+7+N3ff5u4nqVfr0gt5v98Of/THxZ+/PLC iet/Pd+z9uzAq7cPax6P5yHPe9Knbzxy4sUP+j5bPTYyG1kb/OLX335+2ntYOX/6zLG1Vz45N/Tt a6l3pi6vXon+iV6mO69dHhvS37oWtS5Tp5d7+6EUn7iw+Pb7ye8t1u6u4MKFCxcuXLhw4cKFCxcu XLhw0Sr+Bs+kIk4AKAAA 59438 2010-06-22 16:12:49 -0700 2010-10-21 16:50:13 -0700 Rediff against trunk bug-40841.patch text/plain 4665 smagnuso RnJvbSAxNGY2YmIxOTUzNWZlNTM4YmNiMGQ2MjQ2OGNkMWExNzA4Y2UzNDA4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTYW0gTWFnbnVzb24gPHNtYWdudXNvbkBuZXRmbGl4LmNvbT4K RGF0ZTogTW9uLCAyMSBKdW4gMjAxMCAyMjozMzozMyAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gTm9kZSB0aGF0IGhhdmUgYm90aCBhbiBvcGFjaXR5IGFuZCBhIHRyYW5zZm9ybSBhbmltYXRp b24gb24gdGhlbSBzZWVtIG5vdCB0byBmaXJlCiBidWctNDA4NDEKCi0tLQogTGF5b3V0VGVzdHMv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxMiArKysrKysrKysrKysK IFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTgg KysrKysrKysrKysrKysrKysrCiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNz TGF5ZXJRdC5jcHAgfCAgIDE0ICsrKysrKysrKysrKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDQyIGlu c2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDJhOWNiZDguLmRmMjUxY2UgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wNi0xOCAgU2FtIE1hZ251c29uICA8c21hZ251c29u QG5ldGZsaXguY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gTm9kZSB0aGF0IGhhdmUgYm90aCBhbiBvcGFjaXR5IGFuZCBhIHRyYW5zZm9y bSBhbmltYXRpb24gb24KKyAgICAgICAgdGhlbSBzZWVtIG5vdCB0byBmaXJlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDg0MQorCisgICAgICAgICog Y29tcG9zaXRpbmcvYW5pbWF0aW9uL2J1c3ktaW5kaWNhdG9yLW5vLnBuZzogQWRkZWQuCisgICAg ICAgICogY29tcG9zaXRpbmcvYW5pbWF0aW9uL2J1c3ktaW5kaWNhdG9yLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIGNvbXBvc2l0aW5nL2FuaW1hdGlvbi9idXN5LWluZGljYXRvci5wbmc6IEFkZGVk LgorCiAyMDEwLTA2LTIxICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNjE1ODUuCmRpZmYgLS1naXQg YS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDY5YjE2NzkuLjI5 MGUzOWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDYtMTggIFNhbSBNYWdudXNvbiAgPHNtYWdudXNv bkBuZXRmbGl4LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbUXRdIE5vZGUgdGhhdCBoYXZlIGJvdGggYW4gb3BhY2l0eSBhbmQgYSB0cmFuc2Zv cm0gYW5pbWF0aW9uIG9uCisgICAgICAgIHRoZW0gc2VlbSBub3QgdG8gZmlyZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA4NDEKKworICAgICAgICBU ZXN0OiBjb21wb3NpdGluZy9hbmltYXRpb24vYnVzeS1pbmRpY2F0b3IuaHRtbAorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzTGF5ZXJRdEltcGw6OnJlY2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6 R3JhcGhpY3NMYXllclF0SW1wbDo6Zmx1c2hDaGFuZ2VzKToKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXJRdDo6c2V0Q29udGVudHNUb0ltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlRy YW5zZm9ybUFuaW1hdGlvblF0OjpnZXRBbmltYXRlZFByb3BlcnR5KToKKyAgICAgICAgKFdlYkNv cmU6Ok9wYWNpdHlBbmltYXRpb25RdDo6Z2V0QW5pbWF0ZWRQcm9wZXJ0eSk6CisgICAgICAgIChX ZWJDb3JlOjpHcmFwaGljc0xheWVyUXQ6OmFkZEFuaW1hdGlvbik6CisKIDIwMTAtMDYtMjEgIFNo ZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIHJvbGxpbmcgb3V0IHI2MTU4NS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcAppbmRleCA4ZWQwZDg5Li41NjJmMDc2IDEwMDY0NAot LS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAKKysr IGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwCkBAIC02 MzEsNyArNjMxLDcgQEAgdm9pZCBHcmFwaGljc0xheWVyUXRJbXBsOjpmbHVzaENoYW5nZXMoYm9v bCByZWN1cnNpdmUsIGJvb2wgZm9yY2VVcGRhdGVUcmFuc2Zvcm0KICAgICAgICAgY2FzZSBIVE1M Q29udGVudFR5cGU6CiAgICAgICAgICAgICBpZiAobV9wZW5kaW5nQ29udGVudC5jb250ZW50VHlw ZSAhPSBtX2N1cnJlbnRDb250ZW50LmNvbnRlbnRUeXBlKQogICAgICAgICAgICAgICAgIHVwZGF0 ZSgpOwotICAgICAgICAgICAgaWYgKCFtX3N0YXRlLmRyYXdzQ29udGVudCAmJiBtX2xheWVyLT5k cmF3c0NvbnRlbnQoKSkKKyAgICAgICAgICAgIGVsc2UgaWYgKCFtX3N0YXRlLmRyYXdzQ29udGVu dCAmJiBtX2xheWVyLT5kcmF3c0NvbnRlbnQoKSkKICAgICAgICAgICAgICAgICB1cGRhdGUoKTsK IAogICAgICAgICAgICAgc2V0RmxhZyhJdGVtSGFzTm9Db250ZW50cywgIW1fbGF5ZXItPmRyYXdz Q29udGVudCgpKTsKQEAgLTExOTAsNiArMTE5MCw5IEBAIHB1YmxpYzoKICAgICB7CiAgICAgfQog CisKKyAgICB2aXJ0dWFsIEFuaW1hdGVkUHJvcGVydHlJRCBnZXRBbmltYXRlZFByb3BlcnR5KCkg Y29uc3QgPSAwOworCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVN0YXRlKFFBYnN0cmFjdEFuaW1h dGlvbjo6U3RhdGUgbmV3U3RhdGUsIFFBYnN0cmFjdEFuaW1hdGlvbjo6U3RhdGUgb2xkU3RhdGUp CiAgICAgewogICAgICAgICBRQWJzdHJhY3RBbmltYXRpb246OnVwZGF0ZVN0YXRlKG5ld1N0YXRl LCBvbGRTdGF0ZSk7CkBAIC0xMjk4LDYgKzEzMDEsOCBAQCBwdWJsaWM6CiAgICAgICAgICAgICBz ZXRDdXJyZW50VGltZSgxKTsKICAgICB9CiAKKyAgICB2aXJ0dWFsIEFuaW1hdGVkUHJvcGVydHlJ RCBnZXRBbmltYXRlZFByb3BlcnR5KCkgY29uc3QgeyByZXR1cm4gQW5pbWF0ZWRQcm9wZXJ0eVdl YmtpdFRyYW5zZm9ybTsgfQorCiAgICAgLy8gVGhlIGlkZWEgaXMgdGhhdCB3ZSBsZXQgV2ViQ29y ZSBtYW5hZ2UgdGhlIHRyYW5zZm9ybSBvcGVyYXRpb25zIGFuZCBRdCBqdXN0IG1hbmFnZSB0aGUK ICAgICAvLyBhbmltYXRpb24gaGVhcnRiZWF0IGFuZCB0aGUgYm90dG9tLWxpbmUgUVRyYW5zZm9y bS4gV2UgZ2FpbiBwZXJmb3JtYW5jZSwgbm90IGJ5IHVzaW5nCiAgICAgLy8gVHJhbnNmb3JtIGlu c3RlYWQgb2YgVHJhbnNmb3JtYXRpb25NYXRyaXgsIGJ1dCBieSBwcm9wZXIgY2FjaGluZyBvZiBp dGVtcyB0aGF0IGFyZQpAQCAtMTM2OSw2ICsxMzc0LDggQEAgcHVibGljOgogICAgICAgICAgICAg c2V0Q3VycmVudFRpbWUoMSk7CiAgICAgfQogCisgICAgdmlydHVhbCBBbmltYXRlZFByb3BlcnR5 SUQgZ2V0QW5pbWF0ZWRQcm9wZXJ0eSgpIGNvbnN0IHsgcmV0dXJuIEFuaW1hdGVkUHJvcGVydHlP cGFjaXR5OyB9CisKICAgICB2aXJ0dWFsIHZvaWQgYXBwbHlGcmFtZShjb25zdCBxcmVhbCYgZnJv bVZhbHVlLCBjb25zdCBxcmVhbCYgdG9WYWx1ZSwgcXJlYWwgcHJvZ3Jlc3MpCiAgICAgewogICAg ICAgICBxcmVhbCBvcGFjaXR5ID0gcUJvdW5kKHFyZWFsKDApLCBmcm9tVmFsdWUgKyAodG9WYWx1 ZSAtIGZyb21WYWx1ZSkgKiBwcm9ncmVzcywgcXJlYWwoMSkpOwpAQCAtMTQxMCw4ICsxNDE3LDEx IEBAIGJvb2wgR3JhcGhpY3NMYXllclF0OjphZGRBbmltYXRpb24oY29uc3QgS2V5ZnJhbWVWYWx1 ZUxpc3QmIHZhbHVlcywgY29uc3QgSW50U2l6CiAgICAgZm9yIChpdCA9IG1faW1wbC0+bV9hbmlt YXRpb25zLmJlZ2luKCk7IGl0ICE9IG1faW1wbC0+bV9hbmltYXRpb25zLmVuZCgpOyArK2l0KSB7 CiAgICAgICAgIGlmICgqaXQpIHsKICAgICAgICAgICAgIEFuaW1hdGlvblF0QmFzZSogY3VyQW5p bWF0aW9uID0gc3RhdGljX2Nhc3Q8QW5pbWF0aW9uUXRCYXNlKj4oaXQtPmRhdGEoKSk7Ci0gICAg ICAgICAgICBpZiAoY3VyQW5pbWF0aW9uICYmIGN1ckFuaW1hdGlvbi0+bV93ZWJraXRBbmltYXRp b24gPT0gYW5pbSkKKyAgICAgICAgICAgIGlmIChjdXJBbmltYXRpb24gJiYgY3VyQW5pbWF0aW9u LT5tX3dlYmtpdEFuaW1hdGlvbiA9PSBhbmltCisgICAgICAgICAgICAgICAgJiYgdmFsdWVzLnBy b3BlcnR5KCkgPT0gY3VyQW5pbWF0aW9uLT5nZXRBbmltYXRlZFByb3BlcnR5KCkpIHsKICAgICAg ICAgICAgICAgICBuZXdBbmltID0gY3VyQW5pbWF0aW9uOworICAgICAgICAgICAgICAgIGJyZWFr OworICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQogCi0tIAoxLjcuMQoK 71509 2010-10-21 16:50:17 -0700 2010-12-14 15:14:22 -0800 Patch bug-40841-20101021165219.patch text/plain 8951 smagnuso ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1MzEwMDdjYzYzNDNhNDRkY2E4MDkxM2M0YzA5ZDg0ZDgxM2RmNGUyLi5lN2ZmODIy ZjY5YmUzYTgwOTQ3MzcyZWM0NDhjMzk0NTNlNzQxOTVkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMDYtMTggIFNhbSBNYWdudXNvbiAgPHNtYWdudXNvbkBuZXRmbGl4LmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIE5vZGUgdGhh dCBoYXZlIGJvdGggYW4gb3BhY2l0eSBhbmQgYSB0cmFuc2Zvcm0gYW5pbWF0aW9uIG9uCisgICAg ICAgIHRoZW0gc2VlbSBub3QgdG8gZmlyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDA4NDEKKworICAgICAgICAqIGNvbXBvc2l0aW5nL2FuaW1hdGlv bi9idXN5LWluZGljYXRvci1uby5wbmc6IEFkZGVkLgorICAgICAgICAqIGNvbXBvc2l0aW5nL2Fu aW1hdGlvbi9idXN5LWluZGljYXRvci5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBjb21wb3NpdGlu Zy9hbmltYXRpb24vYnVzeS1pbmRpY2F0b3IucG5nOiBBZGRlZC4KKwogMjAxMC0xMC0yMSAgRGF2 aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4g QWRsZXIuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9hbmltYXRpb24vYnVz eS1pbmRpY2F0b3Itbm8ucG5nIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvYW5pbWF0aW9uL2J1 c3ktaW5kaWNhdG9yLW5vLnBuZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43ZDNmZDFiNjRlM2I1MTI1ODFhYTM0MjNm ZjUzZTAzNmU2ZTJjZGJkCkdJVCBiaW5hcnkgcGF0Y2gKbGl0ZXJhbCAxNjgKemNtZUFTQE4/KG9s SHlgdVZCcSFpYTB2cF41a01AOyEzSERgMSM3a2VEYWpKb2g/M3ledzM3MH5xRXJVUWw+RFNyCnox PCV+WF53Z2wjI0ZXYXlsY19kOU1QOG1SanYqRGQtZHRHNyViKn5AOzwoXyh8NV5LQEtCI2M4YlZY TDU/MGhMYAp6Yy11QWZzKCpDYXVVa15Tez4oZlE4eUp8YGJQaEJ5YXZMTnR2aGhTVEZmeGxKOUpz JW9NUz8rRVMxOUBpWFI5O04KT1IwZEMxS2JMaCoyfjdadEghX0YtCgpsaXRlcmFsIDAKSGNtVj9k MDAwMDEKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9hbmltYXRpb24vYnVz eS1pbmRpY2F0b3IuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2FuaW1hdGlvbi9idXN5 LWluZGljYXRvci5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjFkZTNhMzE1MGU4OTY1NWViZmYwMzViMjA0NjE0 MDQ0NmUwYjU5ZTgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9h bmltYXRpb24vYnVzeS1pbmRpY2F0b3IuaHRtbApAQCAtMCwwICsxLDkzIEBACis8IURPQ1RZUEUg aHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8dGl0bGU+QnVzeSE8L3RpdGxlPgor ICAgICAgICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiIG1lZGlhPSJzY3JlZW4iPgorICAgICAgICAg ICAgIC5hcHAtc3RhcnR1cCAjYXBwLWxvYWRpbmcgeworICAgICAgICAgICAgICAgd2lkdGg6IDMw MHB4OworICAgICAgICAgICAgICAgaGVpZ2h0OiAxMDBweDsKKyAgICAgICAgICAgICAgIHBvc2l0 aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgICAgICAgIGJhY2tncm91bmQ6ICMwMEZGMDA7CisgICAg ICAgICAgICAgfQorICAgICAgICAgICAgIC5hcHAtc3RhcnR1cCAjYXBwLWxvYWRpbmctcHJvZ3Jl c3MgeworICAgICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICAgICAgICAg dG9wOiAzMHB4OworICAgICAgICAgICAgICAgbGVmdDogMTAwcHg7CisgICAgICAgICAgICAgfQor ICAgICAgICAgICAgLnByb2dyZXNzLWluZGljYXRvciB7CisgICAgICAgICAgICAgICB3aWR0aDog OTRweDsKKyAgICAgICAgICAgICAgIGhlaWdodDogMzBweDsKKyAgICAgICAgICAgICAgIGJhY2tn cm91bmQ6IHVybChidXN5LWluZGljYXRvci1uby5wbmcpIG5vLXJlcGVhdCBjZW50ZXIgY2VudGVy OworICAgICAgICAgICAgICAgZGlzcGxheTogbm9uZTsKKyAgICAgICAgICAgICB9CisgICAgICAg ICAgICAgLnByb2dyZXNzLWluZGljYXRvciA+IGRpdiB7CisgICAgICAgICAgICAgICBwb3NpdGlv bjogYWJzb2x1dGU7CisgICAgICAgICAgICAgICBiYWNrZ3JvdW5kOiB1cmwoYnVzeS1pbmRpY2F0 b3IucG5nKSBuby1yZXBlYXQ7CisgICAgICAgICAgICAgICB3aWR0aDogMThweDsKKyAgICAgICAg ICAgICAgIGhlaWdodDogMzBweDsKKyAgICAgICAgICAgICAgIG9wYWNpdHk6IDA7CisgICAgICAg ICAgICAgICAtd2Via2l0LWFuaW1hdGlvbi1kdXJhdGlvbjogMi40czsKKyAgICAgICAgICAgICAg IC13ZWJraXQtYW5pbWF0aW9uLWl0ZXJhdGlvbi1jb3VudDogaW5maW5pdGU7CisgICAgICAgICAg ICAgfQorICAgICAgICAgICAgIC5wcm9ncmVzcy1pbmRpY2F0b3IudmlzaWJsZSAucHJvZ3Jlc3Mt aW5kaWNhdG9yMCB7CisgICAgICAgICAgICAgICBsZWZ0OiAwcHg7CisgICAgICAgICAgICAgICAt d2Via2l0LWFuaW1hdGlvbi1kZWxheTogMC40czsKKyAgICAgICAgICAgICB9CisgICAgICAgICAg ICAgLnByb2dyZXNzLWluZGljYXRvci52aXNpYmxlIC5wcm9ncmVzcy1pbmRpY2F0b3IxIHsKKyAg ICAgICAgICAgICAgIGxlZnQ6IDE5cHg7CisgICAgICAgICAgICAgICAtd2Via2l0LWFuaW1hdGlv bi1kZWxheTogMC44czsKKyAgICAgICAgICAgICB9CisgICAgICAgICAgICAgLnByb2dyZXNzLWlu ZGljYXRvci52aXNpYmxlIC5wcm9ncmVzcy1pbmRpY2F0b3IyIHsKKyAgICAgICAgICAgICAgIGxl ZnQ6IDM4cHg7CisgICAgICAgICAgICAgICAtd2Via2l0LWFuaW1hdGlvbi1kZWxheTogMS4yczsK KyAgICAgICAgICAgICB9CisgICAgICAgICAgICAgLnByb2dyZXNzLWluZGljYXRvci52aXNpYmxl IC5wcm9ncmVzcy1pbmRpY2F0b3IzIHsKKyAgICAgICAgICAgICAgIGxlZnQ6IDU3cHg7CisgICAg ICAgICAgICAgICAtd2Via2l0LWFuaW1hdGlvbi1kZWxheTogMS42czsKKyAgICAgICAgICAgICB9 CisgICAgICAgICAgICAgLnByb2dyZXNzLWluZGljYXRvci52aXNpYmxlIC5wcm9ncmVzcy1pbmRp Y2F0b3I0IHsKKyAgICAgICAgICAgICAgIGxlZnQ6IDc2cHg7CisgICAgICAgICAgICAgICAtd2Vi a2l0LWFuaW1hdGlvbi1kZWxheTogMnM7CisgICAgICAgICAgICAgfQorICAgICAgICAgICAgIC5w cm9ncmVzcy1pbmRpY2F0b3IudmlzaWJsZSB7IGRpc3BsYXk6IGJsb2NrOyB9CisgICAgICAgICAg ICAgLnByb2dyZXNzLWluZGljYXRvci52aXNpYmxlID4gZGl2IHsgLXdlYmtpdC1hbmltYXRpb24t cGxheS1zdGF0ZTogcnVubmluZzsgfQorCisgICAgICAgICAgICAgQC13ZWJraXQta2V5ZnJhbWVz IHNwaW5uZXIgeworICAgICAgICAgICAgICAgICAwJSB7CisgICAgICAgICAgICAgICAgICAgICAt d2Via2l0LXRyYW5zZm9ybTogc2NhbGUoMC43KTsKKyAgICAgICAgICAgICAgICAgICAgIG9wYWNp dHk6IDE7CisgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgMTAlIHsKKyAgICAg ICAgICAgICAgICAgICAgIC13ZWJraXQtdHJhbnNmb3JtOiBzY2FsZSgxKTsKKyAgICAgICAgICAg ICAgICAgICAgIG9wYWNpdHk6IDE7CisgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAg ICAgMjUlIHsKKyAgICAgICAgICAgICAgICAgICAgIC13ZWJraXQtdHJhbnNmb3JtOiBzY2FsZSgw LjcpOworICAgICAgICAgICAgICAgICAgICAgb3BhY2l0eTogMTsKKyAgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgICAgICAzMCUgeworICAgICAgICAgICAgICAgICAgICAgLXdlYmtpdC10 cmFuc2Zvcm06IHNjYWxlKDAuNyk7CisgICAgICAgICAgICAgICAgICAgICBvcGFjaXR5OiAwOwor ICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgIDEwMCUgeworICAgICAgICAgICAg ICAgICAgICAgLXdlYmtpdC10cmFuc2Zvcm06IHNjYWxlKDAuNyk7CisgICAgICAgICAgICAgICAg ICAgICBvcGFjaXR5OiAwOworICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgfQorICAg ICAgICAgICAgIC5wcm9ncmVzcy1pbmRpY2F0b3IudmlzaWJsZSA+IGRpdiB7CisgICAgICAgICAg ICAgICAgIC13ZWJraXQtYW5pbWF0aW9uLW5hbWU6IHNwaW5uZXI7CisgICAgICAgICAgICAgfQor ICAgIDwvc3R5bGU+CisgICAgPC9oZWFkPgorICAgIDxib2R5IGNsYXNzPSJhcHAtc3RhcnR1cCI+ CisgICAgICAgIDxkaXYgaWQ9ImFwcC1sb2FkaW5nIj4KKyAgICAgICAgICAgIDxkaXYgaWQ9ImFw cC1sb2FkaW5nLXByb2dyZXNzIiBjbGFzcz0icHJvZ3Jlc3MtaW5kaWNhdG9yIHZpc2libGUiPgor ICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9InByb2dyZXNzLWluZGljYXRvcjAiPjwvZGl2Pgor ICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9InByb2dyZXNzLWluZGljYXRvcjEiPjwvZGl2Pgor ICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9InByb2dyZXNzLWluZGljYXRvcjIiPjwvZGl2Pgor ICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9InByb2dyZXNzLWluZGljYXRvcjMiPjwvZGl2Pgor ICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9InByb2dyZXNzLWluZGljYXRvcjQiPjwvZGl2Pgor ICAgICAgICAgICAgPC9kaXY+CisgICAgICAgIDwvZGl2PgorICAgIDwvYm9keT4KKzwvaHRtbD4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2FuaW1hdGlvbi9idXN5LWluZGlj YXRvci5wbmcgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9hbmltYXRpb24vYnVzeS1pbmRpY2F0 b3IucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLmMyMGQ1NTNiNjg0MzZkMDllZWIyNGQwM2FkMGNhODNjMjFjM2I3 YmUKR0lUIGJpbmFyeSBwYXRjaApsaXRlcmFsIDE5MAp6Y21lQVNATj8ob2xIeWB1VkJxIWlhMHZw XkxPPzlYITJ+NE48PXcwWFFqI1VFNWhjTy1YKGk9fU1YM3lxRGZ2bU0KejNaQSklPjhVfWZpN0F6 WkNzUz5KaVZ7M3M5NzhIQENHOURGZVFrZ0p8OXtQbGF+Z1JqdXF4KVR2OVlQS1pES2UqCnotQGQr TTMoTDgtRWFmMjZJbFB5P2VTYVVYNnE+eGZjUnwqaXo5WnxVP29NPUI8I3dee3NAYjIhP21YI183 ajMyVAprN2tATVo1cEtOfCVwMypgUj9ocCZSJktVPzBKTXcyKTc4JnFvbGA7KzBPekRlRSZ1PWsK CmxpdGVyYWwgMApIY21WP2QwMDAwMQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTVhZDUxNGFmY2YyNzkxMzhmYjg1OTg0OTk5ZjFiNWRl ODI4MWM2OC4uYjY4OTg1YjJhNDcxZjExYjI3ZTJhNzViZmVjZjQzNWUxMjVhOGQwYiAxMDA2NDQK LS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyMSBAQAorMjAxMC0wNi0xOCAgU2FtIE1hZ251c29uICA8c21hZ251c29uQG5ldGZsaXguY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0g Tm9kZSB0aGF0IGhhdmUgYm90aCBhbiBvcGFjaXR5IGFuZCBhIHRyYW5zZm9ybSBhbmltYXRpb24g b24KKyAgICAgICAgdGhlbSBzZWVtIG5vdCB0byBmaXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDg0MQorCisgICAgICAgIFRlc3Q6IGNvbXBvc2l0 aW5nL2FuaW1hdGlvbi9idXN5LWluZGljYXRvci5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NMYXllclF0SW1wbDo6cmVjYWNoZSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVy UXRJbXBsOjpmbHVzaENoYW5nZXMpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclF0 OjpzZXRDb250ZW50c1RvSW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6VHJhbnNmb3JtQW5pbWF0 aW9uUXQ6OmdldEFuaW1hdGVkUHJvcGVydHkpOgorICAgICAgICAoV2ViQ29yZTo6T3BhY2l0eUFu aW1hdGlvblF0OjpnZXRBbmltYXRlZFByb3BlcnR5KToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzTGF5ZXJRdDo6YWRkQW5pbWF0aW9uKToKKwogMjAxMC0xMC0yMSAgRGF2aWQgSHlhdHQgIDxo eWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAKaW5kZXgg ZTA5NDFmNTdkOWMzMjVjYjY2ZmIzNTRiYWYyZTBlOTRmYjJlN2IzOS4uNDVhMWI2MGM4MGViZjU0 ZjlmMDQ3OWM0ZTBiNzQzMTA3NDViNTUwZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcApAQCAtNzEzLDcgKzcxMyw3IEBAIHZvaWQgR3Jh cGhpY3NMYXllclF0SW1wbDo6Zmx1c2hDaGFuZ2VzKGJvb2wgcmVjdXJzaXZlLCBib29sIGZvcmNl VXBkYXRlVHJhbnNmb3JtCiAgICAgICAgIGNhc2UgSFRNTENvbnRlbnRUeXBlOgogICAgICAgICAg ICAgaWYgKG1fcGVuZGluZ0NvbnRlbnQuY29udGVudFR5cGUgIT0gbV9jdXJyZW50Q29udGVudC5j b250ZW50VHlwZSkKICAgICAgICAgICAgICAgICB1cGRhdGUoKTsKLSAgICAgICAgICAgIGlmICgh bV9zdGF0ZS5kcmF3c0NvbnRlbnQgJiYgbV9sYXllci0+ZHJhd3NDb250ZW50KCkpCisgICAgICAg ICAgICBlbHNlIGlmICghbV9zdGF0ZS5kcmF3c0NvbnRlbnQgJiYgbV9sYXllci0+ZHJhd3NDb250 ZW50KCkpCiAgICAgICAgICAgICAgICAgdXBkYXRlKCk7CiAKICAgICAgICAgICAgIHNldEZsYWco SXRlbUhhc05vQ29udGVudHMsICFtX2xheWVyLT5kcmF3c0NvbnRlbnQoKSk7CkBAIC0xMjk1LDYg KzEyOTUsOSBAQCBwdWJsaWM6CiAgICAgewogICAgIH0KIAorCisgICAgdmlydHVhbCBBbmltYXRl ZFByb3BlcnR5SUQgYW5pbWF0ZWRQcm9wZXJ0eSgpIGNvbnN0ID0gMDsKKwogICAgIHZpcnR1YWwg dm9pZCB1cGRhdGVTdGF0ZShRQWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG5ld1N0YXRlLCBRQWJz dHJhY3RBbmltYXRpb246OlN0YXRlIG9sZFN0YXRlKQogICAgIHsKICAgICAgICAgUUFic3RyYWN0 QW5pbWF0aW9uOjp1cGRhdGVTdGF0ZShuZXdTdGF0ZSwgb2xkU3RhdGUpOwpAQCAtMTQyOCw2ICsx NDMxLDggQEAgcHVibGljOgogICAgICAgICAgICAgc2V0Q3VycmVudFRpbWUoMSk7CiAgICAgfQog CisgICAgdmlydHVhbCBBbmltYXRlZFByb3BlcnR5SUQgYW5pbWF0ZWRQcm9wZXJ0eSgpIGNvbnN0 IHsgcmV0dXJuIEFuaW1hdGVkUHJvcGVydHlXZWJraXRUcmFuc2Zvcm07IH0KKwogICAgIC8vIFRo ZSBpZGVhIGlzIHRoYXQgd2UgbGV0IFdlYkNvcmUgbWFuYWdlIHRoZSB0cmFuc2Zvcm0gb3BlcmF0 aW9ucyBhbmQgUXQganVzdCBtYW5hZ2UgdGhlCiAgICAgLy8gYW5pbWF0aW9uIGhlYXJ0YmVhdCBh bmQgdGhlIGJvdHRvbS1saW5lIFFUcmFuc2Zvcm0uIFdlIGdhaW4gcGVyZm9ybWFuY2UsIG5vdCBi eSB1c2luZwogICAgIC8vIFRyYW5zZm9ybSBpbnN0ZWFkIG9mIFRyYW5zZm9ybWF0aW9uTWF0cml4 LCBidXQgYnkgcHJvcGVyIGNhY2hpbmcgb2YgaXRlbXMgdGhhdCBhcmUKQEAgLTE0OTksNiArMTUw NCw4IEBAIHB1YmxpYzoKICAgICAgICAgICAgIHNldEN1cnJlbnRUaW1lKDEpOwogICAgIH0KIAor ICAgIHZpcnR1YWwgQW5pbWF0ZWRQcm9wZXJ0eUlEIGFuaW1hdGVkUHJvcGVydHkoKSBjb25zdCB7 IHJldHVybiBBbmltYXRlZFByb3BlcnR5T3BhY2l0eTsgfQorCiAgICAgdmlydHVhbCB2b2lkIGFw cGx5RnJhbWUoY29uc3QgcXJlYWwmIGZyb21WYWx1ZSwgY29uc3QgcXJlYWwmIHRvVmFsdWUsIHFy ZWFsIHByb2dyZXNzKQogICAgIHsKICAgICAgICAgcXJlYWwgb3BhY2l0eSA9IHFCb3VuZChxcmVh bCgwKSwgZnJvbVZhbHVlICsgKHRvVmFsdWUgLSBmcm9tVmFsdWUpICogcHJvZ3Jlc3MsIHFyZWFs KDEpKTsKQEAgLTE1NDAsOCArMTU0NywxMSBAQCBib29sIEdyYXBoaWNzTGF5ZXJRdDo6YWRkQW5p bWF0aW9uKGNvbnN0IEtleWZyYW1lVmFsdWVMaXN0JiB2YWx1ZXMsIGNvbnN0IEludFNpegogICAg IGZvciAoaXQgPSBtX2ltcGwtPm1fYW5pbWF0aW9ucy5iZWdpbigpOyBpdCAhPSBtX2ltcGwtPm1f YW5pbWF0aW9ucy5lbmQoKTsgKytpdCkgewogICAgICAgICBpZiAoKml0KSB7CiAgICAgICAgICAg ICBBbmltYXRpb25RdEJhc2UqIGN1ckFuaW1hdGlvbiA9IHN0YXRpY19jYXN0PEFuaW1hdGlvblF0 QmFzZSo+KGl0LT5kYXRhKCkpOwotICAgICAgICAgICAgaWYgKGN1ckFuaW1hdGlvbiAmJiBjdXJB bmltYXRpb24tPm1fd2Via2l0QW5pbWF0aW9uID09IGFuaW0pCisgICAgICAgICAgICBpZiAoY3Vy QW5pbWF0aW9uICYmIGN1ckFuaW1hdGlvbi0+bV93ZWJraXRBbmltYXRpb24gPT0gYW5pbQorICAg ICAgICAgICAgICAgICYmIHZhbHVlcy5wcm9wZXJ0eSgpID09IGN1ckFuaW1hdGlvbi0+YW5pbWF0 ZWRQcm9wZXJ0eSgpKSB7CiAgICAgICAgICAgICAgICAgbmV3QW5pbSA9IGN1ckFuaW1hdGlvbjsK KyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0K IAo=