49940 2010-11-22 14:28:22 -0800 [Chromium] Implement FileWriterSync 2010-11-24 17:55:42 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ericu ericu commit-queue levin oldest_to_newest 312525 0 ericu 2010-11-22 14:28:22 -0800 Add the Chromium-specific implementation for FileWriterSync. 312622 1 74620 ericu 2010-11-22 17:26:48 -0800 Created attachment 74620 Chromium bits to implement AsyncFileWriter support for synchronous operations See https://bugs.webkit.org/show_bug.cgi?id=49939 for context, but the patches can go in in whichever order. 313118 2 74620 levin 2010-11-23 20:44:49 -0800 Comment on attachment 74620 Chromium bits to implement AsyncFileWriter support for synchronous operations View in context: https://bugs.webkit.org/attachment.cgi?id=74620&action=review > WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp:208 > + if (context->thread()->runLoop().runInMode(context, WorkerRunLoop::defaultMode()) == MessageQueueTerminated) Don't run a nested loop in defaultMode. It should have a name (and ideally have a number appended). See other places where this is done. Other than that this change looks great! 313413 3 74784 ericu 2010-11-24 11:40:53 -0800 Created attachment 74784 Added a mode for the runloop. I decided not to make a unique per-invocation [numbered] mode string. It's extra string manipulation on every call for a feature that may never be needed, and it'll be easy to add later. I did put in a warning comment about it, though. 313455 4 74784 levin 2010-11-24 13:59:44 -0800 Comment on attachment 74784 Added a mode for the runloop. View in context: https://bugs.webkit.org/attachment.cgi?id=74784&action=review > WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp:205 > + m_proxy->postTaskForModeToWorkerContext(createCallbackTask(&runTaskOnWorkerThread, this, task), fileWriterOperationsMode); Ok so this posts to a mode for the sync calls and the async calls. In other words, it is using a mode for the async calls when it really isn't trying to post to a nested message loop. That will work and results in less code... (it feels mildly odd for some reason but) ok. 313456 5 74784 levin 2010-11-24 14:03:28 -0800 Comment on attachment 74784 Added a mode for the runloop. Actually I think the single mode is broken. 313457 6 levin 2010-11-24 14:04:14 -0800 (In reply to comment #5) > (From update of attachment 74784 [details]) > Actually I think the single mode is broken. If this function is used by async functions for callbacks, then those callbacks will happen during this sync call and that would be bad. 313475 7 74796 ericu 2010-11-24 14:41:49 -0800 Created attachment 74796 Fixed runloop to have a unique ID. 313493 8 74796 levin 2010-11-24 15:18:54 -0800 Comment on attachment 74796 Fixed runloop to have a unique ID. Thanks! 313549 9 commit-queue 2010-11-24 17:25:09 -0800 The commit-queue encountered the following flaky tests while processing attachment 74796: fast/css/font-face-download-error.html animations/suspend-resume-animation-events.html Please file bugs against the tests. These tests were authored by cmarrin@apple.com and yuzo@google.com. The commit-queue is continuing to process your patch. 313564 10 74796 commit-queue 2010-11-24 17:55:36 -0800 Comment on attachment 74796 Fixed runloop to have a unique ID. Clearing flags on attachment: 74796 Committed r72711: <http://trac.webkit.org/changeset/72711> 313565 11 commit-queue 2010-11-24 17:55:42 -0800 All reviewed patches have been landed. Closing bug. 74620 2010-11-22 17:26:48 -0800 2010-11-24 11:40:53 -0800 Chromium bits to implement AsyncFileWriter support for synchronous operations chromium.patch text/plain 6795 ericu SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNzI1NzMpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTAtMTEtMjIgIEVyaWMg VWhyaGFuZSAgPGVyaWN1QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbQ2hyb21pdW1dIEltcGxlbWVudCBGaWxlV3JpdGVyU3lu YworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDk5NDAK KworICAgICAgICBBZGRlZCB3YWl0Rm9yT3BlcmF0aW9uVG9Db21wbGV0ZSwgZGVsZWdhdGluZyB0 byB0aGUgYnJpZGdlLgorICAgICAgICAqIHNyYy9Xb3JrZXJBc3luY0ZpbGVXcml0ZXJDaHJvbWl1 bS5jcHA6CisgICAgICAgICogc3JjL1dvcmtlckFzeW5jRmlsZVdyaXRlckNocm9taXVtLmg6CisK KyAgICAgICAgQWRkZWQgd2FpdEZvck9wZXJhdGlvblRvQ29tcGxldGUgYW5kIHNvbWUgZGVidWct b25seSBjb2RlIHRvIG1ha2Ugc3VyZSBpdCdzIHdvcmtpbmcgcHJvcGVybHkuCisgICAgICAgICog c3JjL1dvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2UuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjpwb3N0V3JpdGVUb01haW5UaHJlYWQp OgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjpwb3N0 VHJ1bmNhdGVUb01haW5UaHJlYWQpOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlV3JpdGVy Q2FsbGJhY2tzQnJpZGdlOjpwb3N0QWJvcnRUb01haW5UaHJlYWQpOgorICAgICAgICAoV2ViS2l0 OjpXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjpXb3JrZXJGaWxlV3JpdGVyQ2FsbGJh Y2tzQnJpZGdlKToKKyAgICAgICAgKFdlYktpdDo6V29ya2VyRmlsZVdyaXRlckNhbGxiYWNrc0Jy aWRnZTo6ZGlkV3JpdGVPbldvcmtlclRocmVhZCk6CisgICAgICAgIChXZWJLaXQ6OldvcmtlckZp bGVXcml0ZXJDYWxsYmFja3NCcmlkZ2U6OmRpZEZhaWxPbldvcmtlclRocmVhZCk6CisgICAgICAg IChXZWJLaXQ6OldvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2U6OmRpZFRydW5jYXRlT25X b3JrZXJUaHJlYWQpOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tz QnJpZGdlOjp3YWl0Rm9yT3BlcmF0aW9uVG9Db21wbGV0ZSk6CisgICAgICAgICogc3JjL1dvcmtl ckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2UuaDoKKwogMjAxMC0xMS0yMiAgVG9ueSBDaGFuZyAg PHRvbnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGwgQ2hyb21pdW0g REVQUyB0byByNjcwMDQuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dvcmtlckFzeW5jRmls ZVdyaXRlckNocm9taXVtLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dv cmtlckFzeW5jRmlsZVdyaXRlckNocm9taXVtLmNwcAkocmV2aXNpb24gNzI1NzEpCisrKyBXZWJL aXQvY2hyb21pdW0vc3JjL1dvcmtlckFzeW5jRmlsZVdyaXRlckNocm9taXVtLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNjQsNiArNjQsMTEgQEAgV29ya2VyQXN5bmNGaWxlV3JpdGVyQ2hyb21pdW06 On5Xb3JrZXJBcwogICAgIG1fYnJpZGdlLT5wb3N0U2h1dGRvd25Ub01haW5UaHJlYWQobV9icmlk Z2UpOwogfQogCitib29sIFdvcmtlckFzeW5jRmlsZVdyaXRlckNocm9taXVtOjp3YWl0Rm9yT3Bl cmF0aW9uVG9Db21wbGV0ZSgpCit7CisgICAgcmV0dXJuIG1fYnJpZGdlLT53YWl0Rm9yT3BlcmF0 aW9uVG9Db21wbGV0ZSgpOworfQorCiB2b2lkIFdvcmtlckFzeW5jRmlsZVdyaXRlckNocm9taXVt Ojp3cml0ZShsb25nIGxvbmcgcG9zaXRpb24sIEJsb2IqIGRhdGEpCiB7CiAgICAgbV9icmlkZ2Ut PnBvc3RXcml0ZVRvTWFpblRocmVhZChwb3NpdGlvbiwgZGF0YS0+dXJsKCkpOwpJbmRleDogV2Vi S2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJBc3luY0ZpbGVXcml0ZXJDaHJvbWl1bS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV29ya2VyQXN5bmNGaWxlV3JpdGVyQ2hyb21pdW0u aAkocmV2aXNpb24gNzI1NzEpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dvcmtlckFzeW5jRmls ZVdyaXRlckNocm9taXVtLmgJKHdvcmtpbmcgY29weSkKQEAgLTY3LDYgKzY3LDggQEAgcHVibGlj OgogICAgIH0KICAgICB+V29ya2VyQXN5bmNGaWxlV3JpdGVyQ2hyb21pdW0oKTsKICAgICAKKyAg ICBib29sIHdhaXRGb3JPcGVyYXRpb25Ub0NvbXBsZXRlKCk7CisKICAgICAvLyBGaWxlV3JpdGVy CiAgICAgdmlydHVhbCB2b2lkIHdyaXRlKGxvbmcgbG9uZyBwb3NpdGlvbiwgQmxvYiogZGF0YSk7 CiAgICAgdmlydHVhbCB2b2lkIHRydW5jYXRlKGxvbmcgbG9uZyBsZW5ndGgpOwpJbmRleDogV2Vi S2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NC cmlkZ2UuY3BwCShyZXZpc2lvbiA3MjU3MSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV29ya2Vy RmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU5LDE2ICs1 OSwyMSBAQCB2b2lkIFdvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2U6Om5vCiAKIHZvaWQg V29ya2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZTo6cG9zdFdyaXRlVG9NYWluVGhyZWFkKGxv bmcgbG9uZyBwb3NpdGlvbiwgY29uc3QgS1VSTCYgZGF0YSkKIHsKKyAgICBBU1NFUlQoIW1fb3Bl cmF0aW9uSW5Qcm9ncmVzcyk7CisgICAgbV9vcGVyYXRpb25JblByb2dyZXNzID0gdHJ1ZTsKICAg ICBkaXNwYXRjaFRhc2tUb01haW5UaHJlYWQoY3JlYXRlQ2FsbGJhY2tUYXNrKCZ3cml0ZU9uTWFp blRocmVhZCwgdGhpcywgcG9zaXRpb24sIGRhdGEpKTsKIH0KIAogdm9pZCBXb3JrZXJGaWxlV3Jp dGVyQ2FsbGJhY2tzQnJpZGdlOjpwb3N0VHJ1bmNhdGVUb01haW5UaHJlYWQobG9uZyBsb25nIGxl bmd0aCkKIHsKKyAgICBBU1NFUlQoIW1fb3BlcmF0aW9uSW5Qcm9ncmVzcyk7CisgICAgbV9vcGVy YXRpb25JblByb2dyZXNzID0gdHJ1ZTsKICAgICBkaXNwYXRjaFRhc2tUb01haW5UaHJlYWQoY3Jl YXRlQ2FsbGJhY2tUYXNrKCZ0cnVuY2F0ZU9uTWFpblRocmVhZCwgdGhpcywgbGVuZ3RoKSk7CiB9 CiAKIHZvaWQgV29ya2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZTo6cG9zdEFib3J0VG9NYWlu VGhyZWFkKCkKIHsKKyAgICBBU1NFUlQobV9vcGVyYXRpb25JblByb2dyZXNzKTsKICAgICBkaXNw YXRjaFRhc2tUb01haW5UaHJlYWQoY3JlYXRlQ2FsbGJhY2tUYXNrKCZhYm9ydE9uTWFpblRocmVh ZCwgdGhpcykpOwogfQogCkBAIC0xMjcsNiArMTMyLDcgQEAgV29ya2VyRmlsZVdyaXRlckNhbGxi YWNrc0JyaWRnZTo6V29ya2VyRgogICAgICwgbV93b3JrZXJDb250ZXh0KHNjcmlwdEV4ZWN1dGlv bkNvbnRleHQpCiAgICAgLCBtX2NsaWVudE9uV29ya2VyVGhyZWFkKGNsaWVudCkKICAgICAsIG1f d3JpdGVyRGVsZXRlZChmYWxzZSkKKyAgICAsIG1fb3BlcmF0aW9uSW5Qcm9ncmVzcyhmYWxzZSkK IHsKICAgICBBU1NFUlQobV93b3JrZXJDb250ZXh0LT5pc0NvbnRleHRUaHJlYWQoKSk7CiAgICAg cG9zdEluaXRUb01haW5UaHJlYWQocGF0aCk7CkBAIC0xNDcsMTggKzE1MywyNSBAQCBXb3JrZXJG aWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjp+V29ya2VyCiB2b2lkIFdvcmtlckZpbGVXcml0ZXJD YWxsYmFja3NCcmlkZ2U6OmRpZFdyaXRlT25Xb3JrZXJUaHJlYWQoU2NyaXB0RXhlY3V0aW9uQ29u dGV4dCosIFBhc3NSZWZQdHI8V29ya2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZT4gYnJpZGdl LCBsb25nIGxvbmcgbGVuZ3RoLCBib29sIGNvbXBsZXRlKQogewogICAgIEFTU0VSVChicmlkZ2Ut Pm1fd29ya2VyQ29udGV4dC0+aXNDb250ZXh0VGhyZWFkKCkpOworICAgIEFTU0VSVChicmlkZ2Ut Pm1fb3BlcmF0aW9uSW5Qcm9ncmVzcyk7CisgICAgaWYgKGNvbXBsZXRlKQorICAgICAgICBicmlk Z2UtPm1fb3BlcmF0aW9uSW5Qcm9ncmVzcyA9IGZhbHNlOwogICAgIGJyaWRnZS0+bV9jbGllbnRP bldvcmtlclRocmVhZC0+ZGlkV3JpdGUobGVuZ3RoLCBjb21wbGV0ZSk7CiB9CiAKIHZvaWQgV29y a2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZTo6ZGlkRmFpbE9uV29ya2VyVGhyZWFkKFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPFdvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NC cmlkZ2U+IGJyaWRnZSwgV2ViRmlsZUVycm9yIGVycm9yKQogewogICAgIEFTU0VSVChicmlkZ2Ut Pm1fd29ya2VyQ29udGV4dC0+aXNDb250ZXh0VGhyZWFkKCkpOworICAgIEFTU0VSVChicmlkZ2Ut Pm1fb3BlcmF0aW9uSW5Qcm9ncmVzcyk7CisgICAgYnJpZGdlLT5tX29wZXJhdGlvbkluUHJvZ3Jl c3MgPSBmYWxzZTsKICAgICBicmlkZ2UtPm1fY2xpZW50T25Xb3JrZXJUaHJlYWQtPmRpZEZhaWwo c3RhdGljX2Nhc3Q8RmlsZUVycm9yOjpFcnJvckNvZGU+KGVycm9yKSk7CiB9CiAKIHZvaWQgV29y a2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZTo6ZGlkVHJ1bmNhdGVPbldvcmtlclRocmVhZChT Y3JpcHRFeGVjdXRpb25Db250ZXh0KiwgUGFzc1JlZlB0cjxXb3JrZXJGaWxlV3JpdGVyQ2FsbGJh Y2tzQnJpZGdlPiBicmlkZ2UpCiB7CiAgICAgQVNTRVJUKGJyaWRnZS0+bV93b3JrZXJDb250ZXh0 LT5pc0NvbnRleHRUaHJlYWQoKSk7CisgICAgQVNTRVJUKGJyaWRnZS0+bV9vcGVyYXRpb25JblBy b2dyZXNzKTsKKyAgICBicmlkZ2UtPm1fb3BlcmF0aW9uSW5Qcm9ncmVzcyA9IGZhbHNlOwogICAg IGJyaWRnZS0+bV9jbGllbnRPbldvcmtlclRocmVhZC0+ZGlkVHJ1bmNhdGUoKTsKIH0KIApAQCAt MTg4LDYgKzIwMSwxNiBAQCB2b2lkIFdvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2U6OmRp CiAgICAgbV9wcm94eS0+cG9zdFRhc2tGb3JNb2RlVG9Xb3JrZXJDb250ZXh0KGNyZWF0ZUNhbGxi YWNrVGFzaygmcnVuVGFza09uV29ya2VyVGhyZWFkLCB0aGlzLCB0YXNrKSwgV29ya2VyUnVuTG9v cDo6ZGVmYXVsdE1vZGUoKSk7CiB9CiAKK2Jvb2wgV29ya2VyRmlsZVdyaXRlckNhbGxiYWNrc0Jy aWRnZTo6d2FpdEZvck9wZXJhdGlvblRvQ29tcGxldGUoKQoreworICAgIHdoaWxlIChtX29wZXJh dGlvbkluUHJvZ3Jlc3MpIHsKKyAgICAgICAgV29ya2VyQ29udGV4dCogY29udGV4dCA9IHN0YXRp Y19jYXN0PFdvcmtlckNvbnRleHQqPihtX3dvcmtlckNvbnRleHQpOworICAgICAgICBpZiAoY29u dGV4dC0+dGhyZWFkKCktPnJ1bkxvb3AoKS5ydW5Jbk1vZGUoY29udGV4dCwgV29ya2VyUnVuTG9v cDo6ZGVmYXVsdE1vZGUoKSkgPT0gTWVzc2FnZVF1ZXVlVGVybWluYXRlZCkKKyAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgcmV0dXJuIHRydWU7CiB9CiAKK30gLy8gbmFtZXNw YWNlIFdlYktpdAorCiAjZW5kaWYgLy8gRU5BQkxFKEZJTEVfU1lTVEVNKQpJbmRleDogV2ViS2l0 L2Nocm9taXVtL3NyYy9Xb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdl LmgJKHJldmlzaW9uIDcyNTcxKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJGaWxlV3Jp dGVyQ2FsbGJhY2tzQnJpZGdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwNiw2ICsxMDYsOSBAQCBw dWJsaWM6CiAgICAgdm9pZCBkaWRGYWlsKFdlYkZpbGVFcnJvcik7CiAgICAgdm9pZCBkaWRUcnVu Y2F0ZSgpOwogCisgICAgLy8gQ2FsbCB0aGlzIG9uIHRoZSBjb250ZXh0IHRocmVhZCB0byB3YWl0 IGZvciB0aGUgY3VycmVudCBvcGVyYXRpb24gdG8gY29tcGxldGUuCisgICAgYm9vbCB3YWl0Rm9y T3BlcmF0aW9uVG9Db21wbGV0ZSgpOworCiBwcml2YXRlOgogICAgIFdvcmtlckZpbGVXcml0ZXJD YWxsYmFja3NCcmlkZ2UoY29uc3QgU3RyaW5nJiBwYXRoLCBXZWJDb3JlOjpXb3JrZXJMb2FkZXJQ cm94eSosIFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBXZWJDb3JlOjpBc3luY0Zp bGVXcml0ZXJDbGllbnQqKTsKIApAQCAtMTQ3LDYgKzE1MCw5IEBAIHByaXZhdGU6CiAKICAgICAv LyBVc2VkIHRvIGluZGljYXRlIHRoYXQgc2h1dGRvd24gaGFzIHN0YXJ0ZWQgb24gdGhlIG1haW4g dGhyZWFkLCBhbmQgaGVuY2UgdGhlIHdyaXRlciBoYXMgYmVlbiBkZWxldGVkLgogICAgIGJvb2wg bV93cml0ZXJEZWxldGVkOworCisgICAgLy8gVXNlZCBieSB3YWl0Rm9yT3BlcmF0aW9uVG9Db21w bGV0ZS4KKyAgICBib29sIG1fb3BlcmF0aW9uSW5Qcm9ncmVzczsKIH07CiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUK 74784 2010-11-24 11:40:53 -0800 2010-11-24 14:41:49 -0800 Added a mode for the runloop. chromium.patch text/plain 7561 ericu SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNzI1NzMpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTAtMTEtMjIgIEVyaWMg VWhyaGFuZSAgPGVyaWN1QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbQ2hyb21pdW1dIEltcGxlbWVudCBGaWxlV3JpdGVyU3lu YworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDk5NDAK KworICAgICAgICBBZGRlZCB3YWl0Rm9yT3BlcmF0aW9uVG9Db21wbGV0ZSwgZGVsZWdhdGluZyB0 byB0aGUgYnJpZGdlLgorICAgICAgICAqIHNyYy9Xb3JrZXJBc3luY0ZpbGVXcml0ZXJDaHJvbWl1 bS5jcHA6CisgICAgICAgICogc3JjL1dvcmtlckFzeW5jRmlsZVdyaXRlckNocm9taXVtLmg6CisK KyAgICAgICAgQWRkZWQgd2FpdEZvck9wZXJhdGlvblRvQ29tcGxldGUgYW5kIHNvbWUgZGVidWct b25seSBjb2RlIHRvIG1ha2Ugc3VyZSBpdCdzIHdvcmtpbmcgcHJvcGVybHkuCisgICAgICAgICog c3JjL1dvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2UuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjpwb3N0V3JpdGVUb01haW5UaHJlYWQp OgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjpwb3N0 VHJ1bmNhdGVUb01haW5UaHJlYWQpOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlV3JpdGVy Q2FsbGJhY2tzQnJpZGdlOjpwb3N0QWJvcnRUb01haW5UaHJlYWQpOgorICAgICAgICAoV2ViS2l0 OjpXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjpXb3JrZXJGaWxlV3JpdGVyQ2FsbGJh Y2tzQnJpZGdlKToKKyAgICAgICAgKFdlYktpdDo6V29ya2VyRmlsZVdyaXRlckNhbGxiYWNrc0Jy aWRnZTo6ZGlkV3JpdGVPbldvcmtlclRocmVhZCk6CisgICAgICAgIChXZWJLaXQ6OldvcmtlckZp bGVXcml0ZXJDYWxsYmFja3NCcmlkZ2U6OmRpZEZhaWxPbldvcmtlclRocmVhZCk6CisgICAgICAg IChXZWJLaXQ6OldvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2U6OmRpZFRydW5jYXRlT25X b3JrZXJUaHJlYWQpOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tz QnJpZGdlOjp3YWl0Rm9yT3BlcmF0aW9uVG9Db21wbGV0ZSk6CisgICAgICAgICogc3JjL1dvcmtl ckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2UuaDoKKwogMjAxMC0xMS0yMiAgVG9ueSBDaGFuZyAg PHRvbnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGwgQ2hyb21pdW0g REVQUyB0byByNjcwMDQuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dvcmtlckFzeW5jRmls ZVdyaXRlckNocm9taXVtLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dv cmtlckFzeW5jRmlsZVdyaXRlckNocm9taXVtLmNwcAkocmV2aXNpb24gNzI1NzEpCisrKyBXZWJL aXQvY2hyb21pdW0vc3JjL1dvcmtlckFzeW5jRmlsZVdyaXRlckNocm9taXVtLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNjQsNiArNjQsMTEgQEAgV29ya2VyQXN5bmNGaWxlV3JpdGVyQ2hyb21pdW06 On5Xb3JrZXJBcwogICAgIG1fYnJpZGdlLT5wb3N0U2h1dGRvd25Ub01haW5UaHJlYWQobV9icmlk Z2UpOwogfQogCitib29sIFdvcmtlckFzeW5jRmlsZVdyaXRlckNocm9taXVtOjp3YWl0Rm9yT3Bl cmF0aW9uVG9Db21wbGV0ZSgpCit7CisgICAgcmV0dXJuIG1fYnJpZGdlLT53YWl0Rm9yT3BlcmF0 aW9uVG9Db21wbGV0ZSgpOworfQorCiB2b2lkIFdvcmtlckFzeW5jRmlsZVdyaXRlckNocm9taXVt Ojp3cml0ZShsb25nIGxvbmcgcG9zaXRpb24sIEJsb2IqIGRhdGEpCiB7CiAgICAgbV9icmlkZ2Ut PnBvc3RXcml0ZVRvTWFpblRocmVhZChwb3NpdGlvbiwgZGF0YS0+dXJsKCkpOwpJbmRleDogV2Vi S2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJBc3luY0ZpbGVXcml0ZXJDaHJvbWl1bS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV29ya2VyQXN5bmNGaWxlV3JpdGVyQ2hyb21pdW0u aAkocmV2aXNpb24gNzI1NzEpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dvcmtlckFzeW5jRmls ZVdyaXRlckNocm9taXVtLmgJKHdvcmtpbmcgY29weSkKQEAgLTY3LDYgKzY3LDggQEAgcHVibGlj OgogICAgIH0KICAgICB+V29ya2VyQXN5bmNGaWxlV3JpdGVyQ2hyb21pdW0oKTsKICAgICAKKyAg ICBib29sIHdhaXRGb3JPcGVyYXRpb25Ub0NvbXBsZXRlKCk7CisKICAgICAvLyBGaWxlV3JpdGVy CiAgICAgdmlydHVhbCB2b2lkIHdyaXRlKGxvbmcgbG9uZyBwb3NpdGlvbiwgQmxvYiogZGF0YSk7 CiAgICAgdmlydHVhbCB2b2lkIHRydW5jYXRlKGxvbmcgbG9uZyBsZW5ndGgpOwpJbmRleDogV2Vi S2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NC cmlkZ2UuY3BwCShyZXZpc2lvbiA3MjU3MSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV29ya2Vy RmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU5LDE2ICs1 OSwyMSBAQCB2b2lkIFdvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2U6Om5vCiAKIHZvaWQg V29ya2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZTo6cG9zdFdyaXRlVG9NYWluVGhyZWFkKGxv bmcgbG9uZyBwb3NpdGlvbiwgY29uc3QgS1VSTCYgZGF0YSkKIHsKKyAgICBBU1NFUlQoIW1fb3Bl cmF0aW9uSW5Qcm9ncmVzcyk7CisgICAgbV9vcGVyYXRpb25JblByb2dyZXNzID0gdHJ1ZTsKICAg ICBkaXNwYXRjaFRhc2tUb01haW5UaHJlYWQoY3JlYXRlQ2FsbGJhY2tUYXNrKCZ3cml0ZU9uTWFp blRocmVhZCwgdGhpcywgcG9zaXRpb24sIGRhdGEpKTsKIH0KIAogdm9pZCBXb3JrZXJGaWxlV3Jp dGVyQ2FsbGJhY2tzQnJpZGdlOjpwb3N0VHJ1bmNhdGVUb01haW5UaHJlYWQobG9uZyBsb25nIGxl bmd0aCkKIHsKKyAgICBBU1NFUlQoIW1fb3BlcmF0aW9uSW5Qcm9ncmVzcyk7CisgICAgbV9vcGVy YXRpb25JblByb2dyZXNzID0gdHJ1ZTsKICAgICBkaXNwYXRjaFRhc2tUb01haW5UaHJlYWQoY3Jl YXRlQ2FsbGJhY2tUYXNrKCZ0cnVuY2F0ZU9uTWFpblRocmVhZCwgdGhpcywgbGVuZ3RoKSk7CiB9 CiAKIHZvaWQgV29ya2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZTo6cG9zdEFib3J0VG9NYWlu VGhyZWFkKCkKIHsKKyAgICBBU1NFUlQobV9vcGVyYXRpb25JblByb2dyZXNzKTsKICAgICBkaXNw YXRjaFRhc2tUb01haW5UaHJlYWQoY3JlYXRlQ2FsbGJhY2tUYXNrKCZhYm9ydE9uTWFpblRocmVh ZCwgdGhpcykpOwogfQogCkBAIC0xMjcsNiArMTMyLDcgQEAgV29ya2VyRmlsZVdyaXRlckNhbGxi YWNrc0JyaWRnZTo6V29ya2VyRgogICAgICwgbV93b3JrZXJDb250ZXh0KHNjcmlwdEV4ZWN1dGlv bkNvbnRleHQpCiAgICAgLCBtX2NsaWVudE9uV29ya2VyVGhyZWFkKGNsaWVudCkKICAgICAsIG1f d3JpdGVyRGVsZXRlZChmYWxzZSkKKyAgICAsIG1fb3BlcmF0aW9uSW5Qcm9ncmVzcyhmYWxzZSkK IHsKICAgICBBU1NFUlQobV93b3JrZXJDb250ZXh0LT5pc0NvbnRleHRUaHJlYWQoKSk7CiAgICAg cG9zdEluaXRUb01haW5UaHJlYWQocGF0aCk7CkBAIC0xNDcsMTggKzE1MywyNSBAQCBXb3JrZXJG aWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjp+V29ya2VyCiB2b2lkIFdvcmtlckZpbGVXcml0ZXJD YWxsYmFja3NCcmlkZ2U6OmRpZFdyaXRlT25Xb3JrZXJUaHJlYWQoU2NyaXB0RXhlY3V0aW9uQ29u dGV4dCosIFBhc3NSZWZQdHI8V29ya2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZT4gYnJpZGdl LCBsb25nIGxvbmcgbGVuZ3RoLCBib29sIGNvbXBsZXRlKQogewogICAgIEFTU0VSVChicmlkZ2Ut Pm1fd29ya2VyQ29udGV4dC0+aXNDb250ZXh0VGhyZWFkKCkpOworICAgIEFTU0VSVChicmlkZ2Ut Pm1fb3BlcmF0aW9uSW5Qcm9ncmVzcyk7CisgICAgaWYgKGNvbXBsZXRlKQorICAgICAgICBicmlk Z2UtPm1fb3BlcmF0aW9uSW5Qcm9ncmVzcyA9IGZhbHNlOwogICAgIGJyaWRnZS0+bV9jbGllbnRP bldvcmtlclRocmVhZC0+ZGlkV3JpdGUobGVuZ3RoLCBjb21wbGV0ZSk7CiB9CiAKIHZvaWQgV29y a2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZTo6ZGlkRmFpbE9uV29ya2VyVGhyZWFkKFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPFdvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NC cmlkZ2U+IGJyaWRnZSwgV2ViRmlsZUVycm9yIGVycm9yKQogewogICAgIEFTU0VSVChicmlkZ2Ut Pm1fd29ya2VyQ29udGV4dC0+aXNDb250ZXh0VGhyZWFkKCkpOworICAgIEFTU0VSVChicmlkZ2Ut Pm1fb3BlcmF0aW9uSW5Qcm9ncmVzcyk7CisgICAgYnJpZGdlLT5tX29wZXJhdGlvbkluUHJvZ3Jl c3MgPSBmYWxzZTsKICAgICBicmlkZ2UtPm1fY2xpZW50T25Xb3JrZXJUaHJlYWQtPmRpZEZhaWwo c3RhdGljX2Nhc3Q8RmlsZUVycm9yOjpFcnJvckNvZGU+KGVycm9yKSk7CiB9CiAKIHZvaWQgV29y a2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZTo6ZGlkVHJ1bmNhdGVPbldvcmtlclRocmVhZChT Y3JpcHRFeGVjdXRpb25Db250ZXh0KiwgUGFzc1JlZlB0cjxXb3JrZXJGaWxlV3JpdGVyQ2FsbGJh Y2tzQnJpZGdlPiBicmlkZ2UpCiB7CiAgICAgQVNTRVJUKGJyaWRnZS0+bV93b3JrZXJDb250ZXh0 LT5pc0NvbnRleHRUaHJlYWQoKSk7CisgICAgQVNTRVJUKGJyaWRnZS0+bV9vcGVyYXRpb25JblBy b2dyZXNzKTsKKyAgICBicmlkZ2UtPm1fb3BlcmF0aW9uSW5Qcm9ncmVzcyA9IGZhbHNlOwogICAg IGJyaWRnZS0+bV9jbGllbnRPbldvcmtlclRocmVhZC0+ZGlkVHJ1bmNhdGUoKTsKIH0KIApAQCAt MTgyLDEyICsxOTUsMjYgQEAgdm9pZCBXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjpk aQogICAgIFdlYldvcmtlckJhc2U6OmRpc3BhdGNoVGFza1RvTWFpblRocmVhZChjcmVhdGVDYWxs YmFja1Rhc2soJnJ1blRhc2tPbk1haW5UaHJlYWQsIHRoaXMsIHRhc2spKTsKIH0KIAorLy8gV2Ug dXNlIGEgc2luZ2xlIG1vZGUgc3RyaW5nIGZvciBhbGwgb3BlcmF0aW9uczsgaWYgeW91IGNoYW5n ZSB0aGlzIGNvZGUgdG8gYWxsb3cgbXVsdGlwbGUgaW4tZmxpZ2h0IG9wZXJhdGlvbnMgW2UuZy4g YWRkaW5nIHByb2dyZXNzIGV2ZW50cyB0byBzeW5jaHJvbm91cworLy8gb3BlcmF0aW9ucyBvciBz aGFyaW5nIGEgYnJpZGdlIGJldHdlZW4gbXVsdGlwbGUgRmlsZVdyaXRlcnNdIHlvdSdsbCBuZWVk IHRvIHVzZSBhIHVuaXF1ZS1wZXItb3BlcmF0aW9uIG1vZGUgb3Igd2FpdEZvck9wZXJhdGlvblRv Q29tcGxldGUgd2lsbCBicmVhay4KK3N0YXRpYyBjb25zdCBjaGFyIGZpbGVXcml0ZXJPcGVyYXRp b25zTW9kZVtdID0gImZpbGVXcml0ZXJPcGVyYXRpb25zTW9kZSI7CisKIHZvaWQgV29ya2VyRmls ZVdyaXRlckNhbGxiYWNrc0JyaWRnZTo6ZGlzcGF0Y2hUYXNrVG9Xb3JrZXJUaHJlYWQoUGFzc093 blB0cjxTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpUYXNrPiB0YXNrKQogewogICAgIEFTU0VSVChp c01haW5UaHJlYWQoKSk7Ci0gICAgbV9wcm94eS0+cG9zdFRhc2tGb3JNb2RlVG9Xb3JrZXJDb250 ZXh0KGNyZWF0ZUNhbGxiYWNrVGFzaygmcnVuVGFza09uV29ya2VyVGhyZWFkLCB0aGlzLCB0YXNr KSwgV29ya2VyUnVuTG9vcDo6ZGVmYXVsdE1vZGUoKSk7CisgICAgbV9wcm94eS0+cG9zdFRhc2tG b3JNb2RlVG9Xb3JrZXJDb250ZXh0KGNyZWF0ZUNhbGxiYWNrVGFzaygmcnVuVGFza09uV29ya2Vy VGhyZWFkLCB0aGlzLCB0YXNrKSwgZmlsZVdyaXRlck9wZXJhdGlvbnNNb2RlKTsKIH0KIAorYm9v bCBXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjp3YWl0Rm9yT3BlcmF0aW9uVG9Db21w bGV0ZSgpCit7CisgICAgd2hpbGUgKG1fb3BlcmF0aW9uSW5Qcm9ncmVzcykgeworICAgICAgICBX b3JrZXJDb250ZXh0KiBjb250ZXh0ID0gc3RhdGljX2Nhc3Q8V29ya2VyQ29udGV4dCo+KG1fd29y a2VyQ29udGV4dCk7CisgICAgICAgIGlmIChjb250ZXh0LT50aHJlYWQoKS0+cnVuTG9vcCgpLnJ1 bkluTW9kZShjb250ZXh0LCBmaWxlV3JpdGVyT3BlcmF0aW9uc01vZGUpID09IE1lc3NhZ2VRdWV1 ZVRlcm1pbmF0ZWQpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorICAgIHJldHVy biB0cnVlOwogfQogCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKKwogI2VuZGlmIC8vIEVOQUJMRShG SUxFX1NZU1RFTSkKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV29ya2VyRmlsZVdyaXRlckNh bGxiYWNrc0JyaWRnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV29ya2Vy RmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZS5oCShyZXZpc2lvbiA3MjU3MSkKKysrIFdlYktpdC9j aHJvbWl1bS9zcmMvV29ya2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZS5oCSh3b3JraW5nIGNv cHkpCkBAIC0xMDYsNiArMTA2LDkgQEAgcHVibGljOgogICAgIHZvaWQgZGlkRmFpbChXZWJGaWxl RXJyb3IpOwogICAgIHZvaWQgZGlkVHJ1bmNhdGUoKTsKIAorICAgIC8vIENhbGwgdGhpcyBvbiB0 aGUgY29udGV4dCB0aHJlYWQgdG8gd2FpdCBmb3IgdGhlIGN1cnJlbnQgb3BlcmF0aW9uIHRvIGNv bXBsZXRlLgorICAgIGJvb2wgd2FpdEZvck9wZXJhdGlvblRvQ29tcGxldGUoKTsKKwogcHJpdmF0 ZToKICAgICBXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlKGNvbnN0IFN0cmluZyYgcGF0 aCwgV2ViQ29yZTo6V29ya2VyTG9hZGVyUHJveHkqLCBXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25D b250ZXh0KiwgV2ViQ29yZTo6QXN5bmNGaWxlV3JpdGVyQ2xpZW50Kik7CiAKQEAgLTE0Nyw2ICsx NTAsOSBAQCBwcml2YXRlOgogCiAgICAgLy8gVXNlZCB0byBpbmRpY2F0ZSB0aGF0IHNodXRkb3du IGhhcyBzdGFydGVkIG9uIHRoZSBtYWluIHRocmVhZCwgYW5kIGhlbmNlIHRoZSB3cml0ZXIgaGFz IGJlZW4gZGVsZXRlZC4KICAgICBib29sIG1fd3JpdGVyRGVsZXRlZDsKKworICAgIC8vIFVzZWQg Ynkgd2FpdEZvck9wZXJhdGlvblRvQ29tcGxldGUuCisgICAgYm9vbCBtX29wZXJhdGlvbkluUHJv Z3Jlc3M7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 74796 2010-11-24 14:41:49 -0800 2010-11-24 17:55:36 -0800 Fixed runloop to have a unique ID. chromium.patch text/plain 7754 ericu SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNzI1NzMpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTAtMTEtMjIgIEVyaWMg VWhyaGFuZSAgPGVyaWN1QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbQ2hyb21pdW1dIEltcGxlbWVudCBGaWxlV3JpdGVyU3lu YworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDk5NDAK KworICAgICAgICBBZGRlZCB3YWl0Rm9yT3BlcmF0aW9uVG9Db21wbGV0ZSwgZGVsZWdhdGluZyB0 byB0aGUgYnJpZGdlLgorICAgICAgICAqIHNyYy9Xb3JrZXJBc3luY0ZpbGVXcml0ZXJDaHJvbWl1 bS5jcHA6CisgICAgICAgICogc3JjL1dvcmtlckFzeW5jRmlsZVdyaXRlckNocm9taXVtLmg6CisK KyAgICAgICAgQWRkZWQgd2FpdEZvck9wZXJhdGlvblRvQ29tcGxldGUgYW5kIHNvbWUgZGVidWct b25seSBjb2RlIHRvIG1ha2Ugc3VyZSBpdCdzIHdvcmtpbmcgcHJvcGVybHkuCisgICAgICAgICog c3JjL1dvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2UuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjpwb3N0V3JpdGVUb01haW5UaHJlYWQp OgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjpwb3N0 VHJ1bmNhdGVUb01haW5UaHJlYWQpOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlV3JpdGVy Q2FsbGJhY2tzQnJpZGdlOjpwb3N0QWJvcnRUb01haW5UaHJlYWQpOgorICAgICAgICAoV2ViS2l0 OjpXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjpXb3JrZXJGaWxlV3JpdGVyQ2FsbGJh Y2tzQnJpZGdlKToKKyAgICAgICAgKFdlYktpdDo6V29ya2VyRmlsZVdyaXRlckNhbGxiYWNrc0Jy aWRnZTo6ZGlkV3JpdGVPbldvcmtlclRocmVhZCk6CisgICAgICAgIChXZWJLaXQ6OldvcmtlckZp bGVXcml0ZXJDYWxsYmFja3NCcmlkZ2U6OmRpZEZhaWxPbldvcmtlclRocmVhZCk6CisgICAgICAg IChXZWJLaXQ6OldvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2U6OmRpZFRydW5jYXRlT25X b3JrZXJUaHJlYWQpOgorICAgICAgICAoV2ViS2l0OjpXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tz QnJpZGdlOjp3YWl0Rm9yT3BlcmF0aW9uVG9Db21wbGV0ZSk6CisgICAgICAgICogc3JjL1dvcmtl ckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2UuaDoKKwogMjAxMC0xMS0yMiAgVG9ueSBDaGFuZyAg PHRvbnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGwgQ2hyb21pdW0g REVQUyB0byByNjcwMDQuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dvcmtlckFzeW5jRmls ZVdyaXRlckNocm9taXVtLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dv cmtlckFzeW5jRmlsZVdyaXRlckNocm9taXVtLmNwcAkocmV2aXNpb24gNzI1NzEpCisrKyBXZWJL aXQvY2hyb21pdW0vc3JjL1dvcmtlckFzeW5jRmlsZVdyaXRlckNocm9taXVtLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNjQsNiArNjQsMTEgQEAgV29ya2VyQXN5bmNGaWxlV3JpdGVyQ2hyb21pdW06 On5Xb3JrZXJBcwogICAgIG1fYnJpZGdlLT5wb3N0U2h1dGRvd25Ub01haW5UaHJlYWQobV9icmlk Z2UpOwogfQogCitib29sIFdvcmtlckFzeW5jRmlsZVdyaXRlckNocm9taXVtOjp3YWl0Rm9yT3Bl cmF0aW9uVG9Db21wbGV0ZSgpCit7CisgICAgcmV0dXJuIG1fYnJpZGdlLT53YWl0Rm9yT3BlcmF0 aW9uVG9Db21wbGV0ZSgpOworfQorCiB2b2lkIFdvcmtlckFzeW5jRmlsZVdyaXRlckNocm9taXVt Ojp3cml0ZShsb25nIGxvbmcgcG9zaXRpb24sIEJsb2IqIGRhdGEpCiB7CiAgICAgbV9icmlkZ2Ut PnBvc3RXcml0ZVRvTWFpblRocmVhZChwb3NpdGlvbiwgZGF0YS0+dXJsKCkpOwpJbmRleDogV2Vi S2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJBc3luY0ZpbGVXcml0ZXJDaHJvbWl1bS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV29ya2VyQXN5bmNGaWxlV3JpdGVyQ2hyb21pdW0u aAkocmV2aXNpb24gNzI1NzEpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dvcmtlckFzeW5jRmls ZVdyaXRlckNocm9taXVtLmgJKHdvcmtpbmcgY29weSkKQEAgLTY3LDYgKzY3LDggQEAgcHVibGlj OgogICAgIH0KICAgICB+V29ya2VyQXN5bmNGaWxlV3JpdGVyQ2hyb21pdW0oKTsKICAgICAKKyAg ICBib29sIHdhaXRGb3JPcGVyYXRpb25Ub0NvbXBsZXRlKCk7CisKICAgICAvLyBGaWxlV3JpdGVy CiAgICAgdmlydHVhbCB2b2lkIHdyaXRlKGxvbmcgbG9uZyBwb3NpdGlvbiwgQmxvYiogZGF0YSk7 CiAgICAgdmlydHVhbCB2b2lkIHRydW5jYXRlKGxvbmcgbG9uZyBsZW5ndGgpOwpJbmRleDogV2Vi S2l0L2Nocm9taXVtL3NyYy9Xb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NC cmlkZ2UuY3BwCShyZXZpc2lvbiA3MjU3MSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV29ya2Vy RmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU5LDE2ICs1 OSwyMSBAQCB2b2lkIFdvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2U6Om5vCiAKIHZvaWQg V29ya2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZTo6cG9zdFdyaXRlVG9NYWluVGhyZWFkKGxv bmcgbG9uZyBwb3NpdGlvbiwgY29uc3QgS1VSTCYgZGF0YSkKIHsKKyAgICBBU1NFUlQoIW1fb3Bl cmF0aW9uSW5Qcm9ncmVzcyk7CisgICAgbV9vcGVyYXRpb25JblByb2dyZXNzID0gdHJ1ZTsKICAg ICBkaXNwYXRjaFRhc2tUb01haW5UaHJlYWQoY3JlYXRlQ2FsbGJhY2tUYXNrKCZ3cml0ZU9uTWFp blRocmVhZCwgdGhpcywgcG9zaXRpb24sIGRhdGEpKTsKIH0KIAogdm9pZCBXb3JrZXJGaWxlV3Jp dGVyQ2FsbGJhY2tzQnJpZGdlOjpwb3N0VHJ1bmNhdGVUb01haW5UaHJlYWQobG9uZyBsb25nIGxl bmd0aCkKIHsKKyAgICBBU1NFUlQoIW1fb3BlcmF0aW9uSW5Qcm9ncmVzcyk7CisgICAgbV9vcGVy YXRpb25JblByb2dyZXNzID0gdHJ1ZTsKICAgICBkaXNwYXRjaFRhc2tUb01haW5UaHJlYWQoY3Jl YXRlQ2FsbGJhY2tUYXNrKCZ0cnVuY2F0ZU9uTWFpblRocmVhZCwgdGhpcywgbGVuZ3RoKSk7CiB9 CiAKIHZvaWQgV29ya2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZTo6cG9zdEFib3J0VG9NYWlu VGhyZWFkKCkKIHsKKyAgICBBU1NFUlQobV9vcGVyYXRpb25JblByb2dyZXNzKTsKICAgICBkaXNw YXRjaFRhc2tUb01haW5UaHJlYWQoY3JlYXRlQ2FsbGJhY2tUYXNrKCZhYm9ydE9uTWFpblRocmVh ZCwgdGhpcykpOwogfQogCkBAIC0xMjEsMTQgKzEyNiwxOSBAQCB2b2lkIFdvcmtlckZpbGVXcml0 ZXJDYWxsYmFja3NCcmlkZ2U6OmRpCiAgICAgZGlzcGF0Y2hUYXNrVG9Xb3JrZXJUaHJlYWQoY3Jl YXRlQ2FsbGJhY2tUYXNrKCZkaWRUcnVuY2F0ZU9uV29ya2VyVGhyZWFkLCB0aGlzKSk7CiB9CiAK K3N0YXRpYyBjb25zdCBjaGFyIGZpbGVXcml0ZXJPcGVyYXRpb25zTW9kZVtdID0gImZpbGVXcml0 ZXJPcGVyYXRpb25zTW9kZSI7CisKIFdvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2U6Oldv cmtlckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2UoY29uc3QgU3RyaW5nJiBwYXRoLCBXb3JrZXJM b2FkZXJQcm94eSogcHJveHksIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIHNjcmlwdEV4ZWN1dGlv bkNvbnRleHQsIEFzeW5jRmlsZVdyaXRlckNsaWVudCogY2xpZW50KQogICAgIDogV29ya2VyQ29u dGV4dDo6T2JzZXJ2ZXIoc3RhdGljX2Nhc3Q8V29ya2VyQ29udGV4dCo+KHNjcmlwdEV4ZWN1dGlv bkNvbnRleHQpKQogICAgICwgbV9wcm94eShwcm94eSkKICAgICAsIG1fd29ya2VyQ29udGV4dChz Y3JpcHRFeGVjdXRpb25Db250ZXh0KQogICAgICwgbV9jbGllbnRPbldvcmtlclRocmVhZChjbGll bnQpCiAgICAgLCBtX3dyaXRlckRlbGV0ZWQoZmFsc2UpCisgICAgLCBtX29wZXJhdGlvbkluUHJv Z3Jlc3MoZmFsc2UpCiB7CiAgICAgQVNTRVJUKG1fd29ya2VyQ29udGV4dC0+aXNDb250ZXh0VGhy ZWFkKCkpOworICAgIG1fbW9kZSA9IGZpbGVXcml0ZXJPcGVyYXRpb25zTW9kZTsKKyAgICBtX21v ZGUuYXBwZW5kKFN0cmluZzo6bnVtYmVyKHN0YXRpY19jYXN0PFdvcmtlckNvbnRleHQqPihzY3Jp cHRFeGVjdXRpb25Db250ZXh0KS0+dGhyZWFkKCktPnJ1bkxvb3AoKS5jcmVhdGVVbmlxdWVJZCgp KSk7CiAgICAgcG9zdEluaXRUb01haW5UaHJlYWQocGF0aCk7CiB9CiAKQEAgLTE0NywxOCArMTU3 LDI1IEBAIFdvcmtlckZpbGVXcml0ZXJDYWxsYmFja3NCcmlkZ2U6On5Xb3JrZXIKIHZvaWQgV29y a2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZTo6ZGlkV3JpdGVPbldvcmtlclRocmVhZChTY3Jp cHRFeGVjdXRpb25Db250ZXh0KiwgUGFzc1JlZlB0cjxXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tz QnJpZGdlPiBicmlkZ2UsIGxvbmcgbG9uZyBsZW5ndGgsIGJvb2wgY29tcGxldGUpCiB7CiAgICAg QVNTRVJUKGJyaWRnZS0+bV93b3JrZXJDb250ZXh0LT5pc0NvbnRleHRUaHJlYWQoKSk7CisgICAg QVNTRVJUKGJyaWRnZS0+bV9vcGVyYXRpb25JblByb2dyZXNzKTsKKyAgICBpZiAoY29tcGxldGUp CisgICAgICAgIGJyaWRnZS0+bV9vcGVyYXRpb25JblByb2dyZXNzID0gZmFsc2U7CiAgICAgYnJp ZGdlLT5tX2NsaWVudE9uV29ya2VyVGhyZWFkLT5kaWRXcml0ZShsZW5ndGgsIGNvbXBsZXRlKTsK IH0KIAogdm9pZCBXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjpkaWRGYWlsT25Xb3Jr ZXJUaHJlYWQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8V29ya2VyRmlsZVdy aXRlckNhbGxiYWNrc0JyaWRnZT4gYnJpZGdlLCBXZWJGaWxlRXJyb3IgZXJyb3IpCiB7CiAgICAg QVNTRVJUKGJyaWRnZS0+bV93b3JrZXJDb250ZXh0LT5pc0NvbnRleHRUaHJlYWQoKSk7CisgICAg QVNTRVJUKGJyaWRnZS0+bV9vcGVyYXRpb25JblByb2dyZXNzKTsKKyAgICBicmlkZ2UtPm1fb3Bl cmF0aW9uSW5Qcm9ncmVzcyA9IGZhbHNlOwogICAgIGJyaWRnZS0+bV9jbGllbnRPbldvcmtlclRo cmVhZC0+ZGlkRmFpbChzdGF0aWNfY2FzdDxGaWxlRXJyb3I6OkVycm9yQ29kZT4oZXJyb3IpKTsK IH0KIAogdm9pZCBXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjpkaWRUcnVuY2F0ZU9u V29ya2VyVGhyZWFkKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPFdvcmtlckZp bGVXcml0ZXJDYWxsYmFja3NCcmlkZ2U+IGJyaWRnZSkKIHsKICAgICBBU1NFUlQoYnJpZGdlLT5t X3dvcmtlckNvbnRleHQtPmlzQ29udGV4dFRocmVhZCgpKTsKKyAgICBBU1NFUlQoYnJpZGdlLT5t X29wZXJhdGlvbkluUHJvZ3Jlc3MpOworICAgIGJyaWRnZS0+bV9vcGVyYXRpb25JblByb2dyZXNz ID0gZmFsc2U7CiAgICAgYnJpZGdlLT5tX2NsaWVudE9uV29ya2VyVGhyZWFkLT5kaWRUcnVuY2F0 ZSgpOwogfQogCkBAIC0xODUsOSArMjAyLDE5IEBAIHZvaWQgV29ya2VyRmlsZVdyaXRlckNhbGxi YWNrc0JyaWRnZTo6ZGkKIHZvaWQgV29ya2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZTo6ZGlz cGF0Y2hUYXNrVG9Xb3JrZXJUaHJlYWQoUGFzc093blB0cjxTY3JpcHRFeGVjdXRpb25Db250ZXh0 OjpUYXNrPiB0YXNrKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgbV9wcm94 eS0+cG9zdFRhc2tGb3JNb2RlVG9Xb3JrZXJDb250ZXh0KGNyZWF0ZUNhbGxiYWNrVGFzaygmcnVu VGFza09uV29ya2VyVGhyZWFkLCB0aGlzLCB0YXNrKSwgV29ya2VyUnVuTG9vcDo6ZGVmYXVsdE1v ZGUoKSk7CisgICAgbV9wcm94eS0+cG9zdFRhc2tGb3JNb2RlVG9Xb3JrZXJDb250ZXh0KGNyZWF0 ZUNhbGxiYWNrVGFzaygmcnVuVGFza09uV29ya2VyVGhyZWFkLCB0aGlzLCB0YXNrKSwgbV9tb2Rl KTsKIH0KIAorYm9vbCBXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlOjp3YWl0Rm9yT3Bl cmF0aW9uVG9Db21wbGV0ZSgpCit7CisgICAgd2hpbGUgKG1fb3BlcmF0aW9uSW5Qcm9ncmVzcykg eworICAgICAgICBXb3JrZXJDb250ZXh0KiBjb250ZXh0ID0gc3RhdGljX2Nhc3Q8V29ya2VyQ29u dGV4dCo+KG1fd29ya2VyQ29udGV4dCk7CisgICAgICAgIGlmIChjb250ZXh0LT50aHJlYWQoKS0+ cnVuTG9vcCgpLnJ1bkluTW9kZShjb250ZXh0LCBtX21vZGUpID09IE1lc3NhZ2VRdWV1ZVRlcm1p bmF0ZWQpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorICAgIHJldHVybiB0cnVl OwogfQogCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKKwogI2VuZGlmIC8vIEVOQUJMRShGSUxFX1NZ U1RFTSkKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV29ya2VyRmlsZVdyaXRlckNhbGxiYWNr c0JyaWRnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV29ya2VyRmlsZVdy aXRlckNhbGxiYWNrc0JyaWRnZS5oCShyZXZpc2lvbiA3MjU3MSkKKysrIFdlYktpdC9jaHJvbWl1 bS9zcmMvV29ya2VyRmlsZVdyaXRlckNhbGxiYWNrc0JyaWRnZS5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMDYsNiArMTA2LDkgQEAgcHVibGljOgogICAgIHZvaWQgZGlkRmFpbChXZWJGaWxlRXJyb3Ip OwogICAgIHZvaWQgZGlkVHJ1bmNhdGUoKTsKIAorICAgIC8vIENhbGwgdGhpcyBvbiB0aGUgY29u dGV4dCB0aHJlYWQgdG8gd2FpdCBmb3IgdGhlIGN1cnJlbnQgb3BlcmF0aW9uIHRvIGNvbXBsZXRl LgorICAgIGJvb2wgd2FpdEZvck9wZXJhdGlvblRvQ29tcGxldGUoKTsKKwogcHJpdmF0ZToKICAg ICBXb3JrZXJGaWxlV3JpdGVyQ2FsbGJhY2tzQnJpZGdlKGNvbnN0IFN0cmluZyYgcGF0aCwgV2Vi Q29yZTo6V29ya2VyTG9hZGVyUHJveHkqLCBXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiwgV2ViQ29yZTo6QXN5bmNGaWxlV3JpdGVyQ2xpZW50Kik7CiAKQEAgLTE0Nyw2ICsxNTAsMTIg QEAgcHJpdmF0ZToKIAogICAgIC8vIFVzZWQgdG8gaW5kaWNhdGUgdGhhdCBzaHV0ZG93biBoYXMg c3RhcnRlZCBvbiB0aGUgbWFpbiB0aHJlYWQsIGFuZCBoZW5jZSB0aGUgd3JpdGVyIGhhcyBiZWVu IGRlbGV0ZWQuCiAgICAgYm9vbCBtX3dyaXRlckRlbGV0ZWQ7CisKKyAgICAvLyBVc2VkIGJ5IHdh aXRGb3JPcGVyYXRpb25Ub0NvbXBsZXRlLgorICAgIGJvb2wgbV9vcGVyYXRpb25JblByb2dyZXNz OworCisgICAgLy8gVXNlZCBieSBwb3N0VGFza0Zvck1vZGVUb1dvcmtlckNvbnRleHQgYW5kIHJ1 bkluTW9kZS4KKyAgICBTdHJpbmcgbV9tb2RlOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQo=