52731 2011-01-19 12:17:45 -0800 Web Inspector: further simplify InspectorState. 2011-01-20 05:21:08 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman abarth apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 336692 0 pfeldman 2011-01-19 12:17:45 -0800 This change moved XHR logging flag into console agent, removes InspectorState pushing to the front-end. 336696 1 79463 pfeldman 2011-01-19 12:19:59 -0800 Created attachment 79463 [PATCH] Proposed change 336697 2 webkit.review.bot 2011-01-19 12:21:42 -0800 Attachment 79463 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/inspector/InspectorConsoleAgent.h:73: The parameter name "enabled" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/inspector/InspectorState.h:75: The parameter name "value" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/inspector/InspectorState.h:81: The parameter name "propertyId" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/inspector/InspectorState.h:82: The parameter name "propertyId" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/inspector/InspectorState.h:83: The parameter name "propertyId" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/inspector/InspectorState.h:84: The parameter name "propertyId" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 6 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 336718 3 79463 loislo 2011-01-19 12:40:41 -0800 Comment on attachment 79463 [PATCH] Proposed change View in context: https://bugs.webkit.org/attachment.cgi?id=79463&action=review > Source/WebCore/ChangeLog:9 > + removes InspectorState pushing to the front-end.No new tests. (OOPS!) Nit: please fix. looks good to me 337271 4 79463 yurys 2011-01-20 04:43:23 -0800 Comment on attachment 79463 [PATCH] Proposed change Please fix style errors and ChangeLog description before landing. 337274 5 pfeldman 2011-01-20 04:50:03 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebCore/ChangeLog M Source/WebCore/inspector/Inspector.idl M Source/WebCore/inspector/InspectorConsoleAgent.cpp M Source/WebCore/inspector/InspectorConsoleAgent.h M Source/WebCore/inspector/InspectorController.cpp M Source/WebCore/inspector/InspectorController.h M Source/WebCore/inspector/InspectorState.cpp M Source/WebCore/inspector/InspectorState.h M Source/WebCore/inspector/front-end/ConsoleView.js M Source/WebCore/inspector/front-end/inspector.js Committed r76230 337287 6 webkit.review.bot 2011-01-20 05:21:08 -0800 http://trac.webkit.org/changeset/76230 might have broken Qt Linux Release 79463 2011-01-19 12:19:59 -0800 2011-01-20 04:43:23 -0800 [PATCH] Proposed change state_push text/plain 19473 pfeldman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmYmNhMTM2Li43NjhiM2QzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDMg QEAKIDIwMTEtMDEtMTkgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogZnVydGhlciBzaW1wbGlmeSBJbnNwZWN0b3JTdGF0ZS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyNzMxCisKKyAgICAgICAgVGhpcyBjaGFu Z2UgbW92ZXMgWEhSIGxvZ2dpbmcgZmxhZyBpbnRvIGNvbnNvbGUgYWdlbnQsCisgICAgICAgIHJl bW92ZXMgSW5zcGVjdG9yU3RhdGUgcHVzaGluZyB0byB0aGUgZnJvbnQtZW5kLk5vIG5ldyB0ZXN0 cy4gKE9PUFMhKQorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5pZGw6CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JDb25zb2xlQWdlbnQ6Okluc3BlY3RvckNvbnNvbGVBZ2VudCk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JDb25zb2xlQWdlbnQ6OnJlc291cmNlUmV0cmlldmVkQnlYTUxI dHRwUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb25zb2xlQWdlbnQ6OnNl dE1vbml0b3JpbmdYSFJFbmFibGVkKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnNv bGVBZ2VudDo6c2V0Q29uc29sZU1lc3NhZ2VzRW5hYmxlZCk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JDb25zb2xlQWdlbnQ6OmFkZENvbnNvbGVNZXNzYWdlKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxl cjo6SW5zcGVjdG9yQ29udHJvbGxlcik6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNv bnRyb2xsZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OnN0YXRl KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OnNldHRpbmdzKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yU3RhdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yU3RhdGU6Okluc3BlY3RvclN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvclN0YXRlOjpyZWdpc3RlckJvb2xlYW4pOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y U3RhdGU6OnJlZ2lzdGVyU3RyaW5nKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclN0YXRl OjpyZWdpc3RlckxvbmcpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yU3RhdGU6OnJlZ2lz dGVyT2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclN0YXRlOjpQcm9wZXJ0eTo6 Y3JlYXRlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yU3RhdGUuaDoKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fcmVnaXN0ZXJDb25zb2xlRG9tYWluRGlzcGF0Y2hl ci5kaXNwYXRjaGVyLmNvbnNvbGVNZXNzYWdlc0NsZWFyZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fcmVnaXN0ZXJDb25zb2xlRG9tYWluRGlzcGF0Y2hl ci5kaXNwYXRjaGVyLm1vbml0b3JpbmdYSFJTdGF0ZUNoYW5nZWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fcmVnaXN0ZXJDb25zb2xlRG9tYWluRGlzcGF0 Y2hlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlLl9oYW5k bGVDb250ZXh0TWVudUV2ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qczoKKworMjAxMS0wMS0xOSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVt Lm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IG1vdmUgbWV0aG9kcyBmcm9tIEluamVjdGVkU2NyaXB0IGRvbWFpbiBp bnRvIERPTSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3Iu aWRsIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKaW5kZXggMGRiYTUx YS4uZmJjYTllYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ci5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKQEAgLTM5 LDggKzM5LDYgQEAgbW9kdWxlIGNvcmUgewogICAgICAgICBbZG9tYWluPUluc3BlY3Rvcl0gdm9p ZCBhZGRTY3JpcHRUb0V2YWx1YXRlT25Mb2FkKGluIFN0cmluZyBzY3JpcHRTb3VyY2UpOwogICAg ICAgICBbZG9tYWluPUluc3BlY3Rvcl0gdm9pZCByZW1vdmVBbGxTY3JpcHRzVG9FdmFsdWF0ZU9u TG9hZCgpOwogICAgICAgICBbZG9tYWluPUluc3BlY3Rvcl0gdm9pZCByZWxlYXNlV3JhcHBlck9i amVjdEdyb3VwKGluIGxvbmcgaW5qZWN0ZWRTY3JpcHRJZCwgaW4gU3RyaW5nIG9iamVjdEdyb3Vw KTsKLSAgICAgICAgW2RvbWFpbj1JbnNwZWN0b3JdIHZvaWQgZ2V0SW5zcGVjdG9yU3RhdGUob3V0 IE9iamVjdCBzdGF0ZSk7Ci0gICAgICAgIFtkb21haW49SW5zcGVjdG9yXSB2b2lkIHNldE1vbml0 b3JpbmdYSFJFbmFibGVkKGluIGJvb2xlYW4gZW5hYmxlLCBvdXQgYm9vbGVhbiBuZXdTdGF0ZSk7 CiAgICAgICAgIFtkb21haW49SW5zcGVjdG9yXSB2b2lkIHJlbG9hZFBhZ2UoKTsKICAgICAgICAg W2RvbWFpbj1JbnNwZWN0b3JdIHZvaWQgcG9wdWxhdGVTY3JpcHRPYmplY3RzKCk7CiAKQEAgLTk1 LDYgKzkzLDggQEAgbW9kdWxlIGNvcmUgewogICAgICAgICBbbm90aWZ5LCBkb21haW49Q29uc29s ZV0gdm9pZCB1cGRhdGVDb25zb2xlTWVzc2FnZVJlcGVhdENvdW50KG91dCB1bnNpZ25lZCBsb25n IGNvdW50KTsKICAgICAgICAgW2RvbWFpbj1Db25zb2xlXSB2b2lkIGNsZWFyQ29uc29sZU1lc3Nh Z2VzKCk7CiAgICAgICAgIFtub3RpZnksIGRvbWFpbj1Db25zb2xlXSB2b2lkIGNvbnNvbGVNZXNz YWdlc0NsZWFyZWQoKTsKKyAgICAgICAgW2RvbWFpbj1Db25zb2xlXSB2b2lkIHNldE1vbml0b3Jp bmdYSFJFbmFibGVkKGluIGJvb2xlYW4gZW5hYmxlZCk7CisgICAgICAgIFtub3RpZnksIGRvbWFp bj1Db25zb2xlXSB2b2lkIG1vbml0b3JpbmdYSFJTdGF0ZUNoYW5nZWQob3V0IGJvb2xlYW4gZW5h YmxlZCk7CiAKICAgICAgICAgLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KICAgICAgICAgLy8gTmV0d29yayBBUEkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb25zb2xlQWdl bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5j cHAKaW5kZXggYTU0M2NiMi4uMmM4MzdmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5jcHAKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNs dWRlICJJbnNwZWN0b3JDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yRE9NQWdlbnQu aCIKICNpbmNsdWRlICJJbnNwZWN0b3JGcm9udGVuZC5oIgorI2luY2x1ZGUgIkluc3BlY3RvclNl dHRpbmdzLmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yU3RhdGUuaCIKICNpbmNsdWRlICJSZXNvdXJj ZUVycm9yLmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VSZXNwb25zZS5oIgpAQCAtNDksOSArNTAsOCBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBzdGF0aWMgY29uc3QgdW5zaWduZWQgbWF4aW11bUNvbnNv bGVNZXNzYWdlcyA9IDEwMDA7CiBzdGF0aWMgY29uc3QgdW5zaWduZWQgZXhwaXJlQ29uc29sZU1l c3NhZ2VzU3RlcCA9IDEwMDsKIAotSW5zcGVjdG9yQ29uc29sZUFnZW50OjpJbnNwZWN0b3JDb25z b2xlQWdlbnQoSW5zcGVjdG9yQ29udHJvbGxlciogaW5zcGVjdG9yQ29udHJvbGxlciwgSW5zcGVj dG9yU3RhdGUqIHN0YXRlKQorSW5zcGVjdG9yQ29uc29sZUFnZW50OjpJbnNwZWN0b3JDb25zb2xl QWdlbnQoSW5zcGVjdG9yQ29udHJvbGxlciogaW5zcGVjdG9yQ29udHJvbGxlcikKICAgICA6IG1f aW5zcGVjdG9yQ29udHJvbGxlcihpbnNwZWN0b3JDb250cm9sbGVyKQotICAgICwgbV9zdGF0ZShz dGF0ZSkKICAgICAsIG1fZnJvbnRlbmQoMCkKICAgICAsIG1fcHJldmlvdXNNZXNzYWdlKDApCiAg ICAgLCBtX2V4cGlyZWRDb25zb2xlTWVzc2FnZUNvdW50KDApCkBAIC0xNjUsNyArMTY1LDcgQEAg dm9pZCBJbnNwZWN0b3JDb25zb2xlQWdlbnQ6OnJlc291cmNlUmV0cmlldmVkQnlYTUxIdHRwUmVx dWVzdChjb25zdCBTdHJpbmcmIHVybCwKIHsKICAgICBpZiAoIW1faW5zcGVjdG9yQ29udHJvbGxl ci0+ZW5hYmxlZCgpKQogICAgICAgICByZXR1cm47Ci0gICAgaWYgKG1fc3RhdGUtPmdldEJvb2xl YW4oSW5zcGVjdG9yU3RhdGU6Om1vbml0b3JpbmdYSFIpKQorICAgIGlmIChtX2luc3BlY3RvckNv bnRyb2xsZXItPnN0YXRlKCktPmdldEJvb2xlYW4oSW5zcGVjdG9yU3RhdGU6Om1vbml0b3JpbmdY SFIpKQogICAgICAgICBhZGRNZXNzYWdlVG9Db25zb2xlKEpTTWVzc2FnZVNvdXJjZSwgTG9nTWVz c2FnZVR5cGUsIExvZ01lc3NhZ2VMZXZlbCwgIlhIUiBmaW5pc2hlZCBsb2FkaW5nOiBcIiIgKyB1 cmwgKyAiXCIuIiwgc2VuZExpbmVOdW1iZXIsIHNlbmRVUkwpOwogfQogCkBAIC0xOTEsMTEgKzE5 MSwyMSBAQCB2b2lkIEluc3BlY3RvckNvbnNvbGVBZ2VudDo6ZGlkRmFpbExvYWRpbmcodW5zaWdu ZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdQogICAgIGFkZENvbnNvbGVNZXNzYWdlKG5l dyBDb25zb2xlTWVzc2FnZShPdGhlck1lc3NhZ2VTb3VyY2UsIE5ldHdvcmtFcnJvck1lc3NhZ2VU eXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgbWVzc2FnZSwgZXJyb3IuZmFpbGluZ1VSTCgpLCBpZGVu dGlmaWVyKSk7CiB9CiAKK3ZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpzZXRNb25pdG9yaW5n WEhSRW5hYmxlZChib29sIGVuYWJsZWQpCit7CisgICAgbV9pbnNwZWN0b3JDb250cm9sbGVyLT5z dGF0ZSgpLT5zZXRCb29sZWFuKEluc3BlY3RvclN0YXRlOjptb25pdG9yaW5nWEhSLCBlbmFibGVk KTsKKyAgICBtX2luc3BlY3RvckNvbnRyb2xsZXItPnNldHRpbmdzKCktPnNldEJvb2xlYW4oSW5z cGVjdG9yU2V0dGluZ3M6Ok1vbml0b3JpbmdYSFJFbmFibGVkLCBlbmFibGVkKTsKKyAgICBpZiAo bV9mcm9udGVuZCkKKyAgICAgICAgbV9mcm9udGVuZC0+bW9uaXRvcmluZ1hIUlN0YXRlQ2hhbmdl ZChlbmFibGVkKTsKK30KKwogdm9pZCBJbnNwZWN0b3JDb25zb2xlQWdlbnQ6OnNldENvbnNvbGVN ZXNzYWdlc0VuYWJsZWQoYm9vbCBlbmFibGVkKQogewotICAgIG1fc3RhdGUtPnNldEJvb2xlYW4o SW5zcGVjdG9yU3RhdGU6OmNvbnNvbGVNZXNzYWdlc0VuYWJsZWQsIGVuYWJsZWQpOwotICAgIGlm ICghbV9pbnNwZWN0b3JDb250cm9sbGVyLT5lbmFibGVkKCkpCisgICAgbV9pbnNwZWN0b3JDb250 cm9sbGVyLT5zdGF0ZSgpLT5zZXRCb29sZWFuKEluc3BlY3RvclN0YXRlOjpjb25zb2xlTWVzc2Fn ZXNFbmFibGVkLCBlbmFibGVkKTsKKyAgICBpZiAoIWVuYWJsZWQgfHwgIW1fZnJvbnRlbmQpCiAg ICAgICAgIHJldHVybjsKKworICAgIG1fZnJvbnRlbmQtPm1vbml0b3JpbmdYSFJTdGF0ZUNoYW5n ZWQobV9pbnNwZWN0b3JDb250cm9sbGVyLT5zdGF0ZSgpLT5nZXRCb29sZWFuKEluc3BlY3RvclN0 YXRlOjptb25pdG9yaW5nWEhSKSk7CiAgICAgaWYgKG1fZXhwaXJlZENvbnNvbGVNZXNzYWdlQ291 bnQpCiAgICAgICAgIG1fZnJvbnRlbmQtPnVwZGF0ZUNvbnNvbGVNZXNzYWdlRXhwaXJlZENvdW50 KG1fZXhwaXJlZENvbnNvbGVNZXNzYWdlQ291bnQpOwogICAgIHVuc2lnbmVkIG1lc3NhZ2VDb3Vu dCA9IG1fY29uc29sZU1lc3NhZ2VzLnNpemUoKTsKQEAgLTIxMCwxMiArMjIwLDEyIEBAIHZvaWQg SW5zcGVjdG9yQ29uc29sZUFnZW50OjphZGRDb25zb2xlTWVzc2FnZShQYXNzT3duUHRyPENvbnNv bGVNZXNzYWdlPiBjb25zb2xlCiAKICAgICBpZiAobV9wcmV2aW91c01lc3NhZ2UgJiYgbV9wcmV2 aW91c01lc3NhZ2UtPmlzRXF1YWwoY29uc29sZU1lc3NhZ2UuZ2V0KCkpKSB7CiAgICAgICAgIG1f cHJldmlvdXNNZXNzYWdlLT5pbmNyZW1lbnRDb3VudCgpOwotICAgICAgICBpZiAobV9zdGF0ZS0+ Z2V0Qm9vbGVhbihJbnNwZWN0b3JTdGF0ZTo6Y29uc29sZU1lc3NhZ2VzRW5hYmxlZCkgJiYgbV9m cm9udGVuZCkKKyAgICAgICAgaWYgKG1faW5zcGVjdG9yQ29udHJvbGxlci0+c3RhdGUoKS0+Z2V0 Qm9vbGVhbihJbnNwZWN0b3JTdGF0ZTo6Y29uc29sZU1lc3NhZ2VzRW5hYmxlZCkgJiYgbV9mcm9u dGVuZCkKICAgICAgICAgICAgIG1fcHJldmlvdXNNZXNzYWdlLT51cGRhdGVSZXBlYXRDb3VudElu Q29uc29sZShtX2Zyb250ZW5kKTsKICAgICB9IGVsc2UgewogICAgICAgICBtX3ByZXZpb3VzTWVz c2FnZSA9IGNvbnNvbGVNZXNzYWdlLmdldCgpOwogICAgICAgICBtX2NvbnNvbGVNZXNzYWdlcy5h cHBlbmQoY29uc29sZU1lc3NhZ2UpOwotICAgICAgICBpZiAobV9zdGF0ZS0+Z2V0Qm9vbGVhbihJ bnNwZWN0b3JTdGF0ZTo6Y29uc29sZU1lc3NhZ2VzRW5hYmxlZCkgJiYgbV9mcm9udGVuZCkKKyAg ICAgICAgaWYgKG1faW5zcGVjdG9yQ29udHJvbGxlci0+c3RhdGUoKS0+Z2V0Qm9vbGVhbihJbnNw ZWN0b3JTdGF0ZTo6Y29uc29sZU1lc3NhZ2VzRW5hYmxlZCkgJiYgbV9mcm9udGVuZCkKICAgICAg ICAgICAgIG1fcHJldmlvdXNNZXNzYWdlLT5hZGRUb0Zyb250ZW5kKG1fZnJvbnRlbmQsIG1faW5z cGVjdG9yQ29udHJvbGxlci0+aW5qZWN0ZWRTY3JpcHRIb3N0KCkpOwogICAgIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5oIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5oCmluZGV4IDk3 ZmNiM2YuLjNhMDVlZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JDb25zb2xlQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yQ29uc29sZUFnZW50LmgKQEAgLTQ4LDcgKzQ4LDcgQEAgY2xhc3MgU2NyaXB0UHJvZmlsZTsK IAogY2xhc3MgSW5zcGVjdG9yQ29uc29sZUFnZW50IDogcHVibGljIE5vbmNvcHlhYmxlIHsKIHB1 YmxpYzoKLSAgICBJbnNwZWN0b3JDb25zb2xlQWdlbnQoSW5zcGVjdG9yQ29udHJvbGxlciosIElu c3BlY3RvclN0YXRlKik7CisgICAgSW5zcGVjdG9yQ29uc29sZUFnZW50KEluc3BlY3RvckNvbnRy b2xsZXIqKTsKICAgICB+SW5zcGVjdG9yQ29uc29sZUFnZW50KCk7CiAKICAgICB2b2lkIHNldENv bnNvbGVNZXNzYWdlc0VuYWJsZWQoYm9vbCBlbmFibGVkLCBib29sKiBuZXdTdGF0ZSk7CkBAIC03 MCwxMyArNzAsMTMgQEAgcHVibGljOgogICAgIHZvaWQgYWRkUHJvZmlsZUZpbmlzaGVkTWVzc2Fn ZVRvQ29uc29sZShQYXNzUmVmUHRyPFNjcmlwdFByb2ZpbGU+LCB1bnNpZ25lZCBsaW5lTnVtYmVy LCBjb25zdCBTdHJpbmcmIHNvdXJjZVVSTCk7CiAgICAgdm9pZCBhZGRTdGFydFByb2ZpbGluZ01l c3NhZ2VUb0NvbnNvbGUoY29uc3QgU3RyaW5nJiB0aXRsZSwgdW5zaWduZWQgbGluZU51bWJlciwg Y29uc3QgU3RyaW5nJiBzb3VyY2VVUkwpOwogI2VuZGlmCisgICAgdm9pZCBzZXRNb25pdG9yaW5n WEhSRW5hYmxlZChib29sIGVuYWJsZWQpOwogCiBwcml2YXRlOgogICAgIHZvaWQgc2V0Q29uc29s ZU1lc3NhZ2VzRW5hYmxlZChib29sKTsKICAgICB2b2lkIGFkZENvbnNvbGVNZXNzYWdlKFBhc3NP d25QdHI8Q29uc29sZU1lc3NhZ2U+KTsKIAogICAgIEluc3BlY3RvckNvbnRyb2xsZXIqIG1faW5z cGVjdG9yQ29udHJvbGxlcjsKLSAgICBJbnNwZWN0b3JTdGF0ZSogbV9zdGF0ZTsKICAgICBJbnNw ZWN0b3JGcm9udGVuZCogbV9mcm9udGVuZDsKICAgICBDb25zb2xlTWVzc2FnZSogbV9wcmV2aW91 c01lc3NhZ2U7CiAgICAgVmVjdG9yPE93blB0cjxDb25zb2xlTWVzc2FnZT4gPiBtX2NvbnNvbGVN ZXNzYWdlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9s bGVyLmNwcAppbmRleCA4YjZiNmJmLi4yZDBhNWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC0xNDEsNyArMTQxLDcgQEAgSW5z cGVjdG9yQ29udHJvbGxlcjo6SW5zcGVjdG9yQ29udHJvbGxlcihQYWdlKiBwYWdlLCBJbnNwZWN0 b3JDbGllbnQqIGNsaWVudCkKICAgICAsIG1fc3RhdGUobmV3IEluc3BlY3RvclN0YXRlKGNsaWVu dCkpCiAgICAgLCBtX2luc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyKG5ldyBJbnNwZWN0b3JCYWNr ZW5kRGlzcGF0Y2hlcih0aGlzKSkKICAgICAsIG1faW5qZWN0ZWRTY3JpcHRIb3N0KEluamVjdGVk U2NyaXB0SG9zdDo6Y3JlYXRlKHRoaXMpKQotICAgICwgbV9jb25zb2xlQWdlbnQobmV3IEluc3Bl Y3RvckNvbnNvbGVBZ2VudCh0aGlzLCBtX3N0YXRlLmdldCgpKSkKKyAgICAsIG1fY29uc29sZUFn ZW50KG5ldyBJbnNwZWN0b3JDb25zb2xlQWdlbnQodGhpcykpCiAjaWYgRU5BQkxFKEpBVkFTQ1JJ UFRfREVCVUdHRVIpCiAgICAgLCBtX2F0dGFjaERlYnVnZ2VyV2hlblNob3duKGZhbHNlKQogICAg ICwgbV9wcm9maWxlckFnZW50KEluc3BlY3RvclByb2ZpbGVyQWdlbnQ6OmNyZWF0ZSh0aGlzKSkK QEAgLTIxNCwxMSArMjE0LDYgQEAgYm9vbCBJbnNwZWN0b3JDb250cm9sbGVyOjpzZWFyY2hpbmdG b3JOb2RlSW5QYWdlKCkgY29uc3QKICAgICByZXR1cm4gbV9zdGF0ZS0+Z2V0Qm9vbGVhbihJbnNw ZWN0b3JTdGF0ZTo6c2VhcmNoaW5nRm9yTm9kZSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yQ29udHJv bGxlcjo6Z2V0SW5zcGVjdG9yU3RhdGUoUmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIHN0YXRlKQot ewotICAgICpzdGF0ZSA9IG1fc3RhdGUtPmdlbmVyYXRlU3RhdGVPYmplY3RGb3JGcm9udGVuZCgp OwotfQotCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnJlc3RvcmVJbnNwZWN0b3JTdGF0ZUZy b21Db29raWUoY29uc3QgU3RyaW5nJiBpbnNwZWN0b3JTdGF0ZUNvb2tpZSkKIHsKICAgICBtX3N0 YXRlLT5yZXN0b3JlRnJvbUluc3BlY3RvckNvb2tpZShpbnNwZWN0b3JTdGF0ZUNvb2tpZSk7CkBA IC0zNzgsMTMgKzM3Myw2IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6c2V0U2VhcmNoaW5n Rm9yTm9kZShib29sIGVuYWJsZWQsIGJvb2wqIG5ld1N0YXRlKQogICAgIHNldFNlYXJjaGluZ0Zv ck5vZGUoZW5hYmxlZCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6c2V0TW9uaXRv cmluZ1hIUkVuYWJsZWQoYm9vbCBlbmFibGVkLCBib29sKiBuZXdTdGF0ZSkKLXsKLSAgICAqbmV3 U3RhdGUgPSBlbmFibGVkOwotICAgIG1fc3RhdGUtPnNldEJvb2xlYW4oSW5zcGVjdG9yU3RhdGU6 Om1vbml0b3JpbmdYSFIsIGVuYWJsZWQpOwotICAgIG1fc2V0dGluZ3MtPnNldEJvb2xlYW4oSW5z cGVjdG9yU2V0dGluZ3M6Ok1vbml0b3JpbmdYSFJFbmFibGVkLCBlbmFibGVkKTsKLX0KLQogdm9p ZCBJbnNwZWN0b3JDb250cm9sbGVyOjpjb25uZWN0RnJvbnRlbmQoKQogewogICAgIG1fb3Blbmlu Z0Zyb250ZW5kID0gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnRyb2xsZXIuaAppbmRleCBhYjgzNzdkLi4xZDliY2NlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKQEAgLTIzOSw2ICsyMzksOSBAQCBw dWJsaWM6CiAgICAgdm9pZCBzZXRJbnNwZWN0b3JBdHRhY2hlZEhlaWdodChsb25nIGhlaWdodCk7 CiAgICAgbG9uZyBpbnNwZWN0b3JBdHRhY2hlZEhlaWdodCgpIGNvbnN0OwogCisgICAgSW5zcGVj dG9yU3RhdGUqIHN0YXRlKCkgeyByZXR1cm4gbV9zdGF0ZS5nZXQoKTsgfQorICAgIEluc3BlY3Rv clNldHRpbmdzKiBzZXR0aW5ncygpIHsgcmV0dXJuIG1fc2V0dGluZ3MuZ2V0KCk7IH0KKwogcHJp dmF0ZToKICAgICBmcmllbmQgY2xhc3MgSW5zcGVjdG9yQmFja2VuZDsKICAgICBmcmllbmQgY2xh c3MgSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXI7CkBAIC0yNTAsOCArMjUzLDYgQEAgcHJpdmF0 ZToKIAogICAgIHZvaWQgZW5zdXJlU2V0dGluZ3NMb2FkZWQoKTsKIAotICAgIHZvaWQgZ2V0SW5z cGVjdG9yU3RhdGUoUmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIHN0YXRlKTsKLQogICAgIHZvaWQg cG9wdWxhdGVTY3JpcHRPYmplY3RzKCk7CiAgICAgdm9pZCBwdXNoRGF0YUNvbGxlY3RlZE9mZmxp bmUoKTsKICAgICB2b2lkIHJlc3RvcmVEZWJ1Z2dlcigpOwpAQCAtMjY2LDcgKzI2Nyw2IEBAIHBy aXZhdGU6CiAgICAgLy8gRm9sbG93aW5nIGFyZSB1c2VkIGZyb20gSW5zcGVjdG9yQmFja2VuZCBh bmQgaW50ZXJuYWxseS4KICAgICB2b2lkIHNldFNlYXJjaGluZ0Zvck5vZGUoYm9vbCBlbmFibGVk LCBib29sKiBuZXdTdGF0ZSk7CiAKLSAgICB2b2lkIHNldE1vbml0b3JpbmdYSFJFbmFibGVkKGJv b2wgZW5hYmxlZCwgYm9vbCogbmV3U3RhdGUpOwogICAgIHZvaWQgcmVsZWFzZUZyb250ZW5kTGlm ZXRpbWVBZ2VudHMoKTsKIAogI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0YXRlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdGF0ZS5jcHAKaW5kZXggMWI3NDUxOC4uMDBj MmEzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0YXRl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3RhdGUuY3BwCkBA IC0zOSwxNSArMzksMTIgQEAgSW5zcGVjdG9yU3RhdGU6Okluc3BlY3RvclN0YXRlKEluc3BlY3Rv ckNsaWVudCogY2xpZW50KQogICAgIDogbV9jbGllbnQoY2xpZW50KQogewogICAgIC8vIFB1cmUg cmVsb2FkIHN0YXRlCi0gICAgcmVnaXN0ZXJCb29sZWFuKHVzZXJJbml0aWF0ZWRQcm9maWxpbmcs IGZhbHNlLCBTdHJpbmcoKSk7Ci0gICAgcmVnaXN0ZXJCb29sZWFuKHRpbWVsaW5lUHJvZmlsZXJF bmFibGVkLCBmYWxzZSwgU3RyaW5nKCkpOwotICAgIHJlZ2lzdGVyQm9vbGVhbihzZWFyY2hpbmdG b3JOb2RlLCBmYWxzZSwgU3RyaW5nKCkpOwotICAgIHJlZ2lzdGVyT2JqZWN0KHN0aWNreUJyZWFr cG9pbnRzLCBTdHJpbmcoKSk7Ci0KLSAgICAvLyBTaG91bGQgZ28gYXdheQotICAgIHJlZ2lzdGVy Qm9vbGVhbihjb25zb2xlTWVzc2FnZXNFbmFibGVkLCBmYWxzZSwgImNvbnNvbGVNZXNzYWdlc0Vu YWJsZWQiKTsKLSAgICByZWdpc3RlckJvb2xlYW4obW9uaXRvcmluZ1hIUiwgZmFsc2UsICJtb25p dG9yaW5nWEhSRW5hYmxlZCIpOwotICAgIHJlZ2lzdGVyTG9uZyhwYXVzZU9uRXhjZXB0aW9uc1N0 YXRlLCAwLCAicGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSIpOworICAgIHJlZ2lzdGVyQm9vbGVhbih1 c2VySW5pdGlhdGVkUHJvZmlsaW5nLCBmYWxzZSk7CisgICAgcmVnaXN0ZXJCb29sZWFuKHRpbWVs aW5lUHJvZmlsZXJFbmFibGVkLCBmYWxzZSk7CisgICAgcmVnaXN0ZXJCb29sZWFuKHNlYXJjaGlu Z0Zvck5vZGUsIGZhbHNlKTsKKyAgICByZWdpc3Rlck9iamVjdChzdGlja3lCcmVha3BvaW50cyk7 CisgICAgcmVnaXN0ZXJCb29sZWFuKGNvbnNvbGVNZXNzYWdlc0VuYWJsZWQsIGZhbHNlKTsKKyAg ICByZWdpc3RlckJvb2xlYW4obW9uaXRvcmluZ1hIUiwgZmFsc2UpOwogfQogCiB2b2lkIEluc3Bl Y3RvclN0YXRlOjpyZXN0b3JlRnJvbUluc3BlY3RvckNvb2tpZShjb25zdCBTdHJpbmcmIGpzb24p CkBAIC03MCwxNiArNjcsNiBAQCB2b2lkIEluc3BlY3RvclN0YXRlOjpyZXN0b3JlRnJvbUluc3Bl Y3RvckNvb2tpZShjb25zdCBTdHJpbmcmIGpzb24pCiAgICAgfQogfQogCi1QYXNzUmVmUHRyPElu c3BlY3Rvck9iamVjdD4gSW5zcGVjdG9yU3RhdGU6OmdlbmVyYXRlU3RhdGVPYmplY3RGb3JGcm9u dGVuZCgpCi17Ci0gICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gc3RhdGVPYmplY3QgPSBJbnNw ZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwotICAgIGZvciAoUHJvcGVydHlNYXA6Oml0ZXJhdG9yIGkg PSBtX3Byb3BlcnRpZXMuYmVnaW4oKTsgaSAhPSBtX3Byb3BlcnRpZXMuZW5kKCk7ICsraSkgewot ICAgICAgICBpZiAoaS0+c2Vjb25kLm1fZnJvbnRlbmRBbGlhcy5sZW5ndGgoKSkKLSAgICAgICAg ICAgIHN0YXRlT2JqZWN0LT5zZXRWYWx1ZShpLT5zZWNvbmQubV9mcm9udGVuZEFsaWFzLCBpLT5z ZWNvbmQubV92YWx1ZSk7Ci0gICAgfQotICAgIHJldHVybiBzdGF0ZU9iamVjdC5yZWxlYXNlKCk7 Ci19Ci0KIHZvaWQgSW5zcGVjdG9yU3RhdGU6OnVwZGF0ZUNvb2tpZSgpCiB7CiAgICAgUmVmUHRy PEluc3BlY3Rvck9iamVjdD4gY29va2llT2JqZWN0ID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUo KTsKQEAgLTEzOSwzMSArMTI2LDMwIEBAIHZvaWQgSW5zcGVjdG9yU3RhdGU6OnNldE9iamVjdChJ bnNwZWN0b3JQcm9wZXJ0eUlkIGlkLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjCiAgICAgdXBk YXRlQ29va2llKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yU3RhdGU6OnJlZ2lzdGVyQm9vbGVhbihJ bnNwZWN0b3JQcm9wZXJ0eUlkIHByb3BlcnR5SWQsIGJvb2wgdmFsdWUsIGNvbnN0IFN0cmluZyYg ZnJvbnRlbmRBbGlhcykKK3ZvaWQgSW5zcGVjdG9yU3RhdGU6OnJlZ2lzdGVyQm9vbGVhbihJbnNw ZWN0b3JQcm9wZXJ0eUlkIHByb3BlcnR5SWQsIGJvb2wgdmFsdWUpCiB7Ci0gICAgbV9wcm9wZXJ0 aWVzLnNldChwcm9wZXJ0eUlkLCBQcm9wZXJ0eTo6Y3JlYXRlKEluc3BlY3RvckJhc2ljVmFsdWU6 OmNyZWF0ZSh2YWx1ZSksIGZyb250ZW5kQWxpYXMpKTsKKyAgICBtX3Byb3BlcnRpZXMuc2V0KHBy b3BlcnR5SWQsIFByb3BlcnR5OjpjcmVhdGUoSW5zcGVjdG9yQmFzaWNWYWx1ZTo6Y3JlYXRlKHZh bHVlKSkpOwogfQogCi12b2lkIEluc3BlY3RvclN0YXRlOjpyZWdpc3RlclN0cmluZyhJbnNwZWN0 b3JQcm9wZXJ0eUlkIHByb3BlcnR5SWQsIGNvbnN0IFN0cmluZyYgdmFsdWUsIGNvbnN0IFN0cmlu ZyYgZnJvbnRlbmRBbGlhcykKK3ZvaWQgSW5zcGVjdG9yU3RhdGU6OnJlZ2lzdGVyU3RyaW5nKElu c3BlY3RvclByb3BlcnR5SWQgcHJvcGVydHlJZCwgY29uc3QgU3RyaW5nJiB2YWx1ZSkKIHsKLSAg ICBtX3Byb3BlcnRpZXMuc2V0KHByb3BlcnR5SWQsIFByb3BlcnR5OjpjcmVhdGUoSW5zcGVjdG9y U3RyaW5nOjpjcmVhdGUodmFsdWUpLCBmcm9udGVuZEFsaWFzKSk7CisgICAgbV9wcm9wZXJ0aWVz LnNldChwcm9wZXJ0eUlkLCBQcm9wZXJ0eTo6Y3JlYXRlKEluc3BlY3RvclN0cmluZzo6Y3JlYXRl KHZhbHVlKSkpOwogfQogCi12b2lkIEluc3BlY3RvclN0YXRlOjpyZWdpc3RlckxvbmcoSW5zcGVj dG9yUHJvcGVydHlJZCBwcm9wZXJ0eUlkLCBsb25nIHZhbHVlLCBjb25zdCBTdHJpbmcmIGZyb250 ZW5kQWxpYXMpCit2b2lkIEluc3BlY3RvclN0YXRlOjpyZWdpc3RlckxvbmcoSW5zcGVjdG9yUHJv cGVydHlJZCBwcm9wZXJ0eUlkLCBsb25nIHZhbHVlKQogewotICAgIG1fcHJvcGVydGllcy5zZXQo cHJvcGVydHlJZCwgUHJvcGVydHk6OmNyZWF0ZShJbnNwZWN0b3JCYXNpY1ZhbHVlOjpjcmVhdGUo KGRvdWJsZSl2YWx1ZSksIGZyb250ZW5kQWxpYXMpKTsKKyAgICBtX3Byb3BlcnRpZXMuc2V0KHBy b3BlcnR5SWQsIFByb3BlcnR5OjpjcmVhdGUoSW5zcGVjdG9yQmFzaWNWYWx1ZTo6Y3JlYXRlKChk b3VibGUpdmFsdWUpKSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yU3RhdGU6OnJlZ2lzdGVyT2JqZWN0 KEluc3BlY3RvclByb3BlcnR5SWQgcHJvcGVydHlJZCwgY29uc3QgU3RyaW5nJiBmcm9udGVuZEFs aWFzKQordm9pZCBJbnNwZWN0b3JTdGF0ZTo6cmVnaXN0ZXJPYmplY3QoSW5zcGVjdG9yUHJvcGVy dHlJZCBwcm9wZXJ0eUlkKQogewotICAgIG1fcHJvcGVydGllcy5zZXQocHJvcGVydHlJZCwgUHJv cGVydHk6OmNyZWF0ZShJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpLCBmcm9udGVuZEFsaWFzKSk7 CisgICAgbV9wcm9wZXJ0aWVzLnNldChwcm9wZXJ0eUlkLCBQcm9wZXJ0eTo6Y3JlYXRlKEluc3Bl Y3Rvck9iamVjdDo6Y3JlYXRlKCkpKTsKIH0KIAotSW5zcGVjdG9yU3RhdGU6OlByb3BlcnR5IElu c3BlY3RvclN0YXRlOjpQcm9wZXJ0eTo6Y3JlYXRlKFBhc3NSZWZQdHI8SW5zcGVjdG9yVmFsdWU+ IHZhbHVlLCBjb25zdCBTdHJpbmcmIGZyb250ZW5kQWxpYXMpCitJbnNwZWN0b3JTdGF0ZTo6UHJv cGVydHkgSW5zcGVjdG9yU3RhdGU6OlByb3BlcnR5OjpjcmVhdGUoUGFzc1JlZlB0cjxJbnNwZWN0 b3JWYWx1ZT4gdmFsdWUpCiB7CiAgICAgUHJvcGVydHkgcHJvcGVydHk7CiAgICAgcHJvcGVydHku bV92YWx1ZSA9IHZhbHVlOwotICAgIHByb3BlcnR5Lm1fZnJvbnRlbmRBbGlhcyA9IGZyb250ZW5k QWxpYXM7CiAgICAgcmV0dXJuIHByb3BlcnR5OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yU3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JTdGF0ZS5oCmluZGV4IDMxNDJjOTIuLjE1ZTJiNTcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdGF0ZS5oCkBAIC00Nyw3ICs0Nyw2IEBAIHB1YmxpYzoK ICAgICAgICAgbW9uaXRvcmluZ1hIUiA9IDEsCiAgICAgICAgIHRpbWVsaW5lUHJvZmlsZXJFbmFi bGVkLAogICAgICAgICBzZWFyY2hpbmdGb3JOb2RlLAotICAgICAgICBwYXVzZU9uRXhjZXB0aW9u c1N0YXRlLAogICAgICAgICBjb25zb2xlTWVzc2FnZXNFbmFibGVkLAogICAgICAgICB1c2VySW5p dGlhdGVkUHJvZmlsaW5nLAogICAgICAgICBzdGlja3lCcmVha3BvaW50cywKQEAgLTU2LDkgKzU1 LDcgQEAgcHVibGljOgogCiAgICAgSW5zcGVjdG9yU3RhdGUoSW5zcGVjdG9yQ2xpZW50KiBjbGll bnQpOwogCi0gICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGdlbmVyYXRlU3RhdGVPYmpl Y3RGb3JGcm9udGVuZCgpOwogICAgIHZvaWQgcmVzdG9yZUZyb21JbnNwZWN0b3JDb29raWUoY29u c3QgU3RyaW5nJiBqc29uU3RyaW5nKTsKLSAgICBTdHJpbmcgZ2V0RnJvbnRlbmRBbGlhcyhJbnNw ZWN0b3JQcm9wZXJ0eUlkIHByb3BlcnR5SWQpOwogCiAgICAgYm9vbCBnZXRCb29sZWFuKEluc3Bl Y3RvclByb3BlcnR5SWQgcHJvcGVydHlJZCk7CiAgICAgU3RyaW5nIGdldFN0cmluZyhJbnNwZWN0 b3JQcm9wZXJ0eUlkIHByb3BlcnR5SWQpOwpAQCAtNzUsMTcgKzcyLDE2IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBzZXRWYWx1ZShJbnNwZWN0b3JQcm9wZXJ0eUlkIHByb3BlcnR5SWQsIFBhc3NSZWZQ dHI8SW5zcGVjdG9yVmFsdWU+IHZhbHVlKTsKIAogICAgIHN0cnVjdCBQcm9wZXJ0eSB7Ci0gICAg ICAgIHN0YXRpYyBQcm9wZXJ0eSBjcmVhdGUoUGFzc1JlZlB0cjxJbnNwZWN0b3JWYWx1ZT4gdmFs dWUsIGNvbnN0IFN0cmluZyYgZnJvbnRlbmRBbGlhcyk7Ci0gICAgICAgIFN0cmluZyBtX2Zyb250 ZW5kQWxpYXM7CisgICAgICAgIHN0YXRpYyBQcm9wZXJ0eSBjcmVhdGUoUGFzc1JlZlB0cjxJbnNw ZWN0b3JWYWx1ZT4gdmFsdWUpOwogICAgICAgICBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IG1fdmFs dWU7CiAgICAgfTsKICAgICB0eXBlZGVmIEhhc2hNYXA8bG9uZywgUHJvcGVydHk+IFByb3BlcnR5 TWFwOwogICAgIFByb3BlcnR5TWFwIG1fcHJvcGVydGllczsKIAotICAgIHZvaWQgcmVnaXN0ZXJC b29sZWFuKEluc3BlY3RvclByb3BlcnR5SWQgcHJvcGVydHlJZCwgYm9vbCB2YWx1ZSwgY29uc3Qg U3RyaW5nJiBmcm9udGVuZEFsaWFzKTsKLSAgICB2b2lkIHJlZ2lzdGVyU3RyaW5nKEluc3BlY3Rv clByb3BlcnR5SWQgcHJvcGVydHlJZCwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgY29uc3QgU3RyaW5n JiBmcm9udGVuZEFsaWFzKTsKLSAgICB2b2lkIHJlZ2lzdGVyTG9uZyhJbnNwZWN0b3JQcm9wZXJ0 eUlkIHByb3BlcnR5SWQsIGxvbmcgdmFsdWUsIGNvbnN0IFN0cmluZyYgZnJvbnRlbmRBbGlhcyk7 Ci0gICAgdm9pZCByZWdpc3Rlck9iamVjdChJbnNwZWN0b3JQcm9wZXJ0eUlkIHByb3BlcnR5SWQs IGNvbnN0IFN0cmluZyYgZnJvbnRlbmRBbGlhcyk7CisgICAgdm9pZCByZWdpc3RlckJvb2xlYW4o SW5zcGVjdG9yUHJvcGVydHlJZCBwcm9wZXJ0eUlkLCBib29sIHZhbHVlKTsKKyAgICB2b2lkIHJl Z2lzdGVyU3RyaW5nKEluc3BlY3RvclByb3BlcnR5SWQgcHJvcGVydHlJZCwgY29uc3QgU3RyaW5n JiB2YWx1ZSk7CisgICAgdm9pZCByZWdpc3RlckxvbmcoSW5zcGVjdG9yUHJvcGVydHlJZCBwcm9w ZXJ0eUlkLCBsb25nIHZhbHVlKTsKKyAgICB2b2lkIHJlZ2lzdGVyT2JqZWN0KEluc3BlY3RvclBy b3BlcnR5SWQgcHJvcGVydHlJZCk7CiAKICAgICBJbnNwZWN0b3JDbGllbnQqIG1fY2xpZW50Owog fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29s ZVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3 LmpzCmluZGV4IGFiYzA4NDIuLmJkMDhlNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwpAQCAtMTQ5LDYgKzE0OSwxMSBAQCBXZWJJ bnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgY29uc29sZU1l c3NhZ2VzQ2xlYXJlZDogZnVuY3Rpb24oKQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAg IGNvbnNvbGUuY2xlYXJNZXNzYWdlcygpOworICAgICAgICAgICAgfSwKKworICAgICAgICAgICAg bW9uaXRvcmluZ1hIUlN0YXRlQ2hhbmdlZDogZnVuY3Rpb24oZW5hYmxlZCkKKyAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICBjb25zb2xlLl9tb25pdG9yaW5nWEhSRW5hYmxlZCA9IGVuYWJs ZWQ7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5y ZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIoIkNvbnNvbGUiLCBkaXNwYXRjaGVyKTsKQEAgLTQxMywx NCArNDE4LDkgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQogCisgICAgICAgIHZhciBpdGVtQWN0aW9uID0gSW5z cGVjdG9yQmFja2VuZC5zZXRNb25pdG9yaW5nWEhSRW5hYmxlZC5iaW5kKEluc3BlY3RvckJhY2tl bmQsICF0aGlzLl9tb25pdG9yaW5nWEhSRW5hYmxlZCk7CiAgICAgICAgIHZhciBjb250ZXh0TWVu dSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKLQotICAgICAgICBmdW5jdGlvbiBt b25pdG9yaW5nWEhSV2FzQ2hhbmdlZChuZXdTdGF0ZSkKLSAgICAgICAgewotICAgICAgICAgICAg V2ViSW5zcGVjdG9yLm1vbml0b3JpbmdYSFJFbmFibGVkID0gbmV3U3RhdGU7Ci0gICAgICAgIH0K LSAgICAgICAgdmFyIGl0ZW1BY3Rpb24gPSBJbnNwZWN0b3JCYWNrZW5kLnNldE1vbml0b3JpbmdY SFJFbmFibGVkLmJpbmQoSW5zcGVjdG9yQmFja2VuZCwgIVdlYkluc3BlY3Rvci5tb25pdG9yaW5n WEhSRW5hYmxlZCwgbW9uaXRvcmluZ1hIUldhc0NoYW5nZWQpOwotICAgICAgICBjb250ZXh0TWVu dS5hcHBlbmRDaGVja2JveEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJYTUxIdHRwUmVxdWVz dCBsb2dnaW5nIiksIGl0ZW1BY3Rpb24sIFdlYkluc3BlY3Rvci5tb25pdG9yaW5nWEhSRW5hYmxl ZCk7CisgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZENoZWNrYm94SXRlbShXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIlhNTEh0dHBSZXF1ZXN0IGxvZ2dpbmciKSwgaXRlbUFjdGlvbiwgdGhpcy5fbW9u aXRvcmluZ1hIUkVuYWJsZWQpOwogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYklu c3BlY3Rvci5VSVN0cmluZygiQ2xlYXIgQ29uc29sZSIpLCB0aGlzLnJlcXVlc3RDbGVhck1lc3Nh Z2VzLmJpbmQodGhpcykpOwogICAgICAgICBjb250ZXh0TWVudS5zaG93KGV2ZW50KTsKICAgICB9 LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpp bmRleCAyOTNjNmQ5Li45MDk2ZDAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtNjAxLDEyICs2MDEsNiBAQCBXZWJJbnNwZWN0b3Iu ZG9Mb2FkZWREb25lID0gZnVuY3Rpb24oKQogCiAgICAgdGhpcy5leHRlbnNpb25TZXJ2ZXIuaW5p dEV4dGVuc2lvbnMoKTsKIAotICAgIGZ1bmN0aW9uIHBvcHVsYXRlSW5zcGVjdG9yU3RhdGUoaW5z cGVjdG9yU3RhdGUpCi0gICAgewotICAgICAgICBXZWJJbnNwZWN0b3IubW9uaXRvcmluZ1hIUkVu YWJsZWQgPSBpbnNwZWN0b3JTdGF0ZS5tb25pdG9yaW5nWEhSRW5hYmxlZDsKLSAgICB9Ci0gICAg SW5zcGVjdG9yQmFja2VuZC5nZXRJbnNwZWN0b3JTdGF0ZShwb3B1bGF0ZUluc3BlY3RvclN0YXRl KTsKLQogICAgIGZ1bmN0aW9uIG9uUG9wdWxhdGVTY3JpcHRPYmplY3RzKCkKICAgICB7CiAgICAg ICAgIGlmICghV2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbCkK