36216 2010-03-17 06:00:38 -0700 [Qt] GraphicsLayer: support fill-modes 2010-04-20 13:05:49 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All CLOSED FIXED Qt P3 Normal --- 37746 36191 1 noam noam abarth benjamin commit-queue eric hausmann kenneth koivisto ossy tonikitoo webkit.review.bot oldest_to_newest 200710 0 noam 2010-03-17 06:00:38 -0700 fill-modes are a new webkit CSS concept that allows for compound sequential animations. This needs to be special-cased in GraphicsLayer. test: LayoutTests/animations/fill-mode-transform.html 213478 1 53576 noam 2010-04-16 16:23:14 -0700 Created attachment 53576 implemet fill modes in GraphicsLayerQt 213486 2 koivisto 2010-04-16 16:36:00 -0700 r=me, please remove the unused fillBackwards function 213488 3 53580 noam 2010-04-16 16:37:11 -0700 Created attachment 53580 removed unnecessary function 213556 4 53580 commit-queue 2010-04-16 19:05:00 -0700 Comment on attachment 53580 removed unnecessary function Clearing flags on attachment: 53580 Committed r57770: <http://trac.webkit.org/changeset/57770> 213557 5 commit-queue 2010-04-16 19:05:05 -0700 All reviewed patches have been landed. Closing bug. 213563 6 webkit.review.bot 2010-04-16 19:23:32 -0700 http://trac.webkit.org/changeset/57770 might have broken Qt Linux Release 213586 7 ossy 2010-04-16 23:42:41 -0700 (In reply to comment #6) > http://trac.webkit.org/changeset/57770 might have broken Qt Linux Release Rollout committed in http://trac.webkit.org/changeset/57776 213587 8 ossy 2010-04-16 23:44:59 -0700 rollout bug: https://bugs.webkit.org/show_bug.cgi?id=37746 crashed caused by the original bug: http://build.webkit.org/results/Qt%20Linux%20Release/r57770%20%2810253%29/results.html First I tried to do a clean build, but it didn't resolve the crashes, so I had to rollout the patch. 213852 9 53576 eric 2010-04-18 16:28:28 -0700 Comment on attachment 53576 implemet fill modes in GraphicsLayerQt Cleared Antti Koivisto's review+ from obsolete attachment 53576 so that this bug does not appear in http://webkit.org/pending-commit. 213926 10 53655 noam 2010-04-19 00:07:37 -0700 Created attachment 53655 re-submitting the patch, this time with a couple of more null-checks I overlooked in the first patch. All the regressed tests worked for me after this patch. 214061 11 53655 commit-queue 2010-04-19 09:32:01 -0700 Comment on attachment 53655 re-submitting the patch, this time with a couple of more null-checks I overlooked in the first patch. All the regressed tests worked for me after this patch. Rejecting patch 53655 from commit-queue. Found no modified ChangeLogs, cannot create a commit message. All changes require a ChangeLog. See: http://webkit.org/coding/contributing.html 214092 12 kenneth 2010-04-19 10:35:11 -0700 You are right, how could I have missed that :-(. I will r- it for that reason. 214112 13 ossy 2010-04-19 11:04:30 -0700 (In reply to comment #10) > Created an attachment (id=53655) [details] > re-submitting the patch, this time with a couple of more null-checks I > overlooked in the first patch. All the regressed tests worked for me after this > patch. I tested it on bot, it will work without crashes. 214129 14 53695 noam 2010-04-19 11:36:24 -0700 Created attachment 53695 changelog was mistakenly omitted from previous patch 214524 15 53695 commit-queue 2010-04-20 01:28:11 -0700 Comment on attachment 53695 changelog was mistakenly omitted from previous patch Clearing flags on attachment: 53695 Committed r57878: <http://trac.webkit.org/changeset/57878> 214525 16 commit-queue 2010-04-20 01:28:18 -0700 All reviewed patches have been landed. Closing bug. 214901 17 hausmann 2010-04-20 13:05:19 -0700 Revision r57878 cherry-picked into qtwebkit-2.0 with commit 6b307dc15ad5180ba95bb97df76f0cfcc2e8bf22 53576 2010-04-16 16:23:14 -0700 2010-04-18 16:28:28 -0700 implemet fill modes in GraphicsLayerQt patch-36216-1.diff text/plain 6681 noam ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhZDAzZmYwLi4xNzFiMmRmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDQt MTYgIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEdyYXBoaWNzTGF5 ZXI6IHN1cHBvcnQgZmlsbC1tb2RlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzYyMTYKKworICAgICAgICBSZW1vdmUgTGF5b3V0VGVzdHMvYW5pbWF0 aW9ucy9maWxsLW1vZGUtdHJhbnNmb3JtLmh0bWwgZnJvbSB0aGUgc2tpcCBsaXN0CisKKyAgICAg ICAgKiBwbGF0Zm9ybS9xdC9Ta2lwcGVkOgorCiAyMDEwLTA0LTE2ICBBbmRyZXcgU2NoZXJrdXMg IDxzY2hlcmt1c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgZml4aW5nIENo cm9taXVtIHRlc3RfZXhwZWN0YXRpb25zLnR4dCBkdWUgdG8gcmVtb3ZlZCB0ZXN0cyBpbiByNTcy OTIuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAppbmRleCBkMjQ3ZWU4Li5kODMzYjFkIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL3F0L1NraXBwZWQKQEAgLTUyMTYsOSArNTIxNiw2IEBAIGVkaXRpbmcvZXhlY0NvbW1h bmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLmh0bWwKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM1OTczCiBmYXN0L211bHRpY29sL2hpdC10ZXN0LWFib3ZlLW9y LWJlbG93Lmh0bWwKIAotIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzYxOTEKLSNbUXRdIEdyYXBoaWNzTGF5ZXI6IGZpeCB0ZXN0IHJlZ3Jlc3Npb25zCi1hbmltYXRp b25zL2ZpbGwtbW9kZS10cmFuc2Zvcm0uaHRtbAogYW5pbWF0aW9ucy9zaW11bHRhbmVvdXMtc3Rh cnQtbGVmdC5odG1sCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z NzM4MQogYW5pbWF0aW9ucy9keW5hbWljLXN0eWxlc2hlZXQtbG9hZGluZy5odG1sCmRpZmYgLS1n aXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDY5NzlhMzMu LmIwZDBmOWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDQtMTYgIE5vJ2FtIFJvc2VudGhhbCAgPG5v YW0ucm9zZW50aGFsQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbUXRdIEdyYXBoaWNzTGF5ZXI6IHN1cHBvcnQgZmlsbC1tb2Rlcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYyMTYKKyAg ICAgICAgSW1wbGVtZW50IHRoZSBDU1MtYW5pbWF0aW9uICJmaWxsIG1vZGUiIGNvbmNlcHQgaW4g R3JhcGhpY3NMYXllclF0LiBUaGUgY29uY2VwdAorICAgICAgICBlbmFibGVzIGEga2V5LWZyYW1l IGFuaW1hdGlvbiB0byBnbyB0byB0aGUgYW5pbWF0aW9uJ3Mgc3RhcnRpbmcgcG9pbnQgYmVmb3Jl IHRoZSBkZWxheSwKKyAgICAgICAgYW5kL29yIHRvIHN0YXkgYXQgdGhlIGFuaW1hdGlvbidzIGVu ZGluZyBwb2ludCBhZnRlciBpdHMgZW5kZWQsIHdpdGhvdXQgcmV2ZXJ0aW5nIHRvIHRoZSBkZWZh dWx0CisgICAgICAgIHZhbHVlLgorICAgICAgICBXZSBkbyB0aGF0IGJ5IG1hbnVhbGx5IHNldHRp bmcgdGhlIHZhbHVlIHRvIGtleWZyYW1lLTAgYmVmb3JlIHRoZSBkZWxheSBpZiBmaWxsLW1vZGUg aXMgYmFja3dhcmRzL2JvdGgsCisgICAgICAgIGFuZCBtYW51YWxseSBtb2RpZnlpbmcgdGhlIGRl ZmF1bHQgdmFsdWUgdG8gdGhlIGFuaW1hdGVkIHZhbHVlIGFzIHdlIGFuaW1hdGUsIHdpdGggZmls bC1tb2RlIGZvcndhcmRzL2JvdGguCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9H cmFwaGljc0xheWVyUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uUXRCYXNlOjpB bmltYXRpb25RdEJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uUXRCYXNlOjpmaWxs QmFja3dhcmRzKToKKyAgICAgICAgKFdlYkNvcmU6OlRyYW5zZm9ybUFuaW1hdGlvblF0Ojp+VHJh bnNmb3JtQW5pbWF0aW9uUXQpOgorICAgICAgICAoV2ViQ29yZTo6VHJhbnNmb3JtQW5pbWF0aW9u UXQ6OmFwcGx5RnJhbWUpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclF0OjphZGRB bmltYXRpb24pOgorCiAyMDEwLTA0LTE2ICBEdW1pdHJ1IERhbmlsaXVjICA8ZHVtaUBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcCBi L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcAppbmRleCBm NmZmYmZlLi5jZTEzNTkyIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L0dyYXBoaWNzTGF5ZXJRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9H cmFwaGljc0xheWVyUXQuY3BwCkBAIC05OTUsNiArOTk1LDcgQEAgcHVibGljOgogICAgICAgICAs IG1fd2Via2l0UHJvcGVydHlJRCh2YWx1ZXMucHJvcGVydHkoKSkKICAgICAgICAgLCBtX3dlYmtp dEFuaW1hdGlvbihhbmltKQogICAgICAgICAsIG1fa2V5ZnJhbWVzTmFtZShuYW1lKQorICAgICAg ICAsIG1fZmlsbHNGb3J3YXJkcyhmYWxzZSkKICAgICB7CiAgICAgfQogCkBAIC0xMDA3LDYgKzEw MDgsMTEgQEAgcHVibGljOgogICAgICAgICAgICAgbV9sYXllci5kYXRhKCktPm5vdGlmeUFuaW1h dGlvblN0YXJ0ZWRBc3luYygpOwogICAgIH0KIAorICAgIHZvaWQgZmlsbEJhY2t3YXJkcygpCisg ICAgeworICAgICAgICB1cGRhdGVDdXJyZW50VGltZSgwKTsKKyAgICB9CisKICAgICB2aXJ0dWFs IGludCBkdXJhdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fZHVyYXRpb247IH0KIAogICAgIFFXZWFr UG9pbnRlcjxHcmFwaGljc0xheWVyUXRJbXBsPiBtX2xheWVyOwpAQCAtMTAxOCw2ICsxMDI0LDcg QEAgcHVibGljOgogICAgIC8vIHdlIG1pZ2h0IG5lZWQgdGhpcyBpbiBjYXNlIHRoZSBzYW1lIGFu aW1hdGlvbiBpcyBhZGRlZCBhZ2FpbiAoaS5lLiByZXN1bWVkIGJ5IFdlYkNvcmUpCiAgICAgY29u c3QgQW5pbWF0aW9uKiBtX3dlYmtpdEFuaW1hdGlvbjsKICAgICBRU3RyaW5nIG1fa2V5ZnJhbWVz TmFtZTsKKyAgICBib29sIG1fZmlsbHNGb3J3YXJkczsKIH07CiAKIC8vIHdlJ2QgcmF0aGVyIGhh dmUgYSB0ZW1wbGF0aXplZCBRQWJzdHJhY3RBbmltYXRpb24gdGhhbiBRUHJvcGVydHlBbmltYXRp b24gLyBRVmFyaWFudEFuaW1hdGlvbjsKQEAgLTExMDIsMTAgKzExMDksMTAgQEAgcHVibGljOgog CiAgICAgflRyYW5zZm9ybUFuaW1hdGlvblF0KCkKICAgICB7Ci0gICAgICAgIC8vIHRoaXMgY2Ft ZSB1cCBkdXJpbmcgdGhlIGNvbXBvc2l0aW5nL2FuaW1hdGlvbiBMYXlvdXRUZXN0cwotICAgICAg ICAvLyB3aGVuIHRoZSBhbmltYXRpb24gZGllcywgdGhlIHRyYW5zZm9ybSBoYXMgdG8gZ28gYmFj ayB0byBkZWZhdWx0Ci0gICAgICAgIGlmIChtX2xheWVyKQotICAgICAgICAgICAgbV9sYXllci5k YXRhKCktPnVwZGF0ZVRyYW5zZm9ybSgpOworICAgICAgICBpZiAobV9maWxsc0ZvcndhcmRzKQor ICAgICAgICAgICAgc2V0Q3VycmVudFRpbWUoMSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg IG1fbGF5ZXIuZGF0YSgpLT5zZXRCYXNlVHJhbnNmb3JtKG1fbGF5ZXIuZGF0YSgpLT5tX2xheWVy LT50cmFuc2Zvcm0oKSk7CiAgICAgfQogCiAgICAgLy8gdGhlIGlkZWEgaXMgdGhhdCB3ZSBsZXQg V2ViQ29yZSBtYW5hZ2UgdGhlIHRyYW5zZm9ybS1vcGVyYXRpb25zCkBAIC0xMTQ0LDYgKzExNTEs OCBAQCBwdWJsaWM6CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgbV9sYXllci5k YXRhKCktPnNldEJhc2VUcmFuc2Zvcm0odHJhbnNmb3JtTWF0cml4KTsKKyAgICAgICAgaWYgKG1f ZmlsbHNGb3J3YXJkcykKKyAgICAgICAgICAgIG1fbGF5ZXIuZGF0YSgpLT5tX2xheWVyLT5zZXRU cmFuc2Zvcm0obV9sYXllci5kYXRhKCktPm1fYmFzZVRyYW5zZm9ybSk7CiAgICAgfQogCiAgICAg dmlydHVhbCB2b2lkIHVwZGF0ZVN0YXRlKFFBYnN0cmFjdEFuaW1hdGlvbjo6U3RhdGUgbmV3U3Rh dGUsIFFBYnN0cmFjdEFuaW1hdGlvbjo6U3RhdGUgb2xkU3RhdGUpCkBAIC0xMTczLDYgKzExODIs MTMgQEAgcHVibGljOgogICAgIHsKICAgICB9CiAKKyAgICB+T3BhY2l0eUFuaW1hdGlvblF0KCkK KyAgICB7CisgICAgICAgIGlmIChtX2ZpbGxzRm9yd2FyZHMpCisgICAgICAgICAgICBzZXRDdXJy ZW50VGltZSgxKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgbV9sYXllci5kYXRhKCktPnNl dE9wYWNpdHkobV9sYXllci5kYXRhKCktPm1fbGF5ZXItPm9wYWNpdHkoKSk7CisgICAgfQogICAg IHZpcnR1YWwgdm9pZCBhcHBseUZyYW1lKGNvbnN0IHFyZWFsJiBmcm9tVmFsdWUsIGNvbnN0IHFy ZWFsJiB0b1ZhbHVlLCBxcmVhbCBwcm9ncmVzcykKICAgICB7CiAgICAgICAgIHFyZWFsIG9wYWNp dHkgPSBxQm91bmQocXJlYWwoMCksIGZyb21WYWx1ZSArICh0b1ZhbHVlLWZyb21WYWx1ZSkqcHJv Z3Jlc3MsIHFyZWFsKDEpKTsKQEAgLTExODMsNiArMTE5OSw4IEBAIHB1YmxpYzoKICAgICAgICAg ICAgIG1fbGF5ZXIuZGF0YSgpLT5zY2VuZSgpLT51cGRhdGUoKTsKIAogICAgICAgICBtX2xheWVy LmRhdGEoKS0+c2V0T3BhY2l0eShvcGFjaXR5KTsKKyAgICAgICAgaWYgKG1fZmlsbHNGb3J3YXJk cykKKyAgICAgICAgICAgIG1fbGF5ZXIuZGF0YSgpLT5tX2xheWVyLT5zZXRPcGFjaXR5KG9wYWNp dHkpOwogICAgIH0KIAogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVTdGF0ZShRQWJzdHJhY3RBbmlt YXRpb246OlN0YXRlIG5ld1N0YXRlLCBRQWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG9sZFN0YXRl KQpAQCAtMTE5OSw3ICsxMjE3LDcgQEAgYm9vbCBHcmFwaGljc0xheWVyUXQ6OmFkZEFuaW1hdGlv bihjb25zdCBLZXlmcmFtZVZhbHVlTGlzdCYgdmFsdWVzLCBjb25zdCBJbnRTaXoKICAgICBpZiAo IWFuaW0tPmR1cmF0aW9uKCkgfHwgIWFuaW0tPml0ZXJhdGlvbkNvdW50KCkpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIAotICAgIFFBYnN0cmFjdEFuaW1hdGlvbiogbmV3QW5pbSA9IDA7CisgICAg QW5pbWF0aW9uUXRCYXNlKiBuZXdBbmltID0gMDsKIAogICAgIC8vIGZpeGVkOiB3ZSBtaWdodCBh bHJlYWR5IGhhdmUgdGhlIFF0IGFuaW1hdGlvbiBvYmplY3QgYXNzb2NpYXRlZCB3aXRoIHRoaXMg V2ViQ29yZTo6QW5pbWF0aW9uIG9iamVjdAogICAgIGZvciAoUUxpc3Q8UVdlYWtQb2ludGVyPFFB YnN0cmFjdEFuaW1hdGlvbj4gPjo6aXRlcmF0b3IgaXQgPSBtX2ltcGwtPm1fYW5pbWF0aW9ucy5i ZWdpbigpOyBpdCAhPSBtX2ltcGwtPm1fYW5pbWF0aW9ucy5lbmQoKTsgKytpdCkgewpAQCAtMTIy NCw2ICsxMjQyLDcgQEAgYm9vbCBHcmFwaGljc0xheWVyUXQ6OmFkZEFuaW1hdGlvbihjb25zdCBL ZXlmcmFtZVZhbHVlTGlzdCYgdmFsdWVzLCBjb25zdCBJbnRTaXoKIAogICAgICAgICAvLyB3ZSBt YWtlIHN1cmUgV2ViQ29yZTo6QW5pbWF0aW9uIGFuZCBRQW5pbWF0aW9uIGFyZSBvbiB0aGUgc2Ft ZSB0ZXJtcwogICAgICAgICBuZXdBbmltLT5zZXRMb29wQ291bnQoYW5pbS0+aXRlcmF0aW9uQ291 bnQoKSk7CisgICAgICAgIG5ld0FuaW0tPm1fZmlsbHNGb3J3YXJkcyA9IGFuaW0tPmZpbGxzRm9y d2FyZHMoKTsKICAgICAgICAgbV9pbXBsLT5tX2FuaW1hdGlvbnMuYXBwZW5kKFFXZWFrUG9pbnRl cjxRQWJzdHJhY3RBbmltYXRpb24+KG5ld0FuaW0pKTsKICAgICAgICAgUU9iamVjdDo6Y29ubmVj dCgmbV9pbXBsLT5tX3N1c3BlbmRUaW1lciwgU0lHTkFMKHRpbWVvdXQoKSksIG5ld0FuaW0sIFNM T1QocmVzdW1lKCkpKTsKICAgICB9CkBAIC0xMjMxLDYgKzEyNTAsMTAgQEAgYm9vbCBHcmFwaGlj c0xheWVyUXQ6OmFkZEFuaW1hdGlvbihjb25zdCBLZXlmcmFtZVZhbHVlTGlzdCYgdmFsdWVzLCBj b25zdCBJbnRTaXoKICAgICAvLyBmbHVzaCBub3cgb3IgZmxpY2tlci4uLgogICAgIG1faW1wbC0+ Zmx1c2hDaGFuZ2VzKGZhbHNlKTsKIAorICAgIC8vIHdoZW4gZmlsbC1tb2RlIGlzIGJhY2t3YXJk cy9ib3RoLCB3ZSBzZXQgdGhlIHZhbHVlIHRvIDAgYmVmb3JlIHRoZSBkZWxheSB0YWtlcyBwbGFj ZQorICAgIGlmIChhbmltLT5maWxsc0JhY2t3YXJkcygpKQorICAgICAgICBuZXdBbmltLT5zZXRD dXJyZW50VGltZSgwKTsKKwogICAgIGlmIChhbmltLT5kZWxheSgpKQogICAgICAgICBRVGltZXI6 OnNpbmdsZVNob3QoYW5pbS0+ZGVsYXkoKSAqIDEwMDAsIG5ld0FuaW0sIFNMT1Qoc3RhcnQoKSkp OwogICAgIGVsc2UK 53580 2010-04-16 16:37:11 -0700 2010-04-19 00:07:37 -0700 removed unnecessary function patch-36216-2.diff text/plain 6349 noam ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhZDAzZmYwLi4xNzFiMmRmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDQt MTYgIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEdyYXBoaWNzTGF5 ZXI6IHN1cHBvcnQgZmlsbC1tb2RlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzYyMTYKKworICAgICAgICBSZW1vdmUgTGF5b3V0VGVzdHMvYW5pbWF0 aW9ucy9maWxsLW1vZGUtdHJhbnNmb3JtLmh0bWwgZnJvbSB0aGUgc2tpcCBsaXN0CisKKyAgICAg ICAgKiBwbGF0Zm9ybS9xdC9Ta2lwcGVkOgorCiAyMDEwLTA0LTE2ICBBbmRyZXcgU2NoZXJrdXMg IDxzY2hlcmt1c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgZml4aW5nIENo cm9taXVtIHRlc3RfZXhwZWN0YXRpb25zLnR4dCBkdWUgdG8gcmVtb3ZlZCB0ZXN0cyBpbiByNTcy OTIuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAppbmRleCBkMjQ3ZWU4Li5kODMzYjFkIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL3F0L1NraXBwZWQKQEAgLTUyMTYsOSArNTIxNiw2IEBAIGVkaXRpbmcvZXhlY0NvbW1h bmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLmh0bWwKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM1OTczCiBmYXN0L211bHRpY29sL2hpdC10ZXN0LWFib3ZlLW9y LWJlbG93Lmh0bWwKIAotIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzYxOTEKLSNbUXRdIEdyYXBoaWNzTGF5ZXI6IGZpeCB0ZXN0IHJlZ3Jlc3Npb25zCi1hbmltYXRp b25zL2ZpbGwtbW9kZS10cmFuc2Zvcm0uaHRtbAogYW5pbWF0aW9ucy9zaW11bHRhbmVvdXMtc3Rh cnQtbGVmdC5odG1sCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z NzM4MQogYW5pbWF0aW9ucy9keW5hbWljLXN0eWxlc2hlZXQtbG9hZGluZy5odG1sCmRpZmYgLS1n aXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDY5NzlhMzMu LmJkN2Q0NjIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMDQtMTYgIE5vJ2FtIFJvc2VudGhhbCAgPG5v YW0ucm9zZW50aGFsQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbUXRdIEdyYXBoaWNzTGF5ZXI6IHN1cHBvcnQgZmlsbC1tb2Rlcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYyMTYKKyAg ICAgICAgSW1wbGVtZW50IHRoZSBDU1MtYW5pbWF0aW9uICJmaWxsIG1vZGUiIGNvbmNlcHQgaW4g R3JhcGhpY3NMYXllclF0LiBUaGUgY29uY2VwdAorICAgICAgICBlbmFibGVzIGEga2V5LWZyYW1l IGFuaW1hdGlvbiB0byBnbyB0byB0aGUgYW5pbWF0aW9uJ3Mgc3RhcnRpbmcgcG9pbnQgYmVmb3Jl IHRoZSBkZWxheSwKKyAgICAgICAgYW5kL29yIHRvIHN0YXkgYXQgdGhlIGFuaW1hdGlvbidzIGVu ZGluZyBwb2ludCBhZnRlciBpdHMgZW5kZWQsIHdpdGhvdXQgcmV2ZXJ0aW5nIHRvIHRoZSBkZWZh dWx0CisgICAgICAgIHZhbHVlLgorICAgICAgICBXZSBkbyB0aGF0IGJ5IG1hbnVhbGx5IHNldHRp bmcgdGhlIHZhbHVlIHRvIGtleWZyYW1lLTAgYmVmb3JlIHRoZSBkZWxheSBpZiBmaWxsLW1vZGUg aXMgYmFja3dhcmRzL2JvdGgsCisgICAgICAgIGFuZCBtYW51YWxseSBtb2RpZnlpbmcgdGhlIGRl ZmF1bHQgdmFsdWUgdG8gdGhlIGFuaW1hdGVkIHZhbHVlIGFzIHdlIGFuaW1hdGUsIHdpdGggZmls bC1tb2RlIGZvcndhcmRzL2JvdGguCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9H cmFwaGljc0xheWVyUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uUXRCYXNlOjpB bmltYXRpb25RdEJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6VHJhbnNmb3JtQW5pbWF0aW9uUXQ6 On5UcmFuc2Zvcm1BbmltYXRpb25RdCk6CisgICAgICAgIChXZWJDb3JlOjpUcmFuc2Zvcm1Bbmlt YXRpb25RdDo6YXBwbHlGcmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyUXQ6 OmFkZEFuaW1hdGlvbik6CisKIDIwMTAtMDQtMTYgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292Lgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQu Y3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwCmlu ZGV4IGY2ZmZiZmUuLmY2MzJhNmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAKQEAgLTk5NSw2ICs5OTUsNyBAQCBwdWJsaWM6CiAgICAg ICAgICwgbV93ZWJraXRQcm9wZXJ0eUlEKHZhbHVlcy5wcm9wZXJ0eSgpKQogICAgICAgICAsIG1f d2Via2l0QW5pbWF0aW9uKGFuaW0pCiAgICAgICAgICwgbV9rZXlmcmFtZXNOYW1lKG5hbWUpCisg ICAgICAgICwgbV9maWxsc0ZvcndhcmRzKGZhbHNlKQogICAgIHsKICAgICB9CiAKQEAgLTEwMTgs NiArMTAxOSw3IEBAIHB1YmxpYzoKICAgICAvLyB3ZSBtaWdodCBuZWVkIHRoaXMgaW4gY2FzZSB0 aGUgc2FtZSBhbmltYXRpb24gaXMgYWRkZWQgYWdhaW4gKGkuZS4gcmVzdW1lZCBieSBXZWJDb3Jl KQogICAgIGNvbnN0IEFuaW1hdGlvbiogbV93ZWJraXRBbmltYXRpb247CiAgICAgUVN0cmluZyBt X2tleWZyYW1lc05hbWU7CisgICAgYm9vbCBtX2ZpbGxzRm9yd2FyZHM7CiB9OwogCiAvLyB3ZSdk IHJhdGhlciBoYXZlIGEgdGVtcGxhdGl6ZWQgUUFic3RyYWN0QW5pbWF0aW9uIHRoYW4gUVByb3Bl cnR5QW5pbWF0aW9uIC8gUVZhcmlhbnRBbmltYXRpb247CkBAIC0xMTAyLDEwICsxMTA0LDEwIEBA IHB1YmxpYzoKIAogICAgIH5UcmFuc2Zvcm1BbmltYXRpb25RdCgpCiAgICAgewotICAgICAgICAv LyB0aGlzIGNhbWUgdXAgZHVyaW5nIHRoZSBjb21wb3NpdGluZy9hbmltYXRpb24gTGF5b3V0VGVz dHMKLSAgICAgICAgLy8gd2hlbiB0aGUgYW5pbWF0aW9uIGRpZXMsIHRoZSB0cmFuc2Zvcm0gaGFz IHRvIGdvIGJhY2sgdG8gZGVmYXVsdAotICAgICAgICBpZiAobV9sYXllcikKLSAgICAgICAgICAg IG1fbGF5ZXIuZGF0YSgpLT51cGRhdGVUcmFuc2Zvcm0oKTsKKyAgICAgICAgaWYgKG1fZmlsbHNG b3J3YXJkcykKKyAgICAgICAgICAgIHNldEN1cnJlbnRUaW1lKDEpOworICAgICAgICBlbHNlCisg ICAgICAgICAgICBtX2xheWVyLmRhdGEoKS0+c2V0QmFzZVRyYW5zZm9ybShtX2xheWVyLmRhdGEo KS0+bV9sYXllci0+dHJhbnNmb3JtKCkpOwogICAgIH0KIAogICAgIC8vIHRoZSBpZGVhIGlzIHRo YXQgd2UgbGV0IFdlYkNvcmUgbWFuYWdlIHRoZSB0cmFuc2Zvcm0tb3BlcmF0aW9ucwpAQCAtMTE0 NCw2ICsxMTQ2LDggQEAgcHVibGljOgogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAg IG1fbGF5ZXIuZGF0YSgpLT5zZXRCYXNlVHJhbnNmb3JtKHRyYW5zZm9ybU1hdHJpeCk7CisgICAg ICAgIGlmIChtX2ZpbGxzRm9yd2FyZHMpCisgICAgICAgICAgICBtX2xheWVyLmRhdGEoKS0+bV9s YXllci0+c2V0VHJhbnNmb3JtKG1fbGF5ZXIuZGF0YSgpLT5tX2Jhc2VUcmFuc2Zvcm0pOwogICAg IH0KIAogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVTdGF0ZShRQWJzdHJhY3RBbmltYXRpb246OlN0 YXRlIG5ld1N0YXRlLCBRQWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG9sZFN0YXRlKQpAQCAtMTE3 Myw2ICsxMTc3LDEzIEBAIHB1YmxpYzoKICAgICB7CiAgICAgfQogCisgICAgfk9wYWNpdHlBbmlt YXRpb25RdCgpCisgICAgeworICAgICAgICBpZiAobV9maWxsc0ZvcndhcmRzKQorICAgICAgICAg ICAgc2V0Q3VycmVudFRpbWUoMSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIG1fbGF5ZXIu ZGF0YSgpLT5zZXRPcGFjaXR5KG1fbGF5ZXIuZGF0YSgpLT5tX2xheWVyLT5vcGFjaXR5KCkpOwor ICAgIH0KICAgICB2aXJ0dWFsIHZvaWQgYXBwbHlGcmFtZShjb25zdCBxcmVhbCYgZnJvbVZhbHVl LCBjb25zdCBxcmVhbCYgdG9WYWx1ZSwgcXJlYWwgcHJvZ3Jlc3MpCiAgICAgewogICAgICAgICBx cmVhbCBvcGFjaXR5ID0gcUJvdW5kKHFyZWFsKDApLCBmcm9tVmFsdWUgKyAodG9WYWx1ZS1mcm9t VmFsdWUpKnByb2dyZXNzLCBxcmVhbCgxKSk7CkBAIC0xMTgzLDYgKzExOTQsOCBAQCBwdWJsaWM6 CiAgICAgICAgICAgICBtX2xheWVyLmRhdGEoKS0+c2NlbmUoKS0+dXBkYXRlKCk7CiAKICAgICAg ICAgbV9sYXllci5kYXRhKCktPnNldE9wYWNpdHkob3BhY2l0eSk7CisgICAgICAgIGlmIChtX2Zp bGxzRm9yd2FyZHMpCisgICAgICAgICAgICBtX2xheWVyLmRhdGEoKS0+bV9sYXllci0+c2V0T3Bh Y2l0eShvcGFjaXR5KTsKICAgICB9CiAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU3RhdGUoUUFi c3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSBuZXdTdGF0ZSwgUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0 ZSBvbGRTdGF0ZSkKQEAgLTExOTksNyArMTIxMiw3IEBAIGJvb2wgR3JhcGhpY3NMYXllclF0Ojph ZGRBbmltYXRpb24oY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmIHZhbHVlcywgY29uc3QgSW50U2l6 CiAgICAgaWYgKCFhbmltLT5kdXJhdGlvbigpIHx8ICFhbmltLT5pdGVyYXRpb25Db3VudCgpKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBRQWJzdHJhY3RBbmltYXRpb24qIG5ld0FuaW0g PSAwOworICAgIEFuaW1hdGlvblF0QmFzZSogbmV3QW5pbSA9IDA7CiAKICAgICAvLyBmaXhlZDog d2UgbWlnaHQgYWxyZWFkeSBoYXZlIHRoZSBRdCBhbmltYXRpb24gb2JqZWN0IGFzc29jaWF0ZWQg d2l0aCB0aGlzIFdlYkNvcmU6OkFuaW1hdGlvbiBvYmplY3QKICAgICBmb3IgKFFMaXN0PFFXZWFr UG9pbnRlcjxRQWJzdHJhY3RBbmltYXRpb24+ID46Oml0ZXJhdG9yIGl0ID0gbV9pbXBsLT5tX2Fu aW1hdGlvbnMuYmVnaW4oKTsgaXQgIT0gbV9pbXBsLT5tX2FuaW1hdGlvbnMuZW5kKCk7ICsraXQp IHsKQEAgLTEyMjQsNiArMTIzNyw3IEBAIGJvb2wgR3JhcGhpY3NMYXllclF0OjphZGRBbmltYXRp b24oY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmIHZhbHVlcywgY29uc3QgSW50U2l6CiAKICAgICAg ICAgLy8gd2UgbWFrZSBzdXJlIFdlYkNvcmU6OkFuaW1hdGlvbiBhbmQgUUFuaW1hdGlvbiBhcmUg b24gdGhlIHNhbWUgdGVybXMKICAgICAgICAgbmV3QW5pbS0+c2V0TG9vcENvdW50KGFuaW0tPml0 ZXJhdGlvbkNvdW50KCkpOworICAgICAgICBuZXdBbmltLT5tX2ZpbGxzRm9yd2FyZHMgPSBhbmlt LT5maWxsc0ZvcndhcmRzKCk7CiAgICAgICAgIG1faW1wbC0+bV9hbmltYXRpb25zLmFwcGVuZChR V2Vha1BvaW50ZXI8UUFic3RyYWN0QW5pbWF0aW9uPihuZXdBbmltKSk7CiAgICAgICAgIFFPYmpl Y3Q6OmNvbm5lY3QoJm1faW1wbC0+bV9zdXNwZW5kVGltZXIsIFNJR05BTCh0aW1lb3V0KCkpLCBu ZXdBbmltLCBTTE9UKHJlc3VtZSgpKSk7CiAgICAgfQpAQCAtMTIzMSw2ICsxMjQ1LDEwIEBAIGJv b2wgR3JhcGhpY3NMYXllclF0OjphZGRBbmltYXRpb24oY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3Qm IHZhbHVlcywgY29uc3QgSW50U2l6CiAgICAgLy8gZmx1c2ggbm93IG9yIGZsaWNrZXIuLi4KICAg ICBtX2ltcGwtPmZsdXNoQ2hhbmdlcyhmYWxzZSk7CiAKKyAgICAvLyB3aGVuIGZpbGwtbW9kZSBp cyBiYWNrd2FyZHMvYm90aCwgd2Ugc2V0IHRoZSB2YWx1ZSB0byAwIGJlZm9yZSB0aGUgZGVsYXkg dGFrZXMgcGxhY2UKKyAgICBpZiAoYW5pbS0+ZmlsbHNCYWNrd2FyZHMoKSkKKyAgICAgICAgbmV3 QW5pbS0+c2V0Q3VycmVudFRpbWUoMCk7CisKICAgICBpZiAoYW5pbS0+ZGVsYXkoKSkKICAgICAg ICAgUVRpbWVyOjpzaW5nbGVTaG90KGFuaW0tPmRlbGF5KCkgKiAxMDAwLCBuZXdBbmltLCBTTE9U KHN0YXJ0KCkpKTsKICAgICBlbHNlCg== 53655 2010-04-19 00:07:37 -0700 2010-04-19 11:36:24 -0700 re-submitting the patch, this time with a couple of more null-checks I overlooked in the first patch. All the regressed tests worked for me after this patch. 36216.diff text/plain 4017 noam ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0 LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcA0K aW5kZXggZjZmZmJmZS4uZjYzMmE2YSAxMDA2NDQNCi0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcA0KKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwDQpAQCAtOTk1LDYgKzk5NSw3IEBAIHB1YmxpYzoN CiAgICAgICAgICwgbV93ZWJraXRQcm9wZXJ0eUlEKHZhbHVlcy5wcm9wZXJ0eSgpKQ0KICAgICAg ICAgLCBtX3dlYmtpdEFuaW1hdGlvbihhbmltKQ0KICAgICAgICAgLCBtX2tleWZyYW1lc05hbWUo bmFtZSkNCisgICAgICAgICwgbV9maWxsc0ZvcndhcmRzKGZhbHNlKQ0KICAgICB7DQogICAgIH0N CiANCkBAIC0xMDE4LDYgKzEwMTksNyBAQCBwdWJsaWM6DQogICAgIC8vIHdlIG1pZ2h0IG5lZWQg dGhpcyBpbiBjYXNlIHRoZSBzYW1lIGFuaW1hdGlvbiBpcyBhZGRlZCBhZ2FpbiAoaS5lLiByZXN1 bWVkIGJ5IFdlYkNvcmUpDQogICAgIGNvbnN0IEFuaW1hdGlvbiogbV93ZWJraXRBbmltYXRpb247 DQogICAgIFFTdHJpbmcgbV9rZXlmcmFtZXNOYW1lOw0KKyAgICBib29sIG1fZmlsbHNGb3J3YXJk czsNCiB9Ow0KIA0KIC8vIHdlJ2QgcmF0aGVyIGhhdmUgYSB0ZW1wbGF0aXplZCBRQWJzdHJhY3RB bmltYXRpb24gdGhhbiBRUHJvcGVydHlBbmltYXRpb24gLyBRVmFyaWFudEFuaW1hdGlvbjsNCkBA IC0xMTAyLDEwICsxMTA0LDEwIEBAIHB1YmxpYzoNCiANCiAgICAgflRyYW5zZm9ybUFuaW1hdGlv blF0KCkNCiAgICAgew0KLSAgICAgICAgLy8gdGhpcyBjYW1lIHVwIGR1cmluZyB0aGUgY29tcG9z aXRpbmcvYW5pbWF0aW9uIExheW91dFRlc3RzDQotICAgICAgICAvLyB3aGVuIHRoZSBhbmltYXRp b24gZGllcywgdGhlIHRyYW5zZm9ybSBoYXMgdG8gZ28gYmFjayB0byBkZWZhdWx0DQotICAgICAg ICBpZiAobV9sYXllcikNCi0gICAgICAgICAgICBtX2xheWVyLmRhdGEoKS0+dXBkYXRlVHJhbnNm b3JtKCk7DQorICAgICAgICBpZiAobV9maWxsc0ZvcndhcmRzKQ0KKyAgICAgICAgICAgIHNldEN1 cnJlbnRUaW1lKDEpOw0KKyAgICAgICAgZWxzZSBpZiAobV9sYXllciAmJiBtX2xheWVyLmRhdGEo KS0+bV9sYXllcikNCisgICAgICAgICAgICBtX2xheWVyLmRhdGEoKS0+c2V0QmFzZVRyYW5zZm9y bShtX2xheWVyLmRhdGEoKS0+bV9sYXllci0+dHJhbnNmb3JtKCkpOw0KICAgICB9DQogDQogICAg IC8vIHRoZSBpZGVhIGlzIHRoYXQgd2UgbGV0IFdlYkNvcmUgbWFuYWdlIHRoZSB0cmFuc2Zvcm0t b3BlcmF0aW9ucw0KQEAgLTExNDQsNiArMTE0Niw4IEBAIHB1YmxpYzoNCiAgICAgICAgICAgICB9 DQogICAgICAgICB9DQogICAgICAgICBtX2xheWVyLmRhdGEoKS0+c2V0QmFzZVRyYW5zZm9ybSh0 cmFuc2Zvcm1NYXRyaXgpOw0KKyAgICAgICAgaWYgKG1fZmlsbHNGb3J3YXJkcykNCisgICAgICAg ICAgICBtX2xheWVyLmRhdGEoKS0+bV9sYXllci0+c2V0VHJhbnNmb3JtKG1fbGF5ZXIuZGF0YSgp LT5tX2Jhc2VUcmFuc2Zvcm0pOw0KICAgICB9DQogDQogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVT dGF0ZShRQWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG5ld1N0YXRlLCBRQWJzdHJhY3RBbmltYXRp b246OlN0YXRlIG9sZFN0YXRlKQ0KQEAgLTExNzMsNiArMTE3NywxMyBAQCBwdWJsaWM6DQogICAg IHsNCiAgICAgfQ0KIA0KKyAgICB+T3BhY2l0eUFuaW1hdGlvblF0KCkNCisgICAgew0KKyAgICAg ICAgaWYgKG1fZmlsbHNGb3J3YXJkcykNCisgICAgICAgICAgICBzZXRDdXJyZW50VGltZSgxKTsN CisgICAgICAgIGVsc2UgaWYgKG1fbGF5ZXIgJiYgbV9sYXllci5kYXRhKCktPm1fbGF5ZXIpDQor ICAgICAgICAgICAgbV9sYXllci5kYXRhKCktPnNldE9wYWNpdHkobV9sYXllci5kYXRhKCktPm1f bGF5ZXItPm9wYWNpdHkoKSk7DQorICAgIH0NCiAgICAgdmlydHVhbCB2b2lkIGFwcGx5RnJhbWUo Y29uc3QgcXJlYWwmIGZyb21WYWx1ZSwgY29uc3QgcXJlYWwmIHRvVmFsdWUsIHFyZWFsIHByb2dy ZXNzKQ0KICAgICB7DQogICAgICAgICBxcmVhbCBvcGFjaXR5ID0gcUJvdW5kKHFyZWFsKDApLCBm cm9tVmFsdWUgKyAodG9WYWx1ZS1mcm9tVmFsdWUpKnByb2dyZXNzLCBxcmVhbCgxKSk7DQpAQCAt MTE4Myw2ICsxMTk0LDggQEAgcHVibGljOg0KICAgICAgICAgICAgIG1fbGF5ZXIuZGF0YSgpLT5z Y2VuZSgpLT51cGRhdGUoKTsNCiANCiAgICAgICAgIG1fbGF5ZXIuZGF0YSgpLT5zZXRPcGFjaXR5 KG9wYWNpdHkpOw0KKyAgICAgICAgaWYgKG1fZmlsbHNGb3J3YXJkcykNCisgICAgICAgICAgICBt X2xheWVyLmRhdGEoKS0+bV9sYXllci0+c2V0T3BhY2l0eShvcGFjaXR5KTsNCiAgICAgfQ0KIA0K ICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU3RhdGUoUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSBu ZXdTdGF0ZSwgUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSBvbGRTdGF0ZSkNCkBAIC0xMTk5LDcg KzEyMTIsNyBAQCBib29sIEdyYXBoaWNzTGF5ZXJRdDo6YWRkQW5pbWF0aW9uKGNvbnN0IEtleWZy YW1lVmFsdWVMaXN0JiB2YWx1ZXMsIGNvbnN0IEludFNpeg0KICAgICBpZiAoIWFuaW0tPmR1cmF0 aW9uKCkgfHwgIWFuaW0tPml0ZXJhdGlvbkNvdW50KCkpDQogICAgICAgICByZXR1cm4gZmFsc2U7 DQogDQotICAgIFFBYnN0cmFjdEFuaW1hdGlvbiogbmV3QW5pbSA9IDA7DQorICAgIEFuaW1hdGlv blF0QmFzZSogbmV3QW5pbSA9IDA7DQogDQogICAgIC8vIGZpeGVkOiB3ZSBtaWdodCBhbHJlYWR5 IGhhdmUgdGhlIFF0IGFuaW1hdGlvbiBvYmplY3QgYXNzb2NpYXRlZCB3aXRoIHRoaXMgV2ViQ29y ZTo6QW5pbWF0aW9uIG9iamVjdA0KICAgICBmb3IgKFFMaXN0PFFXZWFrUG9pbnRlcjxRQWJzdHJh Y3RBbmltYXRpb24+ID46Oml0ZXJhdG9yIGl0ID0gbV9pbXBsLT5tX2FuaW1hdGlvbnMuYmVnaW4o KTsgaXQgIT0gbV9pbXBsLT5tX2FuaW1hdGlvbnMuZW5kKCk7ICsraXQpIHsNCkBAIC0xMjI0LDYg KzEyMzcsNyBAQCBib29sIEdyYXBoaWNzTGF5ZXJRdDo6YWRkQW5pbWF0aW9uKGNvbnN0IEtleWZy YW1lVmFsdWVMaXN0JiB2YWx1ZXMsIGNvbnN0IEludFNpeg0KIA0KICAgICAgICAgLy8gd2UgbWFr ZSBzdXJlIFdlYkNvcmU6OkFuaW1hdGlvbiBhbmQgUUFuaW1hdGlvbiBhcmUgb24gdGhlIHNhbWUg dGVybXMNCiAgICAgICAgIG5ld0FuaW0tPnNldExvb3BDb3VudChhbmltLT5pdGVyYXRpb25Db3Vu dCgpKTsNCisgICAgICAgIG5ld0FuaW0tPm1fZmlsbHNGb3J3YXJkcyA9IGFuaW0tPmZpbGxzRm9y d2FyZHMoKTsNCiAgICAgICAgIG1faW1wbC0+bV9hbmltYXRpb25zLmFwcGVuZChRV2Vha1BvaW50 ZXI8UUFic3RyYWN0QW5pbWF0aW9uPihuZXdBbmltKSk7DQogICAgICAgICBRT2JqZWN0Ojpjb25u ZWN0KCZtX2ltcGwtPm1fc3VzcGVuZFRpbWVyLCBTSUdOQUwodGltZW91dCgpKSwgbmV3QW5pbSwg U0xPVChyZXN1bWUoKSkpOw0KICAgICB9DQpAQCAtMTIzMSw2ICsxMjQ1LDEwIEBAIGJvb2wgR3Jh cGhpY3NMYXllclF0OjphZGRBbmltYXRpb24oY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmIHZhbHVl cywgY29uc3QgSW50U2l6DQogICAgIC8vIGZsdXNoIG5vdyBvciBmbGlja2VyLi4uDQogICAgIG1f aW1wbC0+Zmx1c2hDaGFuZ2VzKGZhbHNlKTsNCiANCisgICAgLy8gd2hlbiBmaWxsLW1vZGUgaXMg YmFja3dhcmRzL2JvdGgsIHdlIHNldCB0aGUgdmFsdWUgdG8gMCBiZWZvcmUgdGhlIGRlbGF5IHRh a2VzIHBsYWNlDQorICAgIGlmIChhbmltLT5maWxsc0JhY2t3YXJkcygpKQ0KKyAgICAgICAgbmV3 QW5pbS0+c2V0Q3VycmVudFRpbWUoMCk7DQorDQogICAgIGlmIChhbmltLT5kZWxheSgpKQ0KICAg ICAgICAgUVRpbWVyOjpzaW5nbGVTaG90KGFuaW0tPmRlbGF5KCkgKiAxMDAwLCBuZXdBbmltLCBT TE9UKHN0YXJ0KCkpKTsNCiAgICAgZWxzZQ0K 53695 2010-04-19 11:36:24 -0700 2010-04-20 01:28:11 -0700 changelog was mistakenly omitted from previous patch patch-36216-2.diff text/plain 6429 noam ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhZDAzZmYwLi4xNzFiMmRmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDQt MTYgIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEdyYXBoaWNzTGF5 ZXI6IHN1cHBvcnQgZmlsbC1tb2RlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzYyMTYKKworICAgICAgICBSZW1vdmUgTGF5b3V0VGVzdHMvYW5pbWF0 aW9ucy9maWxsLW1vZGUtdHJhbnNmb3JtLmh0bWwgZnJvbSB0aGUgc2tpcCBsaXN0CisKKyAgICAg ICAgKiBwbGF0Zm9ybS9xdC9Ta2lwcGVkOgorCiAyMDEwLTA0LTE2ICBBbmRyZXcgU2NoZXJrdXMg IDxzY2hlcmt1c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgZml4aW5nIENo cm9taXVtIHRlc3RfZXhwZWN0YXRpb25zLnR4dCBkdWUgdG8gcmVtb3ZlZCB0ZXN0cyBpbiByNTcy OTIuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAppbmRleCBkMjQ3ZWU4Li5kODMzYjFkIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL3F0L1NraXBwZWQKQEAgLTUyMTYsOSArNTIxNiw2IEBAIGVkaXRpbmcvZXhlY0NvbW1h bmQvbW92ZS1zZWxlY3Rpb24tYmFjay1saW5lLmh0bWwKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM1OTczCiBmYXN0L211bHRpY29sL2hpdC10ZXN0LWFib3ZlLW9y LWJlbG93Lmh0bWwKIAotIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzYxOTEKLSNbUXRdIEdyYXBoaWNzTGF5ZXI6IGZpeCB0ZXN0IHJlZ3Jlc3Npb25zCi1hbmltYXRp b25zL2ZpbGwtbW9kZS10cmFuc2Zvcm0uaHRtbAogYW5pbWF0aW9ucy9zaW11bHRhbmVvdXMtc3Rh cnQtbGVmdC5odG1sCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z NzM4MQogYW5pbWF0aW9ucy9keW5hbWljLXN0eWxlc2hlZXQtbG9hZGluZy5odG1sCmRpZmYgLS1n aXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDY5NzlhMzMu LmJkN2Q0NjIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMDQtMTYgIE5vJ2FtIFJvc2VudGhhbCAgPG5v YW0ucm9zZW50aGFsQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbUXRdIEdyYXBoaWNzTGF5ZXI6IHN1cHBvcnQgZmlsbC1tb2Rlcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYyMTYKKyAg ICAgICAgSW1wbGVtZW50IHRoZSBDU1MtYW5pbWF0aW9uICJmaWxsIG1vZGUiIGNvbmNlcHQgaW4g R3JhcGhpY3NMYXllclF0LiBUaGUgY29uY2VwdAorICAgICAgICBlbmFibGVzIGEga2V5LWZyYW1l IGFuaW1hdGlvbiB0byBnbyB0byB0aGUgYW5pbWF0aW9uJ3Mgc3RhcnRpbmcgcG9pbnQgYmVmb3Jl IHRoZSBkZWxheSwKKyAgICAgICAgYW5kL29yIHRvIHN0YXkgYXQgdGhlIGFuaW1hdGlvbidzIGVu ZGluZyBwb2ludCBhZnRlciBpdHMgZW5kZWQsIHdpdGhvdXQgcmV2ZXJ0aW5nIHRvIHRoZSBkZWZh dWx0CisgICAgICAgIHZhbHVlLgorICAgICAgICBXZSBkbyB0aGF0IGJ5IG1hbnVhbGx5IHNldHRp bmcgdGhlIHZhbHVlIHRvIGtleWZyYW1lLTAgYmVmb3JlIHRoZSBkZWxheSBpZiBmaWxsLW1vZGUg aXMgYmFja3dhcmRzL2JvdGgsCisgICAgICAgIGFuZCBtYW51YWxseSBtb2RpZnlpbmcgdGhlIGRl ZmF1bHQgdmFsdWUgdG8gdGhlIGFuaW1hdGVkIHZhbHVlIGFzIHdlIGFuaW1hdGUsIHdpdGggZmls bC1tb2RlIGZvcndhcmRzL2JvdGguCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9H cmFwaGljc0xheWVyUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uUXRCYXNlOjpB bmltYXRpb25RdEJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6VHJhbnNmb3JtQW5pbWF0aW9uUXQ6 On5UcmFuc2Zvcm1BbmltYXRpb25RdCk6CisgICAgICAgIChXZWJDb3JlOjpUcmFuc2Zvcm1Bbmlt YXRpb25RdDo6YXBwbHlGcmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyUXQ6 OmFkZEFuaW1hdGlvbik6CisKIDIwMTAtMDQtMTYgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292Lgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQu Y3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwCmlu ZGV4IGY2ZmZiZmUuLmY2MzJhNmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAKQEAgLTk5NSw2ICs5OTUsNyBAQCBwdWJsaWM6CiAgICAg ICAgICwgbV93ZWJraXRQcm9wZXJ0eUlEKHZhbHVlcy5wcm9wZXJ0eSgpKQogICAgICAgICAsIG1f d2Via2l0QW5pbWF0aW9uKGFuaW0pCiAgICAgICAgICwgbV9rZXlmcmFtZXNOYW1lKG5hbWUpCisg ICAgICAgICwgbV9maWxsc0ZvcndhcmRzKGZhbHNlKQogICAgIHsKICAgICB9CiAKQEAgLTEwMTgs NiArMTAxOSw3IEBAIHB1YmxpYzoKICAgICAvLyB3ZSBtaWdodCBuZWVkIHRoaXMgaW4gY2FzZSB0 aGUgc2FtZSBhbmltYXRpb24gaXMgYWRkZWQgYWdhaW4gKGkuZS4gcmVzdW1lZCBieSBXZWJDb3Jl KQogICAgIGNvbnN0IEFuaW1hdGlvbiogbV93ZWJraXRBbmltYXRpb247CiAgICAgUVN0cmluZyBt X2tleWZyYW1lc05hbWU7CisgICAgYm9vbCBtX2ZpbGxzRm9yd2FyZHM7CiB9OwogCiAvLyB3ZSdk IHJhdGhlciBoYXZlIGEgdGVtcGxhdGl6ZWQgUUFic3RyYWN0QW5pbWF0aW9uIHRoYW4gUVByb3Bl cnR5QW5pbWF0aW9uIC8gUVZhcmlhbnRBbmltYXRpb247CkBAIC0xMTAyLDEwICsxMTA0LDEwIEBA IHB1YmxpYzoKIAogICAgIH5UcmFuc2Zvcm1BbmltYXRpb25RdCgpCiAgICAgewotICAgICAgICAv LyB0aGlzIGNhbWUgdXAgZHVyaW5nIHRoZSBjb21wb3NpdGluZy9hbmltYXRpb24gTGF5b3V0VGVz dHMKLSAgICAgICAgLy8gd2hlbiB0aGUgYW5pbWF0aW9uIGRpZXMsIHRoZSB0cmFuc2Zvcm0gaGFz IHRvIGdvIGJhY2sgdG8gZGVmYXVsdAotICAgICAgICBpZiAobV9sYXllcikKLSAgICAgICAgICAg IG1fbGF5ZXIuZGF0YSgpLT51cGRhdGVUcmFuc2Zvcm0oKTsKKyAgICAgICAgaWYgKG1fZmlsbHNG b3J3YXJkcykKKyAgICAgICAgICAgIHNldEN1cnJlbnRUaW1lKDEpOworICAgICAgICBlbHNlIGlm IChtX2xheWVyICYmIG1fbGF5ZXIuZGF0YSgpLT5tX2xheWVyKQorICAgICAgICAgICAgbV9sYXll ci5kYXRhKCktPnNldEJhc2VUcmFuc2Zvcm0obV9sYXllci5kYXRhKCktPm1fbGF5ZXItPnRyYW5z Zm9ybSgpKTsKICAgICB9CiAKICAgICAvLyB0aGUgaWRlYSBpcyB0aGF0IHdlIGxldCBXZWJDb3Jl IG1hbmFnZSB0aGUgdHJhbnNmb3JtLW9wZXJhdGlvbnMKQEAgLTExNDQsNiArMTE0Niw4IEBAIHB1 YmxpYzoKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICBtX2xheWVyLmRhdGEoKS0+ c2V0QmFzZVRyYW5zZm9ybSh0cmFuc2Zvcm1NYXRyaXgpOworICAgICAgICBpZiAobV9maWxsc0Zv cndhcmRzKQorICAgICAgICAgICAgbV9sYXllci5kYXRhKCktPm1fbGF5ZXItPnNldFRyYW5zZm9y bShtX2xheWVyLmRhdGEoKS0+bV9iYXNlVHJhbnNmb3JtKTsKICAgICB9CiAKICAgICB2aXJ0dWFs IHZvaWQgdXBkYXRlU3RhdGUoUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSBuZXdTdGF0ZSwgUUFi c3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSBvbGRTdGF0ZSkKQEAgLTExNzMsNiArMTE3NywxMyBAQCBw dWJsaWM6CiAgICAgewogICAgIH0KIAorICAgIH5PcGFjaXR5QW5pbWF0aW9uUXQoKQorICAgIHsK KyAgICAgICAgaWYgKG1fZmlsbHNGb3J3YXJkcykKKyAgICAgICAgICAgIHNldEN1cnJlbnRUaW1l KDEpOworICAgICAgICBlbHNlIGlmIChtX2xheWVyICYmIG1fbGF5ZXIuZGF0YSgpLT5tX2xheWVy KQorICAgICAgICAgICAgbV9sYXllci5kYXRhKCktPnNldE9wYWNpdHkobV9sYXllci5kYXRhKCkt Pm1fbGF5ZXItPm9wYWNpdHkoKSk7CisgICAgfQogICAgIHZpcnR1YWwgdm9pZCBhcHBseUZyYW1l KGNvbnN0IHFyZWFsJiBmcm9tVmFsdWUsIGNvbnN0IHFyZWFsJiB0b1ZhbHVlLCBxcmVhbCBwcm9n cmVzcykKICAgICB7CiAgICAgICAgIHFyZWFsIG9wYWNpdHkgPSBxQm91bmQocXJlYWwoMCksIGZy b21WYWx1ZSArICh0b1ZhbHVlLWZyb21WYWx1ZSkqcHJvZ3Jlc3MsIHFyZWFsKDEpKTsKQEAgLTEx ODMsNiArMTE5NCw4IEBAIHB1YmxpYzoKICAgICAgICAgICAgIG1fbGF5ZXIuZGF0YSgpLT5zY2Vu ZSgpLT51cGRhdGUoKTsKIAogICAgICAgICBtX2xheWVyLmRhdGEoKS0+c2V0T3BhY2l0eShvcGFj aXR5KTsKKyAgICAgICAgaWYgKG1fZmlsbHNGb3J3YXJkcykKKyAgICAgICAgICAgIG1fbGF5ZXIu ZGF0YSgpLT5tX2xheWVyLT5zZXRPcGFjaXR5KG9wYWNpdHkpOwogICAgIH0KIAogICAgIHZpcnR1 YWwgdm9pZCB1cGRhdGVTdGF0ZShRQWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG5ld1N0YXRlLCBR QWJzdHJhY3RBbmltYXRpb246OlN0YXRlIG9sZFN0YXRlKQpAQCAtMTE5OSw3ICsxMjEyLDcgQEAg Ym9vbCBHcmFwaGljc0xheWVyUXQ6OmFkZEFuaW1hdGlvbihjb25zdCBLZXlmcmFtZVZhbHVlTGlz dCYgdmFsdWVzLCBjb25zdCBJbnRTaXoKICAgICBpZiAoIWFuaW0tPmR1cmF0aW9uKCkgfHwgIWFu aW0tPml0ZXJhdGlvbkNvdW50KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIFFBYnN0 cmFjdEFuaW1hdGlvbiogbmV3QW5pbSA9IDA7CisgICAgQW5pbWF0aW9uUXRCYXNlKiBuZXdBbmlt ID0gMDsKIAogICAgIC8vIGZpeGVkOiB3ZSBtaWdodCBhbHJlYWR5IGhhdmUgdGhlIFF0IGFuaW1h dGlvbiBvYmplY3QgYXNzb2NpYXRlZCB3aXRoIHRoaXMgV2ViQ29yZTo6QW5pbWF0aW9uIG9iamVj dAogICAgIGZvciAoUUxpc3Q8UVdlYWtQb2ludGVyPFFBYnN0cmFjdEFuaW1hdGlvbj4gPjo6aXRl cmF0b3IgaXQgPSBtX2ltcGwtPm1fYW5pbWF0aW9ucy5iZWdpbigpOyBpdCAhPSBtX2ltcGwtPm1f YW5pbWF0aW9ucy5lbmQoKTsgKytpdCkgewpAQCAtMTIyNCw2ICsxMjM3LDcgQEAgYm9vbCBHcmFw aGljc0xheWVyUXQ6OmFkZEFuaW1hdGlvbihjb25zdCBLZXlmcmFtZVZhbHVlTGlzdCYgdmFsdWVz LCBjb25zdCBJbnRTaXoKIAogICAgICAgICAvLyB3ZSBtYWtlIHN1cmUgV2ViQ29yZTo6QW5pbWF0 aW9uIGFuZCBRQW5pbWF0aW9uIGFyZSBvbiB0aGUgc2FtZSB0ZXJtcwogICAgICAgICBuZXdBbmlt LT5zZXRMb29wQ291bnQoYW5pbS0+aXRlcmF0aW9uQ291bnQoKSk7CisgICAgICAgIG5ld0FuaW0t Pm1fZmlsbHNGb3J3YXJkcyA9IGFuaW0tPmZpbGxzRm9yd2FyZHMoKTsKICAgICAgICAgbV9pbXBs LT5tX2FuaW1hdGlvbnMuYXBwZW5kKFFXZWFrUG9pbnRlcjxRQWJzdHJhY3RBbmltYXRpb24+KG5l d0FuaW0pKTsKICAgICAgICAgUU9iamVjdDo6Y29ubmVjdCgmbV9pbXBsLT5tX3N1c3BlbmRUaW1l ciwgU0lHTkFMKHRpbWVvdXQoKSksIG5ld0FuaW0sIFNMT1QocmVzdW1lKCkpKTsKICAgICB9CkBA IC0xMjMxLDYgKzEyNDUsMTAgQEAgYm9vbCBHcmFwaGljc0xheWVyUXQ6OmFkZEFuaW1hdGlvbihj b25zdCBLZXlmcmFtZVZhbHVlTGlzdCYgdmFsdWVzLCBjb25zdCBJbnRTaXoKICAgICAvLyBmbHVz aCBub3cgb3IgZmxpY2tlci4uLgogICAgIG1faW1wbC0+Zmx1c2hDaGFuZ2VzKGZhbHNlKTsKIAor ICAgIC8vIHdoZW4gZmlsbC1tb2RlIGlzIGJhY2t3YXJkcy9ib3RoLCB3ZSBzZXQgdGhlIHZhbHVl IHRvIDAgYmVmb3JlIHRoZSBkZWxheSB0YWtlcyBwbGFjZQorICAgIGlmIChhbmltLT5maWxsc0Jh Y2t3YXJkcygpKQorICAgICAgICBuZXdBbmltLT5zZXRDdXJyZW50VGltZSgwKTsKKwogICAgIGlm IChhbmltLT5kZWxheSgpKQogICAgICAgICBRVGltZXI6OnNpbmdsZVNob3QoYW5pbS0+ZGVsYXko KSAqIDEwMDAsIG5ld0FuaW0sIFNMT1Qoc3RhcnQoKSkpOwogICAgIGVsc2UK