115622 2013-05-05 23:07:23 -0700 [BLACKBERRY]clean up load interface in WebPage 2013-05-07 22:07:49 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 xren webkit-unassigned commit-queue joenotcharles mawu rwlbuis xren oldest_to_newest 884781 0 xren 2013-05-05 23:07:23 -0700 Clean up load interface in WebPage internal PR: https://bugzilla.qnx.com/bugzilla/show_bug.cgi?id=315535 internal reviewed by Marry Wu 884783 1 200605 xren 2013-05-05 23:27:50 -0700 Created attachment 200605 clean up load interface in WebPage clean up load interface in WebPage 885742 2 200605 rwlbuis 2013-05-07 08:49:17 -0700 Comment on attachment 200605 clean up load interface in WebPage View in context: https://bugs.webkit.org/attachment.cgi?id=200605&action=review Looks good, but please fix the ChangeLog and then ask Charles or Mary to commit. > Source/WebKit/blackberry/ChangeLog:8 > + Internal reviewd by : Marry WU It is reviewed by, and "Mary Wu". 886092 3 201012 xren 2013-05-07 18:41:05 -0700 Created attachment 201012 clean up load interface in WebPage commit-queue? 886098 4 201012 rwlbuis 2013-05-07 18:57:40 -0700 Comment on attachment 201012 clean up load interface in WebPage View in context: https://bugs.webkit.org/attachment.cgi?id=201012&action=review > Source/WebKit/blackberry/ChangeLog:5 > + Reviewed by Rob Buis and Marry Wu. This will probably not work. You should ask Charles, Mary or Ming how to fix it. 886102 5 201014 xren 2013-05-07 19:06:55 -0700 Created attachment 201014 clean up load interface in WebPage commit ? 886103 6 201015 xren 2013-05-07 19:08:19 -0700 Created attachment 201015 clean up load interface in WebPage commit? 886105 7 201015 charles.wei 2013-05-07 19:28:25 -0700 Comment on attachment 201015 clean up load interface in WebPage Commit. 886106 8 201015 commit-queue 2013-05-07 19:30:33 -0700 Comment on attachment 201015 clean up load interface in WebPage Rejecting attachment 201015 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 201015, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: patching file Source/WebKit/blackberry/Api/WebPage_p.h patching file Source/WebKit/blackberry/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp Hunk #1 FAILED at 1200. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/377497 886117 9 201020 xren 2013-05-07 19:49:16 -0700 Created attachment 201020 clean up load interface in WebPage commit? 886119 10 201021 xren 2013-05-07 19:52:48 -0700 Created attachment 201021 clean up load interface in WebPage commit? 886124 11 201021 charles.wei 2013-05-07 20:00:46 -0700 Comment on attachment 201021 clean up load interface in WebPage re-commit after rebase to resolve the conflict. 886151 12 201021 commit-queue 2013-05-07 22:07:46 -0700 Comment on attachment 201021 clean up load interface in WebPage Clearing flags on attachment: 201021 Committed r149711: <http://trac.webkit.org/changeset/149711> 886152 13 commit-queue 2013-05-07 22:07:49 -0700 All reviewed patches have been landed. Closing bug. 200605 2013-05-05 23:27:50 -0700 2013-05-07 18:41:05 -0700 clean up load interface in WebPage 0001-2013-04-28-Xuefei-Ren-xren-blackberry.com.patch text/plain 10608 xren RnJvbSBjZGI1NDdmZGM3YzMxMjUyNzUyMDNmNjJhYmEwMTRlMTlmYTI3NmViIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYdWVmZWkgUmVuIDx4cmVuQGJsYWNrYmVycnkuY29tPgpEYXRl OiBNb24sIDYgTWF5IDIwMTMgMTQ6MjU6MjUgKzA4MDAKU3ViamVjdDogW1BBVENIXSAyMDEzLTA0 LTI4ICBYdWVmZWkgUmVuICA8eHJlbkBibGFja2JlcnJ5LmNvbT4KCiAgICAgICAgQ2xlYW4gdXAg bG9hZCBpbnRlcmZhY2UgaW4gV2ViUGFnZQogICAgICAgIGh0dHBzOi8vYnVnemlsbGEucW54LmNv bS9idWd6aWxsYS9zaG93X2J1Zy5jZ2k/aWQ9MzE1NTM1CgogICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKICAgICAgICAqIEFwaS9XZWJQYWdlLmNwcDoKICAgICAgICAoQmxhY2tC ZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6bG9hZCk6CiAgICAgICAgKEJsYWNrQmVycnk6 OldlYktpdDo6V2ViUGFnZTo6bG9hZEZpbGUpOgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6 OldlYlBhZ2U6OmxvYWQpOgogICAgICAgICogQXBpL1dlYlBhZ2UuaDoKICAgICAgICAqIEFwaS9X ZWJQYWdlX3AuaDoKICAgICAgICAoV2ViUGFnZVByaXZhdGUpOgogICAgICAgICogV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcDoKICAgICAgICAoV2ViQ29yZTo6 RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5OjpzdGFydERvd25sb2FkKToKCkNvbmZsaWN0czoK CVNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKCkNvbmZsaWN0czoKCVNv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKCVNvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwCi0t LQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCAgICAgICAgICAgfCAg IDUyICsrKysrKysrKy0tLS0tLS0tLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dl YlBhZ2UuaCAgICAgICAgICAgICB8ICAgIDIgKy0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvV2ViUGFnZV9wLmggICAgICAgICAgIHwgICAgMiArLQogU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgfCAgIDE5ICsrKysrKysKIC4uLi9XZWJDb3Jl U3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwIHwgICAgOCArKy0KIDUgZmls ZXMgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygrKSwgMzMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKaW5kZXggZGNiYmZiOS4uOTQ2YTZjMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCkBAIC02NzEsMTIgKzY3MSwx MiBAQCBwcml2YXRlOgogICAgIH0KIH07CiAKLXZvaWQgV2ViUGFnZVByaXZhdGU6OmxvYWQoY29u c3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgdXJsLCBjb25zdCBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6U3RyaW5nJiBuZXR3b3JrVG9rZW4sIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3Jt OjpTdHJpbmcmIG1ldGhvZCwgUGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpDYWNoZVBvbGljeSBj YWNoZVBvbGljeSwgY29uc3QgY2hhciogZGF0YSwgc2l6ZV90IGRhdGFMZW5ndGgsIGNvbnN0IGNo YXIqIGNvbnN0KiBoZWFkZXJzLCBzaXplX3QgaGVhZGVyc0xlbmd0aCwgYm9vbCBpc0luaXRpYWws IGJvb2wgbXVzdEhhbmRsZUludGVybmFsbHksIGJvb2wgbmVlZFJlZmVyZXIsIGJvb2wgZm9yY2VE b3dubG9hZCwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgb3ZlcnJpZGVDb250 ZW50VHlwZSwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgc3VnZ2VzdGVkU2F2 ZU5hbWUpCit2b2lkIFdlYlBhZ2VQcml2YXRlOjpsb2FkKGNvbnN0IFBsYXRmb3JtOjpOZXR3b3Jr UmVxdWVzdCYgbmV0UmVxLCBib29sIG5lZWRSZWZlcmVyKQogewogICAgIHN0b3BDdXJyZW50TG9h ZCgpOwogICAgIERlZmVycmVkVGFza0xvYWRNYW51YWxTY3JpcHQ6OmZpbmlzaE9yQ2FuY2VsKHRo aXMpOwogCi0gICAgU3RyaW5nIHVybFN0cmluZyh1cmwpOworICAgIFN0cmluZyB1cmxTdHJpbmco bmV0UmVxLmdldFVybFJlZigpKTsKICAgICBpZiAodXJsU3RyaW5nLnN0YXJ0c1dpdGgoInZzOiIs IGZhbHNlKSkgewogICAgICAgICB1cmxTdHJpbmcgPSB1cmxTdHJpbmcuc3Vic3RyaW5nKDMpOwog ICAgICAgICBtX21haW5GcmFtZS0+c2V0SW5WaWV3U291cmNlTW9kZSh0cnVlKTsKQEAgLTY5Mywz MCArNjkzLDI1IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OmxvYWQoY29uc3QgQmxhY2tCZXJyeTo6 UGxhdGZvcm06OlN0cmluZyYgdXJsLCBjb25zdCBCbGFja0JlCiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKLSAgICBpZiAoaXNJbml0aWFsKQotICAgICAgICBOZXR3b3JrTWFuYWdlcjo6aW5zdGFu Y2UoKS0+c2V0SW5pdGlhbFVSTChrdXJsKTsKLQogICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0 KGt1cmwpOwotICAgIHJlcXVlc3Quc2V0VG9rZW4obmV0d29ya1Rva2VuKTsKLSAgICBpZiAoaXNJ bml0aWFsIHx8IG11c3RIYW5kbGVJbnRlcm5hbGx5KQotICAgICAgICByZXF1ZXN0LnNldE11c3RI YW5kbGVJbnRlcm5hbGx5KHRydWUpOwotICAgIHJlcXVlc3Quc2V0SFRUUE1ldGhvZChtZXRob2Qp OwotICAgIHJlcXVlc3Quc2V0Q2FjaGVQb2xpY3kodG9XZWJDb3JlQ2FjaGVQb2xpY3koY2FjaGVQ b2xpY3kpKTsKLSAgICBpZiAoIW92ZXJyaWRlQ29udGVudFR5cGUuZW1wdHkoKSkKLSAgICAgICAg cmVxdWVzdC5zZXRPdmVycmlkZUNvbnRlbnRUeXBlKG92ZXJyaWRlQ29udGVudFR5cGUpOwotCi0g ICAgaWYgKGRhdGEpCi0gICAgICAgIHJlcXVlc3Quc2V0SFRUUEJvZHkoRm9ybURhdGE6OmNyZWF0 ZShkYXRhLCBkYXRhTGVuZ3RoKSk7Ci0KLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpICsgMSA8 IGhlYWRlcnNMZW5ndGg7IGkgKz0gMikKLSAgICAgICAgcmVxdWVzdC5hZGRIVFRQSGVhZGVyRmll bGQoaGVhZGVyc1tpXSwgaGVhZGVyc1tpICsgMV0pOworICAgIHJlcXVlc3Quc2V0SFRUUE1ldGhv ZChuZXRSZXEuZ2V0TWV0aG9kUmVmKCkpOworICAgIHJlcXVlc3Quc2V0Q2FjaGVQb2xpY3kodG9X ZWJDb3JlQ2FjaGVQb2xpY3kobmV0UmVxLmdldENhY2hlUG9saWN5KCkpKTsKKyAgICBpZiAoIW5l dFJlcS5nZXRPdmVycmlkZUNvbnRlbnRUeXBlKCkuZW1wdHkoKSkKKyAgICAgICAgcmVxdWVzdC5z ZXRPdmVycmlkZUNvbnRlbnRUeXBlKG5ldFJlcS5nZXRPdmVycmlkZUNvbnRlbnRUeXBlKCkpOwor CisgICAgUGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpIZWFkZXJMaXN0JiBsaXN0ID0gbmV0UmVx LmdldEhlYWRlckxpc3RSZWYoKTsKKyAgICBpZiAoIWxpc3QuZW1wdHkoKSkgeworICAgICAgICBm b3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGlzdC5zaXplKCk7IGkrKykKKyAgICAgICAgICAgIHJl cXVlc3QuYWRkSFRUUEhlYWRlckZpZWxkKGxpc3RbaV0uZmlyc3QuY19zdHIoKSwgbGlzdFtpXS5z ZWNvbmQuY19zdHIoKSk7CisgICAgfQorCiAgICAgaWYgKG5lZWRSZWZlcmVyICYmIGZvY3VzZWRP ck1haW5GcmFtZSgpICYmIGZvY3VzZWRPck1haW5GcmFtZSgpLT5kb2N1bWVudCgpKQogICAgICAg ICByZXF1ZXN0LmFkZEhUVFBIZWFkZXJGaWVsZCgiUmVmZXJlciIsIGZvY3VzZWRPck1haW5GcmFt ZSgpLT5kb2N1bWVudCgpLT51cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKIAotICAgIGlm IChmb3JjZURvd25sb2FkKQorICAgIGlmIChQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OlRhcmdl dElzRG93bmxvYWQgPT0gbmV0UmVxLmdldFRhcmdldFR5cGUoKSkKICAgICAgICAgcmVxdWVzdC5z ZXRGb3JjZURvd25sb2FkKHRydWUpOwotCi0gICAgcmVxdWVzdC5zZXRTdWdnZXN0ZWRTYXZlTmFt ZShzdWdnZXN0ZWRTYXZlTmFtZSk7CisgICAgaWYgKCFuZXRSZXEuZ2V0U3VnZ2VzdGVkU2F2ZU5h bWUoKS5lbXB0eSgpKQorICAgICAgICByZXF1ZXN0LnNldFN1Z2dlc3RlZFNhdmVOYW1lKG5ldFJl cS5nZXRTdWdnZXN0ZWRTYXZlTmFtZSgpKTsKIAogICAgIG1fbWFpbkZyYW1lLT5sb2FkZXIoKS0+ bG9hZChGcmFtZUxvYWRSZXF1ZXN0KG1fbWFpbkZyYW1lLCByZXF1ZXN0KSk7CiB9CkBAIC03Mjks MTggKzcyNCwxNSBAQCB2b2lkIFdlYlBhZ2U6OmxvYWRGaWxlKGNvbnN0IEJsYWNrQmVycnk6OlBs YXRmb3JtOjpTdHJpbmcmIHBhdGgsIGNvbnN0IEJsYWNrQmVycgogICAgIGVsc2UgaWYgKCFmaWxl VXJsLnN0YXJ0c1dpdGgoImZpbGU6Ly8vIikpCiAgICAgICAgIHJldHVybjsKIAotICAgIGQtPmxv YWQoZmlsZVVybCwgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZzo6ZW1wdHlTdHJpbmcoKSwg QmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZygiR0VUIiwgMyksIFBsYXRmb3JtOjpOZXR3b3Jr UmVxdWVzdDo6VXNlUHJvdG9jb2xDYWNoZVBvbGljeSwgMCwgMCwgMCwgMCwgZmFsc2UsIGZhbHNl LCBmYWxzZSwgZmFsc2UsIG92ZXJyaWRlQ29udGVudFR5cGUuY19zdHIoKSk7CisgICAgUGxhdGZv cm06Ok5ldHdvcmtSZXF1ZXN0IG5ldFJlcXVlc3Q7CisgICAgbmV0UmVxdWVzdC5zZXRSZXF1ZXN0 VXJsKHBhdGgpOworICAgIG5ldFJlcXVlc3Quc2V0T3ZlcnJpZGVDb250ZW50VHlwZShvdmVycmlk ZUNvbnRlbnRUeXBlKTsKKyAgICBkLT5sb2FkKG5ldFJlcXVlc3QsIGZhbHNlKTsKIH0KIAotdm9p ZCBXZWJQYWdlOjpsb2FkKGNvbnN0IFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdCYgcmVxdWVzdCwg Ym9vbCBuZWVkUmVmZXJlciwgYm9vbCBmb3JjZURvd25sb2FkKQordm9pZCBXZWJQYWdlOjpsb2Fk KGNvbnN0IFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdCYgcmVxdWVzdCwgYm9vbCBuZWVkUmVmZXJl cikKIHsKLSAgICB2ZWN0b3I8Y29uc3QgY2hhcio+IGhlYWRlcnM7Ci0gICAgUGxhdGZvcm06Ok5l dHdvcmtSZXF1ZXN0OjpIZWFkZXJMaXN0JiBsaXN0ID0gcmVxdWVzdC5nZXRIZWFkZXJMaXN0UmVm KCk7Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxpc3Quc2l6ZSgpOyBpKyspIHsKLSAg ICAgICAgaGVhZGVycy5wdXNoX2JhY2sobGlzdFtpXS5maXJzdC5jX3N0cigpKTsKLSAgICAgICAg aGVhZGVycy5wdXNoX2JhY2sobGlzdFtpXS5zZWNvbmQuY19zdHIoKSk7Ci0gICAgfQotICAgIGQt PmxvYWQocmVxdWVzdC5nZXRVcmxSZWYoKSwgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZzo6 ZW1wdHlTdHJpbmcoKSwgIkdFVCIsIFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6VXNlUHJvdG9j b2xDYWNoZVBvbGljeSwgMCwgMCwgaGVhZGVycy5lbXB0eSgpID8gMCA6ICZoZWFkZXJzWzBdLCBo ZWFkZXJzLnNpemUoKSwgZmFsc2UsIGZhbHNlLCBuZWVkUmVmZXJlciwgZm9yY2VEb3dubG9hZCwg QmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZzo6ZW1wdHlTdHJpbmcoKSwgcmVxdWVzdC5nZXRT dWdnZXN0ZWRTYXZlTmFtZSgpKTsKKyAgICBkLT5sb2FkKHJlcXVlc3QsIG5lZWRSZWZlcmVyKTsK IH0KIAogdm9pZCBXZWJQYWdlUHJpdmF0ZTo6bG9hZFN0cmluZyhjb25zdCBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6U3RyaW5nJiBzdHJpbmcsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJp bmcmIGJhc2VVUkwsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIGNvbnRlbnRU eXBlLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiBmYWlsaW5nVVJMKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmggYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaAppbmRleCBmZWU4NGNjLi4wMzhmMTBmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaAorKysgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaApAQCAtOTIsNyArOTIsNyBAQCBw dWJsaWM6CiAKICAgICB2b2lkIGxvYWRTdHJpbmcoY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06 OlN0cmluZyYsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIGJhc2VVUkwsIGNv bnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIGNvbnRlbnRUeXBlID0gInRleHQvaHRt bCIsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIGZhaWxpbmdVUkwgPSBCbGFj a0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nOjplbXB0eVN0cmluZygpKTsKIAotICAgIHZvaWQgbG9h ZChjb25zdCBQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3QmLCBib29sIG5lZWRSZWZlcmVyID0gZmFs c2UsIGJvb2wgZm9yY2VEb3dubG9hZCA9IGZhbHNlKTsKKyAgICB2b2lkIGxvYWQoY29uc3QgUGxh dGZvcm06Ok5ldHdvcmtSZXF1ZXN0JiwgYm9vbCBuZWVkUmVmZXJlciA9IGZhbHNlKTsKIAogICAg IGJvb2wgZXhlY3V0ZUphdmFTY3JpcHQoY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmlu ZyYgc2NyaXB0LCBKYXZhU2NyaXB0RGF0YVR5cGUmIHJldHVyblR5cGUsIEJsYWNrQmVycnk6OlBs YXRmb3JtOjpTdHJpbmcmIHJldHVyblZhbHVlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvV2ViUGFnZV9wLmgKaW5kZXggN2E5NDY4YS4uY2JlMDBhNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oCkBAIC0xMTUsNyArMTE1LDcgQEAgcHVibGljOgogICAg IGJvb2wgaGFuZGxlTW91c2VFdmVudChXZWJDb3JlOjpQbGF0Zm9ybU1vdXNlRXZlbnQmKTsKICAg ICBib29sIGhhbmRsZVdoZWVsRXZlbnQoV2ViQ29yZTo6UGxhdGZvcm1XaGVlbEV2ZW50Jik7CiAK LSAgICB2b2lkIGxvYWQoY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgdXJsLCBj b25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiBuZXR3b3JrVG9rZW4sIGNvbnN0IEJs YWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIG1ldGhvZCwgUGxhdGZvcm06Ok5ldHdvcmtSZXF1 ZXN0OjpDYWNoZVBvbGljeSwgY29uc3QgY2hhciogZGF0YSwgc2l6ZV90IGRhdGFMZW5ndGgsIGNv bnN0IGNoYXIqIGNvbnN0KiBoZWFkZXJzLCBzaXplX3QgaGVhZGVyc0xlbmd0aCwgYm9vbCBpc0lu aXRpYWwsIGJvb2wgbXVzdEhhbmRsZUludGVybmFsbHkgPSBmYWxzZSwgYm9vbCBuZWVkUmVmZXJl ciA9IGZhbHNlLCBib29sIGZvcmNlRG93bmxvYWQgPSBmYWxzZSwgY29uc3QgQmxhY2tCZXJyeTo6 UGxhdGZvcm06OlN0cmluZyYgb3ZlcnJpZGVDb250ZW50VHlwZSA9IEJsYWNrQmVycnk6OlBsYXRm b3JtOjpTdHJpbmc6OmVtcHR5U3RyaW5nKCksIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpT dHJpbmcmIHN1Z2dlc3RlZFNhdmVOYW1lID0gQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZzo6 ZW1wdHlTdHJpbmcoKSk7CisgICAgdm9pZCBsb2FkKGNvbnN0IFBsYXRmb3JtOjpOZXR3b3JrUmVx dWVzdCYgcGxhdGZvcm1SZXF1ZXN0LCBib29sIG5lZWRSZWZlcmVyID0gZmFsc2UpOwogICAgIHZv aWQgbG9hZFN0cmluZyhjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiwgY29uc3Qg QmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgYmFzZVVSTCwgY29uc3QgQmxhY2tCZXJyeTo6 UGxhdGZvcm06OlN0cmluZyYgbWltZVR5cGUsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpT dHJpbmcmIGZhaWxpbmdVUkwpOwogICAgIGJvb2wgZXhlY3V0ZUphdmFTY3JpcHQoY29uc3QgQmxh Y2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgc2NyaXB0LCBKYXZhU2NyaXB0RGF0YVR5cGUmIHJl dHVyblR5cGUsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHJldHVyblZhbHVlKTsKICAg ICBib29sIGV4ZWN1dGVKYXZhU2NyaXB0SW5Jc29sYXRlZFdvcmxkKGNvbnN0IFdlYkNvcmU6OlNj cmlwdFNvdXJjZUNvZGUmLCBKYXZhU2NyaXB0RGF0YVR5cGUmIHJldHVyblR5cGUsIEJsYWNrQmVy cnk6OlBsYXRmb3JtOjpTdHJpbmcmIHJldHVyblZhbHVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hh bmdlTG9nCmluZGV4IGVkM2QwMGMuLjIyYzk2YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTA1LTA1ICBYdWVmZWkgUmVuICA8eHJlbkBibGFj a2JlcnJ5LmNvbT4KKworICAgICAgICBDbGVhbiB1cCBsb2FkIGludGVyZmFjZSBpbiBXZWJQYWdl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTU2MjIK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW50ZXJuYWwg UFI6MzE1NTM1CisgICAgICAgIEludGVybmFsIHJldmlld2QgYnkgOiBNYXJyeSBXVQorCisgICAg ICAgICogQXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQ YWdlUHJpdmF0ZTo6bG9hZCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2U6 OmxvYWRGaWxlKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZTo6bG9hZCk6 CisgICAgICAgICogQXBpL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBBcGkvV2ViUGFnZV9wLmg6Cisg ICAgICAgIChXZWJQYWdlUHJpdmF0ZSk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVy Q2xpZW50QmxhY2tCZXJyeTo6c3RhcnREb3dubG9hZCk6CisKIDIwMTMtMDUtMDQgIE5pbWEgR2hh bmF2YXRpYW4gIDxuZ2hhbmF2YXRpYW5AYmxhY2tiZXJyeS5jb20+CiAKICAgICAgICAgW0JsYWNr QmVycnldIENsZWFuIHVwIHVudXNlZCBzcGVsbGNoZWNrIGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNr QmVycnkuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1l TG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKaW5kZXggZDcxYmUzOS4uYmM0ZGExNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVy Q2xpZW50QmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKQEAgLTExODcsNyArMTE4 NywxMyBAQCBQYXNzUmVmUHRyPEZyYW1lTmV0d29ya2luZ0NvbnRleHQ+IEZyYW1lTG9hZGVyQ2xp ZW50QmxhY2tCZXJyeTo6Y3JlYXRlTmV0d29ya2luZwogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50 QmxhY2tCZXJyeTo6c3RhcnREb3dubG9hZChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qs IGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkTmFtZSkKIHsKLSAgICBtX3dlYlBhZ2VQcml2YXRlLT5s b2FkKHJlcXVlc3QudXJsKCkuc3RyaW5nKCksIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmc6 OmVtcHR5U3RyaW5nKCksICJHRVQiLCBOZXR3b3JrUmVxdWVzdDo6VXNlUHJvdG9jb2xDYWNoZVBv bGljeSwgMCwgMCwgMCwgMCwgZmFsc2UsIGZhbHNlLCB0cnVlLCAiIiwgc3VnZ2VzdGVkTmFtZSk7 CisgICAgaWYgKHN1Z2dlc3RlZE5hbWUuZW1wdHkoKSkKKyAgICAgICAgbV93ZWJQYWdlUHJpdmF0 ZS0+bV9tYWluRnJhbWUtPmxvYWRlcigpLT5sb2FkKEZyYW1lTG9hZFJlcXVlc3QobV93ZWJQYWdl UHJpdmF0ZS0+bV9tYWluRnJhbWUsIHJlcXVlc3QpKTsKKyAgICBlbHNlIHsKKyAgICAgICAgUmVz b3VyY2VSZXF1ZXN0IHJlcXVlc3RDb3B5ID0gcmVxdWVzdDsKKyAgICAgICAgcmVxdWVzdENvcHku c2V0U3VnZ2VzdGVkU2F2ZU5hbWUoc3VnZ2VzdGVkTmFtZSk7CisgICAgICAgIG1fd2ViUGFnZVBy aXZhdGUtPm1fbWFpbkZyYW1lLT5sb2FkZXIoKS0+bG9hZChGcmFtZUxvYWRSZXF1ZXN0KG1fd2Vi UGFnZVByaXZhdGUtPm1fbWFpbkZyYW1lLCByZXF1ZXN0Q29weSkpOworICAgIH0KIH0KIAogdm9p ZCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmNvbnZlcnRNYWluUmVzb3VyY2VMb2FkVG9E b3dubG9hZChEb2N1bWVudExvYWRlciogZG9jdW1lbnRMb2FkZXIsIGNvbnN0IFJlc291cmNlUmVx dWVzdCYgcmVxdWVzdCwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCi0tIAoxLjcu MTAuNAoK 201012 2013-05-07 18:41:05 -0700 2013-05-07 19:06:55 -0700 clean up load interface in WebPage 0001-2013-04-28-Xuefei-Ren-xren-blackberry.com.patch text/plain 10744 xren RnJvbSBhYTdhZWJlZTQ0NDc1MWQ1Mjg5YmVhNmQyNWIzMjlhY2NkMTU3ODllIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYdWVmZWkgUmVuIDx4cmVuQGJsYWNrYmVycnkuY29tPgpEYXRl OiBXZWQsIDggTWF5IDIwMTMgMDk6MzU6MjEgKzA4MDAKU3ViamVjdDogW1BBVENIXSAyMDEzLTA0 LTI4ICBYdWVmZWkgUmVuICA8eHJlbkBibGFja2JlcnJ5LmNvbT4KCiAgICAgICAgQ2xlYW4gdXAg bG9hZCBpbnRlcmZhY2UgaW4gV2ViUGFnZQogICAgICAgIGh0dHBzOi8vYnVnemlsbGEucW54LmNv bS9idWd6aWxsYS9zaG93X2J1Zy5jZ2k/aWQ9MzE1NTM1CgogICAgICAgIFJldmlld2VkIGJ5IFJv YiBCdWlzIGFuZCBNYXJyeSBXdS4KCiAgICAgICAgKiBBcGkvV2ViUGFnZS5jcHA6CiAgICAgICAg KEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmxvYWQpOgogICAgICAgIChCbGFj a0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2U6OmxvYWRGaWxlKToKICAgICAgICAoQmxhY2tCZXJyeTo6 V2ViS2l0OjpXZWJQYWdlOjpsb2FkKToKICAgICAgICAqIEFwaS9XZWJQYWdlLmg6CiAgICAgICAg KiBBcGkvV2ViUGFnZV9wLmg6CiAgICAgICAgKFdlYlBhZ2VQcml2YXRlKToKICAgICAgICAqIFdl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHA6CiAgICAgICAgKFdl YkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6c3RhcnREb3dubG9hZCk6CgpDb25m bGljdHM6CglTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCi0tLQogU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCAgICAgICAgICAgfCAgIDU0ICsr KysrKysrLS0tLS0tLS0tLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Uu aCAgICAgICAgICAgICB8ICAgIDIgKy0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi UGFnZV9wLmggICAgICAgICAgIHwgICAgMiArLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0No YW5nZUxvZyAgICAgICAgICAgICAgICAgfCAgIDE4ICsrKysrKysKIC4uLi9XZWJDb3JlU3VwcG9y dC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwIHwgICAgOSArKystCiA1IGZpbGVzIGNo YW5nZWQsIDQ5IGluc2VydGlvbnMoKyksIDM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCmluZGV4IGJiYTA3ZjguLmM4ZjNiNmUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcApAQCAtMjAxLDggKzIwMSw2IEBAIHVz aW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiB0eXBlZGVmIGNvbnN0IHVuc2lnbmVkIHNob3J0KiBD VVNob3J0UHRyOwogCi1TVEFUSUNfR0xPQkFMX1NUUklORyhzX2dldCwgIkdFVCIpOwotCiBuYW1l c3BhY2UgQmxhY2tCZXJyeSB7CiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtNjg3LDEyICs2ODUs MTIgQEAgcHJpdmF0ZToKICAgICB9CiB9OwogCi12b2lkIFdlYlBhZ2VQcml2YXRlOjpsb2FkKGNv bnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHVybCwgY29uc3QgQmxhY2tCZXJyeTo6 UGxhdGZvcm06OlN0cmluZyYgbmV0d29ya1Rva2VuLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9y bTo6U3RyaW5nJiBtZXRob2QsIFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6Q2FjaGVQb2xpY3kg Y2FjaGVQb2xpY3ksIGNvbnN0IGNoYXIqIGRhdGEsIHNpemVfdCBkYXRhTGVuZ3RoLCBjb25zdCBj aGFyKiBjb25zdCogaGVhZGVycywgc2l6ZV90IGhlYWRlcnNMZW5ndGgsIGJvb2wgaXNJbml0aWFs LCBib29sIG11c3RIYW5kbGVJbnRlcm5hbGx5LCBib29sIG5lZWRSZWZlcmVyLCBib29sIGZvcmNl RG93bmxvYWQsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIG92ZXJyaWRlQ29u dGVudFR5cGUsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHN1Z2dlc3RlZFNh dmVOYW1lKQordm9pZCBXZWJQYWdlUHJpdmF0ZTo6bG9hZChjb25zdCBQbGF0Zm9ybTo6TmV0d29y a1JlcXVlc3QmIG5ldFJlcSwgYm9vbCBuZWVkUmVmZXJlcikKIHsKICAgICBzdG9wQ3VycmVudExv YWQoKTsKICAgICBEZWZlcnJlZFRhc2tMb2FkTWFudWFsU2NyaXB0OjpmaW5pc2hPckNhbmNlbCh0 aGlzKTsKIAotICAgIFN0cmluZyB1cmxTdHJpbmcodXJsKTsKKyAgICBTdHJpbmcgdXJsU3RyaW5n KG5ldFJlcS5nZXRVcmxSZWYoKSk7CiAgICAgaWYgKHVybFN0cmluZy5zdGFydHNXaXRoKCJ2czoi LCBmYWxzZSkpIHsKICAgICAgICAgdXJsU3RyaW5nID0gdXJsU3RyaW5nLnN1YnN0cmluZygzKTsK ICAgICAgICAgbV9tYWluRnJhbWUtPnNldEluVmlld1NvdXJjZU1vZGUodHJ1ZSk7CkBAIC03MDks MzAgKzcwNywyNSBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpsb2FkKGNvbnN0IEJsYWNrQmVycnk6 OlBsYXRmb3JtOjpTdHJpbmcmIHVybCwgY29uc3QgQmxhY2tCZQogICAgICAgICByZXR1cm47CiAg ICAgfQogCi0gICAgaWYgKGlzSW5pdGlhbCkKLSAgICAgICAgTmV0d29ya01hbmFnZXI6Omluc3Rh bmNlKCktPnNldEluaXRpYWxVUkwoa3VybCk7Ci0KICAgICBSZXNvdXJjZVJlcXVlc3QgcmVxdWVz dChrdXJsKTsKLSAgICByZXF1ZXN0LnNldFRva2VuKG5ldHdvcmtUb2tlbik7Ci0gICAgaWYgKGlz SW5pdGlhbCB8fCBtdXN0SGFuZGxlSW50ZXJuYWxseSkKLSAgICAgICAgcmVxdWVzdC5zZXRNdXN0 SGFuZGxlSW50ZXJuYWxseSh0cnVlKTsKLSAgICByZXF1ZXN0LnNldEhUVFBNZXRob2QobWV0aG9k KTsKLSAgICByZXF1ZXN0LnNldENhY2hlUG9saWN5KHRvV2ViQ29yZUNhY2hlUG9saWN5KGNhY2hl UG9saWN5KSk7Ci0gICAgaWYgKCFvdmVycmlkZUNvbnRlbnRUeXBlLmVtcHR5KCkpCi0gICAgICAg IHJlcXVlc3Quc2V0T3ZlcnJpZGVDb250ZW50VHlwZShvdmVycmlkZUNvbnRlbnRUeXBlKTsKLQot ICAgIGlmIChkYXRhKQotICAgICAgICByZXF1ZXN0LnNldEhUVFBCb2R5KEZvcm1EYXRhOjpjcmVh dGUoZGF0YSwgZGF0YUxlbmd0aCkpOwotCi0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSArIDEg PCBoZWFkZXJzTGVuZ3RoOyBpICs9IDIpCi0gICAgICAgIHJlcXVlc3QuYWRkSFRUUEhlYWRlckZp ZWxkKGhlYWRlcnNbaV0sIGhlYWRlcnNbaSArIDFdKTsKKyAgICByZXF1ZXN0LnNldEhUVFBNZXRo b2QobmV0UmVxLmdldE1ldGhvZFJlZigpKTsKKyAgICByZXF1ZXN0LnNldENhY2hlUG9saWN5KHRv V2ViQ29yZUNhY2hlUG9saWN5KG5ldFJlcS5nZXRDYWNoZVBvbGljeSgpKSk7CisgICAgaWYgKCFu ZXRSZXEuZ2V0T3ZlcnJpZGVDb250ZW50VHlwZSgpLmVtcHR5KCkpCisgICAgICAgIHJlcXVlc3Qu c2V0T3ZlcnJpZGVDb250ZW50VHlwZShuZXRSZXEuZ2V0T3ZlcnJpZGVDb250ZW50VHlwZSgpKTsK KworICAgIFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6SGVhZGVyTGlzdCYgbGlzdCA9IG5ldFJl cS5nZXRIZWFkZXJMaXN0UmVmKCk7CisgICAgaWYgKCFsaXN0LmVtcHR5KCkpIHsKKyAgICAgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxpc3Quc2l6ZSgpOyBpKyspCisgICAgICAgICAgICBy ZXF1ZXN0LmFkZEhUVFBIZWFkZXJGaWVsZChsaXN0W2ldLmZpcnN0LmNfc3RyKCksIGxpc3RbaV0u c2Vjb25kLmNfc3RyKCkpOworICAgIH0KKwogICAgIGlmIChuZWVkUmVmZXJlciAmJiBmb2N1c2Vk T3JNYWluRnJhbWUoKSAmJiBmb2N1c2VkT3JNYWluRnJhbWUoKS0+ZG9jdW1lbnQoKSkKICAgICAg ICAgcmVxdWVzdC5hZGRIVFRQSGVhZGVyRmllbGQoIlJlZmVyZXIiLCBmb2N1c2VkT3JNYWluRnJh bWUoKS0+ZG9jdW1lbnQoKS0+dXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAKLSAgICBp ZiAoZm9yY2VEb3dubG9hZCkKKyAgICBpZiAoUGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpUYXJn ZXRJc0Rvd25sb2FkID09IG5ldFJlcS5nZXRUYXJnZXRUeXBlKCkpCiAgICAgICAgIHJlcXVlc3Qu c2V0Rm9yY2VEb3dubG9hZCh0cnVlKTsKLQotICAgIHJlcXVlc3Quc2V0U3VnZ2VzdGVkU2F2ZU5h bWUoc3VnZ2VzdGVkU2F2ZU5hbWUpOworICAgIGlmICghbmV0UmVxLmdldFN1Z2dlc3RlZFNhdmVO YW1lKCkuZW1wdHkoKSkKKyAgICAgICAgcmVxdWVzdC5zZXRTdWdnZXN0ZWRTYXZlTmFtZShuZXRS ZXEuZ2V0U3VnZ2VzdGVkU2F2ZU5hbWUoKSk7CiAKICAgICBtX21haW5GcmFtZS0+bG9hZGVyKCkt PmxvYWQoRnJhbWVMb2FkUmVxdWVzdChtX21haW5GcmFtZSwgcmVxdWVzdCkpOwogfQpAQCAtNzQ3 LDE4ICs3NDAsMTUgQEAgdm9pZCBXZWJQYWdlOjpsb2FkRmlsZShjb25zdCBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6U3RyaW5nJiBwYXRoLCBjb25zdCBCbGFja0JlcnIKICAgICBlbHNlIGlmICghZmls ZVVybC5zdGFydHNXaXRoKHNfZmlsZVJvb3RQcmVmaXgpKQogICAgICAgICByZXR1cm47CiAKLSAg ICBkLT5sb2FkKGZpbGVVcmwsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmc6OmVtcHR5U3Ry aW5nKCksIHNfZ2V0LCBQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OlVzZVByb3RvY29sQ2FjaGVQ b2xpY3ksIDAsIDAsIDAsIDAsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCBvdmVycmlkZUNv bnRlbnRUeXBlKTsKKyAgICBQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3QgbmV0UmVxdWVzdDsKKyAg ICBuZXRSZXF1ZXN0LnNldFJlcXVlc3RVcmwocGF0aCk7CisgICAgbmV0UmVxdWVzdC5zZXRPdmVy cmlkZUNvbnRlbnRUeXBlKG92ZXJyaWRlQ29udGVudFR5cGUpOworICAgIGQtPmxvYWQobmV0UmVx dWVzdCwgZmFsc2UpOwogfQogCi12b2lkIFdlYlBhZ2U6OmxvYWQoY29uc3QgUGxhdGZvcm06Ok5l dHdvcmtSZXF1ZXN0JiByZXF1ZXN0LCBib29sIG5lZWRSZWZlcmVyLCBib29sIGZvcmNlRG93bmxv YWQpCit2b2lkIFdlYlBhZ2U6OmxvYWQoY29uc3QgUGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0JiBy ZXF1ZXN0LCBib29sIG5lZWRSZWZlcmVyKQogewotICAgIHZlY3Rvcjxjb25zdCBjaGFyKj4gaGVh ZGVyczsKLSAgICBQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OkhlYWRlckxpc3QmIGxpc3QgPSBy ZXF1ZXN0LmdldEhlYWRlckxpc3RSZWYoKTsKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwg bGlzdC5zaXplKCk7IGkrKykgewotICAgICAgICBoZWFkZXJzLnB1c2hfYmFjayhsaXN0W2ldLmZp cnN0LmNfc3RyKCkpOwotICAgICAgICBoZWFkZXJzLnB1c2hfYmFjayhsaXN0W2ldLnNlY29uZC5j X3N0cigpKTsKLSAgICB9Ci0gICAgZC0+bG9hZChyZXF1ZXN0LmdldFVybFJlZigpLCBCbGFja0Jl cnJ5OjpQbGF0Zm9ybTo6U3RyaW5nOjplbXB0eVN0cmluZygpLCBzX2dldCwgUGxhdGZvcm06Ok5l dHdvcmtSZXF1ZXN0OjpVc2VQcm90b2NvbENhY2hlUG9saWN5LCAwLCAwLCBoZWFkZXJzLmVtcHR5 KCkgPyAwIDogJmhlYWRlcnNbMF0sIGhlYWRlcnMuc2l6ZSgpLCBmYWxzZSwgZmFsc2UsIG5lZWRS ZWZlcmVyLCBmb3JjZURvd25sb2FkLCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nOjplbXB0 eVN0cmluZygpLCByZXF1ZXN0LmdldFN1Z2dlc3RlZFNhdmVOYW1lKCkpOworICAgIGQtPmxvYWQo cmVxdWVzdCwgbmVlZFJlZmVyZXIpOwogfQogCiB2b2lkIFdlYlBhZ2VQcml2YXRlOjpsb2FkU3Ry aW5nKGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHN0cmluZywgY29uc3QgQmxh Y2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgYmFzZVVSTCwgY29uc3QgQmxhY2tCZXJyeTo6UGxh dGZvcm06OlN0cmluZyYgY29udGVudFR5cGUsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpT dHJpbmcmIGZhaWxpbmdVUkwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv QXBpL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5oCmlu ZGV4IGUwNTBhYWEuLjljZTUxY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFn ZS5oCkBAIC05Nyw3ICs5Nyw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgbG9hZFN0cmluZyhjb25z dCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZv cm06OlN0cmluZyYgYmFzZVVSTCwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYg Y29udGVudFR5cGUgPSBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nOjpmcm9tQXNjaWkoInRl eHQvaHRtbCIpLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiBmYWlsaW5nVVJM ID0gQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZzo6ZW1wdHlTdHJpbmcoKSk7CiAKLSAgICB2 b2lkIGxvYWQoY29uc3QgUGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0JiwgYm9vbCBuZWVkUmVmZXJl ciA9IGZhbHNlLCBib29sIGZvcmNlRG93bmxvYWQgPSBmYWxzZSk7CisgICAgdm9pZCBsb2FkKGNv bnN0IFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdCYsIGJvb2wgbmVlZFJlZmVyZXIgPSBmYWxzZSk7 CiAKICAgICBib29sIGV4ZWN1dGVKYXZhU2NyaXB0KGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3Jt OjpTdHJpbmcmIHNjcmlwdCwgSmF2YVNjcmlwdERhdGFUeXBlJiByZXR1cm5UeXBlLCBCbGFja0Jl cnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiByZXR1cm5WYWx1ZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvQXBpL1dlYlBhZ2VfcC5oCmluZGV4IGNkNWFjOTIuLjY3Y2I5YTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmgKKysrIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaApAQCAtMTE1LDcgKzExNSw3IEBAIHB1Ymxp YzoKICAgICBib29sIGhhbmRsZU1vdXNlRXZlbnQoV2ViQ29yZTo6UGxhdGZvcm1Nb3VzZUV2ZW50 Jik7CiAgICAgYm9vbCBoYW5kbGVXaGVlbEV2ZW50KFdlYkNvcmU6OlBsYXRmb3JtV2hlZWxFdmVu dCYpOwogCi0gICAgdm9pZCBsb2FkKGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcm IHVybCwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgbmV0d29ya1Rva2VuLCBj b25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiBtZXRob2QsIFBsYXRmb3JtOjpOZXR3 b3JrUmVxdWVzdDo6Q2FjaGVQb2xpY3ksIGNvbnN0IGNoYXIqIGRhdGEsIHNpemVfdCBkYXRhTGVu Z3RoLCBjb25zdCBjaGFyKiBjb25zdCogaGVhZGVycywgc2l6ZV90IGhlYWRlcnNMZW5ndGgsIGJv b2wgaXNJbml0aWFsLCBib29sIG11c3RIYW5kbGVJbnRlcm5hbGx5ID0gZmFsc2UsIGJvb2wgbmVl ZFJlZmVyZXIgPSBmYWxzZSwgYm9vbCBmb3JjZURvd25sb2FkID0gZmFsc2UsIGNvbnN0IEJsYWNr QmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIG92ZXJyaWRlQ29udGVudFR5cGUgPSBCbGFja0JlcnJ5 OjpQbGF0Zm9ybTo6U3RyaW5nOjplbXB0eVN0cmluZygpLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0 Zm9ybTo6U3RyaW5nJiBzdWdnZXN0ZWRTYXZlTmFtZSA9IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpT dHJpbmc6OmVtcHR5U3RyaW5nKCkpOworICAgIHZvaWQgbG9hZChjb25zdCBQbGF0Zm9ybTo6TmV0 d29ya1JlcXVlc3QmIHBsYXRmb3JtUmVxdWVzdCwgYm9vbCBuZWVkUmVmZXJlciA9IGZhbHNlKTsK ICAgICB2b2lkIGxvYWRTdHJpbmcoY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYs IGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIGJhc2VVUkwsIGNvbnN0IEJsYWNr QmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0 Zm9ybTo6U3RyaW5nJiBmYWlsaW5nVVJMKTsKICAgICBib29sIGV4ZWN1dGVKYXZhU2NyaXB0KGNv bnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHNjcmlwdCwgSmF2YVNjcmlwdERhdGFU eXBlJiByZXR1cm5UeXBlLCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiByZXR1cm5WYWx1 ZSk7CiAgICAgYm9vbCBleGVjdXRlSmF2YVNjcmlwdEluSXNvbGF0ZWRXb3JsZChjb25zdCBXZWJD b3JlOjpTY3JpcHRTb3VyY2VDb2RlJiwgSmF2YVNjcmlwdERhdGFUeXBlJiByZXR1cm5UeXBlLCBC bGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiByZXR1cm5WYWx1ZSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0NoYW5nZUxvZwppbmRleCAwMjhmOTRmLi5iNmZlMzMxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMy0wNS0wNyAgWHVlZmVpIFJlbiAgPHhy ZW5AYmxhY2tiZXJyeS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgbG9hZCBpbnRlcmZhY2UgaW4g V2ViUGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTE1NjIyCisgICAgICAgIFJldmlld2VkIGJ5IFJvYiBCdWlzIGFuZCBNYXJyeSBXdS4KKworICAg ICAgICBJbnRlcm5hbCBQUjozMTU1MzUKKworICAgICAgICAqIEFwaS9XZWJQYWdlLmNwcDoKKyAg ICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmxvYWQpOgorICAgICAg ICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjpsb2FkRmlsZSk6CisgICAgICAgIChCbGFj a0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2U6OmxvYWQpOgorICAgICAgICAqIEFwaS9XZWJQYWdlLmg6 CisgICAgICAgICogQXBpL1dlYlBhZ2VfcC5oOgorICAgICAgICAoV2ViUGFnZVByaXZhdGUpOgor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OnN0YXJ0RG93 bmxvYWQpOgorCiAyMDEzLTA1LTAzICBKYWNreSBKaWFuZyAgPHpoYWppYW5nQGJsYWNrYmVycnku Y29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBQYWdlIHJlbmRlcmluZyBzY2FsZSBpcyBjaGFu Z2VkIGFmdGVyIGdvIGJhY2sgYW5kIGZvcndhcmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3Bw IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50QmxhY2tCZXJyeS5jcHAKaW5kZXggY2NmM2I0NS4uZTk1MGU2OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50Qmxh Y2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKQEAgLTEyMDAsOCArMTIwMCwxMyBAQCBQ YXNzUmVmUHRyPEZyYW1lTmV0d29ya2luZ0NvbnRleHQ+IEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tC ZXJyeTo6Y3JlYXRlTmV0d29ya2luZwogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJy eTo6c3RhcnREb3dubG9hZChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN0 cmluZyYgc3VnZ2VzdGVkTmFtZSkKIHsKLSAgICBTVEFUSUNfTE9DQUxfU1RSSU5HKHNfZ2V0LCAi R0VUIik7Ci0gICAgbV93ZWJQYWdlUHJpdmF0ZS0+bG9hZChyZXF1ZXN0LnVybCgpLnN0cmluZygp LCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nOjplbXB0eVN0cmluZygpLCBzX2dldCwgTmV0 d29ya1JlcXVlc3Q6OlVzZVByb3RvY29sQ2FjaGVQb2xpY3ksIDAsIDAsIDAsIDAsIGZhbHNlLCBm YWxzZSwgZmFsc2UsIHRydWUsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmc6OmVtcHR5U3Ry aW5nKCksIHN1Z2dlc3RlZE5hbWUpOworICAgIGlmIChzdWdnZXN0ZWROYW1lLmVtcHR5KCkpCisg ICAgICAgIG1fd2ViUGFnZVByaXZhdGUtPm1fbWFpbkZyYW1lLT5sb2FkZXIoKS0+bG9hZChGcmFt ZUxvYWRSZXF1ZXN0KG1fd2ViUGFnZVByaXZhdGUtPm1fbWFpbkZyYW1lLCByZXF1ZXN0KSk7Cisg ICAgZWxzZSB7CisgICAgICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0Q29weSA9IHJlcXVlc3Q7 CisgICAgICAgIHJlcXVlc3RDb3B5LnNldFN1Z2dlc3RlZFNhdmVOYW1lKHN1Z2dlc3RlZE5hbWUp OworICAgICAgICBtX3dlYlBhZ2VQcml2YXRlLT5tX21haW5GcmFtZS0+bG9hZGVyKCktPmxvYWQo RnJhbWVMb2FkUmVxdWVzdChtX3dlYlBhZ2VQcml2YXRlLT5tX21haW5GcmFtZSwgcmVxdWVzdENv cHkpKTsKKyAgICB9CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5Ojpjb252 ZXJ0TWFpblJlc291cmNlTG9hZFRvRG93bmxvYWQoRG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50TG9h ZGVyLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFJlc291cmNlUmVzcG9u c2UmIHJlc3BvbnNlKQotLSAKMS43LjEwLjQKCg== 201014 2013-05-07 19:06:55 -0700 2013-05-07 19:08:19 -0700 clean up load interface in WebPage 0001-2013-04-28-Xuefei-Ren-xren-blackberry.com.patch text/plain 10744 xren RnJvbSBhYTdhZWJlZTQ0NDc1MWQ1Mjg5YmVhNmQyNWIzMjlhY2NkMTU3ODllIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYdWVmZWkgUmVuIDx4cmVuQGJsYWNrYmVycnkuY29tPgpEYXRl OiBXZWQsIDggTWF5IDIwMTMgMDk6MzU6MjEgKzA4MDAKU3ViamVjdDogW1BBVENIXSAyMDEzLTA0 LTI4ICBYdWVmZWkgUmVuICA8eHJlbkBibGFja2JlcnJ5LmNvbT4KCiAgICAgICAgQ2xlYW4gdXAg bG9hZCBpbnRlcmZhY2UgaW4gV2ViUGFnZQogICAgICAgIGh0dHBzOi8vYnVnemlsbGEucW54LmNv bS9idWd6aWxsYS9zaG93X2J1Zy5jZ2k/aWQ9MzE1NTM1CgogICAgICAgIFJldmlld2VkIGJ5IFJv YiBCdWlzIGFuZCBNYXJyeSBXdS4KCiAgICAgICAgKiBBcGkvV2ViUGFnZS5jcHA6CiAgICAgICAg KEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmxvYWQpOgogICAgICAgIChCbGFj a0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2U6OmxvYWRGaWxlKToKICAgICAgICAoQmxhY2tCZXJyeTo6 V2ViS2l0OjpXZWJQYWdlOjpsb2FkKToKICAgICAgICAqIEFwaS9XZWJQYWdlLmg6CiAgICAgICAg KiBBcGkvV2ViUGFnZV9wLmg6CiAgICAgICAgKFdlYlBhZ2VQcml2YXRlKToKICAgICAgICAqIFdl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHA6CiAgICAgICAgKFdl YkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6c3RhcnREb3dubG9hZCk6CgpDb25m bGljdHM6CglTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCi0tLQogU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCAgICAgICAgICAgfCAgIDU0ICsr KysrKysrLS0tLS0tLS0tLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Uu aCAgICAgICAgICAgICB8ICAgIDIgKy0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi UGFnZV9wLmggICAgICAgICAgIHwgICAgMiArLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0No YW5nZUxvZyAgICAgICAgICAgICAgICAgfCAgIDE4ICsrKysrKysKIC4uLi9XZWJDb3JlU3VwcG9y dC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwIHwgICAgOSArKystCiA1IGZpbGVzIGNo YW5nZWQsIDQ5IGluc2VydGlvbnMoKyksIDM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCmluZGV4IGJiYTA3ZjguLmM4ZjNiNmUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcApAQCAtMjAxLDggKzIwMSw2IEBAIHVz aW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiB0eXBlZGVmIGNvbnN0IHVuc2lnbmVkIHNob3J0KiBD VVNob3J0UHRyOwogCi1TVEFUSUNfR0xPQkFMX1NUUklORyhzX2dldCwgIkdFVCIpOwotCiBuYW1l c3BhY2UgQmxhY2tCZXJyeSB7CiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtNjg3LDEyICs2ODUs MTIgQEAgcHJpdmF0ZToKICAgICB9CiB9OwogCi12b2lkIFdlYlBhZ2VQcml2YXRlOjpsb2FkKGNv bnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHVybCwgY29uc3QgQmxhY2tCZXJyeTo6 UGxhdGZvcm06OlN0cmluZyYgbmV0d29ya1Rva2VuLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9y bTo6U3RyaW5nJiBtZXRob2QsIFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6Q2FjaGVQb2xpY3kg Y2FjaGVQb2xpY3ksIGNvbnN0IGNoYXIqIGRhdGEsIHNpemVfdCBkYXRhTGVuZ3RoLCBjb25zdCBj aGFyKiBjb25zdCogaGVhZGVycywgc2l6ZV90IGhlYWRlcnNMZW5ndGgsIGJvb2wgaXNJbml0aWFs LCBib29sIG11c3RIYW5kbGVJbnRlcm5hbGx5LCBib29sIG5lZWRSZWZlcmVyLCBib29sIGZvcmNl RG93bmxvYWQsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIG92ZXJyaWRlQ29u dGVudFR5cGUsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHN1Z2dlc3RlZFNh dmVOYW1lKQordm9pZCBXZWJQYWdlUHJpdmF0ZTo6bG9hZChjb25zdCBQbGF0Zm9ybTo6TmV0d29y a1JlcXVlc3QmIG5ldFJlcSwgYm9vbCBuZWVkUmVmZXJlcikKIHsKICAgICBzdG9wQ3VycmVudExv YWQoKTsKICAgICBEZWZlcnJlZFRhc2tMb2FkTWFudWFsU2NyaXB0OjpmaW5pc2hPckNhbmNlbCh0 aGlzKTsKIAotICAgIFN0cmluZyB1cmxTdHJpbmcodXJsKTsKKyAgICBTdHJpbmcgdXJsU3RyaW5n KG5ldFJlcS5nZXRVcmxSZWYoKSk7CiAgICAgaWYgKHVybFN0cmluZy5zdGFydHNXaXRoKCJ2czoi LCBmYWxzZSkpIHsKICAgICAgICAgdXJsU3RyaW5nID0gdXJsU3RyaW5nLnN1YnN0cmluZygzKTsK ICAgICAgICAgbV9tYWluRnJhbWUtPnNldEluVmlld1NvdXJjZU1vZGUodHJ1ZSk7CkBAIC03MDks MzAgKzcwNywyNSBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpsb2FkKGNvbnN0IEJsYWNrQmVycnk6 OlBsYXRmb3JtOjpTdHJpbmcmIHVybCwgY29uc3QgQmxhY2tCZQogICAgICAgICByZXR1cm47CiAg ICAgfQogCi0gICAgaWYgKGlzSW5pdGlhbCkKLSAgICAgICAgTmV0d29ya01hbmFnZXI6Omluc3Rh bmNlKCktPnNldEluaXRpYWxVUkwoa3VybCk7Ci0KICAgICBSZXNvdXJjZVJlcXVlc3QgcmVxdWVz dChrdXJsKTsKLSAgICByZXF1ZXN0LnNldFRva2VuKG5ldHdvcmtUb2tlbik7Ci0gICAgaWYgKGlz SW5pdGlhbCB8fCBtdXN0SGFuZGxlSW50ZXJuYWxseSkKLSAgICAgICAgcmVxdWVzdC5zZXRNdXN0 SGFuZGxlSW50ZXJuYWxseSh0cnVlKTsKLSAgICByZXF1ZXN0LnNldEhUVFBNZXRob2QobWV0aG9k KTsKLSAgICByZXF1ZXN0LnNldENhY2hlUG9saWN5KHRvV2ViQ29yZUNhY2hlUG9saWN5KGNhY2hl UG9saWN5KSk7Ci0gICAgaWYgKCFvdmVycmlkZUNvbnRlbnRUeXBlLmVtcHR5KCkpCi0gICAgICAg IHJlcXVlc3Quc2V0T3ZlcnJpZGVDb250ZW50VHlwZShvdmVycmlkZUNvbnRlbnRUeXBlKTsKLQot ICAgIGlmIChkYXRhKQotICAgICAgICByZXF1ZXN0LnNldEhUVFBCb2R5KEZvcm1EYXRhOjpjcmVh dGUoZGF0YSwgZGF0YUxlbmd0aCkpOwotCi0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSArIDEg PCBoZWFkZXJzTGVuZ3RoOyBpICs9IDIpCi0gICAgICAgIHJlcXVlc3QuYWRkSFRUUEhlYWRlckZp ZWxkKGhlYWRlcnNbaV0sIGhlYWRlcnNbaSArIDFdKTsKKyAgICByZXF1ZXN0LnNldEhUVFBNZXRo b2QobmV0UmVxLmdldE1ldGhvZFJlZigpKTsKKyAgICByZXF1ZXN0LnNldENhY2hlUG9saWN5KHRv V2ViQ29yZUNhY2hlUG9saWN5KG5ldFJlcS5nZXRDYWNoZVBvbGljeSgpKSk7CisgICAgaWYgKCFu ZXRSZXEuZ2V0T3ZlcnJpZGVDb250ZW50VHlwZSgpLmVtcHR5KCkpCisgICAgICAgIHJlcXVlc3Qu c2V0T3ZlcnJpZGVDb250ZW50VHlwZShuZXRSZXEuZ2V0T3ZlcnJpZGVDb250ZW50VHlwZSgpKTsK KworICAgIFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6SGVhZGVyTGlzdCYgbGlzdCA9IG5ldFJl cS5nZXRIZWFkZXJMaXN0UmVmKCk7CisgICAgaWYgKCFsaXN0LmVtcHR5KCkpIHsKKyAgICAgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxpc3Quc2l6ZSgpOyBpKyspCisgICAgICAgICAgICBy ZXF1ZXN0LmFkZEhUVFBIZWFkZXJGaWVsZChsaXN0W2ldLmZpcnN0LmNfc3RyKCksIGxpc3RbaV0u c2Vjb25kLmNfc3RyKCkpOworICAgIH0KKwogICAgIGlmIChuZWVkUmVmZXJlciAmJiBmb2N1c2Vk T3JNYWluRnJhbWUoKSAmJiBmb2N1c2VkT3JNYWluRnJhbWUoKS0+ZG9jdW1lbnQoKSkKICAgICAg ICAgcmVxdWVzdC5hZGRIVFRQSGVhZGVyRmllbGQoIlJlZmVyZXIiLCBmb2N1c2VkT3JNYWluRnJh bWUoKS0+ZG9jdW1lbnQoKS0+dXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAKLSAgICBp ZiAoZm9yY2VEb3dubG9hZCkKKyAgICBpZiAoUGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpUYXJn ZXRJc0Rvd25sb2FkID09IG5ldFJlcS5nZXRUYXJnZXRUeXBlKCkpCiAgICAgICAgIHJlcXVlc3Qu c2V0Rm9yY2VEb3dubG9hZCh0cnVlKTsKLQotICAgIHJlcXVlc3Quc2V0U3VnZ2VzdGVkU2F2ZU5h bWUoc3VnZ2VzdGVkU2F2ZU5hbWUpOworICAgIGlmICghbmV0UmVxLmdldFN1Z2dlc3RlZFNhdmVO YW1lKCkuZW1wdHkoKSkKKyAgICAgICAgcmVxdWVzdC5zZXRTdWdnZXN0ZWRTYXZlTmFtZShuZXRS ZXEuZ2V0U3VnZ2VzdGVkU2F2ZU5hbWUoKSk7CiAKICAgICBtX21haW5GcmFtZS0+bG9hZGVyKCkt PmxvYWQoRnJhbWVMb2FkUmVxdWVzdChtX21haW5GcmFtZSwgcmVxdWVzdCkpOwogfQpAQCAtNzQ3 LDE4ICs3NDAsMTUgQEAgdm9pZCBXZWJQYWdlOjpsb2FkRmlsZShjb25zdCBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6U3RyaW5nJiBwYXRoLCBjb25zdCBCbGFja0JlcnIKICAgICBlbHNlIGlmICghZmls ZVVybC5zdGFydHNXaXRoKHNfZmlsZVJvb3RQcmVmaXgpKQogICAgICAgICByZXR1cm47CiAKLSAg ICBkLT5sb2FkKGZpbGVVcmwsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmc6OmVtcHR5U3Ry aW5nKCksIHNfZ2V0LCBQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OlVzZVByb3RvY29sQ2FjaGVQ b2xpY3ksIDAsIDAsIDAsIDAsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCBvdmVycmlkZUNv bnRlbnRUeXBlKTsKKyAgICBQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3QgbmV0UmVxdWVzdDsKKyAg ICBuZXRSZXF1ZXN0LnNldFJlcXVlc3RVcmwocGF0aCk7CisgICAgbmV0UmVxdWVzdC5zZXRPdmVy cmlkZUNvbnRlbnRUeXBlKG92ZXJyaWRlQ29udGVudFR5cGUpOworICAgIGQtPmxvYWQobmV0UmVx dWVzdCwgZmFsc2UpOwogfQogCi12b2lkIFdlYlBhZ2U6OmxvYWQoY29uc3QgUGxhdGZvcm06Ok5l dHdvcmtSZXF1ZXN0JiByZXF1ZXN0LCBib29sIG5lZWRSZWZlcmVyLCBib29sIGZvcmNlRG93bmxv YWQpCit2b2lkIFdlYlBhZ2U6OmxvYWQoY29uc3QgUGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0JiBy ZXF1ZXN0LCBib29sIG5lZWRSZWZlcmVyKQogewotICAgIHZlY3Rvcjxjb25zdCBjaGFyKj4gaGVh ZGVyczsKLSAgICBQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OkhlYWRlckxpc3QmIGxpc3QgPSBy ZXF1ZXN0LmdldEhlYWRlckxpc3RSZWYoKTsKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwg bGlzdC5zaXplKCk7IGkrKykgewotICAgICAgICBoZWFkZXJzLnB1c2hfYmFjayhsaXN0W2ldLmZp cnN0LmNfc3RyKCkpOwotICAgICAgICBoZWFkZXJzLnB1c2hfYmFjayhsaXN0W2ldLnNlY29uZC5j X3N0cigpKTsKLSAgICB9Ci0gICAgZC0+bG9hZChyZXF1ZXN0LmdldFVybFJlZigpLCBCbGFja0Jl cnJ5OjpQbGF0Zm9ybTo6U3RyaW5nOjplbXB0eVN0cmluZygpLCBzX2dldCwgUGxhdGZvcm06Ok5l dHdvcmtSZXF1ZXN0OjpVc2VQcm90b2NvbENhY2hlUG9saWN5LCAwLCAwLCBoZWFkZXJzLmVtcHR5 KCkgPyAwIDogJmhlYWRlcnNbMF0sIGhlYWRlcnMuc2l6ZSgpLCBmYWxzZSwgZmFsc2UsIG5lZWRS ZWZlcmVyLCBmb3JjZURvd25sb2FkLCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nOjplbXB0 eVN0cmluZygpLCByZXF1ZXN0LmdldFN1Z2dlc3RlZFNhdmVOYW1lKCkpOworICAgIGQtPmxvYWQo cmVxdWVzdCwgbmVlZFJlZmVyZXIpOwogfQogCiB2b2lkIFdlYlBhZ2VQcml2YXRlOjpsb2FkU3Ry aW5nKGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHN0cmluZywgY29uc3QgQmxh Y2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgYmFzZVVSTCwgY29uc3QgQmxhY2tCZXJyeTo6UGxh dGZvcm06OlN0cmluZyYgY29udGVudFR5cGUsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpT dHJpbmcmIGZhaWxpbmdVUkwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv QXBpL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5oCmlu ZGV4IGUwNTBhYWEuLjljZTUxY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFn ZS5oCkBAIC05Nyw3ICs5Nyw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgbG9hZFN0cmluZyhjb25z dCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZv cm06OlN0cmluZyYgYmFzZVVSTCwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYg Y29udGVudFR5cGUgPSBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nOjpmcm9tQXNjaWkoInRl eHQvaHRtbCIpLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiBmYWlsaW5nVVJM ID0gQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZzo6ZW1wdHlTdHJpbmcoKSk7CiAKLSAgICB2 b2lkIGxvYWQoY29uc3QgUGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0JiwgYm9vbCBuZWVkUmVmZXJl ciA9IGZhbHNlLCBib29sIGZvcmNlRG93bmxvYWQgPSBmYWxzZSk7CisgICAgdm9pZCBsb2FkKGNv bnN0IFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdCYsIGJvb2wgbmVlZFJlZmVyZXIgPSBmYWxzZSk7 CiAKICAgICBib29sIGV4ZWN1dGVKYXZhU2NyaXB0KGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3Jt OjpTdHJpbmcmIHNjcmlwdCwgSmF2YVNjcmlwdERhdGFUeXBlJiByZXR1cm5UeXBlLCBCbGFja0Jl cnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiByZXR1cm5WYWx1ZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvQXBpL1dlYlBhZ2VfcC5oCmluZGV4IGNkNWFjOTIuLjY3Y2I5YTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmgKKysrIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaApAQCAtMTE1LDcgKzExNSw3IEBAIHB1Ymxp YzoKICAgICBib29sIGhhbmRsZU1vdXNlRXZlbnQoV2ViQ29yZTo6UGxhdGZvcm1Nb3VzZUV2ZW50 Jik7CiAgICAgYm9vbCBoYW5kbGVXaGVlbEV2ZW50KFdlYkNvcmU6OlBsYXRmb3JtV2hlZWxFdmVu dCYpOwogCi0gICAgdm9pZCBsb2FkKGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcm IHVybCwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgbmV0d29ya1Rva2VuLCBj b25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiBtZXRob2QsIFBsYXRmb3JtOjpOZXR3 b3JrUmVxdWVzdDo6Q2FjaGVQb2xpY3ksIGNvbnN0IGNoYXIqIGRhdGEsIHNpemVfdCBkYXRhTGVu Z3RoLCBjb25zdCBjaGFyKiBjb25zdCogaGVhZGVycywgc2l6ZV90IGhlYWRlcnNMZW5ndGgsIGJv b2wgaXNJbml0aWFsLCBib29sIG11c3RIYW5kbGVJbnRlcm5hbGx5ID0gZmFsc2UsIGJvb2wgbmVl ZFJlZmVyZXIgPSBmYWxzZSwgYm9vbCBmb3JjZURvd25sb2FkID0gZmFsc2UsIGNvbnN0IEJsYWNr QmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIG92ZXJyaWRlQ29udGVudFR5cGUgPSBCbGFja0JlcnJ5 OjpQbGF0Zm9ybTo6U3RyaW5nOjplbXB0eVN0cmluZygpLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0 Zm9ybTo6U3RyaW5nJiBzdWdnZXN0ZWRTYXZlTmFtZSA9IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpT dHJpbmc6OmVtcHR5U3RyaW5nKCkpOworICAgIHZvaWQgbG9hZChjb25zdCBQbGF0Zm9ybTo6TmV0 d29ya1JlcXVlc3QmIHBsYXRmb3JtUmVxdWVzdCwgYm9vbCBuZWVkUmVmZXJlciA9IGZhbHNlKTsK ICAgICB2b2lkIGxvYWRTdHJpbmcoY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYs IGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIGJhc2VVUkwsIGNvbnN0IEJsYWNr QmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0 Zm9ybTo6U3RyaW5nJiBmYWlsaW5nVVJMKTsKICAgICBib29sIGV4ZWN1dGVKYXZhU2NyaXB0KGNv bnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHNjcmlwdCwgSmF2YVNjcmlwdERhdGFU eXBlJiByZXR1cm5UeXBlLCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiByZXR1cm5WYWx1 ZSk7CiAgICAgYm9vbCBleGVjdXRlSmF2YVNjcmlwdEluSXNvbGF0ZWRXb3JsZChjb25zdCBXZWJD b3JlOjpTY3JpcHRTb3VyY2VDb2RlJiwgSmF2YVNjcmlwdERhdGFUeXBlJiByZXR1cm5UeXBlLCBC bGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiByZXR1cm5WYWx1ZSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0NoYW5nZUxvZwppbmRleCAwMjhmOTRmLi5iNmZlMzMxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMy0wNS0wNyAgWHVlZmVpIFJlbiAgPHhy ZW5AYmxhY2tiZXJyeS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgbG9hZCBpbnRlcmZhY2UgaW4g V2ViUGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTE1NjIyCisgICAgICAgIFJldmlld2VkIGJ5IFJvYiBCdWlzIGFuZCBNYXJyeSBXdS4KKworICAg ICAgICBJbnRlcm5hbCBQUjozMTU1MzUKKworICAgICAgICAqIEFwaS9XZWJQYWdlLmNwcDoKKyAg ICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmxvYWQpOgorICAgICAg ICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjpsb2FkRmlsZSk6CisgICAgICAgIChCbGFj a0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2U6OmxvYWQpOgorICAgICAgICAqIEFwaS9XZWJQYWdlLmg6 CisgICAgICAgICogQXBpL1dlYlBhZ2VfcC5oOgorICAgICAgICAoV2ViUGFnZVByaXZhdGUpOgor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OnN0YXJ0RG93 bmxvYWQpOgorCiAyMDEzLTA1LTAzICBKYWNreSBKaWFuZyAgPHpoYWppYW5nQGJsYWNrYmVycnku Y29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBQYWdlIHJlbmRlcmluZyBzY2FsZSBpcyBjaGFu Z2VkIGFmdGVyIGdvIGJhY2sgYW5kIGZvcndhcmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3Bw IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50QmxhY2tCZXJyeS5jcHAKaW5kZXggY2NmM2I0NS4uZTk1MGU2OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50Qmxh Y2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKQEAgLTEyMDAsOCArMTIwMCwxMyBAQCBQ YXNzUmVmUHRyPEZyYW1lTmV0d29ya2luZ0NvbnRleHQ+IEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tC ZXJyeTo6Y3JlYXRlTmV0d29ya2luZwogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJy eTo6c3RhcnREb3dubG9hZChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN0 cmluZyYgc3VnZ2VzdGVkTmFtZSkKIHsKLSAgICBTVEFUSUNfTE9DQUxfU1RSSU5HKHNfZ2V0LCAi R0VUIik7Ci0gICAgbV93ZWJQYWdlUHJpdmF0ZS0+bG9hZChyZXF1ZXN0LnVybCgpLnN0cmluZygp LCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nOjplbXB0eVN0cmluZygpLCBzX2dldCwgTmV0 d29ya1JlcXVlc3Q6OlVzZVByb3RvY29sQ2FjaGVQb2xpY3ksIDAsIDAsIDAsIDAsIGZhbHNlLCBm YWxzZSwgZmFsc2UsIHRydWUsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmc6OmVtcHR5U3Ry aW5nKCksIHN1Z2dlc3RlZE5hbWUpOworICAgIGlmIChzdWdnZXN0ZWROYW1lLmVtcHR5KCkpCisg ICAgICAgIG1fd2ViUGFnZVByaXZhdGUtPm1fbWFpbkZyYW1lLT5sb2FkZXIoKS0+bG9hZChGcmFt ZUxvYWRSZXF1ZXN0KG1fd2ViUGFnZVByaXZhdGUtPm1fbWFpbkZyYW1lLCByZXF1ZXN0KSk7Cisg ICAgZWxzZSB7CisgICAgICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0Q29weSA9IHJlcXVlc3Q7 CisgICAgICAgIHJlcXVlc3RDb3B5LnNldFN1Z2dlc3RlZFNhdmVOYW1lKHN1Z2dlc3RlZE5hbWUp OworICAgICAgICBtX3dlYlBhZ2VQcml2YXRlLT5tX21haW5GcmFtZS0+bG9hZGVyKCktPmxvYWQo RnJhbWVMb2FkUmVxdWVzdChtX3dlYlBhZ2VQcml2YXRlLT5tX21haW5GcmFtZSwgcmVxdWVzdENv cHkpKTsKKyAgICB9CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5Ojpjb252 ZXJ0TWFpblJlc291cmNlTG9hZFRvRG93bmxvYWQoRG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50TG9h ZGVyLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFJlc291cmNlUmVzcG9u c2UmIHJlc3BvbnNlKQotLSAKMS43LjEwLjQKCg== 201015 2013-05-07 19:08:19 -0700 2013-05-07 19:49:16 -0700 clean up load interface in WebPage 0001-Clean-up-load-interface-in-WebPage.patch text/plain 10604 xren RnJvbSAwZWU1MTg2MzBkYzgyNzRkYjM5YzY2ODdjOTExZjJlN2M4MWYyNmI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYdWVmZWkgUmVuIDx4cmVuQGJsYWNrYmVycnkuY29tPgpEYXRl OiBXZWQsIDggTWF5IDIwMTMgMTA6MDM6NTQgKzA4MDAKU3ViamVjdDogW1BBVENIXSBDbGVhbiB1 cCBsb2FkIGludGVyZmFjZSBpbiBXZWJQYWdlCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE1NjIyIFJldmlld2VkIGJ5CiBSb2IgQnVpcy4KCkludGVybmFsIFBSOjMx NTUzNQpJbnRlcm5hbCByZXZpZXdlZCBieSAgTWFyeSBXdQoKKiBBcGkvV2ViUGFnZS5jcHA6CihC bGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpsb2FkKToKKEJsYWNrQmVycnk6Oldl YktpdDo6V2ViUGFnZTo6bG9hZEZpbGUpOgooQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjps b2FkKToKKiBBcGkvV2ViUGFnZS5oOgoqIEFwaS9XZWJQYWdlX3AuaDoKKFdlYlBhZ2VQcml2YXRl KToKKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwOgooV2Vi Q29yZTo6RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5OjpzdGFydERvd25sb2FkKToKLS0tCiBT b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwICAgICAgICAgICB8ICAgNTQg KysrKysrKystLS0tLS0tLS0tLS0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFn ZS5oICAgICAgICAgICAgIHwgICAgMiArLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJQYWdlX3AuaCAgICAgICAgICAgfCAgICAyICstCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICB8ICAgMjAgKysrKysrKysKIC4uLi9XZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwIHwgICAgOSArKystCiA1IGZpbGVz IGNoYW5nZWQsIDUxIGluc2VydGlvbnMoKyksIDM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCmluZGV4IGJiYTA3ZjguLmM4ZjNiNmUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcApAQCAtMjAxLDggKzIwMSw2IEBA IHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiB0eXBlZGVmIGNvbnN0IHVuc2lnbmVkIHNob3J0 KiBDVVNob3J0UHRyOwogCi1TVEFUSUNfR0xPQkFMX1NUUklORyhzX2dldCwgIkdFVCIpOwotCiBu YW1lc3BhY2UgQmxhY2tCZXJyeSB7CiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtNjg3LDEyICs2 ODUsMTIgQEAgcHJpdmF0ZToKICAgICB9CiB9OwogCi12b2lkIFdlYlBhZ2VQcml2YXRlOjpsb2Fk KGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHVybCwgY29uc3QgQmxhY2tCZXJy eTo6UGxhdGZvcm06OlN0cmluZyYgbmV0d29ya1Rva2VuLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0 Zm9ybTo6U3RyaW5nJiBtZXRob2QsIFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6Q2FjaGVQb2xp Y3kgY2FjaGVQb2xpY3ksIGNvbnN0IGNoYXIqIGRhdGEsIHNpemVfdCBkYXRhTGVuZ3RoLCBjb25z dCBjaGFyKiBjb25zdCogaGVhZGVycywgc2l6ZV90IGhlYWRlcnNMZW5ndGgsIGJvb2wgaXNJbml0 aWFsLCBib29sIG11c3RIYW5kbGVJbnRlcm5hbGx5LCBib29sIG5lZWRSZWZlcmVyLCBib29sIGZv cmNlRG93bmxvYWQsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIG92ZXJyaWRl Q29udGVudFR5cGUsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHN1Z2dlc3Rl ZFNhdmVOYW1lKQordm9pZCBXZWJQYWdlUHJpdmF0ZTo6bG9hZChjb25zdCBQbGF0Zm9ybTo6TmV0 d29ya1JlcXVlc3QmIG5ldFJlcSwgYm9vbCBuZWVkUmVmZXJlcikKIHsKICAgICBzdG9wQ3VycmVu dExvYWQoKTsKICAgICBEZWZlcnJlZFRhc2tMb2FkTWFudWFsU2NyaXB0OjpmaW5pc2hPckNhbmNl bCh0aGlzKTsKIAotICAgIFN0cmluZyB1cmxTdHJpbmcodXJsKTsKKyAgICBTdHJpbmcgdXJsU3Ry aW5nKG5ldFJlcS5nZXRVcmxSZWYoKSk7CiAgICAgaWYgKHVybFN0cmluZy5zdGFydHNXaXRoKCJ2 czoiLCBmYWxzZSkpIHsKICAgICAgICAgdXJsU3RyaW5nID0gdXJsU3RyaW5nLnN1YnN0cmluZygz KTsKICAgICAgICAgbV9tYWluRnJhbWUtPnNldEluVmlld1NvdXJjZU1vZGUodHJ1ZSk7CkBAIC03 MDksMzAgKzcwNywyNSBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpsb2FkKGNvbnN0IEJsYWNrQmVy cnk6OlBsYXRmb3JtOjpTdHJpbmcmIHVybCwgY29uc3QgQmxhY2tCZQogICAgICAgICByZXR1cm47 CiAgICAgfQogCi0gICAgaWYgKGlzSW5pdGlhbCkKLSAgICAgICAgTmV0d29ya01hbmFnZXI6Omlu c3RhbmNlKCktPnNldEluaXRpYWxVUkwoa3VybCk7Ci0KICAgICBSZXNvdXJjZVJlcXVlc3QgcmVx dWVzdChrdXJsKTsKLSAgICByZXF1ZXN0LnNldFRva2VuKG5ldHdvcmtUb2tlbik7Ci0gICAgaWYg KGlzSW5pdGlhbCB8fCBtdXN0SGFuZGxlSW50ZXJuYWxseSkKLSAgICAgICAgcmVxdWVzdC5zZXRN dXN0SGFuZGxlSW50ZXJuYWxseSh0cnVlKTsKLSAgICByZXF1ZXN0LnNldEhUVFBNZXRob2QobWV0 aG9kKTsKLSAgICByZXF1ZXN0LnNldENhY2hlUG9saWN5KHRvV2ViQ29yZUNhY2hlUG9saWN5KGNh Y2hlUG9saWN5KSk7Ci0gICAgaWYgKCFvdmVycmlkZUNvbnRlbnRUeXBlLmVtcHR5KCkpCi0gICAg ICAgIHJlcXVlc3Quc2V0T3ZlcnJpZGVDb250ZW50VHlwZShvdmVycmlkZUNvbnRlbnRUeXBlKTsK LQotICAgIGlmIChkYXRhKQotICAgICAgICByZXF1ZXN0LnNldEhUVFBCb2R5KEZvcm1EYXRhOjpj cmVhdGUoZGF0YSwgZGF0YUxlbmd0aCkpOwotCi0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSAr IDEgPCBoZWFkZXJzTGVuZ3RoOyBpICs9IDIpCi0gICAgICAgIHJlcXVlc3QuYWRkSFRUUEhlYWRl ckZpZWxkKGhlYWRlcnNbaV0sIGhlYWRlcnNbaSArIDFdKTsKKyAgICByZXF1ZXN0LnNldEhUVFBN ZXRob2QobmV0UmVxLmdldE1ldGhvZFJlZigpKTsKKyAgICByZXF1ZXN0LnNldENhY2hlUG9saWN5 KHRvV2ViQ29yZUNhY2hlUG9saWN5KG5ldFJlcS5nZXRDYWNoZVBvbGljeSgpKSk7CisgICAgaWYg KCFuZXRSZXEuZ2V0T3ZlcnJpZGVDb250ZW50VHlwZSgpLmVtcHR5KCkpCisgICAgICAgIHJlcXVl c3Quc2V0T3ZlcnJpZGVDb250ZW50VHlwZShuZXRSZXEuZ2V0T3ZlcnJpZGVDb250ZW50VHlwZSgp KTsKKworICAgIFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6SGVhZGVyTGlzdCYgbGlzdCA9IG5l dFJlcS5nZXRIZWFkZXJMaXN0UmVmKCk7CisgICAgaWYgKCFsaXN0LmVtcHR5KCkpIHsKKyAgICAg ICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxpc3Quc2l6ZSgpOyBpKyspCisgICAgICAgICAg ICByZXF1ZXN0LmFkZEhUVFBIZWFkZXJGaWVsZChsaXN0W2ldLmZpcnN0LmNfc3RyKCksIGxpc3Rb aV0uc2Vjb25kLmNfc3RyKCkpOworICAgIH0KKwogICAgIGlmIChuZWVkUmVmZXJlciAmJiBmb2N1 c2VkT3JNYWluRnJhbWUoKSAmJiBmb2N1c2VkT3JNYWluRnJhbWUoKS0+ZG9jdW1lbnQoKSkKICAg ICAgICAgcmVxdWVzdC5hZGRIVFRQSGVhZGVyRmllbGQoIlJlZmVyZXIiLCBmb2N1c2VkT3JNYWlu RnJhbWUoKS0+ZG9jdW1lbnQoKS0+dXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAKLSAg ICBpZiAoZm9yY2VEb3dubG9hZCkKKyAgICBpZiAoUGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpU YXJnZXRJc0Rvd25sb2FkID09IG5ldFJlcS5nZXRUYXJnZXRUeXBlKCkpCiAgICAgICAgIHJlcXVl c3Quc2V0Rm9yY2VEb3dubG9hZCh0cnVlKTsKLQotICAgIHJlcXVlc3Quc2V0U3VnZ2VzdGVkU2F2 ZU5hbWUoc3VnZ2VzdGVkU2F2ZU5hbWUpOworICAgIGlmICghbmV0UmVxLmdldFN1Z2dlc3RlZFNh dmVOYW1lKCkuZW1wdHkoKSkKKyAgICAgICAgcmVxdWVzdC5zZXRTdWdnZXN0ZWRTYXZlTmFtZShu ZXRSZXEuZ2V0U3VnZ2VzdGVkU2F2ZU5hbWUoKSk7CiAKICAgICBtX21haW5GcmFtZS0+bG9hZGVy KCktPmxvYWQoRnJhbWVMb2FkUmVxdWVzdChtX21haW5GcmFtZSwgcmVxdWVzdCkpOwogfQpAQCAt NzQ3LDE4ICs3NDAsMTUgQEAgdm9pZCBXZWJQYWdlOjpsb2FkRmlsZShjb25zdCBCbGFja0JlcnJ5 OjpQbGF0Zm9ybTo6U3RyaW5nJiBwYXRoLCBjb25zdCBCbGFja0JlcnIKICAgICBlbHNlIGlmICgh ZmlsZVVybC5zdGFydHNXaXRoKHNfZmlsZVJvb3RQcmVmaXgpKQogICAgICAgICByZXR1cm47CiAK LSAgICBkLT5sb2FkKGZpbGVVcmwsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmc6OmVtcHR5 U3RyaW5nKCksIHNfZ2V0LCBQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OlVzZVByb3RvY29sQ2Fj aGVQb2xpY3ksIDAsIDAsIDAsIDAsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCBvdmVycmlk ZUNvbnRlbnRUeXBlKTsKKyAgICBQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3QgbmV0UmVxdWVzdDsK KyAgICBuZXRSZXF1ZXN0LnNldFJlcXVlc3RVcmwocGF0aCk7CisgICAgbmV0UmVxdWVzdC5zZXRP dmVycmlkZUNvbnRlbnRUeXBlKG92ZXJyaWRlQ29udGVudFR5cGUpOworICAgIGQtPmxvYWQobmV0 UmVxdWVzdCwgZmFsc2UpOwogfQogCi12b2lkIFdlYlBhZ2U6OmxvYWQoY29uc3QgUGxhdGZvcm06 Ok5ldHdvcmtSZXF1ZXN0JiByZXF1ZXN0LCBib29sIG5lZWRSZWZlcmVyLCBib29sIGZvcmNlRG93 bmxvYWQpCit2b2lkIFdlYlBhZ2U6OmxvYWQoY29uc3QgUGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0 JiByZXF1ZXN0LCBib29sIG5lZWRSZWZlcmVyKQogewotICAgIHZlY3Rvcjxjb25zdCBjaGFyKj4g aGVhZGVyczsKLSAgICBQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OkhlYWRlckxpc3QmIGxpc3Qg PSByZXF1ZXN0LmdldEhlYWRlckxpc3RSZWYoKTsKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBp IDwgbGlzdC5zaXplKCk7IGkrKykgewotICAgICAgICBoZWFkZXJzLnB1c2hfYmFjayhsaXN0W2ld LmZpcnN0LmNfc3RyKCkpOwotICAgICAgICBoZWFkZXJzLnB1c2hfYmFjayhsaXN0W2ldLnNlY29u ZC5jX3N0cigpKTsKLSAgICB9Ci0gICAgZC0+bG9hZChyZXF1ZXN0LmdldFVybFJlZigpLCBCbGFj a0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nOjplbXB0eVN0cmluZygpLCBzX2dldCwgUGxhdGZvcm06 Ok5ldHdvcmtSZXF1ZXN0OjpVc2VQcm90b2NvbENhY2hlUG9saWN5LCAwLCAwLCBoZWFkZXJzLmVt cHR5KCkgPyAwIDogJmhlYWRlcnNbMF0sIGhlYWRlcnMuc2l6ZSgpLCBmYWxzZSwgZmFsc2UsIG5l ZWRSZWZlcmVyLCBmb3JjZURvd25sb2FkLCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nOjpl bXB0eVN0cmluZygpLCByZXF1ZXN0LmdldFN1Z2dlc3RlZFNhdmVOYW1lKCkpOworICAgIGQtPmxv YWQocmVxdWVzdCwgbmVlZFJlZmVyZXIpOwogfQogCiB2b2lkIFdlYlBhZ2VQcml2YXRlOjpsb2Fk U3RyaW5nKGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHN0cmluZywgY29uc3Qg QmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgYmFzZVVSTCwgY29uc3QgQmxhY2tCZXJyeTo6 UGxhdGZvcm06OlN0cmluZyYgY29udGVudFR5cGUsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3Jt OjpTdHJpbmcmIGZhaWxpbmdVUkwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5o CmluZGV4IGUwNTBhYWEuLjljZTUxY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi UGFnZS5oCkBAIC05Nyw3ICs5Nyw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgbG9hZFN0cmluZyhj b25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiwgY29uc3QgQmxhY2tCZXJyeTo6UGxh dGZvcm06OlN0cmluZyYgYmFzZVVSTCwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmlu ZyYgY29udGVudFR5cGUgPSBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nOjpmcm9tQXNjaWko InRleHQvaHRtbCIpLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiBmYWlsaW5n VVJMID0gQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZzo6ZW1wdHlTdHJpbmcoKSk7CiAKLSAg ICB2b2lkIGxvYWQoY29uc3QgUGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0JiwgYm9vbCBuZWVkUmVm ZXJlciA9IGZhbHNlLCBib29sIGZvcmNlRG93bmxvYWQgPSBmYWxzZSk7CisgICAgdm9pZCBsb2Fk KGNvbnN0IFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdCYsIGJvb2wgbmVlZFJlZmVyZXIgPSBmYWxz ZSk7CiAKICAgICBib29sIGV4ZWN1dGVKYXZhU2NyaXB0KGNvbnN0IEJsYWNrQmVycnk6OlBsYXRm b3JtOjpTdHJpbmcmIHNjcmlwdCwgSmF2YVNjcmlwdERhdGFUeXBlJiByZXR1cm5UeXBlLCBCbGFj a0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiByZXR1cm5WYWx1ZSk7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmggYi9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oCmluZGV4IGNkNWFjOTIuLjY3Y2I5YTQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmgKKysrIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaApAQCAtMTE1LDcgKzExNSw3IEBAIHB1 YmxpYzoKICAgICBib29sIGhhbmRsZU1vdXNlRXZlbnQoV2ViQ29yZTo6UGxhdGZvcm1Nb3VzZUV2 ZW50Jik7CiAgICAgYm9vbCBoYW5kbGVXaGVlbEV2ZW50KFdlYkNvcmU6OlBsYXRmb3JtV2hlZWxF dmVudCYpOwogCi0gICAgdm9pZCBsb2FkKGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJp bmcmIHVybCwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgbmV0d29ya1Rva2Vu LCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiBtZXRob2QsIFBsYXRmb3JtOjpO ZXR3b3JrUmVxdWVzdDo6Q2FjaGVQb2xpY3ksIGNvbnN0IGNoYXIqIGRhdGEsIHNpemVfdCBkYXRh TGVuZ3RoLCBjb25zdCBjaGFyKiBjb25zdCogaGVhZGVycywgc2l6ZV90IGhlYWRlcnNMZW5ndGgs IGJvb2wgaXNJbml0aWFsLCBib29sIG11c3RIYW5kbGVJbnRlcm5hbGx5ID0gZmFsc2UsIGJvb2wg bmVlZFJlZmVyZXIgPSBmYWxzZSwgYm9vbCBmb3JjZURvd25sb2FkID0gZmFsc2UsIGNvbnN0IEJs YWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIG92ZXJyaWRlQ29udGVudFR5cGUgPSBCbGFja0Jl cnJ5OjpQbGF0Zm9ybTo6U3RyaW5nOjplbXB0eVN0cmluZygpLCBjb25zdCBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6U3RyaW5nJiBzdWdnZXN0ZWRTYXZlTmFtZSA9IEJsYWNrQmVycnk6OlBsYXRmb3Jt OjpTdHJpbmc6OmVtcHR5U3RyaW5nKCkpOworICAgIHZvaWQgbG9hZChjb25zdCBQbGF0Zm9ybTo6 TmV0d29ya1JlcXVlc3QmIHBsYXRmb3JtUmVxdWVzdCwgYm9vbCBuZWVkUmVmZXJlciA9IGZhbHNl KTsKICAgICB2b2lkIGxvYWRTdHJpbmcoY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmlu ZyYsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIGJhc2VVUkwsIGNvbnN0IEJs YWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6U3RyaW5nJiBmYWlsaW5nVVJMKTsKICAgICBib29sIGV4ZWN1dGVKYXZhU2NyaXB0 KGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHNjcmlwdCwgSmF2YVNjcmlwdERh dGFUeXBlJiByZXR1cm5UeXBlLCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiByZXR1cm5W YWx1ZSk7CiAgICAgYm9vbCBleGVjdXRlSmF2YVNjcmlwdEluSXNvbGF0ZWRXb3JsZChjb25zdCBX ZWJDb3JlOjpTY3JpcHRTb3VyY2VDb2RlJiwgSmF2YVNjcmlwdERhdGFUeXBlJiByZXR1cm5UeXBl LCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiByZXR1cm5WYWx1ZSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0NoYW5nZUxvZwppbmRleCAwMjhmOTRmLi44YzRiN2VmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMy0wNS0wNyAgWHVlZmVpIFJlbiAg PHhyZW5AYmxhY2tiZXJyeS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgbG9hZCBpbnRlcmZhY2Ug aW4gV2ViUGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTE1NjIyCisgICAgICAgIFJldmlld2VkIGJ5IFJvYiBCdWlzLgorCisgICAgICAgIEludGVy bmFsIFBSOjMxNTUzNQorICAgICAgICBJbnRlcm5hbCByZXZpZXdlZCBieSAgTWFyeSBXdQorCisK KyAgICAgICAgKiBBcGkvV2ViUGFnZS5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6 OldlYlBhZ2VQcml2YXRlOjpsb2FkKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2Vi UGFnZTo6bG9hZEZpbGUpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjps b2FkKToKKyAgICAgICAgKiBBcGkvV2ViUGFnZS5oOgorICAgICAgICAqIEFwaS9XZWJQYWdlX3Au aDoKKyAgICAgICAgKFdlYlBhZ2VQcml2YXRlKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9G cmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVM b2FkZXJDbGllbnRCbGFja0JlcnJ5OjpzdGFydERvd25sb2FkKToKKwogMjAxMy0wNS0wMyAgSmFj a3kgSmlhbmcgIDx6aGFqaWFuZ0BibGFja2JlcnJ5LmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJy eV0gUGFnZSByZW5kZXJpbmcgc2NhbGUgaXMgY2hhbmdlZCBhZnRlciBnbyBiYWNrIGFuZCBmb3J3 YXJkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwCmluZGV4IGNj ZjNiNDUuLmU5NTBlNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVy cnkuY3BwCkBAIC0xMjAwLDggKzEyMDAsMTMgQEAgUGFzc1JlZlB0cjxGcmFtZU5ldHdvcmtpbmdD b250ZXh0PiBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmNyZWF0ZU5ldHdvcmtpbmcKIAog dm9pZCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OnN0YXJ0RG93bmxvYWQoY29uc3QgUmVz b3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTdHJpbmcmIHN1Z2dlc3RlZE5hbWUpCiB7Ci0g ICAgU1RBVElDX0xPQ0FMX1NUUklORyhzX2dldCwgIkdFVCIpOwotICAgIG1fd2ViUGFnZVByaXZh dGUtPmxvYWQocmVxdWVzdC51cmwoKS5zdHJpbmcoKSwgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0 cmluZzo6ZW1wdHlTdHJpbmcoKSwgc19nZXQsIE5ldHdvcmtSZXF1ZXN0OjpVc2VQcm90b2NvbENh Y2hlUG9saWN5LCAwLCAwLCAwLCAwLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCB0cnVlLCBCbGFja0Jl cnJ5OjpQbGF0Zm9ybTo6U3RyaW5nOjplbXB0eVN0cmluZygpLCBzdWdnZXN0ZWROYW1lKTsKKyAg ICBpZiAoc3VnZ2VzdGVkTmFtZS5lbXB0eSgpKQorICAgICAgICBtX3dlYlBhZ2VQcml2YXRlLT5t X21haW5GcmFtZS0+bG9hZGVyKCktPmxvYWQoRnJhbWVMb2FkUmVxdWVzdChtX3dlYlBhZ2VQcml2 YXRlLT5tX21haW5GcmFtZSwgcmVxdWVzdCkpOworICAgIGVsc2UgeworICAgICAgICBSZXNvdXJj ZVJlcXVlc3QgcmVxdWVzdENvcHkgPSByZXF1ZXN0OworICAgICAgICByZXF1ZXN0Q29weS5zZXRT dWdnZXN0ZWRTYXZlTmFtZShzdWdnZXN0ZWROYW1lKTsKKyAgICAgICAgbV93ZWJQYWdlUHJpdmF0 ZS0+bV9tYWluRnJhbWUtPmxvYWRlcigpLT5sb2FkKEZyYW1lTG9hZFJlcXVlc3QobV93ZWJQYWdl UHJpdmF0ZS0+bV9tYWluRnJhbWUsIHJlcXVlc3RDb3B5KSk7CisgICAgfQogfQogCiB2b2lkIEZy YW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6Y29udmVydE1haW5SZXNvdXJjZUxvYWRUb0Rvd25s b2FkKERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRlciwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiByZXF1ZXN0LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKLS0gCjEuNy4xMC40 Cgo= 201020 2013-05-07 19:49:16 -0700 2013-05-07 19:52:48 -0700 clean up load interface in WebPage 0001-remove-warning-unused-parameter-in-platform-graphics.patch text/plain 21302 xren RnJvbSBhY2JjYjgzZmIwZDhlOWJmZjY4MmU4OTllZGUxMjJkNGUwZmM3ZWQxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYdWVmZWkgUmVuIDx4cmVuQGJsYWNrYmVycnkuY29tPgpEYXRl OiBUaHUsIDE4IEFwciAyMDEzIDExOjAyOjQzICswODAwClN1YmplY3Q6IFtQQVRDSF0gCXJlbW92 ZSB3YXJuaW5nICh1bnVzZWQgcGFyYW1ldGVyICkgaW4KIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNr YmVycnkgCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE0NjcwCgoJ UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoJTm8gbmV3IHRlc3RzIChPT1BTISkuCgoqIHBs YXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvQ2FudmFzTGF5ZXJXZWJLaXRUaHJlYWQuY3BwOgoo V2ViQ29yZTo6Q2FudmFzTGF5ZXJDb21wb3NpdGluZ1RocmVhZENsaWVudDo6ZHJhd1RleHR1cmVz KToKKFdlYkNvcmU6OkNhbnZhc0xheWVyQ29tcG9zaXRpbmdUaHJlYWRDbGllbnQ6OmRlbGV0ZVRl eHR1cmVzKToKKFdlYkNvcmU6OkNhbnZhc0xheWVyQ29tcG9zaXRpbmdUaHJlYWRDbGllbnQ6OmNv bW1pdFBlbmRpbmdUZXh0dXJlVXBsb2Fkcyk6CiogcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJy eS9Gb250QmxhY2tCZXJyeS5jcHA6CihXZWJDb3JlOjpGb250OjpvZmZzZXRGb3JQb3NpdGlvbkZv ckNvbXBsZXhUZXh0KToKKiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0ZvbnRDYWNoZUJs YWNrQmVycnkuY3BwOgooV2ViQ29yZTo6Rm9udENhY2hlOjpnZXRTaW1pbGFyRm9udFBsYXRmb3Jt RGF0YSk6CihXZWJDb3JlOjpGb250Q2FjaGU6OmdldFRyYWl0c0luRmFtaWx5KToKKiBwbGF0Zm9y bS9ncmFwaGljcy9ibGFja2JlcnJ5L0dseXBoUGFnZVRyZWVOb2RlQmxhY2tCZXJyeS5jcHA6CihX ZWJDb3JlOjpHbHlwaFBhZ2U6OmZpbGwpOgoqIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkv R3JhcGhpY3NDb250ZXh0M0RCbGFja0JlcnJ5LmNwcDoKKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4 dDNEOjpsb2dGcmFtZUJ1ZmZlclN0YXR1cyk6CihXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6 SW1hZ2VFeHRyYWN0b3I6OmV4dHJhY3RJbWFnZSk6CiogcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2ti ZXJyeS9HcmFwaGljc0NvbnRleHRCbGFja0JlcnJ5LmNwcDoKKFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dDo6ZHJhd0NvbnZleFBvbHlnb24pOgooV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpmaWxs UmVjdCk6CihXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmZpbGxSb3VuZGVkUmVjdCk6CihXZWJD b3JlOjpHcmFwaGljc0NvbnRleHQ6OnJvdW5kVG9EZXZpY2VQaXhlbHMpOgooV2ViQ29yZTo6R3Jh cGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybVNoYWRvdyk6CihXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQ6OmNsaXBDb252ZXhQb2x5Z29uKToKKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6c2V0VVJM Rm9yUmVjdCk6CihXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OnNldFBsYXRmb3JtU3Ryb2tlQ29s b3IpOgooV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybUZpbGxDb2xvcik6CihX ZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OnNldFBsYXRmb3JtQ29tcG9zaXRlT3BlcmF0aW9uKToK KiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0ltYWdlQmxhY2tCZXJyeS5jcHA6CihXZWJD b3JlOjpJbWFnZTo6ZHJhd1BhdHRlcm4pOgoqIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkv SW1hZ2VCdWZmZXJCbGFja0JlcnJ5LmNwcDoKKFdlYkNvcmU6OmZsdXNoQW5kRHJhdyk6CihXZWJD b3JlOjpJbWFnZUJ1ZmZlcjo6Y29weUltYWdlKToKKFdlYkNvcmU6OkltYWdlQnVmZmVyOjpkcmF3 KToKKFdlYkNvcmU6OkltYWdlQnVmZmVyOjpwbGF0Zm9ybVRyYW5zZm9ybUNvbG9yU3BhY2UpOgoq IHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJUaWxlci5jcHA6CihXZWJDb3JlOjpM YXllclRpbGVyOjpkcmF3VGlsZSk6CiogcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9QYXRo QmxhY2tCZXJyeS5jcHA6CihXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdGb2N1c1Jpbmcp OgooV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpjbGlwUGF0aCk6CiogcGxhdGZvcm0vZ3JhcGhp Y3MvYmxhY2tiZXJyeS9QYXR0ZXJuQmxhY2tCZXJyeS5jcHA6CihXZWJDb3JlOjpQYXR0ZXJuOjpw bGF0Zm9ybVBhdHRlcm4pOgotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICA1MCArKysrKysrKysrKysrKysrKysrKwogLi4uL2JsYWNrYmVy cnkvQ2FudmFzTGF5ZXJXZWJLaXRUaHJlYWQuY3BwICAgICAgICAgfCAgICA2ICstLQogLi4uL2dy YXBoaWNzL2JsYWNrYmVycnkvRm9udEJsYWNrQmVycnkuY3BwICAgICAgICAgfCAgICAyICstCiAu Li4vZ3JhcGhpY3MvYmxhY2tiZXJyeS9Gb250Q2FjaGVCbGFja0JlcnJ5LmNwcCAgICB8ICAgIDQg Ky0KIC4uLi9ibGFja2JlcnJ5L0dseXBoUGFnZVRyZWVOb2RlQmxhY2tCZXJyeS5jcHAgICAgIHwg ICAgMiArLQogLi4uL2JsYWNrYmVycnkvR3JhcGhpY3NDb250ZXh0M0RCbGFja0JlcnJ5LmNwcCAg ICAgfCAgICA0ICstCiAuLi4vYmxhY2tiZXJyeS9HcmFwaGljc0NvbnRleHRCbGFja0JlcnJ5LmNw cCAgICAgICB8ICAgMjAgKysrKy0tLS0KIC4uLi9ncmFwaGljcy9ibGFja2JlcnJ5L0ltYWdlQmxh Y2tCZXJyeS5jcHAgICAgICAgIHwgICAgMiArLQogLi4uL2dyYXBoaWNzL2JsYWNrYmVycnkvSW1h Z2VCdWZmZXJCbGFja0JlcnJ5LmNwcCAgfCAgICA4ICsrLS0KIC4uLi9wbGF0Zm9ybS9ncmFwaGlj cy9ibGFja2JlcnJ5L0xheWVyVGlsZXIuY3BwICAgIHwgICAgMiArLQogLi4uL2dyYXBoaWNzL2Js YWNrYmVycnkvUGF0aEJsYWNrQmVycnkuY3BwICAgICAgICAgfCAgICA2ICstLQogLi4uL2dyYXBo aWNzL2JsYWNrYmVycnkvUGF0dGVybkJsYWNrQmVycnkuY3BwICAgICAgfCAgICAyICstCiAxMiBm aWxlcyBjaGFuZ2VkLCA3OSBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggMzRiN2IyZS4uZTg2ODA4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUzIEBACisyMDEz LTA0LTE3ICBYdWVmZWkgUmVuICA8eHJlbkBibGFja2JlcnJ5LmNvbT4KKworCXJlbW92ZSB3YXJu aW5nICh1bnVzZWQgcGFyYW1ldGVyICkgaW4gcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE0NjcwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0Nh bnZhc0xheWVyV2ViS2l0VGhyZWFkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc0xheWVy Q29tcG9zaXRpbmdUaHJlYWRDbGllbnQ6OmRyYXdUZXh0dXJlcyk6CisgICAgICAgIChXZWJDb3Jl OjpDYW52YXNMYXllckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50OjpkZWxldGVUZXh0dXJlcyk6Cisg ICAgICAgIChXZWJDb3JlOjpDYW52YXNMYXllckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50Ojpjb21t aXRQZW5kaW5nVGV4dHVyZVVwbG9hZHMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Js YWNrYmVycnkvRm9udEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6b2Zm c2V0Rm9yUG9zaXRpb25Gb3JDb21wbGV4VGV4dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvYmxhY2tiZXJyeS9Gb250Q2FjaGVCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZvbnRDYWNoZTo6Z2V0U2ltaWxhckZvbnRQbGF0Zm9ybURhdGEpOgorICAgICAgICAoV2ViQ29y ZTo6Rm9udENhY2hlOjpnZXRUcmFpdHNJbkZhbWlseSk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvYmxhY2tiZXJyeS9HbHlwaFBhZ2VUcmVlTm9kZUJsYWNrQmVycnkuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6R2x5cGhQYWdlOjpmaWxsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9ibGFja2JlcnJ5L0dyYXBoaWNzQ29udGV4dDNEQmxhY2tCZXJyeS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6bG9nRnJhbWVCdWZmZXJTdGF0dXMpOgorICAgICAg ICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0Q6OkltYWdlRXh0cmFjdG9yOjpleHRyYWN0SW1h Z2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvR3JhcGhpY3NDb250 ZXh0QmxhY2tCZXJyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRy YXdDb252ZXhQb2x5Z29uKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6Zmls bFJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpmaWxsUm91bmRlZFJl Y3QpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0Ojpyb3VuZFRvRGV2aWNlUGl4 ZWxzKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6c2V0UGxhdGZvcm1TaGFk b3cpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpjbGlwQ29udmV4UG9seWdv bik6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OnNldFVSTEZvclJlY3QpOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybVN0cm9rZUNvbG9y KToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6c2V0UGxhdGZvcm1GaWxsQ29s b3IpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybUNvbXBv c2l0ZU9wZXJhdGlvbik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9J bWFnZUJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2U6OmRyYXdQYXR0ZXJu KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0ltYWdlQnVmZmVyQmxh Y2tCZXJyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmbHVzaEFuZERyYXcpOgorICAgICAgICAo V2ViQ29yZTo6SW1hZ2VCdWZmZXI6OmNvcHlJbWFnZSk6CisgICAgICAgIChXZWJDb3JlOjpJbWFn ZUJ1ZmZlcjo6ZHJhdyk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6cGxhdGZvcm1U cmFuc2Zvcm1Db2xvclNwYWNlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFja2Jl cnJ5L0xheWVyVGlsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJUaWxlcjo6ZHJhd1Rp bGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvUGF0aEJsYWNrQmVy cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5n KToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6Y2xpcFBhdGgpOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvUGF0dGVybkJsYWNrQmVycnkuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UGF0dGVybjo6cGxhdGZvcm1QYXR0ZXJuKToKKworCiAyMDEzLTA0 LTE3ICBKYW1lcyBDcmFpZyAgPGphbWVzQGNvb2tpZWNyb29rLmNvbT4KIAogICAgICAgICBBWDog YXJpYS1sZXZlbCBkb2VzIG5vdCBvdmVycmlkZSBpbXBsaWNpdCBsZXZlbCBvbiBoMSwgaDIsIGV0 YwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJy eS9DYW52YXNMYXllcldlYktpdFRocmVhZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9ibGFja2JlcnJ5L0NhbnZhc0xheWVyV2ViS2l0VGhyZWFkLmNwcAppbmRleCBlNWIx YTM5Li5lNmMwYTI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ibGFja2JlcnJ5L0NhbnZhc0xheWVyV2ViS2l0VGhyZWFkLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0NhbnZhc0xheWVyV2ViS2l0VGhyZWFk LmNwcApAQCAtNTgsNyArNTgsNyBAQCBDYW52YXNMYXllckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50 OjpDYW52YXNMYXllckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50KEJsYWNrQmVycgogewogfQogCi12 b2lkIENhbnZhc0xheWVyQ29tcG9zaXRpbmdUaHJlYWRDbGllbnQ6OmRyYXdUZXh0dXJlcyhMYXll ckNvbXBvc2l0aW5nVGhyZWFkKiBsYXllciwgZG91YmxlIHNjYWxlLCBjb25zdCBHTEVTMlByb2dy YW0mKQordm9pZCBDYW52YXNMYXllckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50OjpkcmF3VGV4dHVy ZXMoTGF5ZXJDb21wb3NpdGluZ1RocmVhZCogbGF5ZXIsIGRvdWJsZSwgY29uc3QgR0xFUzJQcm9n cmFtJikKIHsKICAgICBpZiAoIW1fYnVmZmVyKQogICAgICAgICByZXR1cm47CkBAIC03MCwxMiAr NzAsMTIgQEAgdm9pZCBDYW52YXNMYXllckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50OjpkcmF3VGV4 dHVyZXMoTGF5ZXJDb21wb3NpdGluZ1RocmVhZCogbGEKICAgICAgICAgQmxhY2tCZXJyeTo6UGxh dGZvcm06OkdyYXBoaWNzOjpTb3VyY2VPdmVyLCBzdGF0aWNfY2FzdDx1bnNpZ25lZCBjaGFyPihs YXllci0+ZHJhd09wYWNpdHkoKSAqIDI1NSkpOwogfQogCi12b2lkIENhbnZhc0xheWVyQ29tcG9z aXRpbmdUaHJlYWRDbGllbnQ6OmRlbGV0ZVRleHR1cmVzKExheWVyQ29tcG9zaXRpbmdUaHJlYWQq IGxheWVyKQordm9pZCBDYW52YXNMYXllckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50OjpkZWxldGVU ZXh0dXJlcyhMYXllckNvbXBvc2l0aW5nVGhyZWFkKikKIHsKICAgICAvLyBOb3RoaW5nIHRvIGRv IGhlcmUsIHRoZSBidWZmZXIgaXMgbm90IG93bmVkIGJ5IHVzLgogfQogCi12b2lkIENhbnZhc0xh eWVyQ29tcG9zaXRpbmdUaHJlYWRDbGllbnQ6OmNvbW1pdFBlbmRpbmdUZXh0dXJlVXBsb2FkcyhM YXllckNvbXBvc2l0aW5nVGhyZWFkKiBsYXllcikKK3ZvaWQgQ2FudmFzTGF5ZXJDb21wb3NpdGlu Z1RocmVhZENsaWVudDo6Y29tbWl0UGVuZGluZ1RleHR1cmVVcGxvYWRzKExheWVyQ29tcG9zaXRp bmdUaHJlYWQqKQogewogICAgIGlmICghbV9idWZmZXIpCiAgICAgICAgIHJldHVybjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvRm9udEJs YWNrQmVycnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJy eS9Gb250QmxhY2tCZXJyeS5jcHAKaW5kZXggZjA2N2E0MC4uZTk0Yzc4NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9Gb250QmxhY2tCZXJy eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9G b250QmxhY2tCZXJyeS5jcHAKQEAgLTYyLDcgKzYyLDcgQEAgZmxvYXQgRm9udDo6ZmxvYXRXaWR0 aEZvckNvbXBsZXhUZXh0KGNvbnN0IFRleHRSdW4mIHJ1biwgSGFzaFNldDxjb25zdCBTaW1wbGVG b24KIH0KIAogLy8gUmV0dXJuIHRoZSBjb2RlIHBvaW50IGluZGV4IGZvciB0aGUgZ2l2ZW4gfHh8 IG9mZnNldCBpbnRvIHRoZSB0ZXh0IHJ1bi4KLWludCBGb250OjpvZmZzZXRGb3JQb3NpdGlvbkZv ckNvbXBsZXhUZXh0KGNvbnN0IFRleHRSdW4mIHJ1biwgZmxvYXQgcG9zaXRpb24sIGJvb2wgaW5j bHVkZVBhcnRpYWxHbHlwaHMpIGNvbnN0CitpbnQgRm9udDo6b2Zmc2V0Rm9yUG9zaXRpb25Gb3JD b21wbGV4VGV4dChjb25zdCBUZXh0UnVuJiBydW4sIGZsb2F0IHBvc2l0aW9uLCBib29sKSBjb25z dAogewogICAgIC8vIEZJWE1FOiBUaGlzIHRydW5jYXRpb24gaXMgbm90IGEgcHJvYmxlbSBmb3Ig SFRNTCwgYnV0IG9ubHkgYWZmZWN0cyBTVkcsIHdoaWNoIHBhc3NlcyBmbG9hdGluZy1wb2ludCBu dW1iZXJzCiAgICAgLy8gdG8gRm9udDo6b2Zmc2V0Rm9yUG9zaXRpb24oKS4gQnVnIGh0dHA6Ly93 ZWJraXQub3JnL2IvNDA2NzMgdHJhY2tzIGZpeGluZyB0aGlzIHByb2JsZW0uCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0ZvbnRDYWNoZUJs YWNrQmVycnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJy eS9Gb250Q2FjaGVCbGFja0JlcnJ5LmNwcAppbmRleCA3YjZjYTcwLi4yZmJjMTRiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0ZvbnRDYWNo ZUJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Js YWNrYmVycnkvRm9udENhY2hlQmxhY2tCZXJyeS5jcHAKQEAgLTE3OCw3ICsxNzgsNyBAQCBQYXNz UmVmUHRyPFNpbXBsZUZvbnREYXRhPiBGb250Q2FjaGU6OmdldEZvbnREYXRhRm9yQ2hhcmFjdGVy cyhjb25zdCBGb250JiBmb250LAogICAgIHJldHVybiBnZXRDYWNoZWRGb250RGF0YSgmcGxhdGZv cm1EYXRhLCBEb05vdFJldGFpbik7CiB9CiAKLVBhc3NSZWZQdHI8U2ltcGxlRm9udERhdGE+IEZv bnRDYWNoZTo6Z2V0U2ltaWxhckZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udCYgZm9udCkKK1Bh c3NSZWZQdHI8U2ltcGxlRm9udERhdGE+IEZvbnRDYWNoZTo6Z2V0U2ltaWxhckZvbnRQbGF0Zm9y bURhdGEoY29uc3QgRm9udCYpCiB7CiAgICAgcmV0dXJuIDA7CiB9CkBAIC0yMTIsNyArMjEyLDcg QEAgUGFzc1JlZlB0cjxTaW1wbGVGb250RGF0YT4gRm9udENhY2hlOjpnZXRMYXN0UmVzb3J0RmFs bGJhY2tGb250KGNvbnN0IEZvbnREZXNjcmkKICAgICByZXR1cm4gZ2V0Q2FjaGVkRm9udERhdGEo Zm9udFBsYXRmb3JtRGF0YSk7CiB9CiAKLXZvaWQgRm9udENhY2hlOjpnZXRUcmFpdHNJbkZhbWls eShjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseU5hbWUsIFZlY3Rvcjx1bnNpZ25lZD4mIHRyYWl0 c01hc2tzKQordm9pZCBGb250Q2FjaGU6OmdldFRyYWl0c0luRmFtaWx5KGNvbnN0IEF0b21pY1N0 cmluZyYsIFZlY3Rvcjx1bnNpZ25lZD4mKQogewogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0ds eXBoUGFnZVRyZWVOb2RlQmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9ibGFja2JlcnJ5L0dseXBoUGFnZVRyZWVOb2RlQmxhY2tCZXJyeS5jcHAKaW5kZXgg NDA2MDAzYS4uY2UyNGM3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYmxhY2tiZXJyeS9HbHlwaFBhZ2VUcmVlTm9kZUJsYWNrQmVycnkuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvR2x5cGhQYWdlVHJlZU5v ZGVCbGFja0JlcnJ5LmNwcApAQCAtNDcsNyArNDcsNyBAQCBwcml2YXRlOgogICAgIERlc3Ryb3lG dW5jdGlvbiBtX2Rlc3Ryb3k7CiB9OwogCi1ib29sIEdseXBoUGFnZTo6ZmlsbCh1bnNpZ25lZCBv ZmZzZXQsIHVuc2lnbmVkIGxlbmd0aCwgVUNoYXIqIGJ1ZmZlciwgdW5zaWduZWQgYnVmZmVyTGVu Z3RoLCBjb25zdCBTaW1wbGVGb250RGF0YSogZm9udERhdGEpCitib29sIEdseXBoUGFnZTo6Zmls bCh1bnNpZ25lZCBvZmZzZXQsIHVuc2lnbmVkLCBVQ2hhciogYnVmZmVyLCB1bnNpZ25lZCBidWZm ZXJMZW5ndGgsIGNvbnN0IFNpbXBsZUZvbnREYXRhKiBmb250RGF0YSkKIHsKICAgICBib29sIGhh dmVHbHlwaHMgPSBmYWxzZTsKICAgICB1bnNpZ25lZCBwb3NpdGlvbiA9IDA7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0dyYXBoaWNzQ29u dGV4dDNEQmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9i bGFja2JlcnJ5L0dyYXBoaWNzQ29udGV4dDNEQmxhY2tCZXJyeS5jcHAKaW5kZXggZTJmN2JiOC4u NzAzMTg5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxh Y2tiZXJyeS9HcmFwaGljc0NvbnRleHQzREJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvR3JhcGhpY3NDb250ZXh0M0RCbGFja0Jl cnJ5LmNwcApAQCAtMjM1LDcgKzIzNSw3IEBAIGJvb2wgR3JhcGhpY3NDb250ZXh0M0Q6OnJlc2hh cGVGQk9zKGNvbnN0IEludFNpemUmIHNpemUpCiAgICAgcmV0dXJuIG11c3RSZXN0b3JlRkJPOwog fQogCi12b2lkIEdyYXBoaWNzQ29udGV4dDNEOjpsb2dGcmFtZUJ1ZmZlclN0YXR1cyhpbnQgbGlu ZSkKK3ZvaWQgR3JhcGhpY3NDb250ZXh0M0Q6OmxvZ0ZyYW1lQnVmZmVyU3RhdHVzKGludCkKIHsK ICAgICBCQkxPRyhCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TG9nTGV2ZWxJbmZvLCAiQ2hlY2tpbmcg RnJhbWVCdWZmZXIgc3RhdHVzIGF0IGxpbmUgJWQ6ICIsIGxpbmUpOwogICAgIHN3aXRjaCAoZ2xD aGVja0ZyYW1lYnVmZmVyU3RhdHVzRVhUKEdMX0ZSQU1FQlVGRkVSX0VYVCkpIHsKQEAgLTM5Miw3 ICszOTIsNyBAQCBHcmFwaGljc0NvbnRleHQzRDo6SW1hZ2VFeHRyYWN0b3I6On5JbWFnZUV4dHJh Y3RvcigpCiB7CiB9CiAKLWJvb2wgR3JhcGhpY3NDb250ZXh0M0Q6OkltYWdlRXh0cmFjdG9yOjpl eHRyYWN0SW1hZ2UoYm9vbCBwcmVtdWx0aXBseUFscGhhLCBib29sIGlnbm9yZUdhbW1hQW5kQ29s b3JQcm9maWxlKQorYm9vbCBHcmFwaGljc0NvbnRleHQzRDo6SW1hZ2VFeHRyYWN0b3I6OmV4dHJh Y3RJbWFnZShib29sIHByZW11bHRpcGx5QWxwaGEsIGJvb2wpCiB7CiAgICAgaWYgKCFtX2ltYWdl KQogICAgICAgICByZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0dyYXBoaWNzQ29udGV4dEJsYWNrQmVycnkuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9HcmFwaGljc0NvbnRl eHRCbGFja0JlcnJ5LmNwcAppbmRleCBiZjQ0ZDM0Li4xNTRmNDlkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0dyYXBoaWNzQ29udGV4dEJs YWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNr YmVycnkvR3JhcGhpY3NDb250ZXh0QmxhY2tCZXJyeS5jcHAKQEAgLTE3NCw3ICsxNzQsNyBAQCB2 b2lkIEdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlQXJjKGNvbnN0IEludFJlY3QmIHJlY3QsIGludCBz dGFydEFuZ2xlLCBpbnQgYW5nbGVTcAogICAgIHBsYXRmb3JtQ29udGV4dCgpLT5hZGRBcmMocmVj dCwgc3RhcnRBbmdsZSwgYW5nbGVTcGFuKTsKIH0KIAotdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRy YXdDb252ZXhQb2x5Z29uKHNpemVfdCBudW1Qb2ludHMsIGNvbnN0IEZsb2F0UG9pbnQqIHBvaW50 cywgYm9vbCBzaG91bGRBbnRpYWxpYXMpCit2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0NvbnZl eFBvbHlnb24oc2l6ZV90IG51bVBvaW50cywgY29uc3QgRmxvYXRQb2ludCogcG9pbnRzLCBib29s KQogewogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTIw MCw3ICsyMDAsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFJlY3QoY29uc3QgRmxvYXRS ZWN0JiByZWN0KQogICAgIHBsYXRmb3JtQ29udGV4dCgpLT5hZGRGaWxsUmVjdChyZWN0LCBwbGF0 Zm9ybUdyYWRpZW50LCBwbGF0Zm9ybVBhdHRlcm4pOwogfQogCi12b2lkIEdyYXBoaWNzQ29udGV4 dDo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBjb25zdCBDb2xvciYgY29sb3IsIENv bG9yU3BhY2UgY29sb3JTcGFjZSkKK3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUmVjdChjb25z dCBGbG9hdFJlY3QmIHJlY3QsIGNvbnN0IENvbG9yJiBjb2xvciwgQ29sb3JTcGFjZSkKIHsKICAg ICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47CkBAIC0yMzQsNyArMjM0 LDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnN0cm9rZVJlY3QoY29uc3QgRmxvYXRSZWN0JiBy ZWN0LCBmbG9hdCBsaW5lV2lkdGgpCiAgICAgICAgIHBsYXRmb3JtQ29udGV4dCgpLT5hZGRTdHJv a2VSZWN0KHJlY3QsIGxpbmVXaWR0aCk7CiB9CiAKLXZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxs Um91bmRlZFJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCwgY29uc3QgSW50U2l6ZSYgdG9wTGVmdCwg Y29uc3QgSW50U2l6ZSYgdG9wUmlnaHQsIGNvbnN0IEludFNpemUmIGJvdHRvbUxlZnQsIGNvbnN0 IEludFNpemUmIGJvdHRvbVJpZ2h0LCBjb25zdCBDb2xvciYgY29sb3IsIENvbG9yU3BhY2UgY29s b3JTcGFjZSkKK3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUm91bmRlZFJlY3QoY29uc3QgSW50 UmVjdCYgcmVjdCwgY29uc3QgSW50U2l6ZSYgdG9wTGVmdCwgY29uc3QgSW50U2l6ZSYgdG9wUmln aHQsIGNvbnN0IEludFNpemUmIGJvdHRvbUxlZnQsIGNvbnN0IEludFNpemUmIGJvdHRvbVJpZ2h0 LCBjb25zdCBDb2xvciYgY29sb3IsIENvbG9yU3BhY2UpCiB7CiAgICAgaWYgKHBhaW50aW5nRGlz YWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMjQ1LDEyICsyNDUsMTIgQEAgdm9pZCBHcmFw aGljc0NvbnRleHQ6OmZpbGxSb3VuZGVkUmVjdChjb25zdCBJbnRSZWN0JiByZWN0LCBjb25zdCBJ bnRTaXplJiB0b3BMZWYKICAgICBwbGF0Zm9ybUNvbnRleHQoKS0+c2V0RmlsbENvbG9yKG1fc3Rh dGUuZmlsbENvbG9yLnJnYigpKTsKIH0KIAotRmxvYXRSZWN0IEdyYXBoaWNzQ29udGV4dDo6cm91 bmRUb0RldmljZVBpeGVscyhjb25zdCBGbG9hdFJlY3QmIHJlY3QsIFJvdW5kaW5nTW9kZSByb3Vu ZGluZ01vZGUpCitGbG9hdFJlY3QgR3JhcGhpY3NDb250ZXh0Ojpyb3VuZFRvRGV2aWNlUGl4ZWxz KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCwgUm91bmRpbmdNb2RlKQogewogICAgIHJldHVybiByZWN0 OwogfQogCi12b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0UGxhdGZvcm1TaGFkb3coY29uc3QgRmxv YXRTaXplJiBvZmZzZXQsIGZsb2F0IGJsdXIsIGNvbnN0IENvbG9yJiBjb2xvciwgQ29sb3JTcGFj ZSBjb2xvclNwYWNlKQordm9pZCBHcmFwaGljc0NvbnRleHQ6OnNldFBsYXRmb3JtU2hhZG93KGNv bnN0IEZsb2F0U2l6ZSYgb2Zmc2V0LCBmbG9hdCBibHVyLCBjb25zdCBDb2xvciYgY29sb3IsIENv bG9yU3BhY2UpCiB7CiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAgICAgcmV0dXJu OwpAQCAtMzUzLDcgKzM1Myw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpjbGlwT3V0KGNvbnN0 IEludFJlY3QmIHJlY3QpCiAgICAgcGxhdGZvcm1Db250ZXh0KCktPmNsaXBPdXQoRmxvYXRSZWN0 KHJlY3QpKTsKIH0KIAotdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXBDb252ZXhQb2x5Z29uKHNp emVfdCBudW1Qb2ludHMsIGNvbnN0IEZsb2F0UG9pbnQqIHBvaW50cywgYm9vbCBhbnRpYWxpYXMp Cit2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xpcENvbnZleFBvbHlnb24oc2l6ZV90IG51bVBvaW50 cywgY29uc3QgRmxvYXRQb2ludCogcG9pbnRzLCBib29sKQogewogICAgIGlmIChwYWludGluZ0Rp c2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTM5NSw3ICszOTUsNyBAQCBJbnRSZWN0IEdy YXBoaWNzQ29udGV4dDo6Y2xpcEJvdW5kcygpIGNvbnN0CiAgICAgcmV0dXJuIEludFJlY3QoSW50 UG9pbnQoSU5UX01JTiAvIDIsIElOVF9NSU4gLyAyKSwgSW50U2l6ZShJTlRfTUFYLCBJTlRfTUFY KSk7CiB9CiAKLXZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRVUkxGb3JSZWN0KGNvbnN0IEtVUkwm IGxpbmssIGNvbnN0IEludFJlY3QmIGRlc3RSZWN0KQordm9pZCBHcmFwaGljc0NvbnRleHQ6OnNl dFVSTEZvclJlY3QoY29uc3QgS1VSTCYsIGNvbnN0IEludFJlY3QmKQogewogfQogCkBAIC00MDcs NyArNDA3LDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnNldFBsYXRmb3JtVGV4dERyYXdpbmdN b2RlKFRleHREcmF3aW5nTW9kZUZsYWdzIG1vZGUpCiAgICAgcGxhdGZvcm1Db250ZXh0KCktPnNl dFRleHREcmF3aW5nTW9kZShtb2RlKTsKIH0KIAotdm9pZCBHcmFwaGljc0NvbnRleHQ6OnNldFBs YXRmb3JtU3Ryb2tlQ29sb3IoY29uc3QgQ29sb3ImIGNvbG9yLCBDb2xvclNwYWNlIGNvbG9yU3Bh Y2UpCit2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0UGxhdGZvcm1TdHJva2VDb2xvcihjb25zdCBD b2xvciYgY29sb3IsIENvbG9yU3BhY2UpCiB7CiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkK ICAgICAgICAgcmV0dXJuOwpAQCAtNDMxLDcgKzQzMSw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0 OjpzZXRQbGF0Zm9ybVN0cm9rZVRoaWNrbmVzcyhmbG9hdCB0aGlja25lc3MpCiAgICAgcGxhdGZv cm1Db250ZXh0KCktPnNldFN0cm9rZVRoaWNrbmVzcyh0aGlja25lc3MpOwogfQogCi12b2lkIEdy YXBoaWNzQ29udGV4dDo6c2V0UGxhdGZvcm1GaWxsQ29sb3IoY29uc3QgQ29sb3ImIGNvbG9yLCBD b2xvclNwYWNlIGNvbG9yU3BhY2UpCit2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0UGxhdGZvcm1G aWxsQ29sb3IoY29uc3QgQ29sb3ImIGNvbG9yLCBDb2xvclNwYWNlKQogewogICAgIGlmIChwYWlu dGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTQzOSw3ICs0MzksNyBAQCB2b2lk IEdyYXBoaWNzQ29udGV4dDo6c2V0UGxhdGZvcm1GaWxsQ29sb3IoY29uc3QgQ29sb3ImIGNvbG9y LCBDb2xvclNwYWNlIGNvbG9yUwogICAgIHBsYXRmb3JtQ29udGV4dCgpLT5zZXRGaWxsQ29sb3Io Y29sb3IucmdiKCkpOwogfQogCi12b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0UGxhdGZvcm1Db21w b3NpdGVPcGVyYXRpb24oQ29tcG9zaXRlT3BlcmF0b3Igb3AsIEJsZW5kTW9kZSBibGVuZE1vZGUp Cit2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0UGxhdGZvcm1Db21wb3NpdGVPcGVyYXRpb24oQ29t cG9zaXRlT3BlcmF0b3Igb3AsIEJsZW5kTW9kZSkKIHsKICAgICBpZiAocGFpbnRpbmdEaXNhYmxl ZCgpKQogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9ibGFja2JlcnJ5L0ltYWdlQmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0ltYWdlQmxhY2tCZXJyeS5jcHAKaW5kZXgg MjQ3Zjc2YS4uZjg3YWNjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYmxhY2tiZXJyeS9JbWFnZUJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvSW1hZ2VCbGFja0JlcnJ5LmNwcApAQCAtMTcy LDcgKzE3Miw3IEBAIHZvaWQgQml0bWFwSW1hZ2U6OmRyYXcoR3JhcGhpY3NDb250ZXh0KiBjb250 ZXh0LCBjb25zdCBGbG9hdFJlY3QmIGRzdFJlY3QsIGNvbnN0CiAgICAgICAgIG9ic2VydmVyLT5k aWREcmF3KHRoaXMpOwogfQogCi12b2lkIEltYWdlOjpkcmF3UGF0dGVybihHcmFwaGljc0NvbnRl eHQqIGNvbnRleHQsIGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwgY29uc3QgQWZmaW5lVHJhbnNm b3JtJiBwYXR0ZXJuVHJhbnNmb3JtYXRpb24sIGNvbnN0IEZsb2F0UG9pbnQmIHBoYXNlLCBDb2xv clNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgQ29tcG9zaXRlT3BlcmF0b3Igb3AsIGNvbnN0IEZsb2F0 UmVjdCYgZHN0UmVjdCwgQmxlbmRNb2RlIGJsZW5kTW9kZSkKK3ZvaWQgSW1hZ2U6OmRyYXdQYXR0 ZXJuKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBj b25zdCBBZmZpbmVUcmFuc2Zvcm0mIHBhdHRlcm5UcmFuc2Zvcm1hdGlvbiwgY29uc3QgRmxvYXRQ b2ludCYgcGhhc2UsIENvbG9yU3BhY2UsIENvbXBvc2l0ZU9wZXJhdG9yIG9wLCBjb25zdCBGbG9h dFJlY3QmIGRzdFJlY3QsIEJsZW5kTW9kZSkKIHsKICAgICBOYXRpdmVJbWFnZVB0ciBpbWFnZSA9 IG5hdGl2ZUltYWdlRm9yQ3VycmVudEZyYW1lKCk7CiAgICAgaWYgKCFpbWFnZSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvSW1hZ2VCdWZm ZXJCbGFja0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNr YmVycnkvSW1hZ2VCdWZmZXJCbGFja0JlcnJ5LmNwcAppbmRleCBmZTcyNTkwLi45NjBiMGRiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0lt YWdlQnVmZmVyQmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYmxhY2tiZXJyeS9JbWFnZUJ1ZmZlckJsYWNrQmVycnkuY3BwCkBAIC0xMTMsNyArMTEz LDcgQEAgdm9pZCBJbWFnZUJ1ZmZlckRhdGE6OmdldEltYWdlRGF0YShHcmFwaGljc0NvbnRleHQq IGNvbnRleHQsIGNvbnN0IEludFJlY3QmIHJlY3QKICAgICBnZXRJbWFnZURhdGFJbnRlcm5hbChj b250ZXh0LCByZWN0LCBzaXplLCByZXN1bHQsIHVubXVsdGlwbHksIG1fd2luZG93KTsKIH0KIAot c3RhdGljIGJvb2wgZmx1c2hBbmREcmF3KGNvbnN0IEltYWdlQnVmZmVyRGF0YSogb2JqZWN0LCBH cmFwaGljc0NvbnRleHQqIGNvbnRleHQsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBjb25z dCBGbG9hdFJlY3QmIGRlc3RSZWN0LCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsIENvbXBvc2l0 ZU9wZXJhdG9yIG9wLCBib29sIHVzZUxvd1F1YWxpdHlTY2FsZSkKK3N0YXRpYyBib29sIGZsdXNo QW5kRHJhdyhjb25zdCBJbWFnZUJ1ZmZlckRhdGEqIG9iamVjdCwgR3JhcGhpY3NDb250ZXh0KiBj b250ZXh0LCBDb2xvclNwYWNlLCBjb25zdCBGbG9hdFJlY3QmIGRlc3RSZWN0LCBjb25zdCBGbG9h dFJlY3QmIHNyY1JlY3QsIENvbXBvc2l0ZU9wZXJhdG9yIG9wLCBib29sKQogewogICAgIGlmICgh bWFrZUJ1ZmZlckN1cnJlbnQob2JqZWN0LT5tX3dpbmRvdykpIHsKICAgICAgICAgQmxhY2tCZXJy eTo6UGxhdGZvcm06OmxvZ0Fsd2F5cyhCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TG9nTGV2ZWxXYXJu LApAQCAtMjA3LDcgKzIwNyw3IEBAIFBsYXRmb3JtTGF5ZXIqIEltYWdlQnVmZmVyOjpwbGF0Zm9y bUxheWVyKCkgY29uc3QKICAgICByZXR1cm4gbV9kYXRhLm1fcGxhdGZvcm1MYXllci5nZXQoKTsK IH0KIAotUGFzc1JlZlB0cjxJbWFnZT4gSW1hZ2VCdWZmZXI6OmNvcHlJbWFnZShCYWNraW5nU3Rv cmVDb3B5IGNvcHlCZWhhdmlvciwgU2NhbGVCZWhhdmlvcikgY29uc3QKK1Bhc3NSZWZQdHI8SW1h Z2U+IEltYWdlQnVmZmVyOjpjb3B5SW1hZ2UoQmFja2luZ1N0b3JlQ29weSwgU2NhbGVCZWhhdmlv cikgY29uc3QKIHsKICAgICAvLyBGSVhNRSByZXNwZWN0IGNvcHlCZWhhdmlvdXIgZW51bS4KICAg ICB1bnNpZ25lZCogaW1hZ2VEYXRhID0gbmV3IHVuc2lnbmVkW21fc2l6ZS53aWR0aCgpICogbV9z aXplLmhlaWdodCgpXTsKQEAgLTIyNCw3ICsyMjQsNyBAQCB2b2lkIEltYWdlQnVmZmVyOjpjbGlw KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgRmxvYXRSZWN0JiByZWN0KSBjb25zdAog ICAgIGNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLT5hZGRNYXNrTGF5ZXIocmVjdCwgbmF0aXZl SW1hZ2UpOwogfQogCi12b2lkIEltYWdlQnVmZmVyOjpkcmF3KEdyYXBoaWNzQ29udGV4dCogY29u dGV4dCwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEZsb2F0UmVjdCYgZGVzdFJl Y3QsIGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwgQ29tcG9zaXRlT3BlcmF0b3Igb3AsIEJsZW5k TW9kZSBibGVuZE1vZGUsIGJvb2wgdXNlTG93UXVhbGl0eVNjYWxlKQordm9pZCBJbWFnZUJ1ZmZl cjo6ZHJhdyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNw YWNlLCBjb25zdCBGbG9hdFJlY3QmIGRlc3RSZWN0LCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3Qs IENvbXBvc2l0ZU9wZXJhdG9yIG9wLCBCbGVuZE1vZGUsIGJvb2wgdXNlTG93UXVhbGl0eVNjYWxl KQogewogICAgIG1fZGF0YS5kcmF3KG1fY29udGV4dC5nZXQoKSwgY29udGV4dCwgc3R5bGVDb2xv clNwYWNlLCBkZXN0UmVjdCwgc3JjUmVjdCwgb3AsIHVzZUxvd1F1YWxpdHlTY2FsZSk7CiB9CkBA IC0yMzUsNyArMjM1LDcgQEAgdm9pZCBJbWFnZUJ1ZmZlcjo6ZHJhd1BhdHRlcm4oR3JhcGhpY3ND b250ZXh0KiBjb250ZXh0LCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3QKICAgICBpbWFnZS0+ZHJh d1BhdHRlcm4oY29udGV4dCwgc3JjUmVjdCwgcGF0dGVyblRyYW5zZm9ybSwgcGhhc2UsIHN0eWxl Q29sb3JTcGFjZSwgb3AsIGRlc3RSZWN0KTsKIH0KIAotdm9pZCBJbWFnZUJ1ZmZlcjo6cGxhdGZv cm1UcmFuc2Zvcm1Db2xvclNwYWNlKGNvbnN0IFZlY3RvcjxpbnQ+JiBsb29rVXBUYWJsZSkKK3Zv aWQgSW1hZ2VCdWZmZXI6OnBsYXRmb3JtVHJhbnNmb3JtQ29sb3JTcGFjZShjb25zdCBWZWN0b3I8 aW50PiYpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2JsYWNrYmVycnkvTGF5ZXJUaWxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9ibGFja2JlcnJ5L0xheWVyVGlsZXIuY3BwCmluZGV4IDU4M2EyOGMuLmNmYTJkZDEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkv TGF5ZXJUaWxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxh Y2tiZXJyeS9MYXllclRpbGVyLmNwcApAQCAtNDQ2LDcgKzQ0Niw3IEBAIHZvaWQgTGF5ZXJUaWxl cjo6cGVyZm9ybVRpbGVKb2IoTGF5ZXJUaWxlKiB0aWxlLCBjb25zdCBUZXh0dXJlSm9iJiBqb2Ip CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKLWJvb2wgTGF5ZXJUaWxlcjo6ZHJhd1Rp bGUoTGF5ZXJDb21wb3NpdGluZ1RocmVhZCogbGF5ZXIsIGRvdWJsZSBzY2FsZSwgY29uc3QgVGls ZUluZGV4JiBpbmRleCwgY29uc3QgRmxvYXRSZWN0JiBkc3QsIGNvbnN0IEdMRVMyUHJvZ3JhbSYg cHJvZ3JhbSkKK2Jvb2wgTGF5ZXJUaWxlcjo6ZHJhd1RpbGUoTGF5ZXJDb21wb3NpdGluZ1RocmVh ZCogbGF5ZXIsIGRvdWJsZSBzY2FsZSwgY29uc3QgVGlsZUluZGV4JiBpbmRleCwgY29uc3QgRmxv YXRSZWN0JiBkc3QsIGNvbnN0IEdMRVMyUHJvZ3JhbSYpCiB7CiAgICAgVHJhbnNmb3JtYXRpb25N YXRyaXggZHJhd1RyYW5zZm9ybSA9IGxheWVyLT5kcmF3VHJhbnNmb3JtKCk7CiAgICAgZmxvYXQg dmVydGljZXNbNCAqIDRdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYmxhY2tiZXJyeS9QYXRoQmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L1BhdGhCbGFja0JlcnJ5LmNwcAppbmRleCAyZmViYWFl Li5jZDY1ODkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9i bGFja2JlcnJ5L1BhdGhCbGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9ibGFja2JlcnJ5L1BhdGhCbGFja0JlcnJ5LmNwcApAQCAtMjMxLDEyICsyMzEs MTIgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnN0cm9rZVBhdGgoY29uc3QgUGF0aCYgcGF0aCkK ICAgICB9CiB9CiAKLXZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5nKGNvbnN0IFZl Y3RvcjxJbnRSZWN0PiYgcmVjdHMsIGludCB3aWR0aCwgaW50IG9mZnNldCwgY29uc3QgQ29sb3Im IGNvbG9yKQordm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdGb2N1c1JpbmcoY29uc3QgVmVjdG9y PEludFJlY3Q+JiwgaW50LCBpbnQsIGNvbnN0IENvbG9yJikKIHsKICAgICBub3RJbXBsZW1lbnRl ZCgpOwogfQogCi12b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ZvY3VzUmluZyhjb25zdCBQYXRo JiBwYXRoLCBpbnQgd2lkdGgsIGludCBvZmZzZXQsIGNvbnN0IENvbG9yJiBjb2xvcikKK3ZvaWQg R3JhcGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5nKGNvbnN0IFBhdGgmLCBpbnQsIGludCwgY29u c3QgQ29sb3ImKQogewogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CkBAIC0yNjMsNyArMjYzLDcg QEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXAoY29uc3QgUGF0aCYgcGF0aCwgV2luZFJ1bGUp CiAgICAgcHAtPmFwcGx5QXNDbGlwKHBsYXRmb3JtQ29udGV4dCgpKTsKIH0KIAotdm9pZCBHcmFw aGljc0NvbnRleHQ6OmNsaXBQYXRoKGNvbnN0IFBhdGgmIHBhdGgsIFdpbmRSdWxlIGNsaXBSdWxl KQordm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXBQYXRoKGNvbnN0IFBhdGgmIHBhdGgsIFdpbmRS dWxlKQogewogICAgIGlmIChwYXRoLnBsYXRmb3JtUGF0aCgpLT5pc1JlY3Rhbmd1bGFyKCkpCiAg ICAgICAgIHBsYXRmb3JtQ29udGV4dCgpLT5jbGlwKHBhdGguYm91bmRpbmdSZWN0KCkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9QYXR0 ZXJuQmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFj a2JlcnJ5L1BhdHRlcm5CbGFja0JlcnJ5LmNwcAppbmRleCBkNjAwZmNkLi40ZDk5YTFjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L1BhdHRl cm5CbGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9i bGFja2JlcnJ5L1BhdHRlcm5CbGFja0JlcnJ5LmNwcApAQCAtMzYsNyArMzYsNyBAQCB2b2lkIFBh dHRlcm46OnBsYXRmb3JtRGVzdHJveSgpCiAgICAgbV9wYXR0ZXJuID0gMDsKIH0KIAotUGxhdGZv cm1QYXR0ZXJuUHRyIFBhdHRlcm46OnBsYXRmb3JtUGF0dGVybihjb25zdCBBZmZpbmVUcmFuc2Zv cm0mIHBhdHRlcm5UcmFuc2Zvcm0pCitQbGF0Zm9ybVBhdHRlcm5QdHIgUGF0dGVybjo6cGxhdGZv cm1QYXR0ZXJuKGNvbnN0IEFmZmluZVRyYW5zZm9ybSYpCiB7CiAgICAgaWYgKG1fcGF0dGVybikK ICAgICAgICAgcmV0dXJuIG1fcGF0dGVybjsKLS0gCjEuNy4xMC40Cgo= 201021 2013-05-07 19:52:48 -0700 2013-05-07 22:07:46 -0700 clean up load interface in WebPage 0001-Clean-up-load-interface-in-WebPage.patch text/plain 10480 xren RnJvbSAyZTVlMTVkNGUyYzFmNmI1Y2U5NTdhOWNlNmEwYTc2OTUyOTdhZGZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYdWVmZWkgUmVuIDx4cmVuQGJsYWNrYmVycnkuY29tPgpEYXRl OiBXZWQsIDggTWF5IDIwMTMgMTA6NDY6NTIgKzA4MDAKU3ViamVjdDogW1BBVENIXSBDbGVhbiB1 cCBsb2FkIGludGVyZmFjZSBpbiBXZWJQYWdlCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE1NjIyIFJldmlld2VkIGJ5CiBSb2IgQnVpcy4KCkludGVybmFsIFBSOjMx NTUzNQpJbnRlcm5hbCByZXZpZXdlZCBieSAgTWFyeSBXdQoKKiBBcGkvV2ViUGFnZS5jcHA6CihC bGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpsb2FkKToKKEJsYWNrQmVycnk6Oldl YktpdDo6V2ViUGFnZTo6bG9hZEZpbGUpOgooQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjps b2FkKToKKiBBcGkvV2ViUGFnZS5oOgoqIEFwaS9XZWJQYWdlX3AuaDoKKFdlYlBhZ2VQcml2YXRl KToKKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwOgooV2Vi Q29yZTo6RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5OjpzdGFydERvd25sb2FkKToKCkNvbmZs aWN0czoKCVNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKCVNvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKCVNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwCi0tLQogU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCAgICAgICAgICAgfCAgIDUyICsrKysrKysr Ky0tLS0tLS0tLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaCAgICAg ICAgICAgICB8ICAgIDIgKy0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9w LmggICAgICAgICAgIHwgICAgMiArLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgfCAgIDE5ICsrKysrKysKIC4uLi9XZWJDb3JlU3VwcG9ydC9GcmFt ZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwIHwgICAgOCArKy0KIDUgZmlsZXMgY2hhbmdlZCwg NTAgaW5zZXJ0aW9ucygrKSwgMzMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvV2ViUGFnZS5jcHAKaW5kZXggZjhiYjQyYy4uZjhkNjA5ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCkBAIC02NzEsMTIgKzY3MSwxMiBAQCBwcml2YXRl OgogICAgIH0KIH07CiAKLXZvaWQgV2ViUGFnZVByaXZhdGU6OmxvYWQoY29uc3QgQmxhY2tCZXJy eTo6UGxhdGZvcm06OlN0cmluZyYgdXJsLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3Ry aW5nJiBuZXR3b3JrVG9rZW4sIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIG1l dGhvZCwgUGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpDYWNoZVBvbGljeSBjYWNoZVBvbGljeSwg Y29uc3QgY2hhciogZGF0YSwgc2l6ZV90IGRhdGFMZW5ndGgsIGNvbnN0IGNoYXIqIGNvbnN0KiBo ZWFkZXJzLCBzaXplX3QgaGVhZGVyc0xlbmd0aCwgYm9vbCBpc0luaXRpYWwsIGJvb2wgbXVzdEhh bmRsZUludGVybmFsbHksIGJvb2wgbmVlZFJlZmVyZXIsIGJvb2wgZm9yY2VEb3dubG9hZCwgY29u c3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgb3ZlcnJpZGVDb250ZW50VHlwZSwgY29u c3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgc3VnZ2VzdGVkU2F2ZU5hbWUpCit2b2lk IFdlYlBhZ2VQcml2YXRlOjpsb2FkKGNvbnN0IFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdCYgbmV0 UmVxLCBib29sIG5lZWRSZWZlcmVyKQogewogICAgIHN0b3BDdXJyZW50TG9hZCgpOwogICAgIERl ZmVycmVkVGFza0xvYWRNYW51YWxTY3JpcHQ6OmZpbmlzaE9yQ2FuY2VsKHRoaXMpOwogCi0gICAg U3RyaW5nIHVybFN0cmluZyh1cmwpOworICAgIFN0cmluZyB1cmxTdHJpbmcobmV0UmVxLmdldFVy bFJlZigpKTsKICAgICBpZiAodXJsU3RyaW5nLnN0YXJ0c1dpdGgoInZzOiIsIGZhbHNlKSkgewog ICAgICAgICB1cmxTdHJpbmcgPSB1cmxTdHJpbmcuc3Vic3RyaW5nKDMpOwogICAgICAgICBtX21h aW5GcmFtZS0+c2V0SW5WaWV3U291cmNlTW9kZSh0cnVlKTsKQEAgLTY5MywzMCArNjkzLDI1IEBA IHZvaWQgV2ViUGFnZVByaXZhdGU6OmxvYWQoY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0 cmluZyYgdXJsLCBjb25zdCBCbGFja0JlCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBp ZiAoaXNJbml0aWFsKQotICAgICAgICBOZXR3b3JrTWFuYWdlcjo6aW5zdGFuY2UoKS0+c2V0SW5p dGlhbFVSTChrdXJsKTsKLQogICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KGt1cmwpOwotICAg IHJlcXVlc3Quc2V0VG9rZW4obmV0d29ya1Rva2VuKTsKLSAgICBpZiAoaXNJbml0aWFsIHx8IG11 c3RIYW5kbGVJbnRlcm5hbGx5KQotICAgICAgICByZXF1ZXN0LnNldE11c3RIYW5kbGVJbnRlcm5h bGx5KHRydWUpOwotICAgIHJlcXVlc3Quc2V0SFRUUE1ldGhvZChtZXRob2QpOwotICAgIHJlcXVl c3Quc2V0Q2FjaGVQb2xpY3kodG9XZWJDb3JlQ2FjaGVQb2xpY3koY2FjaGVQb2xpY3kpKTsKLSAg ICBpZiAoIW92ZXJyaWRlQ29udGVudFR5cGUuZW1wdHkoKSkKLSAgICAgICAgcmVxdWVzdC5zZXRP dmVycmlkZUNvbnRlbnRUeXBlKG92ZXJyaWRlQ29udGVudFR5cGUpOwotCi0gICAgaWYgKGRhdGEp Ci0gICAgICAgIHJlcXVlc3Quc2V0SFRUUEJvZHkoRm9ybURhdGE6OmNyZWF0ZShkYXRhLCBkYXRh TGVuZ3RoKSk7Ci0KLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpICsgMSA8IGhlYWRlcnNMZW5n dGg7IGkgKz0gMikKLSAgICAgICAgcmVxdWVzdC5hZGRIVFRQSGVhZGVyRmllbGQoaGVhZGVyc1tp XSwgaGVhZGVyc1tpICsgMV0pOworICAgIHJlcXVlc3Quc2V0SFRUUE1ldGhvZChuZXRSZXEuZ2V0 TWV0aG9kUmVmKCkpOworICAgIHJlcXVlc3Quc2V0Q2FjaGVQb2xpY3kodG9XZWJDb3JlQ2FjaGVQ b2xpY3kobmV0UmVxLmdldENhY2hlUG9saWN5KCkpKTsKKyAgICBpZiAoIW5ldFJlcS5nZXRPdmVy cmlkZUNvbnRlbnRUeXBlKCkuZW1wdHkoKSkKKyAgICAgICAgcmVxdWVzdC5zZXRPdmVycmlkZUNv bnRlbnRUeXBlKG5ldFJlcS5nZXRPdmVycmlkZUNvbnRlbnRUeXBlKCkpOworCisgICAgUGxhdGZv cm06Ok5ldHdvcmtSZXF1ZXN0OjpIZWFkZXJMaXN0JiBsaXN0ID0gbmV0UmVxLmdldEhlYWRlckxp c3RSZWYoKTsKKyAgICBpZiAoIWxpc3QuZW1wdHkoKSkgeworICAgICAgICBmb3IgKHVuc2lnbmVk IGkgPSAwOyBpIDwgbGlzdC5zaXplKCk7IGkrKykKKyAgICAgICAgICAgIHJlcXVlc3QuYWRkSFRU UEhlYWRlckZpZWxkKGxpc3RbaV0uZmlyc3QuY19zdHIoKSwgbGlzdFtpXS5zZWNvbmQuY19zdHIo KSk7CisgICAgfQorCiAgICAgaWYgKG5lZWRSZWZlcmVyICYmIGZvY3VzZWRPck1haW5GcmFtZSgp ICYmIGZvY3VzZWRPck1haW5GcmFtZSgpLT5kb2N1bWVudCgpKQogICAgICAgICByZXF1ZXN0LmFk ZEhUVFBIZWFkZXJGaWVsZCgiUmVmZXJlciIsIGZvY3VzZWRPck1haW5GcmFtZSgpLT5kb2N1bWVu dCgpLT51cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKIAotICAgIGlmIChmb3JjZURvd25s b2FkKQorICAgIGlmIChQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OlRhcmdldElzRG93bmxvYWQg PT0gbmV0UmVxLmdldFRhcmdldFR5cGUoKSkKICAgICAgICAgcmVxdWVzdC5zZXRGb3JjZURvd25s b2FkKHRydWUpOwotCi0gICAgcmVxdWVzdC5zZXRTdWdnZXN0ZWRTYXZlTmFtZShzdWdnZXN0ZWRT YXZlTmFtZSk7CisgICAgaWYgKCFuZXRSZXEuZ2V0U3VnZ2VzdGVkU2F2ZU5hbWUoKS5lbXB0eSgp KQorICAgICAgICByZXF1ZXN0LnNldFN1Z2dlc3RlZFNhdmVOYW1lKG5ldFJlcS5nZXRTdWdnZXN0 ZWRTYXZlTmFtZSgpKTsKIAogICAgIG1fbWFpbkZyYW1lLT5sb2FkZXIoKS0+bG9hZChGcmFtZUxv YWRSZXF1ZXN0KG1fbWFpbkZyYW1lLCByZXF1ZXN0KSk7CiB9CkBAIC03MjksMTggKzcyNCwxNSBA QCB2b2lkIFdlYlBhZ2U6OmxvYWRGaWxlKGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJp bmcmIHBhdGgsIGNvbnN0IEJsYWNrQmVycgogICAgIGVsc2UgaWYgKCFmaWxlVXJsLnN0YXJ0c1dp dGgoImZpbGU6Ly8vIikpCiAgICAgICAgIHJldHVybjsKIAotICAgIGQtPmxvYWQoZmlsZVVybCwg QmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZzo6ZW1wdHlTdHJpbmcoKSwgQmxhY2tCZXJyeTo6 UGxhdGZvcm06OlN0cmluZygiR0VUIiwgMyksIFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6VXNl UHJvdG9jb2xDYWNoZVBvbGljeSwgMCwgMCwgMCwgMCwgZmFsc2UsIGZhbHNlLCBmYWxzZSwgZmFs c2UsIG92ZXJyaWRlQ29udGVudFR5cGUuY19zdHIoKSk7CisgICAgUGxhdGZvcm06Ok5ldHdvcmtS ZXF1ZXN0IG5ldFJlcXVlc3Q7CisgICAgbmV0UmVxdWVzdC5zZXRSZXF1ZXN0VXJsKHBhdGgpOwor ICAgIG5ldFJlcXVlc3Quc2V0T3ZlcnJpZGVDb250ZW50VHlwZShvdmVycmlkZUNvbnRlbnRUeXBl KTsKKyAgICBkLT5sb2FkKG5ldFJlcXVlc3QsIGZhbHNlKTsKIH0KIAotdm9pZCBXZWJQYWdlOjps b2FkKGNvbnN0IFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdCYgcmVxdWVzdCwgYm9vbCBuZWVkUmVm ZXJlciwgYm9vbCBmb3JjZURvd25sb2FkKQordm9pZCBXZWJQYWdlOjpsb2FkKGNvbnN0IFBsYXRm b3JtOjpOZXR3b3JrUmVxdWVzdCYgcmVxdWVzdCwgYm9vbCBuZWVkUmVmZXJlcikKIHsKLSAgICB2 ZWN0b3I8Y29uc3QgY2hhcio+IGhlYWRlcnM7Ci0gICAgUGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0 OjpIZWFkZXJMaXN0JiBsaXN0ID0gcmVxdWVzdC5nZXRIZWFkZXJMaXN0UmVmKCk7Ci0gICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IGxpc3Quc2l6ZSgpOyBpKyspIHsKLSAgICAgICAgaGVhZGVy cy5wdXNoX2JhY2sobGlzdFtpXS5maXJzdC5jX3N0cigpKTsKLSAgICAgICAgaGVhZGVycy5wdXNo X2JhY2sobGlzdFtpXS5zZWNvbmQuY19zdHIoKSk7Ci0gICAgfQotICAgIGQtPmxvYWQocmVxdWVz dC5nZXRVcmxSZWYoKSwgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZzo6ZW1wdHlTdHJpbmco KSwgIkdFVCIsIFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6VXNlUHJvdG9jb2xDYWNoZVBvbGlj eSwgMCwgMCwgaGVhZGVycy5lbXB0eSgpID8gMCA6ICZoZWFkZXJzWzBdLCBoZWFkZXJzLnNpemUo KSwgZmFsc2UsIGZhbHNlLCBuZWVkUmVmZXJlciwgZm9yY2VEb3dubG9hZCwgQmxhY2tCZXJyeTo6 UGxhdGZvcm06OlN0cmluZzo6ZW1wdHlTdHJpbmcoKSwgcmVxdWVzdC5nZXRTdWdnZXN0ZWRTYXZl TmFtZSgpKTsKKyAgICBkLT5sb2FkKHJlcXVlc3QsIG5lZWRSZWZlcmVyKTsKIH0KIAogdm9pZCBX ZWJQYWdlUHJpdmF0ZTo6bG9hZFN0cmluZyhjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3Ry aW5nJiBzdHJpbmcsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIGJhc2VVUkws IGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIGNvbnRlbnRUeXBlLCBjb25zdCBC bGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiBmYWlsaW5nVVJMKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvQXBpL1dlYlBhZ2UuaAppbmRleCBmZWU4NGNjLi4wMzhmMTBmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuaApAQCAtOTIsNyArOTIsNyBAQCBwdWJsaWM6CiAKICAg ICB2b2lkIGxvYWRTdHJpbmcoY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYsIGNv bnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIGJhc2VVUkwsIGNvbnN0IEJsYWNrQmVy cnk6OlBsYXRmb3JtOjpTdHJpbmcmIGNvbnRlbnRUeXBlID0gInRleHQvaHRtbCIsIGNvbnN0IEJs YWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIGZhaWxpbmdVUkwgPSBCbGFja0JlcnJ5OjpQbGF0 Zm9ybTo6U3RyaW5nOjplbXB0eVN0cmluZygpKTsKIAotICAgIHZvaWQgbG9hZChjb25zdCBQbGF0 Zm9ybTo6TmV0d29ya1JlcXVlc3QmLCBib29sIG5lZWRSZWZlcmVyID0gZmFsc2UsIGJvb2wgZm9y Y2VEb3dubG9hZCA9IGZhbHNlKTsKKyAgICB2b2lkIGxvYWQoY29uc3QgUGxhdGZvcm06Ok5ldHdv cmtSZXF1ZXN0JiwgYm9vbCBuZWVkUmVmZXJlciA9IGZhbHNlKTsKIAogICAgIGJvb2wgZXhlY3V0 ZUphdmFTY3JpcHQoY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgc2NyaXB0LCBK YXZhU2NyaXB0RGF0YVR5cGUmIHJldHVyblR5cGUsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJp bmcmIHJldHVyblZhbHVlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L0FwaS9XZWJQYWdlX3AuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9w LmgKaW5kZXggN2E5NDY4YS4uY2JlMDBhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9XZWJQYWdlX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L1dlYlBhZ2VfcC5oCkBAIC0xMTUsNyArMTE1LDcgQEAgcHVibGljOgogICAgIGJvb2wgaGFuZGxl TW91c2VFdmVudChXZWJDb3JlOjpQbGF0Zm9ybU1vdXNlRXZlbnQmKTsKICAgICBib29sIGhhbmRs ZVdoZWVsRXZlbnQoV2ViQ29yZTo6UGxhdGZvcm1XaGVlbEV2ZW50Jik7CiAKLSAgICB2b2lkIGxv YWQoY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyYgdXJsLCBjb25zdCBCbGFja0Jl cnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiBuZXR3b3JrVG9rZW4sIGNvbnN0IEJsYWNrQmVycnk6OlBs YXRmb3JtOjpTdHJpbmcmIG1ldGhvZCwgUGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpDYWNoZVBv bGljeSwgY29uc3QgY2hhciogZGF0YSwgc2l6ZV90IGRhdGFMZW5ndGgsIGNvbnN0IGNoYXIqIGNv bnN0KiBoZWFkZXJzLCBzaXplX3QgaGVhZGVyc0xlbmd0aCwgYm9vbCBpc0luaXRpYWwsIGJvb2wg bXVzdEhhbmRsZUludGVybmFsbHkgPSBmYWxzZSwgYm9vbCBuZWVkUmVmZXJlciA9IGZhbHNlLCBi b29sIGZvcmNlRG93bmxvYWQgPSBmYWxzZSwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0 cmluZyYgb3ZlcnJpZGVDb250ZW50VHlwZSA9IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmc6 OmVtcHR5U3RyaW5nKCksIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHN1Z2dl c3RlZFNhdmVOYW1lID0gQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZzo6ZW1wdHlTdHJpbmco KSk7CisgICAgdm9pZCBsb2FkKGNvbnN0IFBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdCYgcGxhdGZv cm1SZXF1ZXN0LCBib29sIG5lZWRSZWZlcmVyID0gZmFsc2UpOwogICAgIHZvaWQgbG9hZFN0cmlu Zyhjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nJiwgY29uc3QgQmxhY2tCZXJyeTo6 UGxhdGZvcm06OlN0cmluZyYgYmFzZVVSTCwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0 cmluZyYgbWltZVR5cGUsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIGZhaWxp bmdVUkwpOwogICAgIGJvb2wgZXhlY3V0ZUphdmFTY3JpcHQoY29uc3QgQmxhY2tCZXJyeTo6UGxh dGZvcm06OlN0cmluZyYgc2NyaXB0LCBKYXZhU2NyaXB0RGF0YVR5cGUmIHJldHVyblR5cGUsIEJs YWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmcmIHJldHVyblZhbHVlKTsKICAgICBib29sIGV4ZWN1 dGVKYXZhU2NyaXB0SW5Jc29sYXRlZFdvcmxkKGNvbnN0IFdlYkNvcmU6OlNjcmlwdFNvdXJjZUNv ZGUmLCBKYXZhU2NyaXB0RGF0YVR5cGUmIHJldHVyblR5cGUsIEJsYWNrQmVycnk6OlBsYXRmb3Jt OjpTdHJpbmcmIHJldHVyblZhbHVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4 IGI2YmZlOTIuLjI3YjljNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwz ICsxLDIyIEBACisyMDEzLTA1LTA3ICBYdWVmZWkgUmVuICA8eHJlbkBibGFja2JlcnJ5LmNvbT4K KworICAgICAgICBDbGVhbiB1cCBsb2FkIGludGVyZmFjZSBpbiBXZWJQYWdlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTU2MjIKKyAgICAgICAgUmV2 aWV3ZWQgYnkgUm9iIEJ1aXMuCisKKyAgICAgICAgSW50ZXJuYWwgUFI6MzE1NTM1CisgICAgICAg IEludGVybmFsIHJldmlld2VkIGJ5ICBNYXJ5IFd1CisKKyAgICAgICAgKiBBcGkvV2ViUGFnZS5j cHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpsb2FkKToK KyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZTo6bG9hZEZpbGUpOgorICAgICAg ICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjpsb2FkKToKKyAgICAgICAgKiBBcGkvV2Vi UGFnZS5oOgorICAgICAgICAqIEFwaS9XZWJQYWdlX3AuaDoKKyAgICAgICAgKFdlYlBhZ2VQcml2 YXRlKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVy cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5Ojpz dGFydERvd25sb2FkKToKKwogMjAxMy0wNS0wNyAgTWlrZSBGZW50b24gIDxtaWZlbnRvbkByaW0u Y29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBJbmNyZWFzZSB0aGUgcGFkZGluZyBzaXplIGZv ciBjYXJldCBiYXNlZCBzY3JvbGxpbmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcCBiL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJs YWNrQmVycnkuY3BwCmluZGV4IGQ3MWJlMzkuLmJjNGRhMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVy cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFt ZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwCkBAIC0xMTg3LDcgKzExODcsMTMgQEAgUGFzc1Jl ZlB0cjxGcmFtZU5ldHdvcmtpbmdDb250ZXh0PiBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6 OmNyZWF0ZU5ldHdvcmtpbmcKIAogdm9pZCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OnN0 YXJ0RG93bmxvYWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTdHJpbmcm IHN1Z2dlc3RlZE5hbWUpCiB7Ci0gICAgbV93ZWJQYWdlUHJpdmF0ZS0+bG9hZChyZXF1ZXN0LnVy bCgpLnN0cmluZygpLCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U3RyaW5nOjplbXB0eVN0cmluZygp LCAiR0VUIiwgTmV0d29ya1JlcXVlc3Q6OlVzZVByb3RvY29sQ2FjaGVQb2xpY3ksIDAsIDAsIDAs IDAsIGZhbHNlLCBmYWxzZSwgdHJ1ZSwgIiIsIHN1Z2dlc3RlZE5hbWUpOworICAgIGlmIChzdWdn ZXN0ZWROYW1lLmVtcHR5KCkpCisgICAgICAgIG1fd2ViUGFnZVByaXZhdGUtPm1fbWFpbkZyYW1l LT5sb2FkZXIoKS0+bG9hZChGcmFtZUxvYWRSZXF1ZXN0KG1fd2ViUGFnZVByaXZhdGUtPm1fbWFp bkZyYW1lLCByZXF1ZXN0KSk7CisgICAgZWxzZSB7CisgICAgICAgIFJlc291cmNlUmVxdWVzdCBy ZXF1ZXN0Q29weSA9IHJlcXVlc3Q7CisgICAgICAgIHJlcXVlc3RDb3B5LnNldFN1Z2dlc3RlZFNh dmVOYW1lKHN1Z2dlc3RlZE5hbWUpOworICAgICAgICBtX3dlYlBhZ2VQcml2YXRlLT5tX21haW5G cmFtZS0+bG9hZGVyKCktPmxvYWQoRnJhbWVMb2FkUmVxdWVzdChtX3dlYlBhZ2VQcml2YXRlLT5t X21haW5GcmFtZSwgcmVxdWVzdENvcHkpKTsKKyAgICB9CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJD bGllbnRCbGFja0JlcnJ5Ojpjb252ZXJ0TWFpblJlc291cmNlTG9hZFRvRG93bmxvYWQoRG9jdW1l bnRMb2FkZXIqIGRvY3VtZW50TG9hZGVyLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qs IGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQotLSAKMS43LjEwLjQKCg==