70257 2011-10-17 12:50:56 -0700 Rename static deleteProperty to deletePropertyByIndex 2011-10-20 11:15:14 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 67690 1 mhahnenberg mhahnenberg webkit.review.bot oldest_to_newest 485407 0 mhahnenberg 2011-10-17 12:50:56 -0700 There are two versions of deleteProperty, one that uses an Identifier and the other that uses an unsigned. When we override only one of those versions in a class, the other name in the parent class is hidden. In order to avoid this when defining the MethodTable for such a class, we need give distinct names to each version. We will rename the version that takes an unsigned to deletePropertyByIndex. This will also be a good change because the way in which clients invoke functions in the MethodTable will match their actual declarations (since each entry in the MethodTable also needs a unique name). 485467 1 111312 mhahnenberg 2011-10-17 13:44:44 -0700 Created attachment 111312 Patch 485471 2 webkit.review.bot 2011-10-17 13:46:29 -0700 Attachment 111312 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit', '--chromium']" exit_code: 2 Updating OpenSource From git://git.webkit.org/WebKit b2fbe31..928c0b6 master -> origin/master M Source/JavaScriptCore/runtime/Structure.h M Source/JavaScriptCore/runtime/WriteBarrier.h M Source/JavaScriptCore/runtime/JSObject.h M Source/JavaScriptCore/runtime/JSObject.cpp M Source/JavaScriptCore/runtime/JSArray.h M Source/JavaScriptCore/runtime/JSArray.cpp M Source/JavaScriptCore/ChangeLog M Source/JavaScriptCore/JavaScriptCore.exp M Source/JavaScriptCore/heap/SlotVisitor.h M Source/JavaScriptCore/heap/HeapRootVisitor.h M Source/JavaScriptCore/heap/Heap.cpp M Source/JavaScriptCore/heap/MarkStack.cpp M Source/JavaScriptCore/heap/HandleStack.cpp M Source/JavaScriptCore/heap/MarkStack.h r97642 = 3a7b479fc5c50d3b73427fb39b538f77e3c2a079 (refs/remotes/trunk) M Source/WebCore/ChangeLog M Source/WebCore/page/Frame.cpp M Source/WebCore/page/DOMWindow.h M Source/WebCore/page/DOMWindow.cpp M Source/WebCore/notifications/NotificationCenter.cpp A Source/WebCore/manual-tests/iframe_notifications/iframe-reparenting-close-window.html A Source/WebCore/manual-tests/iframe_notifications/iframe-reparenting-close-window-child.html A Source/WebCore/manual-tests/iframe_notifications/iframe-reparenting-close-window-iframe.html r97643 = 928c0b66202c13784242f405cda156284c4eddea (refs/remotes/trunk) First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/trunk. Updating chromium port dependencies using gclient... Error: Can't switch the checkout to http://v8.googlecode.com/svn/branches/3.6@9637; UUID don't match and there is local changes in /mnt/git/webkit-style-queue/Source/WebKit/chromium/v8. Delete the directory and try again. Re-trying 'depot_tools/gclient sync' Error: Can't switch the checkout to http://v8.googlecode.com/svn/branches/3.6@9637; UUID don't match and there is local changes in /mnt/git/webkit-style-queue/Source/WebKit/chromium/v8. Delete the directory and try again. Re-trying 'depot_tools/gclient sync' Error: Can't switch the checkout to http://v8.googlecode.com/svn/branches/3.6@9637; UUID don't match and there is local changes in /mnt/git/webkit-style-queue/Source/WebKit/chromium/v8. Delete the directory and try again. Error: 'depot_tools/gclient sync' failed 3 tries and returned 256 at Tools/Scripts/update-webkit-chromium line 107. Re-trying 'depot_tools/gclient sync' No such file or directory at Tools/Scripts/update-webkit line 104. If any of these errors are false positives, please file a bug against check-webkit-style. 486369 3 111312 ggaren 2011-10-18 15:49:23 -0700 Comment on attachment 111312 Patch r=me 487199 4 111312 webkit.review.bot 2011-10-19 18:30:21 -0700 Comment on attachment 111312 Patch Rejecting attachment 111312 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: n/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Updating chromium port dependencies using gclient... ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/10176114 487715 5 mhahnenberg 2011-10-20 11:15:14 -0700 Committed r98002: <http://trac.webkit.org/changeset/98002> 111312 2011-10-17 13:44:44 -0700 2011-10-19 18:30:21 -0700 Patch bug-70257-20111017134443.patch text/plain 19167 mhahnenberg U3VidmVyc2lvbiBSZXZpc2lvbjogOTc2MzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDZk MjYwOGJmMGVhNmM2NTJlYjk1ODdiMGZmODcyMDJjYmM3MTJlNDQuLmEzNzliOTZmZGRkMTIwNGVl NDllYjE5OWNmZjYxYzRkMzQ5ZThlNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDQyIEBACisyMDExLTEwLTE3ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBs ZS5jb20+CisKKyAgICAgICAgUmVuYW1lIHN0YXRpYyBkZWxldGVQcm9wZXJ0eSB0byBkZWxldGVQ cm9wZXJ0eUJ5SW5kZXgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTcwMjU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgUmVuYW1pbmcgdmVyc2lvbnMgb2YgZGVsZXRlUHJvcGVydHkgdGhhdCB1c2UgYW4gdW5z aWduZWQgYXMgdGhlIHByb3BlcnR5CisgICAgICAgIG5hbWUgdG8gImRlbGV0ZVByb3BlcnR5QnlJ bmRleCIgaW4gcHJlcGFyYXRpb24gZm9yIGFkZGluZyB0aGVtIHRvIHRoZSAKKyAgICAgICAgTWV0 aG9kVGFibGUsIHdoaWNoIHJlcXVpcmVzIHVuaXF1ZSBuYW1lcyBmb3IgZWFjaCBtZXRob2QuCisK KyAgICAgICAgKiBBUEkvSlNDYWxsYmFja09iamVjdC5oOgorICAgICAgICAqIEFQSS9KU0NhbGxi YWNrT2JqZWN0RnVuY3Rpb25zLmg6CisgICAgICAgIChKU0M6Ojo6ZGVsZXRlUHJvcGVydHlWaXJ0 dWFsKToKKyAgICAgICAgKEpTQzo6OjpkZWxldGVQcm9wZXJ0eUJ5SW5kZXgpOgorICAgICAgICAq IHJ1bnRpbWUvQXJndW1lbnRzLmNwcDoKKyAgICAgICAgKEpTQzo6QXJndW1lbnRzOjpkZWxldGVQ cm9wZXJ0eVZpcnR1YWwpOgorICAgICAgICAoSlNDOjpBcmd1bWVudHM6OmRlbGV0ZVByb3BlcnR5 QnlJbmRleCk6CisgICAgICAgICogcnVudGltZS9Bcmd1bWVudHMuaDoKKyAgICAgICAgKiBydW50 aW1lL0pTQXJyYXkuY3BwOgorICAgICAgICAoSlNDOjpKU0FycmF5OjpkZWxldGVQcm9wZXJ0eVZp cnR1YWwpOgorICAgICAgICAoSlNDOjpKU0FycmF5OjpkZWxldGVQcm9wZXJ0eUJ5SW5kZXgpOgor ICAgICAgICAqIHJ1bnRpbWUvSlNBcnJheS5oOgorICAgICAgICAqIHJ1bnRpbWUvSlNDZWxsLmNw cDoKKyAgICAgICAgKEpTQzo6SlNDZWxsOjpkZWxldGVQcm9wZXJ0eVZpcnR1YWwpOgorICAgICAg ICAoSlNDOjpKU0NlbGw6OmRlbGV0ZVByb3BlcnR5QnlJbmRleCk6CisgICAgICAgICogcnVudGlt ZS9KU0NlbGwuaDoKKyAgICAgICAgKiBydW50aW1lL0pTTm90QW5PYmplY3QuY3BwOgorICAgICAg ICAoSlNDOjpKU05vdEFuT2JqZWN0OjpkZWxldGVQcm9wZXJ0eVZpcnR1YWwpOgorICAgICAgICAo SlNDOjpKU05vdEFuT2JqZWN0OjpkZWxldGVQcm9wZXJ0eUJ5SW5kZXgpOgorICAgICAgICAqIHJ1 bnRpbWUvSlNOb3RBbk9iamVjdC5oOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3QuY3BwOgor ICAgICAgICAoSlNDOjpKU09iamVjdDo6ZGVsZXRlUHJvcGVydHlWaXJ0dWFsKToKKyAgICAgICAg KEpTQzo6SlNPYmplY3Q6OmRlbGV0ZVByb3BlcnR5QnlJbmRleCk6CisgICAgICAgICogcnVudGlt ZS9KU09iamVjdC5oOgorICAgICAgICAqIHJ1bnRpbWUvUmVnRXhwTWF0Y2hlc0FycmF5Lmg6Cisg ICAgICAgIChKU0M6OlJlZ0V4cE1hdGNoZXNBcnJheTo6ZGVsZXRlUHJvcGVydHlWaXJ0dWFsKToK KyAgICAgICAgKEpTQzo6UmVnRXhwTWF0Y2hlc0FycmF5OjpkZWxldGVQcm9wZXJ0eUJ5SW5kZXgp OgorCiAyMDExLTEwLTE3ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAg ICBXaW5kb3dzIGJ1aWxkIGZpeCBhZnRlciByOTc1MzYsIHBhcnQgMwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGY1 ZmFmZTQ5MWRkYTI4NjU0ODY5MDFlMmVmNGExMzY1NzI0MjJhYjQuLjYxZTEyMTYyYWYyMWU0ZDNl ODU3MWZmNjljYzY5ZTcyNTYzYzUzMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAx MS0xMC0xNyAgTWFyayBIYWhuZW5iZXJnICA8bWhhaG5lbmJlcmdAYXBwbGUuY29tPgorCisgICAg ICAgIFJlbmFtZSBzdGF0aWMgZGVsZXRlUHJvcGVydHkgdG8gZGVsZXRlUHJvcGVydHlCeUluZGV4 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDI1Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4gKE9PUFMhKQorCisgICAgICAgIFJlbmFtaW5nIHZlcnNpb25zIG9mIGRlbGV0ZVByb3Bl cnR5IHRoYXQgdXNlIGFuIHVuc2lnbmVkIGFzIHRoZSBwcm9wZXJ0eQorICAgICAgICBuYW1lIHRv ICJkZWxldGVQcm9wZXJ0eUJ5SW5kZXgiIGluIHByZXBhcmF0aW9uIGZvciBhZGRpbmcgdGhlbSB0 byB0aGUgCisgICAgICAgIE1ldGhvZFRhYmxlLCB3aGljaCByZXF1aXJlcyB1bmlxdWUgbmFtZXMg Zm9yIGVhY2ggbWV0aG9kLgorCisgICAgICAgICogYnJpZGdlL3J1bnRpbWVfYXJyYXkuY3BwOgor ICAgICAgICAoSlNDOjpSdW50aW1lQXJyYXk6OmRlbGV0ZVByb3BlcnR5VmlydHVhbCk6CisgICAg ICAgIChKU0M6OlJ1bnRpbWVBcnJheTo6ZGVsZXRlUHJvcGVydHlCeUluZGV4KToKKyAgICAgICAg KiBicmlkZ2UvcnVudGltZV9hcnJheS5oOgorCiAyMDExLTEwLTE3ICBSeW9zdWtlIE5pd2EgIDxy bml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFRvdWNoIEludGVybmFscy5jcHAgdG8gbWFrZSA2 NC1iaXQgR1RLKyBidWlsZCBoYXBweS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA0YzM5ODEwYWZhNDNlYjUyNTEy OWZkNmExZWI3YTZkZjY2MzM0M2M5Li5jNjY0YjM3YmE3YWUzMThiNjJjMDgwYjhhNzg3NDBlYTUw MTcyODllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTAtMTcgIE1hcmsgSGFo bmVuYmVyZyAgPG1oYWhuZW5iZXJnQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgc3RhdGlj IGRlbGV0ZVByb3BlcnR5IHRvIGRlbGV0ZVByb3BlcnR5QnlJbmRleAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzAyNTcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWluZyB2ZXJzaW9ucyBvZiBkZWxl dGVQcm9wZXJ0eSB0aGF0IHVzZSBhbiB1bnNpZ25lZCBhcyB0aGUgcHJvcGVydHkKKyAgICAgICAg bmFtZSB0byAiZGVsZXRlUHJvcGVydHlCeUluZGV4IiBpbiBwcmVwYXJhdGlvbiBmb3IgYWRkaW5n IHRoZW0gdG8gdGhlIAorICAgICAgICBNZXRob2RUYWJsZSwgd2hpY2ggcmVxdWlyZXMgdW5pcXVl IG5hbWVzIGZvciBlYWNoIG1ldGhvZC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9O ZXRzY2FwZS9KU05QT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6SlNOUE9iamVjdDo6ZGVs ZXRlUHJvcGVydHlWaXJ0dWFsKToKKyAgICAgICAgKFdlYktpdDo6SlNOUE9iamVjdDo6ZGVsZXRl UHJvcGVydHlCeUluZGV4KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUv SlNOUE9iamVjdC5oOgorCiAyMDExLTEwLTE3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJj aWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBBZGQgbWV0aG9kcyB0byBnZXQvc2V0IGEg Y3VzdG9tIHRleHQgZW5jb25kaW5nIHRvIFdlYktpdDIgR1RLKyBBUEkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNDYWxsYmFja09iamVjdC5oIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL0FQSS9KU0NhbGxiYWNrT2JqZWN0LmgKaW5kZXggYzA2NDRhMGRlZjAzMTk0NTRl MmYyYzdmZTk4Y2VjZDQ1OTNkYzkxYy4uM2QwOTI5NzA3MDdkZDQ5NjQ0Y2U1NGVmOWYxOWRiODNm ZGNkODk0YSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NhbGxiYWNr T2JqZWN0LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NhbGxiYWNrT2JqZWN0 LmgKQEAgLTE4OCw3ICsxODgsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBkZWxldGVQ cm9wZXJ0eVZpcnR1YWwoRXhlY1N0YXRlKiwgY29uc3QgSWRlbnRpZmllciYpOwogICAgIHN0YXRp YyBib29sIGRlbGV0ZVByb3BlcnR5KEpTQ2VsbCosIEV4ZWNTdGF0ZSosIGNvbnN0IElkZW50aWZp ZXImKTsKICAgICB2aXJ0dWFsIGJvb2wgZGVsZXRlUHJvcGVydHlWaXJ0dWFsKEV4ZWNTdGF0ZSos IHVuc2lnbmVkKTsKLSAgICBzdGF0aWMgYm9vbCBkZWxldGVQcm9wZXJ0eShKU0NlbGwqLCBFeGVj U3RhdGUqLCB1bnNpZ25lZCk7CisgICAgc3RhdGljIGJvb2wgZGVsZXRlUHJvcGVydHlCeUluZGV4 KEpTQ2VsbCosIEV4ZWNTdGF0ZSosIHVuc2lnbmVkKTsKIAogICAgIHZpcnR1YWwgYm9vbCBoYXNJ bnN0YW5jZShFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgdmFsdWUsIEpTVmFsdWUgcHJvdG8pOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTQ2FsbGJhY2tPYmplY3RG dW5jdGlvbnMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNDYWxsYmFja09iamVjdEZ1 bmN0aW9ucy5oCmluZGV4IGMzYTBjOTZlMWVjNzAwZGRmM2UxMGI1MzNjOTU4NjIzMzY1ZmY5ZmEu LmM0OTViNjMwOWRlMTRmYjlhNDhiYmI2NjA4MWIxNTRkNzM1MmYzM2UgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNDYWxsYmFja09iamVjdEZ1bmN0aW9ucy5oCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNDYWxsYmFja09iamVjdEZ1bmN0aW9ucy5oCkBA IC0zMjUsMTEgKzMyNSwxMSBAQCBib29sIEpTQ2FsbGJhY2tPYmplY3Q8UGFyZW50Pjo6ZGVsZXRl UHJvcGVydHkoSlNDZWxsKiBjZWxsLCBFeGVjU3RhdGUqIGV4ZWMsIGNvbgogdGVtcGxhdGUgPGNs YXNzIFBhcmVudD4KIGJvb2wgSlNDYWxsYmFja09iamVjdDxQYXJlbnQ+OjpkZWxldGVQcm9wZXJ0 eVZpcnR1YWwoRXhlY1N0YXRlKiBleGVjLCB1bnNpZ25lZCBwcm9wZXJ0eU5hbWUpCiB7Ci0gICAg cmV0dXJuIGRlbGV0ZVByb3BlcnR5KHRoaXMsIGV4ZWMsIHByb3BlcnR5TmFtZSk7CisgICAgcmV0 dXJuIGRlbGV0ZVByb3BlcnR5QnlJbmRleCh0aGlzLCBleGVjLCBwcm9wZXJ0eU5hbWUpOwogfQog CiB0ZW1wbGF0ZSA8Y2xhc3MgUGFyZW50PgotYm9vbCBKU0NhbGxiYWNrT2JqZWN0PFBhcmVudD46 OmRlbGV0ZVByb3BlcnR5KEpTQ2VsbCogY2VsbCwgRXhlY1N0YXRlKiBleGVjLCB1bnNpZ25lZCBw cm9wZXJ0eU5hbWUpCitib29sIEpTQ2FsbGJhY2tPYmplY3Q8UGFyZW50Pjo6ZGVsZXRlUHJvcGVy dHlCeUluZGV4KEpTQ2VsbCogY2VsbCwgRXhlY1N0YXRlKiBleGVjLCB1bnNpZ25lZCBwcm9wZXJ0 eU5hbWUpCiB7CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PEpTQ2FsbGJhY2tPYmplY3QqPihjZWxs KS0+ZGVsZXRlUHJvcGVydHlWaXJ0dWFsKGV4ZWMsIElkZW50aWZpZXI6OmZyb20oZXhlYywgcHJv cGVydHlOYW1lKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9Bcmd1bWVudHMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQXJndW1lbnRz LmNwcAppbmRleCBmODI0MGMwNjk3MDE3ZDgwNjczNmJkNjhlNGJhYjExZjI3MmJjZDI4Li45NzQ1 OWJhZmJlZWVhZDE4Mzc1YWEwYWM2Y2I0ZThlM2VjZGI0OTdlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9Bcmd1bWVudHMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0FyZ3VtZW50cy5jcHAKQEAgLTMzMCwxMCArMzMwLDEwIEBAIHZvaWQg QXJndW1lbnRzOjpwdXQoSlNDZWxsKiBjZWxsLCBFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IElkZW50 aWZpZXImIHByb3BlcnR5TmFtCiAKIGJvb2wgQXJndW1lbnRzOjpkZWxldGVQcm9wZXJ0eVZpcnR1 YWwoRXhlY1N0YXRlKiBleGVjLCB1bnNpZ25lZCBpKSAKIHsKLSAgICByZXR1cm4gZGVsZXRlUHJv cGVydHkodGhpcywgZXhlYywgaSk7CisgICAgcmV0dXJuIGRlbGV0ZVByb3BlcnR5QnlJbmRleCh0 aGlzLCBleGVjLCBpKTsKIH0KIAotYm9vbCBBcmd1bWVudHM6OmRlbGV0ZVByb3BlcnR5KEpTQ2Vs bCogY2VsbCwgRXhlY1N0YXRlKiBleGVjLCB1bnNpZ25lZCBpKSAKK2Jvb2wgQXJndW1lbnRzOjpk ZWxldGVQcm9wZXJ0eUJ5SW5kZXgoSlNDZWxsKiBjZWxsLCBFeGVjU3RhdGUqIGV4ZWMsIHVuc2ln bmVkIGkpIAogewogICAgIEFyZ3VtZW50cyogdGhpc09iamVjdCA9IHN0YXRpY19jYXN0PEFyZ3Vt ZW50cyo+KGNlbGwpOwogICAgIGlmIChpIDwgdGhpc09iamVjdC0+ZC0+bnVtQXJndW1lbnRzKSB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Bcmd1bWVudHMuaCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FyZ3VtZW50cy5oCmluZGV4IGM1NzViNWM0 Yjc3NWYwMzEzMTBiYjQ3MmM1NTJkMzk2MTIxZjIwOGMuLmVkMmQwOGRlNDE0MTNiMjE5MWMzZTA4 NDlhNDNjZjVjMzhiZTI1OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0FyZ3VtZW50cy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FyZ3Vt ZW50cy5oCkBAIC0xNDgsNyArMTQ4LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHZpcnR1 YWwgYm9vbCBkZWxldGVQcm9wZXJ0eVZpcnR1YWwoRXhlY1N0YXRlKiwgY29uc3QgSWRlbnRpZmll ciYgcHJvcGVydHlOYW1lKTsKICAgICAgICAgc3RhdGljIGJvb2wgZGVsZXRlUHJvcGVydHkoSlND ZWxsKiwgRXhlY1N0YXRlKiwgY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lKTsKICAgICAg ICAgdmlydHVhbCBib29sIGRlbGV0ZVByb3BlcnR5VmlydHVhbChFeGVjU3RhdGUqLCB1bnNpZ25l ZCBwcm9wZXJ0eU5hbWUpOwotICAgICAgICBzdGF0aWMgYm9vbCBkZWxldGVQcm9wZXJ0eShKU0Nl bGwqLCBFeGVjU3RhdGUqLCB1bnNpZ25lZCBwcm9wZXJ0eU5hbWUpOworICAgICAgICBzdGF0aWMg Ym9vbCBkZWxldGVQcm9wZXJ0eUJ5SW5kZXgoSlNDZWxsKiwgRXhlY1N0YXRlKiwgdW5zaWduZWQg cHJvcGVydHlOYW1lKTsKICAgICAgICAgdm9pZCBjcmVhdGVTdHJpY3RNb2RlQ2FsbGVySWZOZWNl c3NhcnkoRXhlY1N0YXRlKik7CiAgICAgICAgIHZvaWQgY3JlYXRlU3RyaWN0TW9kZUNhbGxlZUlm TmVjZXNzYXJ5KEV4ZWNTdGF0ZSopOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU0FycmF5LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT QXJyYXkuY3BwCmluZGV4IGE3OTIwNWNjYjAwMGQxOWY5YTFhZmI1NjJlYjRhMjgyNDdiYjI3Mzgu LjdiNWI5ZThhNWYwMWI0YjM2N2U3OTBhZTc3NmM1N2ZmZTUwYTY4M2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQXJyYXkuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0pTQXJyYXkuY3BwCkBAIC01MjgsMTAgKzUyOCwxMCBAQCBib29s IEpTQXJyYXk6OmRlbGV0ZVByb3BlcnR5KEpTQ2VsbCogY2VsbCwgRXhlY1N0YXRlKiBleGVjLCBj b25zdCBJZGVudGlmaWVyJiBwcgogCiBib29sIEpTQXJyYXk6OmRlbGV0ZVByb3BlcnR5VmlydHVh bChFeGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmVkIGkpCiB7Ci0gICAgcmV0dXJuIGRlbGV0ZVByb3Bl cnR5KHRoaXMsIGV4ZWMsIGkpOworICAgIHJldHVybiBkZWxldGVQcm9wZXJ0eUJ5SW5kZXgodGhp cywgZXhlYywgaSk7CiB9CiAKLWJvb2wgSlNBcnJheTo6ZGVsZXRlUHJvcGVydHkoSlNDZWxsKiBj ZWxsLCBFeGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmVkIGkpCitib29sIEpTQXJyYXk6OmRlbGV0ZVBy b3BlcnR5QnlJbmRleChKU0NlbGwqIGNlbGwsIEV4ZWNTdGF0ZSogZXhlYywgdW5zaWduZWQgaSkK IHsKICAgICBKU0FycmF5KiB0aGlzT2JqZWN0ID0gc3RhdGljX2Nhc3Q8SlNBcnJheSo+KGNlbGwp OwogICAgIHRoaXNPYmplY3QtPmNoZWNrQ29uc2lzdGVuY3koKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQXJyYXkuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0pTQXJyYXkuaAppbmRleCBlMjJmN2I3NzkwYzcyYTU1ZGViNmNlODcyOGE4NWQy NmFhYjI5NjQ0Li43NzU4MzIzY2Q0ZjI0M2UxMjZkY2MxYTdiODE3NjQ2YjVmZWRmMjI2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FycmF5LmgKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNBcnJheS5oCkBAIC0xNzcsNyArMTc3LDcgQEAg bmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHZpcnR1YWwgYm9vbCBkZWxldGVQcm9wZXJ0eVZpcnR1 YWwoRXhlY1N0YXRlKiwgY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lKTsKICAgICAgICAg c3RhdGljIGJvb2wgZGVsZXRlUHJvcGVydHkoSlNDZWxsKiwgRXhlY1N0YXRlKiwgY29uc3QgSWRl bnRpZmllciYgcHJvcGVydHlOYW1lKTsKICAgICAgICAgdmlydHVhbCBib29sIGRlbGV0ZVByb3Bl cnR5VmlydHVhbChFeGVjU3RhdGUqLCB1bnNpZ25lZCBwcm9wZXJ0eU5hbWUpOwotICAgICAgICBz dGF0aWMgYm9vbCBkZWxldGVQcm9wZXJ0eShKU0NlbGwqLCBFeGVjU3RhdGUqLCB1bnNpZ25lZCBw cm9wZXJ0eU5hbWUpOworICAgICAgICBzdGF0aWMgYm9vbCBkZWxldGVQcm9wZXJ0eUJ5SW5kZXgo SlNDZWxsKiwgRXhlY1N0YXRlKiwgdW5zaWduZWQgcHJvcGVydHlOYW1lKTsKICAgICAgICAgdmly dHVhbCB2b2lkIGdldE93blByb3BlcnR5TmFtZXMoRXhlY1N0YXRlKiwgUHJvcGVydHlOYW1lQXJy YXkmLCBFbnVtZXJhdGlvbk1vZGUgbW9kZSA9IEV4Y2x1ZGVEb250RW51bVByb3BlcnRpZXMpOwog ICAgICAgICBzdGF0aWMgdm9pZCB2aXNpdENoaWxkcmVuKEpTQ2VsbCosIFNsb3RWaXNpdG9yJik7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQ2VsbC5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NlbGwuY3BwCmluZGV4IDE5N2RmNDRj MjZjMGY2ZGY1YzhmZjIwMTRmOTZkOWZhNjY3ZDg0OGEuLmNlOTQzYWM3OTJiMjBmZTRlODBjM2Ni ODk5OWU1ZTk2MjZhMTcwOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTQ2VsbC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxs LmNwcApAQCAtMTM1LDEwICsxMzUsMTAgQEAgYm9vbCBKU0NlbGw6OmRlbGV0ZVByb3BlcnR5KEpT Q2VsbCogY2VsbCwgRXhlY1N0YXRlKiBleGVjLCBjb25zdCBJZGVudGlmaWVyJiBpZGUKIAogYm9v bCBKU0NlbGw6OmRlbGV0ZVByb3BlcnR5VmlydHVhbChFeGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmVk IGlkZW50aWZpZXIpCiB7Ci0gICAgcmV0dXJuIGRlbGV0ZVByb3BlcnR5KHRoaXMsIGV4ZWMsIGlk ZW50aWZpZXIpOworICAgIHJldHVybiBkZWxldGVQcm9wZXJ0eUJ5SW5kZXgodGhpcywgZXhlYywg aWRlbnRpZmllcik7CiB9CiAKLWJvb2wgSlNDZWxsOjpkZWxldGVQcm9wZXJ0eShKU0NlbGwqIGNl bGwsIEV4ZWNTdGF0ZSogZXhlYywgdW5zaWduZWQgaWRlbnRpZmllcikKK2Jvb2wgSlNDZWxsOjpk ZWxldGVQcm9wZXJ0eUJ5SW5kZXgoSlNDZWxsKiBjZWxsLCBFeGVjU3RhdGUqIGV4ZWMsIHVuc2ln bmVkIGlkZW50aWZpZXIpCiB7CiAgICAgcmV0dXJuIGNlbGwtPnRvT2JqZWN0KGV4ZWMsIGV4ZWMt PmxleGljYWxHbG9iYWxPYmplY3QoKSktPmRlbGV0ZVByb3BlcnR5VmlydHVhbChleGVjLCBpZGVu dGlmaWVyKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT Q2VsbC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmgKaW5kZXggNDRj YjlhYmY0NTg4NmE4MmMxMjk0MmE3ZGY0ZjU4YWZlZDMyM2I0Ni4uYWExZWM1ZWVmYzM4YjQ3MjRi NDI3NDY3Y2EyYTdiZDRjMjBhNGQ4YyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNDZWxsLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlND ZWxsLmgKQEAgLTk4LDcgKzk4LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHZpcnR1YWwg Ym9vbCBkZWxldGVQcm9wZXJ0eVZpcnR1YWwoRXhlY1N0YXRlKiwgY29uc3QgSWRlbnRpZmllciYg cHJvcGVydHlOYW1lKTsKICAgICAgICAgc3RhdGljIGJvb2wgZGVsZXRlUHJvcGVydHkoSlNDZWxs KiwgRXhlY1N0YXRlKiwgY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lKTsKICAgICAgICAg dmlydHVhbCBib29sIGRlbGV0ZVByb3BlcnR5VmlydHVhbChFeGVjU3RhdGUqLCB1bnNpZ25lZCBw cm9wZXJ0eU5hbWUpOwotICAgICAgICBzdGF0aWMgYm9vbCBkZWxldGVQcm9wZXJ0eShKU0NlbGwq LCBFeGVjU3RhdGUqLCB1bnNpZ25lZCBwcm9wZXJ0eU5hbWUpOworICAgICAgICBzdGF0aWMgYm9v bCBkZWxldGVQcm9wZXJ0eUJ5SW5kZXgoSlNDZWxsKiwgRXhlY1N0YXRlKiwgdW5zaWduZWQgcHJv cGVydHlOYW1lKTsKIAogICAgICAgICB2aXJ0dWFsIEpTT2JqZWN0KiB0b1RoaXNPYmplY3QoRXhl Y1N0YXRlKikgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTTm90QW5PYmplY3QuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNO b3RBbk9iamVjdC5jcHAKaW5kZXggMjJiOWNhYzdmNmFhZTdiZTk4NTVjMDliNGI5MDRmN2UyYTRm MjIwOC4uZTBjNDNkOTM0YmYwMzMyY2ExYWVlM2I2OTEyOGQ4ZjZkODU5NzlhMSAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNOb3RBbk9iamVjdC5jcHAKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNOb3RBbk9iamVjdC5jcHAKQEAgLTEwNywx MCArMTA3LDEwIEBAIGJvb2wgSlNOb3RBbk9iamVjdDo6ZGVsZXRlUHJvcGVydHkoSlNDZWxsKiwg RXhlY1N0YXRlKiBleGVjLCBjb25zdCBJZGVudGlmaWVyJikKIAogYm9vbCBKU05vdEFuT2JqZWN0 OjpkZWxldGVQcm9wZXJ0eVZpcnR1YWwoRXhlY1N0YXRlKiBleGVjLCB1bnNpZ25lZCBwcm9wZXJ0 eU5hbWUpCiB7Ci0gICAgcmV0dXJuIGRlbGV0ZVByb3BlcnR5KHRoaXMsIGV4ZWMsIHByb3BlcnR5 TmFtZSk7CisgICAgcmV0dXJuIGRlbGV0ZVByb3BlcnR5QnlJbmRleCh0aGlzLCBleGVjLCBwcm9w ZXJ0eU5hbWUpOwogfQogCi1ib29sIEpTTm90QW5PYmplY3Q6OmRlbGV0ZVByb3BlcnR5KEpTQ2Vs bCosIEV4ZWNTdGF0ZSogZXhlYywgdW5zaWduZWQpCitib29sIEpTTm90QW5PYmplY3Q6OmRlbGV0 ZVByb3BlcnR5QnlJbmRleChKU0NlbGwqLCBFeGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmVkKQogewog ICAgIEFTU0VSVF9VTlVTRUQoZXhlYywgZXhlYy0+aGFkRXhjZXB0aW9uKCkpOwogICAgIHJldHVy biBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTm90 QW5PYmplY3QuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTm90QW5PYmplY3Qu aAppbmRleCAzZDA2ZWRhMDFkNGE1NzI3NTYzNDczMTM4ZTcwMzMwMGIwYzU1OTkzLi4zYmNlOWIz ODU1MDFiNmMxOTg5MTYzNTliZjlmZDA4YmUzMGJhODI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU05vdEFuT2JqZWN0LmgKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNOb3RBbk9iamVjdC5oCkBAIC04Myw3ICs4Myw3IEBAIG5hbWVzcGFj ZSBKU0MgewogICAgICAgICB2aXJ0dWFsIGJvb2wgZGVsZXRlUHJvcGVydHlWaXJ0dWFsKEV4ZWNT dGF0ZSosIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSk7CiAgICAgICAgIHN0YXRpYyBi b29sIGRlbGV0ZVByb3BlcnR5KEpTQ2VsbCosIEV4ZWNTdGF0ZSosIGNvbnN0IElkZW50aWZpZXIm IHByb3BlcnR5TmFtZSk7CiAgICAgICAgIHZpcnR1YWwgYm9vbCBkZWxldGVQcm9wZXJ0eVZpcnR1 YWwoRXhlY1N0YXRlKiwgdW5zaWduZWQgcHJvcGVydHlOYW1lKTsKLSAgICAgICAgc3RhdGljIGJv b2wgZGVsZXRlUHJvcGVydHkoSlNDZWxsKiwgRXhlY1N0YXRlKiwgdW5zaWduZWQgcHJvcGVydHlO YW1lKTsKKyAgICAgICAgc3RhdGljIGJvb2wgZGVsZXRlUHJvcGVydHlCeUluZGV4KEpTQ2VsbCos IEV4ZWNTdGF0ZSosIHVuc2lnbmVkIHByb3BlcnR5TmFtZSk7CiAKICAgICAgICAgdmlydHVhbCB2 b2lkIGdldE93blByb3BlcnR5TmFtZXMoRXhlY1N0YXRlKiwgUHJvcGVydHlOYW1lQXJyYXkmLCBF bnVtZXJhdGlvbk1vZGUgbW9kZSA9IEV4Y2x1ZGVEb250RW51bVByb3BlcnRpZXMpOwogICAgIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAKaW5kZXggYTU5NDU1 MjZmZThjMTFiYWVjMzI1Yzg1MzFjMTcyNzMzYjhhYTA1Ni4uY2JkYTkwY2ViYjFkOGE1ZDdiNTU3 MjFkNmQ0YjU3ZjAwZDVkMzNhMyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvSlNPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pT T2JqZWN0LmNwcApAQCAtMjg2LDEwICsyODYsMTAgQEAgYm9vbCBKU09iamVjdDo6aGFzT3duUHJv cGVydHkoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUpIGMK IAogYm9vbCBKU09iamVjdDo6ZGVsZXRlUHJvcGVydHlWaXJ0dWFsKEV4ZWNTdGF0ZSogZXhlYywg dW5zaWduZWQgcHJvcGVydHlOYW1lKQogewotICAgIHJldHVybiBkZWxldGVQcm9wZXJ0eSh0aGlz LCBleGVjLCBwcm9wZXJ0eU5hbWUpOworICAgIHJldHVybiBkZWxldGVQcm9wZXJ0eUJ5SW5kZXgo dGhpcywgZXhlYywgcHJvcGVydHlOYW1lKTsKIH0KIAotYm9vbCBKU09iamVjdDo6ZGVsZXRlUHJv cGVydHkoSlNDZWxsKiBjZWxsLCBFeGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmVkIHByb3BlcnR5TmFt ZSkKK2Jvb2wgSlNPYmplY3Q6OmRlbGV0ZVByb3BlcnR5QnlJbmRleChKU0NlbGwqIGNlbGwsIEV4 ZWNTdGF0ZSogZXhlYywgdW5zaWduZWQgcHJvcGVydHlOYW1lKQogewogICAgIHJldHVybiBzdGF0 aWNfY2FzdDxKU09iamVjdCo+KGNlbGwpLT5kZWxldGVQcm9wZXJ0eVZpcnR1YWwoZXhlYywgSWRl bnRpZmllcjo6ZnJvbShleGVjLCBwcm9wZXJ0eU5hbWUpKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU09iamVjdC5oCmluZGV4IDRjZGM5NzljNDBlNzI1NmQwMjY5NWZiMjc4ODlj MjFjNjIxODA4OTcuLjI4Nzk0Nzc0Y2VmMmI5M2NiN2NlMmYxMDhkMTZhY2VkMjJiZTkzNGMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuaApAQCAtMTI4LDcgKzEyOCw3 IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB2aXJ0dWFsIGJvb2wgZGVsZXRlUHJvcGVydHlW aXJ0dWFsKEV4ZWNTdGF0ZSosIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSk7CiAgICAg ICAgIHN0YXRpYyBib29sIGRlbGV0ZVByb3BlcnR5KEpTQ2VsbCosIEV4ZWNTdGF0ZSosIGNvbnN0 IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSk7CiAgICAgICAgIHZpcnR1YWwgYm9vbCBkZWxldGVQ cm9wZXJ0eVZpcnR1YWwoRXhlY1N0YXRlKiwgdW5zaWduZWQgcHJvcGVydHlOYW1lKTsKLSAgICAg ICAgc3RhdGljIGJvb2wgZGVsZXRlUHJvcGVydHkoSlNDZWxsKiwgRXhlY1N0YXRlKiwgdW5zaWdu ZWQgcHJvcGVydHlOYW1lKTsKKyAgICAgICAgc3RhdGljIGJvb2wgZGVsZXRlUHJvcGVydHlCeUlu ZGV4KEpTQ2VsbCosIEV4ZWNTdGF0ZSosIHVuc2lnbmVkIHByb3BlcnR5TmFtZSk7CiAKICAgICAg ICAgdmlydHVhbCBKU1ZhbHVlIGRlZmF1bHRWYWx1ZShFeGVjU3RhdGUqLCBQcmVmZXJyZWRQcmlt aXRpdmVUeXBlKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvUmVnRXhwTWF0Y2hlc0FycmF5LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9SZWdFeHBNYXRjaGVzQXJyYXkuaAppbmRleCBiNzg1ZDlhNjUxNzMxMThmOTczOTQzY2RjNzhj NjQxODliNDBjMWY3Li40ZjFiM2EwMTQ3OTUxOTYwNGJkOWE4OGEyYzA2OWE3ZWY3NTUyZDc4IDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHBNYXRjaGVzQXJy YXkuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHBNYXRjaGVzQXJy YXkuaApAQCAtMTE3LDE1ICsxMTcsMTUgQEAgbmFtZXNwYWNlIEpTQyB7CiAKICAgICAgICAgdmly dHVhbCBib29sIGRlbGV0ZVByb3BlcnR5VmlydHVhbChFeGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmVk IHByb3BlcnR5TmFtZSkKICAgICAgICAgewotICAgICAgICAgICAgcmV0dXJuIGRlbGV0ZVByb3Bl cnR5KHRoaXMsIGV4ZWMsIHByb3BlcnR5TmFtZSk7CisgICAgICAgICAgICByZXR1cm4gZGVsZXRl UHJvcGVydHlCeUluZGV4KHRoaXMsIGV4ZWMsIHByb3BlcnR5TmFtZSk7CiAgICAgICAgIH0KIAot ICAgICAgICBzdGF0aWMgYm9vbCBkZWxldGVQcm9wZXJ0eShKU0NlbGwqIGNlbGwsIEV4ZWNTdGF0 ZSogZXhlYywgdW5zaWduZWQgcHJvcGVydHlOYW1lKQorICAgICAgICBzdGF0aWMgYm9vbCBkZWxl dGVQcm9wZXJ0eUJ5SW5kZXgoSlNDZWxsKiBjZWxsLCBFeGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmVk IHByb3BlcnR5TmFtZSkKICAgICAgICAgewogICAgICAgICAgICAgUmVnRXhwTWF0Y2hlc0FycmF5 KiB0aGlzT2JqZWN0ID0gc3RhdGljX2Nhc3Q8UmVnRXhwTWF0Y2hlc0FycmF5Kj4oY2VsbCk7CiAg ICAgICAgICAgICBpZiAodGhpc09iamVjdC0+c3ViY2xhc3NEYXRhKCkpCiAgICAgICAgICAgICAg ICAgdGhpc09iamVjdC0+ZmlsbEFycmF5SW5zdGFuY2UoZXhlYyk7Ci0gICAgICAgICAgICByZXR1 cm4gSlNBcnJheTo6ZGVsZXRlUHJvcGVydHkodGhpc09iamVjdCwgZXhlYywgcHJvcGVydHlOYW1l KTsKKyAgICAgICAgICAgIHJldHVybiBKU0FycmF5OjpkZWxldGVQcm9wZXJ0eUJ5SW5kZXgodGhp c09iamVjdCwgZXhlYywgcHJvcGVydHlOYW1lKTsKICAgICAgICAgfQogCiAgICAgICAgIHZpcnR1 YWwgdm9pZCBnZXRPd25Qcm9wZXJ0eU5hbWVzKEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYW1l QXJyYXkmIGFyciwgRW51bWVyYXRpb25Nb2RlIG1vZGUgPSBFeGNsdWRlRG9udEVudW1Qcm9wZXJ0 aWVzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYnJpZGdlL3J1bnRpbWVfYXJyYXkuY3Bw IGIvU291cmNlL1dlYkNvcmUvYnJpZGdlL3J1bnRpbWVfYXJyYXkuY3BwCmluZGV4IDY5MDBjYjc3 NDY0MTI3MDBhZmE2MGQzMTBhZDUwNTQ2N2UwYWU2NzcuLjFiMmQ1NjkzNTliMWFjNzc0YzhhZmNl ZDMyZjkxMjQ1NDhiOTQ3NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9ydW50 aW1lX2FycmF5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9hcnJheS5j cHAKQEAgLTE5MywxMCArMTkzLDEwIEBAIGJvb2wgUnVudGltZUFycmF5OjpkZWxldGVQcm9wZXJ0 eShKU0NlbGwqLCBFeGVjU3RhdGUqLCBjb25zdCBJZGVudGlmaWVyJikKIAogYm9vbCBSdW50aW1l QXJyYXk6OmRlbGV0ZVByb3BlcnR5VmlydHVhbChFeGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmVkIHBy b3BlcnR5TmFtZSkKIHsKLSAgICByZXR1cm4gZGVsZXRlUHJvcGVydHkodGhpcywgZXhlYywgcHJv cGVydHlOYW1lKTsKKyAgICByZXR1cm4gZGVsZXRlUHJvcGVydHlCeUluZGV4KHRoaXMsIGV4ZWMs IHByb3BlcnR5TmFtZSk7CiB9CiAKLWJvb2wgUnVudGltZUFycmF5OjpkZWxldGVQcm9wZXJ0eShK U0NlbGwqLCBFeGVjU3RhdGUqLCB1bnNpZ25lZCkKK2Jvb2wgUnVudGltZUFycmF5OjpkZWxldGVQ cm9wZXJ0eUJ5SW5kZXgoSlNDZWxsKiwgRXhlY1N0YXRlKiwgdW5zaWduZWQpCiB7CiAgICAgcmV0 dXJuIGZhbHNlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYnJpZGdlL3J1bnRpbWVf YXJyYXkuaCBiL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9ydW50aW1lX2FycmF5LmgKaW5kZXggNmYz NTNmYWIwNTZjOTFjOWI1NWMxN2E3OWU4OTdkMGI0NDY0ODljYi4uZjA2YThkN2I5Nzc5ZTBkZjNk MThiYTllNDZiYWQ5MzdlMTY2MzY1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYnJpZGdl L3J1bnRpbWVfYXJyYXkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9hcnJh eS5oCkBAIC02Myw3ICs2Myw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgZGVsZXRlUHJv cGVydHlWaXJ0dWFsKEV4ZWNTdGF0ZSosIGNvbnN0IElkZW50aWZpZXIgJnByb3BlcnR5TmFtZSk7 CiAgICAgc3RhdGljIGJvb2wgZGVsZXRlUHJvcGVydHkoSlNDZWxsKiwgRXhlY1N0YXRlKiwgY29u c3QgSWRlbnRpZmllciAmcHJvcGVydHlOYW1lKTsKICAgICB2aXJ0dWFsIGJvb2wgZGVsZXRlUHJv cGVydHlWaXJ0dWFsKEV4ZWNTdGF0ZSosIHVuc2lnbmVkIHByb3BlcnR5TmFtZSk7Ci0gICAgc3Rh dGljIGJvb2wgZGVsZXRlUHJvcGVydHkoSlNDZWxsKiwgRXhlY1N0YXRlKiwgdW5zaWduZWQgcHJv cGVydHlOYW1lKTsKKyAgICBzdGF0aWMgYm9vbCBkZWxldGVQcm9wZXJ0eUJ5SW5kZXgoSlNDZWxs KiwgRXhlY1N0YXRlKiwgdW5zaWduZWQgcHJvcGVydHlOYW1lKTsKICAgICAKICAgICB1bnNpZ25l ZCBnZXRMZW5ndGgoKSBjb25zdCB7IHJldHVybiBnZXRDb25jcmV0ZUFycmF5KCktPmdldExlbmd0 aCgpOyB9CiAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUvSlNOUE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvTmV0c2NhcGUvSlNOUE9iamVjdC5jcHAKaW5kZXggYzc5N2M2Njk2MGNjYmVjYzMyNTJi MzY4MjRjMTYyNzA3MDFhZmIxNC4uZTJkMDJhNDU0ZjNkYWFhOGY5M2Q5YzUxMzU5YjYyODlmZmIw ZDJmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNj YXBlL0pTTlBPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9OZXRzY2FwZS9KU05QT2JqZWN0LmNwcApAQCAtMzY4LDEwICszNjgsMTAgQEAgYm9vbCBKU05Q T2JqZWN0OjpkZWxldGVQcm9wZXJ0eShKU0NlbGwqIGNlbGwsIEV4ZWNTdGF0ZSogZXhlYywgY29u c3QgSWRlbnRpZmllciYKIAogYm9vbCBKU05QT2JqZWN0OjpkZWxldGVQcm9wZXJ0eVZpcnR1YWwo RXhlY1N0YXRlKiBleGVjLCB1bnNpZ25lZCBwcm9wZXJ0eU5hbWUpCiB7Ci0gICAgcmV0dXJuIGRl bGV0ZVByb3BlcnR5KHRoaXMsIGV4ZWMsIHByb3BlcnR5TmFtZSk7CisgICAgcmV0dXJuIGRlbGV0 ZVByb3BlcnR5QnlJbmRleCh0aGlzLCBleGVjLCBwcm9wZXJ0eU5hbWUpOwogfQogCi1ib29sIEpT TlBPYmplY3Q6OmRlbGV0ZVByb3BlcnR5KEpTQ2VsbCogY2VsbCwgRXhlY1N0YXRlKiBleGVjLCB1 bnNpZ25lZCBwcm9wZXJ0eU5hbWUpCitib29sIEpTTlBPYmplY3Q6OmRlbGV0ZVByb3BlcnR5QnlJ bmRleChKU0NlbGwqIGNlbGwsIEV4ZWNTdGF0ZSogZXhlYywgdW5zaWduZWQgcHJvcGVydHlOYW1l KQogewogICAgIHJldHVybiBzdGF0aWNfY2FzdDxKU05QT2JqZWN0Kj4oY2VsbCktPmRlbGV0ZVBy b3BlcnR5KGV4ZWMsIHN0YXRpY19jYXN0PE5QSWRlbnRpZmllcj4oSWRlbnRpZmllclJlcDo6Z2V0 KHByb3BlcnR5TmFtZSkpKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9OZXRzY2FwZS9KU05QT2JqZWN0LmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvTmV0c2NhcGUvSlNOUE9iamVjdC5oCmluZGV4IGRjOTA1YWEzZGM2MTFjNTVl OGMyNDE1MDQ2MjA5MjRmZDk5N2Y2MTIuLjkzMDZmYmI2MzI3YjYwZmJhMDdmMjAzZjZhZWE1NWMz NmFkN2VkODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9O ZXRzY2FwZS9KU05QT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL05ldHNjYXBlL0pTTlBPYmplY3QuaApAQCAtOTIsNyArOTIsNyBAQCBwcml2YXRlOgogICAg IHZpcnR1YWwgYm9vbCBkZWxldGVQcm9wZXJ0eVZpcnR1YWwoSlNDOjpFeGVjU3RhdGUqLCBjb25z dCBKU0M6OklkZW50aWZpZXImIHByb3BlcnR5TmFtZSk7CiAgICAgc3RhdGljIGJvb2wgZGVsZXRl UHJvcGVydHkoSlNDOjpKU0NlbGwqLCBKU0M6OkV4ZWNTdGF0ZSosIGNvbnN0IEpTQzo6SWRlbnRp ZmllciYgcHJvcGVydHlOYW1lKTsKICAgICB2aXJ0dWFsIGJvb2wgZGVsZXRlUHJvcGVydHlWaXJ0 dWFsKEpTQzo6RXhlY1N0YXRlKiwgdW5zaWduZWQgcHJvcGVydHlOYW1lKTsKLSAgICBzdGF0aWMg Ym9vbCBkZWxldGVQcm9wZXJ0eShKU0M6OkpTQ2VsbCosIEpTQzo6RXhlY1N0YXRlKiwgdW5zaWdu ZWQgcHJvcGVydHlOYW1lKTsKKyAgICBzdGF0aWMgYm9vbCBkZWxldGVQcm9wZXJ0eUJ5SW5kZXgo SlNDOjpKU0NlbGwqLCBKU0M6OkV4ZWNTdGF0ZSosIHVuc2lnbmVkIHByb3BlcnR5TmFtZSk7CiAK ICAgICBib29sIGRlbGV0ZVByb3BlcnR5KEpTQzo6RXhlY1N0YXRlKiwgTlBJZGVudGlmaWVyIHBy b3BlcnR5TmFtZSk7CiAK