27661 2009-07-24 12:10:52 -0700 Move more callers to using 3 argument toJS 2009-07-24 12:28:06 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 27634 1 eric webkit-unassigned abarth oldest_to_newest 134618 0 eric 2009-07-24 12:10:52 -0700 Move more callers to using 3 argument toJS Going to start with the ones for which I'm not changing any behavior (because I don't know how to reliably get the right global object). 134620 1 33460 eric 2009-07-24 12:18:13 -0700 Created attachment 33460 patch 134623 2 33460 abarth 2009-07-24 12:24:42 -0700 Comment on attachment 33460 patch I, for one, welcome our new deprecatedGlobalObjectForPrototype overlords. 134627 3 eric 2009-07-24 12:28:06 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/bindings/js/JSCustomPositionCallback.cpp M WebCore/bindings/js/JSCustomPositionErrorCallback.cpp M WebCore/bindings/js/JSCustomSQLStatementCallback.cpp M WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp M WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp M WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp M WebCore/bindings/js/JSNodeFilterCondition.cpp M WebCore/bindings/js/JSWorkerConstructor.cpp Committed r46370 M WebCore/ChangeLog M WebCore/bindings/js/JSWorkerConstructor.cpp M WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp M WebCore/bindings/js/JSCustomPositionErrorCallback.cpp M WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp M WebCore/bindings/js/JSCustomPositionCallback.cpp M WebCore/bindings/js/JSCustomSQLStatementCallback.cpp M WebCore/bindings/js/JSNodeFilterCondition.cpp M WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp r46370 = 387f7b01375536d52ff16937762ec73122e0329c (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46370 33460 2009-07-24 12:18:13 -0700 2009-07-24 12:24:41 -0700 patch bug-27661-20090724121812.patch text/plain 9257 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NWQ2YTBmOC4uNWJhZWY5ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzMSBAQAogMjAwOS0wNy0yNCAgRXJpYyBTZWlkZWwg IDxlcmljQHdlYmtpdC5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTW92ZSBtb3JlIGNhbGxlcnMgdG8gdXNpbmcgMyBhcmd1bWVudCB0b0pTCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzY2MQorCisg ICAgICAgIE5vIGZ1bmN0aW9uYWwgY2hhbmdlcywgdGh1cyBubyB0ZXN0cy4KKyAgICAgICAgVGhl c2UgYXJlIGFsbCB0aGUgcGxhY2VzIHdoZXJlIHdlIGNhbid0IHlldCBwYXNzIHRoZQorICAgICAg ICBjb3JyZWN0IGdsb2JhbE9iamVjdCBiZWNhdXNlIHdlIGRvbid0IGhhdmUgb3IgZG9uJ3Qga25v dyB0aGUgcmlnaHQgb25lLgorCisgICAgICAgICogYmluZGluZ3MvanMvSlNDdXN0b21Qb3NpdGlv bkNhbGxiYWNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTQ3VzdG9tUG9zaXRpb25DYWxsYmFj azo6aGFuZGxlRXZlbnQpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTQ3VzdG9tUG9zaXRpb25F cnJvckNhbGxiYWNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTQ3VzdG9tUG9zaXRpb25FcnJv ckNhbGxiYWNrOjpoYW5kbGVFdmVudCk6CisgICAgICAgICogYmluZGluZ3MvanMvSlNDdXN0b21T UUxTdGF0ZW1lbnRDYWxsYmFjay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0N1c3RvbVNRTFN0 YXRlbWVudENhbGxiYWNrOjpoYW5kbGVFdmVudCk6CisgICAgICAgICogYmluZGluZ3MvanMvSlND dXN0b21TUUxTdGF0ZW1lbnRFcnJvckNhbGxiYWNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpT Q3VzdG9tU1FMU3RhdGVtZW50RXJyb3JDYWxsYmFjazo6aGFuZGxlRXZlbnQpOgorICAgICAgICAq IGJpbmRpbmdzL2pzL0pTQ3VzdG9tU1FMVHJhbnNhY3Rpb25DYWxsYmFjay5jcHA6CisgICAgICAg IChXZWJDb3JlOjpKU0N1c3RvbVNRTFRyYW5zYWN0aW9uQ2FsbGJhY2s6OmhhbmRsZUV2ZW50KToK KyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0N1c3RvbVNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFj ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0N1c3RvbVNRTFRyYW5zYWN0aW9uRXJyb3JDYWxs YmFjazo6aGFuZGxlRXZlbnQpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTTm9kZUZpbHRlckNv bmRpdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU05vZGVGaWx0ZXJDb25kaXRpb246OmFj Y2VwdE5vZGUpOgorCisyMDA5LTA3LTI0ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4K KwogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgogCiAgICAgICAgIEZpeCB0aGUgbGFz dCBvZiB0aGUgeC1mcmFtZSBjb25zdHJ1Y3RvciBjYWxscyB0byBoYXZlIHRoZSByaWdodCBwcm90 b3R5cGUgY2hhaW5zCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3VzdG9tUG9z aXRpb25DYWxsYmFjay5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3VzdG9tUG9zaXRpb25D YWxsYmFjay5jcHAKaW5kZXggNmY5ZWZkOS4uMjg5MTFmZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0N1c3RvbVBvc2l0aW9uQ2FsbGJhY2suY3BwCisrKyBiL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNDdXN0b21Qb3NpdGlvbkNhbGxiYWNrLmNwcApAQCAtNDgsNyArNDgsOCBAQCB2 b2lkIEpTQ3VzdG9tUG9zaXRpb25DYWxsYmFjazo6aGFuZGxlRXZlbnQoR2VvcG9zaXRpb24qIGdl b3Bvc2l0aW9uLCBib29sJiByYWlzZQogICAgIAogICAgIGlmICghbV9mcmFtZS0+c2NyaXB0KCkt PmlzRW5hYmxlZCgpKQogICAgICAgICByZXR1cm47Ci0gICAgCisKKyAgICAvLyBGSVhNRTogVGhp cyBpcyBsaWtlbHkgdGhlIHdyb25nIGdsb2JhbE9iamVjdCAoZm9yIHByb3RvdHlwZSBjaGFpbnMg YXQgbGVhc3QpCiAgICAgSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCA9IG1fZnJhbWUtPnNj cmlwdCgpLT5nbG9iYWxPYmplY3QoKTsKICAgICBFeGVjU3RhdGUqIGV4ZWMgPSBnbG9iYWxPYmpl Y3QtPmdsb2JhbEV4ZWMoKTsKICAgICAKQEAgLTY3LDEwICs2OCwxMCBAQCB2b2lkIEpTQ3VzdG9t UG9zaXRpb25DYWxsYmFjazo6aGFuZGxlRXZlbnQoR2VvcG9zaXRpb24qIGdlb3Bvc2l0aW9uLCBi b29sJiByYWlzZQogICAgIH0KICAgICAKICAgICBSZWZQdHI8SlNDdXN0b21Qb3NpdGlvbkNhbGxi YWNrPiBwcm90ZWN0KHRoaXMpOwotICAgIAorCiAgICAgTWFya2VkQXJndW1lbnRCdWZmZXIgYXJn czsKLSAgICBhcmdzLmFwcGVuZCh0b0pTKGV4ZWMsIGdlb3Bvc2l0aW9uKSk7Ci0gICAgCisgICAg YXJncy5hcHBlbmQodG9KUyhleGVjLCBkZXByZWNhdGVkR2xvYmFsT2JqZWN0Rm9yUHJvdG90eXBl KGV4ZWMpLCBnZW9wb3NpdGlvbikpOworCiAgICAgZ2xvYmFsT2JqZWN0LT5nbG9iYWxEYXRhKCkt PnRpbWVvdXRDaGVja2VyLnN0YXJ0KCk7CiAgICAgY2FsbChleGVjLCBmdW5jdGlvbiwgY2FsbFR5 cGUsIGNhbGxEYXRhLCBtX2NhbGxiYWNrLCBhcmdzKTsKICAgICBnbG9iYWxPYmplY3QtPmdsb2Jh bERhdGEoKS0+dGltZW91dENoZWNrZXIuc3RvcCgpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5k aW5ncy9qcy9KU0N1c3RvbVBvc2l0aW9uRXJyb3JDYWxsYmFjay5jcHAgYi9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTQ3VzdG9tUG9zaXRpb25FcnJvckNhbGxiYWNrLmNwcAppbmRleCBjYzZjZDU1Li44 NzE5ZDg4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3VzdG9tUG9zaXRpb25F cnJvckNhbGxiYWNrLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3VzdG9tUG9zaXRp b25FcnJvckNhbGxiYWNrLmNwcApAQCAtNDgsNyArNDgsOCBAQCB2b2lkIEpTQ3VzdG9tUG9zaXRp b25FcnJvckNhbGxiYWNrOjpoYW5kbGVFdmVudChQb3NpdGlvbkVycm9yKiBwb3NpdGlvbkVycm9y KQogICAgIAogICAgIGlmICghbV9mcmFtZS0+c2NyaXB0KCktPmlzRW5hYmxlZCgpKQogICAgICAg ICByZXR1cm47Ci0gICAgCisKKyAgICAvLyBGSVhNRTogVGhpcyBpcyBsaWtlbHkgdGhlIHdyb25n IGdsb2JhbE9iamVjdCAoZm9yIHByb3RvdHlwZSBjaGFpbnMgYXQgbGVhc3QpCiAgICAgSlNHbG9i YWxPYmplY3QqIGdsb2JhbE9iamVjdCA9IG1fZnJhbWUtPnNjcmlwdCgpLT5nbG9iYWxPYmplY3Qo KTsKICAgICBFeGVjU3RhdGUqIGV4ZWMgPSBnbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKTsKICAg ICAKQEAgLTY5LDcgKzcwLDcgQEAgdm9pZCBKU0N1c3RvbVBvc2l0aW9uRXJyb3JDYWxsYmFjazo6 aGFuZGxlRXZlbnQoUG9zaXRpb25FcnJvciogcG9zaXRpb25FcnJvcikKICAgICBSZWZQdHI8SlND dXN0b21Qb3NpdGlvbkVycm9yQ2FsbGJhY2s+IHByb3RlY3QodGhpcyk7CiAgICAgCiAgICAgTWFy a2VkQXJndW1lbnRCdWZmZXIgYXJnczsKLSAgICBhcmdzLmFwcGVuZCh0b0pTKGV4ZWMsIHBvc2l0 aW9uRXJyb3IpKTsKKyAgICBhcmdzLmFwcGVuZCh0b0pTKGV4ZWMsIGRlcHJlY2F0ZWRHbG9iYWxP YmplY3RGb3JQcm90b3R5cGUoZXhlYyksIHBvc2l0aW9uRXJyb3IpKTsKICAgICAKICAgICBnbG9i YWxPYmplY3QtPmdsb2JhbERhdGEoKS0+dGltZW91dENoZWNrZXIuc3RhcnQoKTsKICAgICBjYWxs KGV4ZWMsIGZ1bmN0aW9uLCBjYWxsVHlwZSwgY2FsbERhdGEsIG1fY2FsbGJhY2ssIGFyZ3MpOwpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0N1c3RvbVNRTFN0YXRlbWVudENhbGxi YWNrLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDdXN0b21TUUxTdGF0ZW1lbnRDYWxsYmFj ay5jcHAKaW5kZXggMTA3YTQ5MS4uNzYzZTI2NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0N1c3RvbVNRTFN0YXRlbWVudENhbGxiYWNrLmNwcAorKysgYi9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTQ3VzdG9tU1FMU3RhdGVtZW50Q2FsbGJhY2suY3BwCkBAIC01NCw2ICs1NCw3IEBA IHZvaWQgSlNDdXN0b21TUUxTdGF0ZW1lbnRDYWxsYmFjazo6aGFuZGxlRXZlbnQoU1FMVHJhbnNh Y3Rpb24qIHRyYW5zYWN0aW9uLCBTUUxSCiAgICAgaWYgKCFtX2ZyYW1lLT5zY3JpcHQoKS0+aXNF bmFibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIC8vIEZJWE1FOiBUaGlzIGlzIGxpa2Vs eSB0aGUgd3JvbmcgZ2xvYmFsT2JqZWN0IChmb3IgcHJvdG90eXBlIGNoYWlucyBhdCBsZWFzdCkK ICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gbV9mcmFtZS0+c2NyaXB0KCktPmds b2JhbE9iamVjdCgpOwogICAgIEV4ZWNTdGF0ZSogZXhlYyA9IGdsb2JhbE9iamVjdC0+Z2xvYmFs RXhlYygpOwogICAgICAgICAKQEAgLTc0LDggKzc1LDggQEAgdm9pZCBKU0N1c3RvbVNRTFN0YXRl bWVudENhbGxiYWNrOjpoYW5kbGVFdmVudChTUUxUcmFuc2FjdGlvbiogdHJhbnNhY3Rpb24sIFNR TFIKICAgICBSZWZQdHI8SlNDdXN0b21TUUxTdGF0ZW1lbnRDYWxsYmFjaz4gcHJvdGVjdCh0aGlz KTsKIAogICAgIE1hcmtlZEFyZ3VtZW50QnVmZmVyIGFyZ3M7Ci0gICAgYXJncy5hcHBlbmQodG9K UyhleGVjLCB0cmFuc2FjdGlvbikpOwotICAgIGFyZ3MuYXBwZW5kKHRvSlMoZXhlYywgcmVzdWx0 U2V0KSk7CisgICAgYXJncy5hcHBlbmQodG9KUyhleGVjLCBkZXByZWNhdGVkR2xvYmFsT2JqZWN0 Rm9yUHJvdG90eXBlKGV4ZWMpLCB0cmFuc2FjdGlvbikpOworICAgIGFyZ3MuYXBwZW5kKHRvSlMo ZXhlYywgZGVwcmVjYXRlZEdsb2JhbE9iamVjdEZvclByb3RvdHlwZShleGVjKSwgcmVzdWx0U2V0 KSk7CiAgICAgICAgIAogICAgIGdsb2JhbE9iamVjdC0+Z2xvYmFsRGF0YSgpLT50aW1lb3V0Q2hl Y2tlci5zdGFydCgpOwogICAgIGNhbGwoZXhlYywgZnVuY3Rpb24sIGNhbGxUeXBlLCBjYWxsRGF0 YSwgbV9jYWxsYmFjaywgYXJncyk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pT Q3VzdG9tU1FMU3RhdGVtZW50RXJyb3JDYWxsYmFjay5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTQ3VzdG9tU1FMU3RhdGVtZW50RXJyb3JDYWxsYmFjay5jcHAKaW5kZXggMDE4ZGFiZC4uNDJi NGE2ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0N1c3RvbVNRTFN0YXRlbWVu dEVycm9yQ2FsbGJhY2suY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDdXN0b21TUUxT dGF0ZW1lbnRFcnJvckNhbGxiYWNrLmNwcApAQCAtNTQsNyArNTQsOCBAQCBib29sIEpTQ3VzdG9t U1FMU3RhdGVtZW50RXJyb3JDYWxsYmFjazo6aGFuZGxlRXZlbnQoU1FMVHJhbnNhY3Rpb24qIHRy YW5zYWN0aW9uLAogICAgICAgICAKICAgICBpZiAoIW1fZnJhbWUtPnNjcmlwdCgpLT5pc0VuYWJs ZWQoKSkKICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIAorCisgICAgLy8gRklYTUU6IFRo aXMgaXMgbGlrZWx5IHRoZSB3cm9uZyBnbG9iYWxPYmplY3QgKGZvciBwcm90b3R5cGUgY2hhaW5z IGF0IGxlYXN0KQogICAgIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBtX2ZyYW1lLT5z Y3JpcHQoKS0+Z2xvYmFsT2JqZWN0KCk7CiAgICAgRXhlY1N0YXRlKiBleGVjID0gZ2xvYmFsT2Jq ZWN0LT5nbG9iYWxFeGVjKCk7CiAgICAgICAgIApAQCAtNzcsOCArNzgsOCBAQCBib29sIEpTQ3Vz dG9tU1FMU3RhdGVtZW50RXJyb3JDYWxsYmFjazo6aGFuZGxlRXZlbnQoU1FMVHJhbnNhY3Rpb24q IHRyYW5zYWN0aW9uLAogICAgIFJlZlB0cjxKU0N1c3RvbVNRTFN0YXRlbWVudEVycm9yQ2FsbGJh Y2s+IHByb3RlY3QodGhpcyk7CiAgICAgICAgIAogICAgIE1hcmtlZEFyZ3VtZW50QnVmZmVyIGFy Z3M7Ci0gICAgYXJncy5hcHBlbmQodG9KUyhleGVjLCB0cmFuc2FjdGlvbikpOwotICAgIGFyZ3Mu YXBwZW5kKHRvSlMoZXhlYywgZXJyb3IpKTsKKyAgICBhcmdzLmFwcGVuZCh0b0pTKGV4ZWMsIGRl cHJlY2F0ZWRHbG9iYWxPYmplY3RGb3JQcm90b3R5cGUoZXhlYyksIHRyYW5zYWN0aW9uKSk7Cisg ICAgYXJncy5hcHBlbmQodG9KUyhleGVjLCBkZXByZWNhdGVkR2xvYmFsT2JqZWN0Rm9yUHJvdG90 eXBlKGV4ZWMpLCBlcnJvcikpOwogICAgICAgICAKICAgICBKU1ZhbHVlIHJlc3VsdDsKICAgICBn bG9iYWxPYmplY3QtPmdsb2JhbERhdGEoKS0+dGltZW91dENoZWNrZXIuc3RhcnQoKTsKZGlmZiAt LWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDdXN0b21TUUxUcmFuc2FjdGlvbkNhbGxiYWNr LmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDdXN0b21TUUxUcmFuc2FjdGlvbkNhbGxiYWNr LmNwcAppbmRleCBhNDFhYzc4Li5kNjljNTUzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTQ3VzdG9tU1FMVHJhbnNhY3Rpb25DYWxsYmFjay5jcHAKKysrIGIvV2ViQ29yZS9iaW5k aW5ncy9qcy9KU0N1c3RvbVNRTFRyYW5zYWN0aW9uQ2FsbGJhY2suY3BwCkBAIC05NCw3ICs5NCw4 IEBAIHZvaWQgSlNDdXN0b21TUUxUcmFuc2FjdGlvbkNhbGxiYWNrOjpoYW5kbGVFdmVudChTUUxU cmFuc2FjdGlvbiogdHJhbnNhY3Rpb24sIGJvCiAKICAgICBpZiAoIW1fZGF0YS0+ZnJhbWUoKS0+ c2NyaXB0KCktPmlzRW5hYmxlZCgpKQogICAgICAgICByZXR1cm47Ci0gICAgICAgIAorCisgICAg Ly8gRklYTUU6IFRoaXMgaXMgbGlrZWx5IHRoZSB3cm9uZyBnbG9iYWxPYmplY3QgKGZvciBwcm90 b3R5cGUgY2hhaW5zIGF0IGxlYXN0KQogICAgIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3Qg PSBtX2RhdGEtPmZyYW1lKCktPnNjcmlwdCgpLT5nbG9iYWxPYmplY3QoKTsKICAgICBFeGVjU3Rh dGUqIGV4ZWMgPSBnbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKTsKICAgICAgICAgCkBAIC0xMTcs NyArMTE4LDcgQEAgdm9pZCBKU0N1c3RvbVNRTFRyYW5zYWN0aW9uQ2FsbGJhY2s6OmhhbmRsZUV2 ZW50KFNRTFRyYW5zYWN0aW9uKiB0cmFuc2FjdGlvbiwgYm8KICAgICBSZWZQdHI8SlNDdXN0b21T UUxUcmFuc2FjdGlvbkNhbGxiYWNrPiBwcm90ZWN0KHRoaXMpOwogICAgICAgICAKICAgICBNYXJr ZWRBcmd1bWVudEJ1ZmZlciBhcmdzOwotICAgIGFyZ3MuYXBwZW5kKHRvSlMoZXhlYywgdHJhbnNh Y3Rpb24pKTsKKyAgICBhcmdzLmFwcGVuZCh0b0pTKGV4ZWMsIGRlcHJlY2F0ZWRHbG9iYWxPYmpl Y3RGb3JQcm90b3R5cGUoZXhlYyksIHRyYW5zYWN0aW9uKSk7CiAKICAgICBnbG9iYWxPYmplY3Qt Pmdsb2JhbERhdGEoKS0+dGltZW91dENoZWNrZXIuc3RhcnQoKTsKICAgICBpZiAoaGFuZGxlRXZl bnRDYWxsVHlwZSAhPSBDYWxsVHlwZU5vbmUpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTQ3VzdG9tU1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrLmNwcCBiL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNDdXN0b21TUUxUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2suY3BwCmluZGV4IDMy NGUyYmIuLjIyMWU4YzYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDdXN0b21T UUxUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2suY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMv SlNDdXN0b21TUUxUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2suY3BwCkBAIC01NCw2ICs1NCw3IEBA IHZvaWQgSlNDdXN0b21TUUxUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2s6OmhhbmRsZUV2ZW50KFNR TEVycm9yKiBlcnJvcikKICAgICBpZiAoIW1fZnJhbWUtPnNjcmlwdCgpLT5pc0VuYWJsZWQoKSkK ICAgICAgICAgcmV0dXJuOwogCisgICAgLy8gRklYTUU6IFRoaXMgaXMgbGlrZWx5IHRoZSB3cm9u ZyBnbG9iYWxPYmplY3QgKGZvciBwcm90b3R5cGUgY2hhaW5zIGF0IGxlYXN0KQogICAgIEpTR2xv YmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBtX2ZyYW1lLT5zY3JpcHQoKS0+Z2xvYmFsT2JqZWN0 KCk7CiAgICAgRXhlY1N0YXRlKiBleGVjID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7CiAK QEAgLTc0LDcgKzc1LDcgQEAgdm9pZCBKU0N1c3RvbVNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFj azo6aGFuZGxlRXZlbnQoU1FMRXJyb3IqIGVycm9yKQogICAgIFJlZlB0cjxKU0N1c3RvbVNRTFRy YW5zYWN0aW9uRXJyb3JDYWxsYmFjaz4gcHJvdGVjdCh0aGlzKTsKIAogICAgIE1hcmtlZEFyZ3Vt ZW50QnVmZmVyIGFyZ3M7Ci0gICAgYXJncy5hcHBlbmQodG9KUyhleGVjLCBlcnJvcikpOworICAg IGFyZ3MuYXBwZW5kKHRvSlMoZXhlYywgZGVwcmVjYXRlZEdsb2JhbE9iamVjdEZvclByb3RvdHlw ZShleGVjKSwgZXJyb3IpKTsKIAogICAgIGdsb2JhbE9iamVjdC0+Z2xvYmFsRGF0YSgpLT50aW1l b3V0Q2hlY2tlci5zdGFydCgpOwogICAgIGNhbGwoZXhlYywgZnVuY3Rpb24sIGNhbGxUeXBlLCBj YWxsRGF0YSwgbV9jYWxsYmFjaywgYXJncyk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTTm9kZUZpbHRlckNvbmRpdGlvbi5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTm9k ZUZpbHRlckNvbmRpdGlvbi5jcHAKaW5kZXggZjVkNGQ1Yy4uYzFmMjM4MSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9iaW5kaW5ncy9qcy9KU05vZGVGaWx0ZXJDb25kaXRpb24uY3BwCisrKyBiL1dlYkNv cmUvYmluZGluZ3MvanMvSlNOb2RlRmlsdGVyQ29uZGl0aW9uLmNwcApAQCAtNjEsNyArNjEsOSBA QCBzaG9ydCBKU05vZGVGaWx0ZXJDb25kaXRpb246OmFjY2VwdE5vZGUoSlNDOjpFeGVjU3RhdGUq IGV4ZWMsIE5vZGUqIGZpbHRlck5vZGUpCiAgICAgICAgIHJldHVybiBOb2RlRmlsdGVyOjpGSUxU RVJfUkVKRUNUOwogCiAgICAgTWFya2VkQXJndW1lbnRCdWZmZXIgYXJnczsKLSAgICBhcmdzLmFw cGVuZCh0b0pTKGV4ZWMsIGZpbHRlck5vZGUpKTsKKyAgICAvLyBGSVhNRTogVGhlIG5vZGUgc2hv dWxkIGhhdmUgdGhlIHByb3RvdHlwZSBjaGFpbiB0aGF0IGNhbWUgZnJvbSBpdHMgZG9jdW1lbnQs IG5vdAorICAgIC8vIHdoYXRldmVyIHByb3RvdHlwZSBjaGFpbiBtaWdodCBiZSBvbiB0aGUgd2lu ZG93IHRoaXMgZmlsdGVyIGNhbWUgZnJvbS4gQnVnIDI3NjYyCisgICAgYXJncy5hcHBlbmQodG9K UyhleGVjLCBkZXByZWNhdGVkR2xvYmFsT2JqZWN0Rm9yUHJvdG90eXBlKGV4ZWMpLCBmaWx0ZXJO b2RlKSk7CiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQogICAgICAgICByZXR1cm4gTm9k ZUZpbHRlcjo6RklMVEVSX1JFSkVDVDs=