66751 2011-08-23 01:00:28 -0700 [Chromium]WebWorkerClientImpl should always invoke InspectorIntrumentation on main thread 2011-08-23 16:22:37 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dslomov dslomov ap dimich levin pfeldman webkit.review.bot yurys oldest_to_newest 455233 0 dslomov 2011-08-23 01:00:28 -0700 InspectorInstrumentation access Document, so the callbacks should always be invoked on main thread (http://code.google.com/p/chromium/issues/detail?id=93777). 455239 1 104802 dslomov 2011-08-23 01:19:18 -0700 Created attachment 104802 This patch moves calls to InspectorInstrumentation from WebWorkerClientImpl to WorkerMessagingProxy 455240 2 webkit.review.bot 2011-08-23 01:21:03 -0700 Attachment 104802 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/WebKit/chromium/ChangeLog:5: Line contains tab character. [whitespace/tab] [5] Source/WebKit/chromium/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] Source/WebKit/chromium/ChangeLog:7: Line contains tab character. [whitespace/tab] [5] Source/WebCore/ChangeLog:5: Line contains tab character. [whitespace/tab] [5] Source/WebCore/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] Source/WebCore/ChangeLog:7: Line contains tab character. [whitespace/tab] [5] Total errors found: 6 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 455242 3 104803 dslomov 2011-08-23 01:24:35 -0700 Created attachment 104803 Indentation fixed 455251 4 104803 pfeldman 2011-08-23 01:50:26 -0700 Comment on attachment 104803 Indentation fixed Looks good. Could you please add ASSERT(isMainThread()) into instrumentationForPage(Page* page) (InstrumentingAgents.cpp) as a drive by? That way it'll hit us prior to thread sanitizer next time. 455666 5 104905 dslomov 2011-08-23 13:41:10 -0700 Created attachment 104905 CR feedback 455671 6 104907 dslomov 2011-08-23 13:43:14 -0700 Created attachment 104907 One more indentation fix.. 455798 7 104907 webkit.review.bot 2011-08-23 16:22:32 -0700 Comment on attachment 104907 One more indentation fix.. Clearing flags on attachment: 104907 Committed r93654: <http://trac.webkit.org/changeset/93654> 455799 8 webkit.review.bot 2011-08-23 16:22:37 -0700 All reviewed patches have been landed. Closing bug. 104802 2011-08-23 01:19:18 -0700 2011-08-23 01:24:35 -0700 This patch moves calls to InspectorInstrumentation from WebWorkerClientImpl to WorkerMessagingProxy 66751.patch text/plain 3857 dslomov SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYldvcmtlckNsaWVudEltcGwuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYldvcmtlckNsaWVu dEltcGwuY3BwCShyZXZpc2lvbiA5MzU1NikKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYldvcmtlckNsaWVudEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw3ICszOSw2IEBA CiAjaW5jbHVkZSAiRXJyb3JFdmVudC5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAi RnJhbWVMb2FkZXJDbGllbnQuaCIKLSNpbmNsdWRlICJJbnNwZWN0b3JJbnN0cnVtZW50YXRpb24u aCIKICNpbmNsdWRlICJNZXNzYWdlRXZlbnQuaCIKICNpbmNsdWRlICJNZXNzYWdlUG9ydC5oIgog I2luY2x1ZGUgIk1lc3NhZ2VQb3J0Q2hhbm5lbC5oIgpAQCAtOTYsNyArOTUsNiBAQAogdm9pZCBX ZWJXb3JrZXJDbGllbnRJbXBsOjp0ZXJtaW5hdGVXb3JrZXJDb250ZXh0KCkKIHsKICAgICBtX3By b3h5LT50ZXJtaW5hdGVXb3JrZXJDb250ZXh0KCk7Ci0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjp3b3JrZXJDb250ZXh0VGVybWluYXRlZChtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuZ2V0 KCksIHRoaXMpOwogfQogCiB2b2lkIFdlYldvcmtlckNsaWVudEltcGw6OnBvc3RNZXNzYWdlVG9X b3JrZXJDb250ZXh0KApAQCAtMTg1LDcgKzE4Myw2IEBACiB2b2lkIFdlYldvcmtlckNsaWVudElt cGw6OndvcmtlckNvbnRleHREZXN0cm95ZWQoKQogewogICAgIG1fcHJveHktPndvcmtlckNvbnRl eHREZXN0cm95ZWQoKTsKLSAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndvcmtlckNvbnRl eHRUZXJtaW5hdGVkKG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dC5nZXQoKSwgdGhpcyk7CiB9CiAK IGJvb2wgV2ViV29ya2VyQ2xpZW50SW1wbDo6YWxsb3dGaWxlU3lzdGVtKCkgCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gOTM1ODApCisrKyBTb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDExLTA4 LTIzICBEbWl0cnkgTG9tb3YgIDxEbWl0cnkgTG9tb3YgKGRzbG9tb3ZAZ29vZ2xlLmNvbSk+CisK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2NzUxIAor ICAgICAgICBbQ2hyb21pdW1dV2ViV29ya2VyQ2xpZW50SW1wbCBzaG91bGQgYWx3YXlzIGludm9r ZQorCUluc3BlY3RvckludHJ1bWVudGF0aW9uIG9uIG1haW4gdGhyZWFkLgorCVRoZSBmaXggbW92 ZXMgY2FsbHMgdG8gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uIGZyb20KKwlXZWJXb3JrZXJDbGll bnRJbXBsIHRvIHVuZWRybHlpbmcgV29ya2VyTWVzc2FnaW5nUHJveHkuCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzcmMvV2ViV29ya2VyQ2xpZW50 SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYldvcmtlckNsaWVudEltcGw6OnRlcm1pbmF0 ZVdvcmtlckNvbnRleHQpOgorICAgICAgICAoV2ViS2l0OjpXZWJXb3JrZXJDbGllbnRJbXBsOjp3 b3JrZXJDb250ZXh0RGVzdHJveWVkKToKKwogMjAxMS0wOC0yMiAgU2hlcmlmZiBCb3QgIDx3ZWJr aXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBv dXQgcjkzNTc1LgpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTM1ODApCisrKyBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBAQAorMjAxMS0wOC0y MyAgRG1pdHJ5IExvbW92ICA8RG1pdHJ5IExvbW92IChkc2xvbW92QGdvb2dsZS5jb20pPgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Njc1MSAKKyAg ICAgICAgW0Nocm9taXVtXVdlYldvcmtlckNsaWVudEltcGwgc2hvdWxkIGFsd2F5cyBpbnZva2UK KwlJbnNwZWN0b3JJbnRydW1lbnRhdGlvbiBvbiBtYWluIHRocmVhZC4KKwlUaGUgZml4IG1vdmVz IGNhbGxzIHRvIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbiBmcm9tCisJV2ViV29ya2VyQ2xpZW50 SW1wbCB0byB1bmVkcmx5aW5nIFdvcmtlck1lc3NhZ2luZ1Byb3h5LgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVz dHMuCisKKyAgICAgICAgKiB3b3JrZXJzL1dvcmtlck1lc3NhZ2luZ1Byb3h5LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Oldvcmtlck1lc3NhZ2luZ1Byb3h5Ojp3b3JrZXJDb250ZXh0RGVzdHJveWVk SW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyTWVzc2FnaW5nUHJveHk6OnRlcm1p bmF0ZVdvcmtlckNvbnRleHQpOgorCiAyMDExLTA4LTIyICBKb2huIEJhdGVzICA8amJhdGVzQGdv b2dsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50ZWQgc2tpYSBzdXBwb3J0IGZvciBjYWNoaW5n IHJlc2l6ZXMgb2YgY3JvcHBlZCBpbWFnZXMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS93b3JrZXJz L1dvcmtlck1lc3NhZ2luZ1Byb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS93 b3JrZXJzL1dvcmtlck1lc3NhZ2luZ1Byb3h5LmNwcAkocmV2aXNpb24gOTM1NTYpCisrKyBTb3Vy Y2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlck1lc3NhZ2luZ1Byb3h5LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzgsNiArMzgsNyBAQAogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRXJy b3JFdmVudC5oIgogI2luY2x1ZGUgIkV4Y2VwdGlvbkNvZGUuaCIKKyNpbmNsdWRlICJJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb24uaCIKICNpbmNsdWRlICJNZXNzYWdlRXZlbnQuaCIKICNpbmNsdWRl ICJTY3JpcHRDYWxsU3RhY2suaCIKICNpbmNsdWRlICJTY3JpcHRFeGVjdXRpb25Db250ZXh0Lmgi CkBAIC0zNDAsNiArMzQxLDkgQEAKICAgICAvLyBpbiBlaXRoZXIgc2lkZSBhbnkgbW9yZS4gSG93 ZXZlciwgdGhlIFdvcmtlciBvYmplY3QgbWF5IHN0aWxsIGV4aXN0LCBhbmQgaXQgYXNzdW1lcyB0 aGF0IHRoZSBwcm94eSBleGlzdHMsIHRvby4KICAgICBtX2Fza2VkVG9UZXJtaW5hdGUgPSB0cnVl OwogICAgIG1fd29ya2VyVGhyZWFkID0gMDsKKworICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6d29ya2VyQ29udGV4dFRlcm1pbmF0ZWQobV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LmdldCgp LCB0aGlzKTsKKwogICAgIGlmICghbV93b3JrZXJPYmplY3QpCiAgICAgICAgIGRlbGV0ZSB0aGlz OwogfQpAQCAtMzUyLDYgKzM1Niw4IEBACiAKICAgICBpZiAobV93b3JrZXJUaHJlYWQpCiAgICAg ICAgIG1fd29ya2VyVGhyZWFkLT5zdG9wKCk7CisKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OndvcmtlckNvbnRleHRUZXJtaW5hdGVkKG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dC5nZXQo KSwgdGhpcyk7CiB9CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQo= 104803 2011-08-23 01:24:35 -0700 2011-08-23 13:41:10 -0700 Indentation fixed 66751.patch text/plain 3899 dslomov SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYldvcmtlckNsaWVudEltcGwuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYldvcmtlckNsaWVu dEltcGwuY3BwCShyZXZpc2lvbiA5MzU1NikKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYldvcmtlckNsaWVudEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw3ICszOSw2IEBA CiAjaW5jbHVkZSAiRXJyb3JFdmVudC5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAi RnJhbWVMb2FkZXJDbGllbnQuaCIKLSNpbmNsdWRlICJJbnNwZWN0b3JJbnN0cnVtZW50YXRpb24u aCIKICNpbmNsdWRlICJNZXNzYWdlRXZlbnQuaCIKICNpbmNsdWRlICJNZXNzYWdlUG9ydC5oIgog I2luY2x1ZGUgIk1lc3NhZ2VQb3J0Q2hhbm5lbC5oIgpAQCAtOTYsNyArOTUsNiBAQAogdm9pZCBX ZWJXb3JrZXJDbGllbnRJbXBsOjp0ZXJtaW5hdGVXb3JrZXJDb250ZXh0KCkKIHsKICAgICBtX3By b3h5LT50ZXJtaW5hdGVXb3JrZXJDb250ZXh0KCk7Ci0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjp3b3JrZXJDb250ZXh0VGVybWluYXRlZChtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuZ2V0 KCksIHRoaXMpOwogfQogCiB2b2lkIFdlYldvcmtlckNsaWVudEltcGw6OnBvc3RNZXNzYWdlVG9X b3JrZXJDb250ZXh0KApAQCAtMTg1LDcgKzE4Myw2IEBACiB2b2lkIFdlYldvcmtlckNsaWVudElt cGw6OndvcmtlckNvbnRleHREZXN0cm95ZWQoKQogewogICAgIG1fcHJveHktPndvcmtlckNvbnRl eHREZXN0cm95ZWQoKTsKLSAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndvcmtlckNvbnRl eHRUZXJtaW5hdGVkKG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dC5nZXQoKSwgdGhpcyk7CiB9CiAK IGJvb2wgV2ViV29ya2VyQ2xpZW50SW1wbDo6YWxsb3dGaWxlU3lzdGVtKCkgCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gOTM1ODApCisrKyBTb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDExLTA4 LTIzICBEbWl0cnkgTG9tb3YgIDxEbWl0cnkgTG9tb3YgKGRzbG9tb3ZAZ29vZ2xlLmNvbSk+CisK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2NzUxIAor ICAgICAgICBbQ2hyb21pdW1dV2ViV29ya2VyQ2xpZW50SW1wbCBzaG91bGQgYWx3YXlzIGludm9r ZQorICAgICAgICBJbnNwZWN0b3JJbnRydW1lbnRhdGlvbiBvbiBtYWluIHRocmVhZC4KKyAgICAg ICAgVGhlIGZpeCBtb3ZlcyBjYWxscyB0byBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb24gZnJvbQor ICAgICAgICBXZWJXb3JrZXJDbGllbnRJbXBsIHRvIHVuZWRybHlpbmcgV29ya2VyTWVzc2FnaW5n UHJveHkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBzcmMvV2ViV29ya2VyQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYldvcmtl ckNsaWVudEltcGw6OnRlcm1pbmF0ZVdvcmtlckNvbnRleHQpOgorICAgICAgICAoV2ViS2l0OjpX ZWJXb3JrZXJDbGllbnRJbXBsOjp3b3JrZXJDb250ZXh0RGVzdHJveWVkKToKKwogMjAxMS0wOC0y MiAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAg VW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjkzNTc1LgpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24g OTM1ODApCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxOSBAQAorMjAxMS0wOC0yMyAgRG1pdHJ5IExvbW92ICA8RG1pdHJ5IExvbW92IChkc2xv bW92QGdvb2dsZS5jb20pPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02Njc1MSAKKyAgICAgICAgW0Nocm9taXVtXVdlYldvcmtlckNsaWVudEltcGwg c2hvdWxkIGFsd2F5cyBpbnZva2UKKyAgICAgICAgSW5zcGVjdG9ySW50cnVtZW50YXRpb24gb24g bWFpbiB0aHJlYWQuCisgICAgICAgIFRoZSBmaXggbW92ZXMgY2FsbHMgdG8gSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uIGZyb20KKyAgICAgICAgV2ViV29ya2VyQ2xpZW50SW1wbCB0byB1bmVkcmx5 aW5nIFdvcmtlck1lc3NhZ2luZ1Byb3h5LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAg KiB3b3JrZXJzL1dvcmtlck1lc3NhZ2luZ1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oldv cmtlck1lc3NhZ2luZ1Byb3h5Ojp3b3JrZXJDb250ZXh0RGVzdHJveWVkSW50ZXJuYWwpOgorICAg ICAgICAoV2ViQ29yZTo6V29ya2VyTWVzc2FnaW5nUHJveHk6OnRlcm1pbmF0ZVdvcmtlckNvbnRl eHQpOgorCiAyMDExLTA4LTIyICBKb2huIEJhdGVzICA8amJhdGVzQGdvb2dsZS5jb20+CiAKICAg ICAgICAgSW1wbGVtZW50ZWQgc2tpYSBzdXBwb3J0IGZvciBjYWNoaW5nIHJlc2l6ZXMgb2YgY3Jv cHBlZCBpbWFnZXMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlck1lc3NhZ2lu Z1Byb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlck1l c3NhZ2luZ1Byb3h5LmNwcAkocmV2aXNpb24gOTM1NTYpCisrKyBTb3VyY2UvV2ViQ29yZS93b3Jr ZXJzL1dvcmtlck1lc3NhZ2luZ1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzgsNiArMzgs NyBAQAogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRXJyb3JFdmVudC5oIgogI2lu Y2x1ZGUgIkV4Y2VwdGlvbkNvZGUuaCIKKyNpbmNsdWRlICJJbnNwZWN0b3JJbnN0cnVtZW50YXRp b24uaCIKICNpbmNsdWRlICJNZXNzYWdlRXZlbnQuaCIKICNpbmNsdWRlICJTY3JpcHRDYWxsU3Rh Y2suaCIKICNpbmNsdWRlICJTY3JpcHRFeGVjdXRpb25Db250ZXh0LmgiCkBAIC0zNDAsNiArMzQx LDkgQEAKICAgICAvLyBpbiBlaXRoZXIgc2lkZSBhbnkgbW9yZS4gSG93ZXZlciwgdGhlIFdvcmtl ciBvYmplY3QgbWF5IHN0aWxsIGV4aXN0LCBhbmQgaXQgYXNzdW1lcyB0aGF0IHRoZSBwcm94eSBl eGlzdHMsIHRvby4KICAgICBtX2Fza2VkVG9UZXJtaW5hdGUgPSB0cnVlOwogICAgIG1fd29ya2Vy VGhyZWFkID0gMDsKKworICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d29ya2VyQ29udGV4 dFRlcm1pbmF0ZWQobV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LmdldCgpLCB0aGlzKTsKKwogICAg IGlmICghbV93b3JrZXJPYmplY3QpCiAgICAgICAgIGRlbGV0ZSB0aGlzOwogfQpAQCAtMzUyLDYg KzM1Niw4IEBACiAKICAgICBpZiAobV93b3JrZXJUaHJlYWQpCiAgICAgICAgIG1fd29ya2VyVGhy ZWFkLT5zdG9wKCk7CisKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndvcmtlckNvbnRl eHRUZXJtaW5hdGVkKG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dC5nZXQoKSwgdGhpcyk7CiB9CiAK ICNpZiBFTkFCTEUoSU5TUEVDVE9SKQo= 104905 2011-08-23 13:41:10 -0700 2011-08-23 13:43:44 -0700 CR feedback 66751 (1).patch text/plain 4468 dslomov SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYldvcmtlckNsaWVudEltcGwuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYldvcmtlckNsaWVu dEltcGwuY3BwKHJldmlzaW9uIDkzNTU2KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViV29ya2VyQ2xpZW50SW1wbC5jcHAod29ya2luZyBjb3B5KQpAQCAtMzksNyArMzksNiBAQAog I2luY2x1ZGUgIkVycm9yRXZlbnQuaCIKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZy YW1lTG9hZGVyQ2xpZW50LmgiCi0jaW5jbHVkZSAiSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgi CiAjaW5jbHVkZSAiTWVzc2FnZUV2ZW50LmgiCiAjaW5jbHVkZSAiTWVzc2FnZVBvcnQuaCIKICNp bmNsdWRlICJNZXNzYWdlUG9ydENoYW5uZWwuaCIKQEAgLTk2LDcgKzk1LDYgQEAKIHZvaWQgV2Vi V29ya2VyQ2xpZW50SW1wbDo6dGVybWluYXRlV29ya2VyQ29udGV4dCgpCiB7CiAgICAgbV9wcm94 eS0+dGVybWluYXRlV29ya2VyQ29udGV4dCgpOwotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6d29ya2VyQ29udGV4dFRlcm1pbmF0ZWQobV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LmdldCgp LCB0aGlzKTsKIH0KIAogdm9pZCBXZWJXb3JrZXJDbGllbnRJbXBsOjpwb3N0TWVzc2FnZVRvV29y a2VyQ29udGV4dCgKQEAgLTE4NSw3ICsxODMsNiBAQAogdm9pZCBXZWJXb3JrZXJDbGllbnRJbXBs Ojp3b3JrZXJDb250ZXh0RGVzdHJveWVkKCkKIHsKICAgICBtX3Byb3h5LT53b3JrZXJDb250ZXh0 RGVzdHJveWVkKCk7Ci0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3b3JrZXJDb250ZXh0 VGVybWluYXRlZChtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuZ2V0KCksIHRoaXMpOwogfQogCiBi b29sIFdlYldvcmtlckNsaWVudEltcGw6OmFsbG93RmlsZVN5c3RlbSgpIApJbmRleDogU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cocmV2aXNpb24gOTM1ODApCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZyh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDgtMjMg IERtaXRyeSBMb21vdiAgPERtaXRyeSBMb21vdiAoZHNsb21vdkBnb29nbGUuY29tKT4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjY3NTEgCisgICAg ICAgIFtDaHJvbWl1bV1XZWJXb3JrZXJDbGllbnRJbXBsIHNob3VsZCBhbHdheXMgaW52b2tlCisg ICAgICAgIEluc3BlY3RvckludHJ1bWVudGF0aW9uIG9uIG1haW4gdGhyZWFkLgorICAgICAgICBU aGUgZml4IG1vdmVzIGNhbGxzIHRvIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbiBmcm9tCisgICAg ICAgIFdlYldvcmtlckNsaWVudEltcGwgdG8gdW5lZHJseWluZyBXb3JrZXJNZXNzYWdpbmdQcm94 eS4KKworICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgorCisgICAgICAgICogc3Jj L1dlYldvcmtlckNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJXb3JrZXJDbGll bnRJbXBsOjp0ZXJtaW5hdGVXb3JrZXJDb250ZXh0KToKKyAgICAgICAgKFdlYktpdDo6V2ViV29y a2VyQ2xpZW50SW1wbDo6d29ya2VyQ29udGV4dERlc3Ryb3llZCk6CisKIDIwMTEtMDgtMjIgIFNo ZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIHJvbGxpbmcgb3V0IHI5MzU3NS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cocmV2aXNpb24gOTM1ODAp CisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIx IEBACisyMDExLTA4LTIzICBEbWl0cnkgTG9tb3YgIDxEbWl0cnkgTG9tb3YgKGRzbG9tb3ZAZ29v Z2xlLmNvbSk+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTY2NzUxIAorICAgICAgICBbQ2hyb21pdW1dV2ViV29ya2VyQ2xpZW50SW1wbCBzaG91bGQg YWx3YXlzIGludm9rZQorSW5zcGVjdG9ySW50cnVtZW50YXRpb24gb24gbWFpbiB0aHJlYWQuCitU aGUgZml4IG1vdmVzIGNhbGxzIHRvIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbiBmcm9tCitXZWJX b3JrZXJDbGllbnRJbXBsIHRvIHVuZWRybHlpbmcgV29ya2VyTWVzc2FnaW5nUHJveHkuCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4 aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3RydW1lbnRpbmdBZ2VudHMu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6aW5zdHJ1bWVudGF0aW9uRm9yUGFnZSk6CisgICAgICAg ICogd29ya2Vycy9Xb3JrZXJNZXNzYWdpbmdQcm94eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpX b3JrZXJNZXNzYWdpbmdQcm94eTo6d29ya2VyQ29udGV4dERlc3Ryb3llZEludGVybmFsKToKKyAg ICAgICAgKFdlYkNvcmU6Oldvcmtlck1lc3NhZ2luZ1Byb3h5Ojp0ZXJtaW5hdGVXb3JrZXJDb250 ZXh0KToKKwogMjAxMS0wOC0yMiAgSm9obiBCYXRlcyAgPGpiYXRlc0Bnb29nbGUuY29tPgogCiAg ICAgICAgIEltcGxlbWVudGVkIHNraWEgc3VwcG9ydCBmb3IgY2FjaGluZyByZXNpemVzIG9mIGNy b3BwZWQgaW1hZ2VzLgpJbmRleDogU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJNZXNzYWdp bmdQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJN ZXNzYWdpbmdQcm94eS5jcHAocmV2aXNpb24gOTM1NTYpCisrKyBTb3VyY2UvV2ViQ29yZS93b3Jr ZXJzL1dvcmtlck1lc3NhZ2luZ1Byb3h5LmNwcCh3b3JraW5nIGNvcHkpCkBAIC0zOCw2ICszOCw3 IEBACiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJFcnJvckV2ZW50LmgiCiAjaW5j bHVkZSAiRXhjZXB0aW9uQ29kZS5oIgorI2luY2x1ZGUgIkluc3BlY3Rvckluc3RydW1lbnRhdGlv bi5oIgogI2luY2x1ZGUgIk1lc3NhZ2VFdmVudC5oIgogI2luY2x1ZGUgIlNjcmlwdENhbGxTdGFj ay5oIgogI2luY2x1ZGUgIlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaCIKQEAgLTM0MCw2ICszNDEs OSBAQAogICAgIC8vIGluIGVpdGhlciBzaWRlIGFueSBtb3JlLiBIb3dldmVyLCB0aGUgV29ya2Vy IG9iamVjdCBtYXkgc3RpbGwgZXhpc3QsIGFuZCBpdCBhc3N1bWVzIHRoYXQgdGhlIHByb3h5IGV4 aXN0cywgdG9vLgogICAgIG1fYXNrZWRUb1Rlcm1pbmF0ZSA9IHRydWU7CiAgICAgbV93b3JrZXJU aHJlYWQgPSAwOworCisgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3b3JrZXJDb250ZXh0 VGVybWluYXRlZChtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuZ2V0KCksIHRoaXMpOworCiAgICAg aWYgKCFtX3dvcmtlck9iamVjdCkKICAgICAgICAgZGVsZXRlIHRoaXM7CiB9CkBAIC0zNTIsNiAr MzU2LDggQEAKIAogICAgIGlmIChtX3dvcmtlclRocmVhZCkKICAgICAgICAgbV93b3JrZXJUaHJl YWQtPnN0b3AoKTsKKworICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d29ya2VyQ29udGV4 dFRlcm1pbmF0ZWQobV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LmdldCgpLCB0aGlzKTsKIH0KIAog I2lmIEVOQUJMRShJTlNQRUNUT1IpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z dHJ1bWVudGluZ0FnZW50cy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3RydW1lbnRpbmdBZ2VudHMuY3BwKHJldmlzaW9uIDkzNTU2KQorKysgU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3RydW1lbnRpbmdBZ2VudHMuY3BwKHdvcmtpbmcgY29weSkKQEAg LTQyLDYgKzQyLDcgQEAKIAogSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGF0aW9uRm9y UGFnZShQYWdlKiBwYWdlKQogeworICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgaWYg KEluc3BlY3RvckNvbnRyb2xsZXIqIGNvbnRyb2xsZXIgPSBwYWdlLT5pbnNwZWN0b3JDb250cm9s bGVyKCkpCiAgICAgICAgIHJldHVybiBjb250cm9sbGVyLT5tX2luc3RydW1lbnRpbmdBZ2VudHMu Z2V0KCk7CiAgICAgcmV0dXJuIDA7Cg== 104907 2011-08-23 13:43:14 -0700 2011-08-23 16:22:32 -0700 One more indentation fix.. 66751 (1).patch text/plain 4492 dslomov SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYldvcmtlckNsaWVudEltcGwuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYldvcmtlckNsaWVu dEltcGwuY3BwKHJldmlzaW9uIDkzNTU2KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViV29ya2VyQ2xpZW50SW1wbC5jcHAod29ya2luZyBjb3B5KQpAQCAtMzksNyArMzksNiBAQAog I2luY2x1ZGUgIkVycm9yRXZlbnQuaCIKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZy YW1lTG9hZGVyQ2xpZW50LmgiCi0jaW5jbHVkZSAiSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgi CiAjaW5jbHVkZSAiTWVzc2FnZUV2ZW50LmgiCiAjaW5jbHVkZSAiTWVzc2FnZVBvcnQuaCIKICNp bmNsdWRlICJNZXNzYWdlUG9ydENoYW5uZWwuaCIKQEAgLTk2LDcgKzk1LDYgQEAKIHZvaWQgV2Vi V29ya2VyQ2xpZW50SW1wbDo6dGVybWluYXRlV29ya2VyQ29udGV4dCgpCiB7CiAgICAgbV9wcm94 eS0+dGVybWluYXRlV29ya2VyQ29udGV4dCgpOwotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6d29ya2VyQ29udGV4dFRlcm1pbmF0ZWQobV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LmdldCgp LCB0aGlzKTsKIH0KIAogdm9pZCBXZWJXb3JrZXJDbGllbnRJbXBsOjpwb3N0TWVzc2FnZVRvV29y a2VyQ29udGV4dCgKQEAgLTE4NSw3ICsxODMsNiBAQAogdm9pZCBXZWJXb3JrZXJDbGllbnRJbXBs Ojp3b3JrZXJDb250ZXh0RGVzdHJveWVkKCkKIHsKICAgICBtX3Byb3h5LT53b3JrZXJDb250ZXh0 RGVzdHJveWVkKCk7Ci0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3b3JrZXJDb250ZXh0 VGVybWluYXRlZChtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuZ2V0KCksIHRoaXMpOwogfQogCiBi b29sIFdlYldvcmtlckNsaWVudEltcGw6OmFsbG93RmlsZVN5c3RlbSgpIApJbmRleDogU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cocmV2aXNpb24gOTM1ODApCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZyh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDgtMjMg IERtaXRyeSBMb21vdiAgPERtaXRyeSBMb21vdiAoZHNsb21vdkBnb29nbGUuY29tKT4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjY3NTEgCisgICAg ICAgIFtDaHJvbWl1bV1XZWJXb3JrZXJDbGllbnRJbXBsIHNob3VsZCBhbHdheXMgaW52b2tlCisg ICAgICAgIEluc3BlY3RvckludHJ1bWVudGF0aW9uIG9uIG1haW4gdGhyZWFkLgorICAgICAgICBU aGUgZml4IG1vdmVzIGNhbGxzIHRvIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbiBmcm9tCisgICAg ICAgIFdlYldvcmtlckNsaWVudEltcGwgdG8gdW5lZHJseWluZyBXb3JrZXJNZXNzYWdpbmdQcm94 eS4KKworICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgorCisgICAgICAgICogc3Jj L1dlYldvcmtlckNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJXb3JrZXJDbGll bnRJbXBsOjp0ZXJtaW5hdGVXb3JrZXJDb250ZXh0KToKKyAgICAgICAgKFdlYktpdDo6V2ViV29y a2VyQ2xpZW50SW1wbDo6d29ya2VyQ29udGV4dERlc3Ryb3llZCk6CisKIDIwMTEtMDgtMjIgIFNo ZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIHJvbGxpbmcgb3V0IHI5MzU3NS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cocmV2aXNpb24gOTM1ODAp CisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIx IEBACisyMDExLTA4LTIzICBEbWl0cnkgTG9tb3YgIDxEbWl0cnkgTG9tb3YgKGRzbG9tb3ZAZ29v Z2xlLmNvbSk+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTY2NzUxIAorICAgICAgICBbQ2hyb21pdW1dV2ViV29ya2VyQ2xpZW50SW1wbCBzaG91bGQg YWx3YXlzIGludm9rZQorICAgICAgICBJbnNwZWN0b3JJbnRydW1lbnRhdGlvbiBvbiBtYWluIHRo cmVhZC4KKyAgICAgICAgVGhlIGZpeCBtb3ZlcyBjYWxscyB0byBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb24gZnJvbQorICAgICAgICBXZWJXb3JrZXJDbGllbnRJbXBsIHRvIHVuZWRybHlpbmcgV29y a2VyTWVzc2FnaW5nUHJveHkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4K KworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogaW5zcGVj dG9yL0luc3RydW1lbnRpbmdBZ2VudHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aW5zdHJ1bWVu dGF0aW9uRm9yUGFnZSk6CisgICAgICAgICogd29ya2Vycy9Xb3JrZXJNZXNzYWdpbmdQcm94eS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJNZXNzYWdpbmdQcm94eTo6d29ya2VyQ29udGV4 dERlc3Ryb3llZEludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6Oldvcmtlck1lc3NhZ2luZ1By b3h5Ojp0ZXJtaW5hdGVXb3JrZXJDb250ZXh0KToKKwogMjAxMS0wOC0yMiAgSm9obiBCYXRlcyAg PGpiYXRlc0Bnb29nbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudGVkIHNraWEgc3VwcG9ydCBm b3IgY2FjaGluZyByZXNpemVzIG9mIGNyb3BwZWQgaW1hZ2VzLgpJbmRleDogU291cmNlL1dlYkNv cmUvd29ya2Vycy9Xb3JrZXJNZXNzYWdpbmdQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJNZXNzYWdpbmdQcm94eS5jcHAocmV2aXNpb24gOTM1NTYp CisrKyBTb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlck1lc3NhZ2luZ1Byb3h5LmNwcCh3b3Jr aW5nIGNvcHkpCkBAIC0zOCw2ICszOCw3IEBACiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNs dWRlICJFcnJvckV2ZW50LmgiCiAjaW5jbHVkZSAiRXhjZXB0aW9uQ29kZS5oIgorI2luY2x1ZGUg Ikluc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oIgogI2luY2x1ZGUgIk1lc3NhZ2VFdmVudC5oIgog I2luY2x1ZGUgIlNjcmlwdENhbGxTdGFjay5oIgogI2luY2x1ZGUgIlNjcmlwdEV4ZWN1dGlvbkNv bnRleHQuaCIKQEAgLTM0MCw2ICszNDEsOSBAQAogICAgIC8vIGluIGVpdGhlciBzaWRlIGFueSBt b3JlLiBIb3dldmVyLCB0aGUgV29ya2VyIG9iamVjdCBtYXkgc3RpbGwgZXhpc3QsIGFuZCBpdCBh c3N1bWVzIHRoYXQgdGhlIHByb3h5IGV4aXN0cywgdG9vLgogICAgIG1fYXNrZWRUb1Rlcm1pbmF0 ZSA9IHRydWU7CiAgICAgbV93b3JrZXJUaHJlYWQgPSAwOworCisgICAgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uOjp3b3JrZXJDb250ZXh0VGVybWluYXRlZChtX3NjcmlwdEV4ZWN1dGlvbkNvbnRl eHQuZ2V0KCksIHRoaXMpOworCiAgICAgaWYgKCFtX3dvcmtlck9iamVjdCkKICAgICAgICAgZGVs ZXRlIHRoaXM7CiB9CkBAIC0zNTIsNiArMzU2LDggQEAKIAogICAgIGlmIChtX3dvcmtlclRocmVh ZCkKICAgICAgICAgbV93b3JrZXJUaHJlYWQtPnN0b3AoKTsKKworICAgIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6d29ya2VyQ29udGV4dFRlcm1pbmF0ZWQobV9zY3JpcHRFeGVjdXRpb25Db250 ZXh0LmdldCgpLCB0aGlzKTsKIH0KIAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zdHJ1bWVudGluZ0FnZW50cy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3RydW1lbnRpbmdBZ2VudHMuY3BwKHJldmlz aW9uIDkzNTU2KQorKysgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3RydW1lbnRpbmdBZ2Vu dHMuY3BwKHdvcmtpbmcgY29weSkKQEAgLTQyLDYgKzQyLDcgQEAKIAogSW5zdHJ1bWVudGluZ0Fn ZW50cyogaW5zdHJ1bWVudGF0aW9uRm9yUGFnZShQYWdlKiBwYWdlKQogeworICAgIEFTU0VSVChp c01haW5UaHJlYWQoKSk7CiAgICAgaWYgKEluc3BlY3RvckNvbnRyb2xsZXIqIGNvbnRyb2xsZXIg PSBwYWdlLT5pbnNwZWN0b3JDb250cm9sbGVyKCkpCiAgICAgICAgIHJldHVybiBjb250cm9sbGVy LT5tX2luc3RydW1lbnRpbmdBZ2VudHMuZ2V0KCk7CiAgICAgcmV0dXJuIDA7Cg==