62721 2011-06-15 05:45:54 -0700 Web Inspector: provide unique identifiers for frames 2011-06-15 08:44:44 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 421201 0 caseq 2011-06-15 05:45:54 -0700 Currently, we use frame address as a frame id, this does not guarantee frame ids to be unique through the life time of the process. This is first step in making frame ids unique -- we now assign sequential ids and maintain them as a map within InspectorPageAgent. The next step would be to make the ids unique for multi-process browsers by including some system-unique identifier. 421202 1 97279 caseq 2011-06-15 05:49:06 -0700 Created attachment 97279 patch 421203 2 webkit.review.bot 2011-06-15 05:53:22 -0700 Attachment 97279 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/InspectorPageAgent.cpp:648: Place brace on its own line for function definitions. [whitespace/braces] [4] Source/WebCore/inspector/InspectorPageAgent.cpp:653: Place brace on its own line for function definitions. [whitespace/braces] [4] Source/WebCore/inspector/InspectorPageAgent.cpp:659: Declaration has space between type name and * in Frame *frame [whitespace/declaration] [3] Total errors found: 3 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 421204 3 97280 caseq 2011-06-15 05:56:20 -0700 Created attachment 97280 patch (style fixed) 421208 4 97280 pfeldman 2011-06-15 06:04:49 -0700 Comment on attachment 97280 patch (style fixed) View in context: https://bugs.webkit.org/attachment.cgi?id=97280&action=review > Source/WebCore/inspector/InspectorPageAgent.cpp:646 > +InspectorPageAgent::FrameEntry::FrameEntry() I'd rather instrument frame destruction. 421232 5 97287 caseq 2011-06-15 06:40:22 -0700 Created attachment 97287 patch (FrameDestructionObserver -> InspectorInstrumentation) 421238 6 webkit.review.bot 2011-06-15 06:57:48 -0700 Attachment 97280 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit', '--chromium']" exit_code: 9 Updating OpenSource RA layer request failed: OPTIONS of 'http://svn.webkit.org/repository/webkit': timed out waiting for server (http://svn.webkit.org) at /usr/lib/git-core/git-svn line 2295 Died at Tools/Scripts/update-webkit line 146. If any of these errors are false positives, please file a bug against check-webkit-style. 421249 7 97287 pfeldman 2011-06-15 07:19:34 -0700 Comment on attachment 97287 patch (FrameDestructionObserver -> InspectorInstrumentation) View in context: https://bugs.webkit.org/attachment.cgi?id=97287&action=review > Source/WebCore/inspector/InspectorPageAgent.cpp:594 > + ASSERT(iterator != m_frameToIdentifier.end()); This assertion will fail due to the lazy identifier assignment. 421266 8 97292 caseq 2011-06-15 07:37:09 -0700 Created attachment 97292 patch Thanks for catching this! This is an unfortunate leftover from the previous implementation. 421324 9 caseq 2011-06-15 08:44:44 -0700 manually committed r88940: http://trac.webkit.org/changeset/88940 97279 2011-06-15 05:49:06 -0700 2011-06-15 05:56:20 -0700 patch frame-ids.diff text/plain 6003 caseq ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMDRkNGNkLi5iZjczYzZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDYtMTUgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBwcm92aWRlIHVuaXF1ZSBpZGVudGlmaWVycyBmb3IgZnJhbWVzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjcyMQorCisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JQYWdlQWdlbnQ6OmZyYW1lRm9ySWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFn ZUFnZW50OjpmcmFtZUlkKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclBhZ2VBZ2VudDo6 ZnJhbWVEZXN0cm95ZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFnZUFnZW50OjpG cmFtZUVudHJ5OjpGcmFtZUVudHJ5KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclBhZ2VB Z2VudDo6RnJhbWVFbnRyeTo6ZnJhbWVEZXN0cm95ZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yUGFnZUFnZW50OjpGcmFtZUVudHJ5Ojp+RnJhbWVFbnRyeSk6CisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oOgorICAgICAgICAqIHBhZ2UvRnJhbWUuY3BwOgor CiAyMDExLTA2LTEwICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCmluZGV4IDE5MzQ5OTcuLmEyZTg5MTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCkBA IC02OSw2ICs2OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSB7CiAvLyBUaGlz IHNob3VsZCBiZSBrZXB0IHRoZSBzYW1lIGFzIHRoZSBvbmUgaW4gZnJvbnQtZW5kL3V0aWxpdGll cy5qcwogc3RhdGljIGNvbnN0IGNoYXIgcmVnZXhTcGVjaWFsQ2hhcmFjdGVyc1tdID0gIltdKCl7 fSstKi4sP1xcXiR8IjsKK3N0YXRpYyB1bnNpZ25lZCBpbnQgc19sYXN0RnJhbWVJZGVudGlmaWVy ID0gMDsKIH0KIAogc3RhdGljIGJvb2wgZGVjb2RlU2hhcmVkQnVmZmVyKFBhc3NSZWZQdHI8U2hh cmVkQnVmZmVyPiBidWZmZXIsIGNvbnN0IFN0cmluZyYgdGV4dEVuY29kaW5nTmFtZSwgU3RyaW5n KiByZXN1bHQpCkBAIC01NjIsMTcgKzU2MywyNCBAQCBzdGF0aWMgU3RyaW5nIHBvaW50ZXJBc0lk KHZvaWQqIHBvaW50ZXIpCiAKIEZyYW1lKiBJbnNwZWN0b3JQYWdlQWdlbnQ6OmZyYW1lRm9ySWQo Y29uc3QgU3RyaW5nJiBmcmFtZUlkKQogewotICAgIEZyYW1lKiBtYWluRnJhbWUgPSBtX3BhZ2Ut Pm1haW5GcmFtZSgpOwotICAgIGZvciAoRnJhbWUqIGZyYW1lID0gbWFpbkZyYW1lOyBmcmFtZTsg ZnJhbWUgPSBmcmFtZS0+dHJlZSgpLT50cmF2ZXJzZU5leHQobWFpbkZyYW1lKSkgewotICAgICAg ICBpZiAocG9pbnRlckFzSWQoZnJhbWUpID09IGZyYW1lSWQpCi0gICAgICAgICAgICByZXR1cm4g ZnJhbWU7Ci0gICAgfQotICAgIHJldHVybiAwOworICAgIGJvb2wgb2sgPSBmYWxzZTsKKyAgICB1 bnNpZ25lZCBpbnQgaWRlbnRpZmllciA9IGZyYW1lSWQudG9VSW50U3RyaWN0KCZvayk7CisgICAg aWYgKCFvayB8fCAhaWRlbnRpZmllcikKKyAgICAgICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIG1f aWRlbnRpZmllclRvRnJhbWUuZ2V0KGlkZW50aWZpZXIpLm1fZnJhbWU7CiB9CiAKIFN0cmluZyBJ bnNwZWN0b3JQYWdlQWdlbnQ6OmZyYW1lSWQoRnJhbWUqIGZyYW1lKQogewotICAgIHJldHVybiBw b2ludGVyQXNJZChmcmFtZSk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAgICAgcmV0dXJuICIiOwor ICAgIHVuc2lnbmVkIGludCBpZGVudGlmaWVyID0gbV9mcmFtZVRvSWRlbnRpZmllci5nZXQoZnJh bWUpOworICAgIGlmICghaWRlbnRpZmllcikgeworICAgICAgICBpZGVudGlmaWVyID0gKytzX2xh c3RGcmFtZUlkZW50aWZpZXI7CisgICAgICAgIG1fZnJhbWVUb0lkZW50aWZpZXIuc2V0KGZyYW1l LCBpZGVudGlmaWVyKTsKKyAgICAgICAgbV9pZGVudGlmaWVyVG9GcmFtZS5zZXQoaWRlbnRpZmll ciwgRnJhbWVFbnRyeSh0aGlzLCBmcmFtZSkpOworICAgIH0gCisgICAgcmV0dXJuIFN0cmluZzo6 bnVtYmVyKGlkZW50aWZpZXIpOwogfQogCiBTdHJpbmcgSW5zcGVjdG9yUGFnZUFnZW50Ojpsb2Fk ZXJJZChEb2N1bWVudExvYWRlciogbG9hZGVyKQpAQCAtNTgwLDYgKzU4OCwxNCBAQCBTdHJpbmcg SW5zcGVjdG9yUGFnZUFnZW50Ojpsb2FkZXJJZChEb2N1bWVudExvYWRlciogbG9hZGVyKQogICAg IHJldHVybiBwb2ludGVyQXNJZChsb2FkZXIpOwogfQogCit2b2lkIEluc3BlY3RvclBhZ2VBZ2Vu dDo6ZnJhbWVEZXN0cm95ZWQoRnJhbWUqIGZyYW1lKQoreworICAgIEhhc2hNYXA8RnJhbWUqLCB1 bnNpZ25lZCBpbnQ+OjppdGVyYXRvciBpdGVyYXRvciA9IG1fZnJhbWVUb0lkZW50aWZpZXIuZmlu ZChmcmFtZSk7CisgICAgQVNTRVJUKGl0ZXJhdG9yICE9IG1fZnJhbWVUb0lkZW50aWZpZXIuZW5k KCkpOworICAgIG1faWRlbnRpZmllclRvRnJhbWUucmVtb3ZlKGl0ZXJhdG9yLT5zZWNvbmQpOwor ICAgIG1fZnJhbWVUb0lkZW50aWZpZXIucmVtb3ZlKGl0ZXJhdG9yKTsKK30KKwogUGFzc1JlZlB0 cjxJbnNwZWN0b3JPYmplY3Q+IEluc3BlY3RvclBhZ2VBZ2VudDo6YnVpbGRPYmplY3RGb3JGcmFt ZShGcmFtZSogZnJhbWUpCiB7CiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZnJhbWVPYmpl Y3QgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwpAQCAtNjI3LDYgKzY0MywzMSBAQCBQYXNz UmVmUHRyPEluc3BlY3Rvck9iamVjdD4gSW5zcGVjdG9yUGFnZUFnZW50OjpidWlsZE9iamVjdEZv ckZyYW1lVHJlZShGcmFtZSogZgogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKK0luc3BlY3RvclBh Z2VBZ2VudDo6RnJhbWVFbnRyeTo6RnJhbWVFbnRyeSgpCisgICAgOiBtX2FnZW50KDApCisgICAg LCBtX2ZyYW1lKDApIHsKK30KKworSW5zcGVjdG9yUGFnZUFnZW50OjpGcmFtZUVudHJ5OjpGcmFt ZUVudHJ5KEluc3BlY3RvclBhZ2VBZ2VudCogYWdlbnQsIEZyYW1lKiBmcmFtZSkKKyAgICA6IG1f YWdlbnQoYWdlbnQpCisgICAgLCBtX2ZyYW1lKGZyYW1lKSB7CisgICAgbV9mcmFtZS0+YWRkRGVz dHJ1Y3Rpb25PYnNlcnZlcih0aGlzKTsKK30KKyAgICAKK3ZvaWQgSW5zcGVjdG9yUGFnZUFnZW50 OjpGcmFtZUVudHJ5OjpmcmFtZURlc3Ryb3llZCgpCit7CisgICAgRnJhbWUgKmZyYW1lID0gbV9m cmFtZTsKKyAgICAvLyBJbnZhbGlkYXRlIGZyYW1lIHNvIHRoYXQgd2UgZG9uJ3QgYXR0ZW1wdCB0 byB1bnN1YnNjcmliZSBmcm9tIGZyYW1lRGVzdHJveWVkIHdoaWxlIEZyYW1lIGl0ZXJhdGVzIG92 ZXIgbGlzdGVuZXJzLgorICAgIG1fZnJhbWUgPSAwOworICAgIG1fYWdlbnQtPmZyYW1lRGVzdHJv eWVkKGZyYW1lKTsKK30KKworSW5zcGVjdG9yUGFnZUFnZW50OjpGcmFtZUVudHJ5Ojp+RnJhbWVF bnRyeSgpCit7CisgICAgaWYgKG1fZnJhbWUpCisgICAgICAgIG1fZnJhbWUtPnJlbW92ZURlc3Ry dWN0aW9uT2JzZXJ2ZXIodGhpcyk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2Vu ZGlmIC8vIEVOQUJMRShJTlNQRUNUT1IpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUGFnZUFnZW50LmgKaW5kZXggYzEyZDc5Yi4uMTE0MGNmMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuaApAQCAtMzMsOCArMzMsMTAgQEAK IAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCiAKKyNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUg Ikluc3BlY3RvckZyb250ZW5kLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKKyNpbmNs dWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAjaW5jbHVk ZSA8d3RmL1ZlY3Rvci5oPgogCkBAIC05OSw2ICsxMDEsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBm cmFtZU5hdmlnYXRlZChEb2N1bWVudExvYWRlciopOwogICAgIHZvaWQgZnJhbWVEZXRhY2hlZChG cmFtZSopOwogCisgICAgLy8gQ2FsbGVkIHZpYSBGcmFtZURlc3RydWN0aW9uT2JzZXJ2ZXIvRnJh bWVFbnRyeTo6ZnJhbWVEZXN0cm95ZWQoKTsKKyAgICB2b2lkIGZyYW1lRGVzdHJveWVkKEZyYW1l Kik7CisKICAgICAvLyBJbnNwZWN0b3IgQ29udHJvbGxlciBBUEkKICAgICB2b2lkIHNldEZyb250 ZW5kKEluc3BlY3RvckZyb250ZW5kKik7CiAgICAgdm9pZCBjbGVhckZyb250ZW5kKCk7CkBAIC0x MTAsNiArMTE1LDE2IEBAIHB1YmxpYzoKICAgICBTdHJpbmcgbG9hZGVySWQoRG9jdW1lbnRMb2Fk ZXIqKTsKIAogcHJpdmF0ZToKKyAgICBzdHJ1Y3QgRnJhbWVFbnRyeSA6IHB1YmxpYyBGcmFtZURl c3RydWN0aW9uT2JzZXJ2ZXIgeworICAgICAgICBJbnNwZWN0b3JQYWdlQWdlbnQqIG1fYWdlbnQ7 CisgICAgICAgIEZyYW1lKiBtX2ZyYW1lOworICAgICAgICAKKyAgICAgICAgdmlydHVhbCB2b2lk IGZyYW1lRGVzdHJveWVkKCk7CisgICAgICAgIEZyYW1lRW50cnkoKTsKKyAgICAgICAgRnJhbWVF bnRyeShJbnNwZWN0b3JQYWdlQWdlbnQqLCBGcmFtZSopOworICAgICAgICB2aXJ0dWFsIH5GcmFt ZUVudHJ5KCk7CisgICAgfTsKKwogICAgIEluc3BlY3RvclBhZ2VBZ2VudChJbnN0cnVtZW50aW5n QWdlbnRzKiwgUGFnZSosIEluamVjdGVkU2NyaXB0TWFuYWdlciopOwogCiAgICAgUGFzc1JlZlB0 cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9yRnJhbWUoRnJhbWUqKTsKQEAgLTEyMCw2 ICsxMzUsOCBAQCBwcml2YXRlOgogICAgIEluamVjdGVkU2NyaXB0TWFuYWdlciogbV9pbmplY3Rl ZFNjcmlwdE1hbmFnZXI7CiAgICAgSW5zcGVjdG9yRnJvbnRlbmQ6OlBhZ2UqIG1fZnJvbnRlbmQ7 CiAgICAgVmVjdG9yPFN0cmluZz4gbV9zY3JpcHRzVG9FdmFsdWF0ZU9uTG9hZDsKKyAgICBIYXNo TWFwPEZyYW1lKiwgdW5zaWduZWQgaW50PiBtX2ZyYW1lVG9JZGVudGlmaWVyOworICAgIEhhc2hN YXA8dW5zaWduZWQgaW50LCBGcmFtZUVudHJ5PiBtX2lkZW50aWZpZXJUb0ZyYW1lOwogfTsKIAog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWUuY3BwCmluZGV4IDA0MTczYzkuLjAxZTc1YTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWUuY3BwCkBAIC01Nyw2ICs1Nyw3IEBACiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVk ZSAiSFRNTFRhYmxlQ2VsbEVsZW1lbnQuaCIKICNpbmNsdWRlICJIaXRUZXN0UmVzdWx0LmgiCisj aW5jbHVkZSAiSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5o IgogI2luY2x1ZGUgIk1lZGlhRmVhdHVyZU5hbWVzLmgiCiAjaW5jbHVkZSAiTWVkaWFTdHJlYW1G cmFtZUNvbnRyb2xsZXIuaCIK 97280 2011-06-15 05:56:20 -0700 2011-06-15 06:40:22 -0700 patch (style fixed) frame-ids.diff text/plain 6005 caseq ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMDRkNGNkLi5iZjczYzZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDYtMTUgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBwcm92aWRlIHVuaXF1ZSBpZGVudGlmaWVycyBmb3IgZnJhbWVzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjcyMQorCisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JQYWdlQWdlbnQ6OmZyYW1lRm9ySWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFn ZUFnZW50OjpmcmFtZUlkKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclBhZ2VBZ2VudDo6 ZnJhbWVEZXN0cm95ZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFnZUFnZW50OjpG cmFtZUVudHJ5OjpGcmFtZUVudHJ5KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclBhZ2VB Z2VudDo6RnJhbWVFbnRyeTo6ZnJhbWVEZXN0cm95ZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yUGFnZUFnZW50OjpGcmFtZUVudHJ5Ojp+RnJhbWVFbnRyeSk6CisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oOgorICAgICAgICAqIHBhZ2UvRnJhbWUuY3BwOgor CiAyMDExLTA2LTEwICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCmluZGV4IDE5MzQ5OTcuLmY3MzcxMDQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCkBA IC02OSw2ICs2OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSB7CiAvLyBUaGlz IHNob3VsZCBiZSBrZXB0IHRoZSBzYW1lIGFzIHRoZSBvbmUgaW4gZnJvbnQtZW5kL3V0aWxpdGll cy5qcwogc3RhdGljIGNvbnN0IGNoYXIgcmVnZXhTcGVjaWFsQ2hhcmFjdGVyc1tdID0gIltdKCl7 fSstKi4sP1xcXiR8IjsKK3N0YXRpYyB1bnNpZ25lZCBpbnQgc19sYXN0RnJhbWVJZGVudGlmaWVy ID0gMDsKIH0KIAogc3RhdGljIGJvb2wgZGVjb2RlU2hhcmVkQnVmZmVyKFBhc3NSZWZQdHI8U2hh cmVkQnVmZmVyPiBidWZmZXIsIGNvbnN0IFN0cmluZyYgdGV4dEVuY29kaW5nTmFtZSwgU3RyaW5n KiByZXN1bHQpCkBAIC01NjIsMTcgKzU2MywyNCBAQCBzdGF0aWMgU3RyaW5nIHBvaW50ZXJBc0lk KHZvaWQqIHBvaW50ZXIpCiAKIEZyYW1lKiBJbnNwZWN0b3JQYWdlQWdlbnQ6OmZyYW1lRm9ySWQo Y29uc3QgU3RyaW5nJiBmcmFtZUlkKQogewotICAgIEZyYW1lKiBtYWluRnJhbWUgPSBtX3BhZ2Ut Pm1haW5GcmFtZSgpOwotICAgIGZvciAoRnJhbWUqIGZyYW1lID0gbWFpbkZyYW1lOyBmcmFtZTsg ZnJhbWUgPSBmcmFtZS0+dHJlZSgpLT50cmF2ZXJzZU5leHQobWFpbkZyYW1lKSkgewotICAgICAg ICBpZiAocG9pbnRlckFzSWQoZnJhbWUpID09IGZyYW1lSWQpCi0gICAgICAgICAgICByZXR1cm4g ZnJhbWU7Ci0gICAgfQotICAgIHJldHVybiAwOworICAgIGJvb2wgb2sgPSBmYWxzZTsKKyAgICB1 bnNpZ25lZCBpbnQgaWRlbnRpZmllciA9IGZyYW1lSWQudG9VSW50U3RyaWN0KCZvayk7CisgICAg aWYgKCFvayB8fCAhaWRlbnRpZmllcikKKyAgICAgICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIG1f aWRlbnRpZmllclRvRnJhbWUuZ2V0KGlkZW50aWZpZXIpLm1fZnJhbWU7CiB9CiAKIFN0cmluZyBJ bnNwZWN0b3JQYWdlQWdlbnQ6OmZyYW1lSWQoRnJhbWUqIGZyYW1lKQogewotICAgIHJldHVybiBw b2ludGVyQXNJZChmcmFtZSk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAgICAgcmV0dXJuICIiOwor ICAgIHVuc2lnbmVkIGludCBpZGVudGlmaWVyID0gbV9mcmFtZVRvSWRlbnRpZmllci5nZXQoZnJh bWUpOworICAgIGlmICghaWRlbnRpZmllcikgeworICAgICAgICBpZGVudGlmaWVyID0gKytzX2xh c3RGcmFtZUlkZW50aWZpZXI7CisgICAgICAgIG1fZnJhbWVUb0lkZW50aWZpZXIuc2V0KGZyYW1l LCBpZGVudGlmaWVyKTsKKyAgICAgICAgbV9pZGVudGlmaWVyVG9GcmFtZS5zZXQoaWRlbnRpZmll ciwgRnJhbWVFbnRyeSh0aGlzLCBmcmFtZSkpOworICAgIH0gCisgICAgcmV0dXJuIFN0cmluZzo6 bnVtYmVyKGlkZW50aWZpZXIpOwogfQogCiBTdHJpbmcgSW5zcGVjdG9yUGFnZUFnZW50Ojpsb2Fk ZXJJZChEb2N1bWVudExvYWRlciogbG9hZGVyKQpAQCAtNTgwLDYgKzU4OCwxNCBAQCBTdHJpbmcg SW5zcGVjdG9yUGFnZUFnZW50Ojpsb2FkZXJJZChEb2N1bWVudExvYWRlciogbG9hZGVyKQogICAg IHJldHVybiBwb2ludGVyQXNJZChsb2FkZXIpOwogfQogCit2b2lkIEluc3BlY3RvclBhZ2VBZ2Vu dDo6ZnJhbWVEZXN0cm95ZWQoRnJhbWUqIGZyYW1lKQoreworICAgIEhhc2hNYXA8RnJhbWUqLCB1 bnNpZ25lZCBpbnQ+OjppdGVyYXRvciBpdGVyYXRvciA9IG1fZnJhbWVUb0lkZW50aWZpZXIuZmlu ZChmcmFtZSk7CisgICAgQVNTRVJUKGl0ZXJhdG9yICE9IG1fZnJhbWVUb0lkZW50aWZpZXIuZW5k KCkpOworICAgIG1faWRlbnRpZmllclRvRnJhbWUucmVtb3ZlKGl0ZXJhdG9yLT5zZWNvbmQpOwor ICAgIG1fZnJhbWVUb0lkZW50aWZpZXIucmVtb3ZlKGl0ZXJhdG9yKTsKK30KKwogUGFzc1JlZlB0 cjxJbnNwZWN0b3JPYmplY3Q+IEluc3BlY3RvclBhZ2VBZ2VudDo6YnVpbGRPYmplY3RGb3JGcmFt ZShGcmFtZSogZnJhbWUpCiB7CiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZnJhbWVPYmpl Y3QgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwpAQCAtNjI3LDYgKzY0MywzMyBAQCBQYXNz UmVmUHRyPEluc3BlY3Rvck9iamVjdD4gSW5zcGVjdG9yUGFnZUFnZW50OjpidWlsZE9iamVjdEZv ckZyYW1lVHJlZShGcmFtZSogZgogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKK0luc3BlY3RvclBh Z2VBZ2VudDo6RnJhbWVFbnRyeTo6RnJhbWVFbnRyeSgpCisgICAgOiBtX2FnZW50KDApCisgICAg LCBtX2ZyYW1lKDApCit7Cit9CisKK0luc3BlY3RvclBhZ2VBZ2VudDo6RnJhbWVFbnRyeTo6RnJh bWVFbnRyeShJbnNwZWN0b3JQYWdlQWdlbnQqIGFnZW50LCBGcmFtZSogZnJhbWUpCisgICAgOiBt X2FnZW50KGFnZW50KQorICAgICwgbV9mcmFtZShmcmFtZSkKK3sKKyAgICBtX2ZyYW1lLT5hZGRE ZXN0cnVjdGlvbk9ic2VydmVyKHRoaXMpOworfQorICAgIAordm9pZCBJbnNwZWN0b3JQYWdlQWdl bnQ6OkZyYW1lRW50cnk6OmZyYW1lRGVzdHJveWVkKCkKK3sKKyAgICBGcmFtZSogZnJhbWUgPSBt X2ZyYW1lOworICAgIC8vIEludmFsaWRhdGUgZnJhbWUgc28gdGhhdCB3ZSBkb24ndCBhdHRlbXB0 IHRvIHVuc3Vic2NyaWJlIGZyb20gZnJhbWVEZXN0cm95ZWQgd2hpbGUgRnJhbWUgaXRlcmF0ZXMg b3ZlciBsaXN0ZW5lcnMuCisgICAgbV9mcmFtZSA9IDA7CisgICAgbV9hZ2VudC0+ZnJhbWVEZXN0 cm95ZWQoZnJhbWUpOworfQorCitJbnNwZWN0b3JQYWdlQWdlbnQ6OkZyYW1lRW50cnk6On5GcmFt ZUVudHJ5KCkKK3sKKyAgICBpZiAobV9mcmFtZSkKKyAgICAgICAgbV9mcmFtZS0+cmVtb3ZlRGVz dHJ1Y3Rpb25PYnNlcnZlcih0aGlzKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAj ZW5kaWYgLy8gRU5BQkxFKElOU1BFQ1RPUikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JQYWdlQWdlbnQuaAppbmRleCBjMTJkNzliLi4xMTQwY2YxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmgKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCkBAIC0zMyw4ICszMywxMCBA QAogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKIAorI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVk ZSAiSW5zcGVjdG9yRnJvbnRlbmQuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgorI2lu Y2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KICNpbmNs dWRlIDx3dGYvVmVjdG9yLmg+CiAKQEAgLTk5LDYgKzEwMSw5IEBAIHB1YmxpYzoKICAgICB2b2lk IGZyYW1lTmF2aWdhdGVkKERvY3VtZW50TG9hZGVyKik7CiAgICAgdm9pZCBmcmFtZURldGFjaGVk KEZyYW1lKik7CiAKKyAgICAvLyBDYWxsZWQgdmlhIEZyYW1lRGVzdHJ1Y3Rpb25PYnNlcnZlci9G cmFtZUVudHJ5OjpmcmFtZURlc3Ryb3llZCgpOworICAgIHZvaWQgZnJhbWVEZXN0cm95ZWQoRnJh bWUqKTsKKwogICAgIC8vIEluc3BlY3RvciBDb250cm9sbGVyIEFQSQogICAgIHZvaWQgc2V0RnJv bnRlbmQoSW5zcGVjdG9yRnJvbnRlbmQqKTsKICAgICB2b2lkIGNsZWFyRnJvbnRlbmQoKTsKQEAg LTExMCw2ICsxMTUsMTYgQEAgcHVibGljOgogICAgIFN0cmluZyBsb2FkZXJJZChEb2N1bWVudExv YWRlciopOwogCiBwcml2YXRlOgorICAgIHN0cnVjdCBGcmFtZUVudHJ5IDogcHVibGljIEZyYW1l RGVzdHJ1Y3Rpb25PYnNlcnZlciB7CisgICAgICAgIEluc3BlY3RvclBhZ2VBZ2VudCogbV9hZ2Vu dDsKKyAgICAgICAgRnJhbWUqIG1fZnJhbWU7CisgICAgICAgIAorICAgICAgICB2aXJ0dWFsIHZv aWQgZnJhbWVEZXN0cm95ZWQoKTsKKyAgICAgICAgRnJhbWVFbnRyeSgpOworICAgICAgICBGcmFt ZUVudHJ5KEluc3BlY3RvclBhZ2VBZ2VudCosIEZyYW1lKik7CisgICAgICAgIHZpcnR1YWwgfkZy YW1lRW50cnkoKTsKKyAgICB9OworCiAgICAgSW5zcGVjdG9yUGFnZUFnZW50KEluc3RydW1lbnRp bmdBZ2VudHMqLCBQYWdlKiwgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKik7CiAKICAgICBQYXNzUmVm UHRyPEluc3BlY3Rvck9iamVjdD4gYnVpbGRPYmplY3RGb3JGcmFtZShGcmFtZSopOwpAQCAtMTIw LDYgKzEzNSw4IEBAIHByaXZhdGU6CiAgICAgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKiBtX2luamVj dGVkU2NyaXB0TWFuYWdlcjsKICAgICBJbnNwZWN0b3JGcm9udGVuZDo6UGFnZSogbV9mcm9udGVu ZDsKICAgICBWZWN0b3I8U3RyaW5nPiBtX3NjcmlwdHNUb0V2YWx1YXRlT25Mb2FkOworICAgIEhh c2hNYXA8RnJhbWUqLCB1bnNpZ25lZCBpbnQ+IG1fZnJhbWVUb0lkZW50aWZpZXI7CisgICAgSGFz aE1hcDx1bnNpZ25lZCBpbnQsIEZyYW1lRW50cnk+IG1faWRlbnRpZmllclRvRnJhbWU7CiB9Owog CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwIGIvU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZS5jcHAKaW5kZXggMDQxNzNjOS4uMDFlNzVhMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZS5jcHAKQEAgLTU3LDYgKzU3LDcgQEAKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNs dWRlICJIVE1MVGFibGVDZWxsRWxlbWVudC5oIgogI2luY2x1ZGUgIkhpdFRlc3RSZXN1bHQuaCIK KyNpbmNsdWRlICJJbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaCIKICNpbmNsdWRlICJMb2dnaW5n LmgiCiAjaW5jbHVkZSAiTWVkaWFGZWF0dXJlTmFtZXMuaCIKICNpbmNsdWRlICJNZWRpYVN0cmVh bUZyYW1lQ29udHJvbGxlci5oIgo= 97287 2011-06-15 06:40:22 -0700 2011-06-15 07:37:09 -0700 patch (FrameDestructionObserver -> InspectorInstrumentation) frame-ids.diff text/plain 7664 caseq ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMDRkNGNkLi41N2Q4NzU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDYtMTUgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBwcm92aWRlIHVuaXF1ZSBpZGVudGlmaWVycyBmb3IgZnJhbWVzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjcyMQorCisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmZyYW1lRGVzdHJveWVkSW1wbCk6CisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpmcmFtZURlc3Ryb3llZCk6CisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JQYWdlQWdlbnQ6OmZyYW1lRm9ySWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFn ZUFnZW50OjpmcmFtZUlkKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclBhZ2VBZ2VudDo6 ZnJhbWVEZXN0cm95ZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQu aDoKKyAgICAgICAgKiBwYWdlL0ZyYW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjp+ RnJhbWUpOgorCiAyMDExLTA2LTEwICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCmluZGV4 IGQwODBhMzQuLjZjMzM4YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCkBAIC02MDgsNiArNjA4LDEyIEBAIHZvaWQg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDb21taXRMb2FkSW1wbChJbnN0cnVtZW50aW5n QWdlbnRzKiBpbnN0cnVtZW50CiAgICAgICAgIHBhZ2VBZ2VudC0+ZnJhbWVOYXZpZ2F0ZWQobG9h ZGVyKTsKIH0KIAordm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmZyYW1lRGVzdHJveWVk SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCBGcmFtZSogZnJh bWUpCit7CisgICAgaWYgKEluc3BlY3RvclBhZ2VBZ2VudCogaW5zcGVjdG9yUGFnZUFnZW50ID0g aW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yUGFnZUFnZW50KCkpCisgICAgICAgIGluc3Bl Y3RvclBhZ2VBZ2VudC0+ZnJhbWVEZXN0cm95ZWQoZnJhbWUpOworfQorCiBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb25Db29raWUgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsV3JpdGVIVE1M SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCB1bnNpZ25lZCBp bnQgbGVuZ3RoLCB1bnNpZ25lZCBpbnQgc3RhcnRMaW5lKQogewogICAgIGludCB0aW1lbGluZUFn ZW50SWQgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckluc3RydW1lbnRhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvcklu c3RydW1lbnRhdGlvbi5oCmluZGV4IDY1MGEwMDguLmU4NzU0YjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKQEAgLTEzMyw2 ICsxMzMsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgbG9hZEV2ZW50RmlyZWQoRnJhbWUq LCBjb25zdCBLVVJMJik7CiAgICAgc3RhdGljIHZvaWQgZnJhbWVEZXRhY2hlZEZyb21QYXJlbnQo RnJhbWUqKTsKICAgICBzdGF0aWMgdm9pZCBkaWRDb21taXRMb2FkKEZyYW1lKiwgRG9jdW1lbnRM b2FkZXIqKTsKKyAgICBzdGF0aWMgdm9pZCBmcmFtZURlc3Ryb3llZChGcmFtZSopOwogCiAgICAg c3RhdGljIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSB3aWxsV3JpdGVIVE1MKERvY3Vt ZW50KiwgdW5zaWduZWQgaW50IGxlbmd0aCwgdW5zaWduZWQgaW50IHN0YXJ0TGluZSk7CiAgICAg c3RhdGljIHZvaWQgZGlkV3JpdGVIVE1MKGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNv b2tpZSYsIHVuc2lnbmVkIGludCBlbmRMaW5lKTsKQEAgLTI1Nyw2ICsyNTgsNyBAQCBwcml2YXRl OgogICAgIHN0YXRpYyB2b2lkIGxvYWRFdmVudEZpcmVkSW1wbChJbnN0cnVtZW50aW5nQWdlbnRz KiwgRnJhbWUqLCBjb25zdCBLVVJMJik7CiAgICAgc3RhdGljIHZvaWQgZnJhbWVEZXRhY2hlZEZy b21QYXJlbnRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqLCBGcmFtZSopOwogICAgIHN0YXRpYyB2 b2lkIGRpZENvbW1pdExvYWRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqLCBQYWdlKiwgRG9jdW1l bnRMb2FkZXIqKTsKKyAgICBzdGF0aWMgdm9pZCBmcmFtZURlc3Ryb3llZEltcGwoSW5zdHJ1bWVu dGluZ0FnZW50cyosIEZyYW1lKik7CiAKICAgICBzdGF0aWMgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uQ29va2llIHdpbGxXcml0ZUhUTUxJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqLCB1bnNpZ25l ZCBpbnQgbGVuZ3RoLCB1bnNpZ25lZCBpbnQgc3RhcnRMaW5lKTsKICAgICBzdGF0aWMgdm9pZCBk aWRXcml0ZUhUTUxJbXBsKGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSYsIHVu c2lnbmVkIGludCBlbmRMaW5lKTsKQEAgLTgyMyw2ICs4MjUsMTcgQEAgaW5saW5lIHZvaWQgSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDb21taXRMb2FkKEZyYW1lKiBmcmFtZSwgRG9jdW1l bnRMb2FkZXIKICNlbmRpZgogfQogCitpbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OmZyYW1lRGVzdHJveWVkKEZyYW1lKiBmcmFtZSkKK3sKKyNpZiBFTkFCTEUoSU5TUEVDVE9S KQorICAgIFBhZ2UqIHBhZ2UgPSBmcmFtZS0+cGFnZSgpOworICAgIGlmICghcGFnZSkKKyAgICAg ICAgcmV0dXJuOworICAgIGlmIChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdl bnRzID0gaW5zdHJ1bWVudGluZ0FnZW50c0ZvclBhZ2UocGFnZSkpCisgICAgICAgIGZyYW1lRGVz dHJveWVkSW1wbChpbnN0cnVtZW50aW5nQWdlbnRzLCBmcmFtZSk7CisjZW5kaWYKK30KKwogaW5s aW5lIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OndpbGxXcml0ZUhUTUwoRG9jdW1lbnQqIGRvY3VtZW50LCB1bnNpZ25lZCBpbnQgbGVuZ3Ro LCB1bnNpZ25lZCBpbnQgc3RhcnRMaW5lKQogewogI2lmIEVOQUJMRShJTlNQRUNUT1IpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCmluZGV4IDE5 MzQ5OTcuLmE0NjYwZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JQYWdlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JQYWdlQWdlbnQuY3BwCkBAIC02OSw2ICs2OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5h bWVzcGFjZSB7CiAvLyBUaGlzIHNob3VsZCBiZSBrZXB0IHRoZSBzYW1lIGFzIHRoZSBvbmUgaW4g ZnJvbnQtZW5kL3V0aWxpdGllcy5qcwogc3RhdGljIGNvbnN0IGNoYXIgcmVnZXhTcGVjaWFsQ2hh cmFjdGVyc1tdID0gIltdKCl7fSstKi4sP1xcXiR8IjsKK3N0YXRpYyB1bnNpZ25lZCBpbnQgc19s YXN0RnJhbWVJZGVudGlmaWVyID0gMDsKIH0KIAogc3RhdGljIGJvb2wgZGVjb2RlU2hhcmVkQnVm ZmVyKFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBidWZmZXIsIGNvbnN0IFN0cmluZyYgdGV4dEVu Y29kaW5nTmFtZSwgU3RyaW5nKiByZXN1bHQpCkBAIC01NjIsMTcgKzU2MywyNCBAQCBzdGF0aWMg U3RyaW5nIHBvaW50ZXJBc0lkKHZvaWQqIHBvaW50ZXIpCiAKIEZyYW1lKiBJbnNwZWN0b3JQYWdl QWdlbnQ6OmZyYW1lRm9ySWQoY29uc3QgU3RyaW5nJiBmcmFtZUlkKQogewotICAgIEZyYW1lKiBt YWluRnJhbWUgPSBtX3BhZ2UtPm1haW5GcmFtZSgpOwotICAgIGZvciAoRnJhbWUqIGZyYW1lID0g bWFpbkZyYW1lOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLT50cmF2ZXJzZU5leHQobWFp bkZyYW1lKSkgewotICAgICAgICBpZiAocG9pbnRlckFzSWQoZnJhbWUpID09IGZyYW1lSWQpCi0g ICAgICAgICAgICByZXR1cm4gZnJhbWU7Ci0gICAgfQotICAgIHJldHVybiAwOworICAgIGJvb2wg b2sgPSBmYWxzZTsKKyAgICB1bnNpZ25lZCBpbnQgaWRlbnRpZmllciA9IGZyYW1lSWQudG9VSW50 U3RyaWN0KCZvayk7CisgICAgaWYgKCFvayB8fCAhaWRlbnRpZmllcikKKyAgICAgICAgcmV0dXJu IDA7CisgICAgcmV0dXJuIG1faWRlbnRpZmllclRvRnJhbWUuZ2V0KGlkZW50aWZpZXIpOwogfQog CiBTdHJpbmcgSW5zcGVjdG9yUGFnZUFnZW50OjpmcmFtZUlkKEZyYW1lKiBmcmFtZSkKIHsKLSAg ICByZXR1cm4gcG9pbnRlckFzSWQoZnJhbWUpOworICAgIGlmICghZnJhbWUpCisgICAgICAgIHJl dHVybiAiIjsKKyAgICB1bnNpZ25lZCBpbnQgaWRlbnRpZmllciA9IG1fZnJhbWVUb0lkZW50aWZp ZXIuZ2V0KGZyYW1lKTsKKyAgICBpZiAoIWlkZW50aWZpZXIpIHsKKyAgICAgICAgaWRlbnRpZmll ciA9ICsrc19sYXN0RnJhbWVJZGVudGlmaWVyOworICAgICAgICBtX2ZyYW1lVG9JZGVudGlmaWVy LnNldChmcmFtZSwgaWRlbnRpZmllcik7CisgICAgICAgIG1faWRlbnRpZmllclRvRnJhbWUuc2V0 KGlkZW50aWZpZXIsIGZyYW1lKTsKKyAgICB9IAorICAgIHJldHVybiBTdHJpbmc6Om51bWJlcihp ZGVudGlmaWVyKTsKIH0KIAogU3RyaW5nIEluc3BlY3RvclBhZ2VBZ2VudDo6bG9hZGVySWQoRG9j dW1lbnRMb2FkZXIqIGxvYWRlcikKQEAgLTU4MCw2ICs1ODgsMTQgQEAgU3RyaW5nIEluc3BlY3Rv clBhZ2VBZ2VudDo6bG9hZGVySWQoRG9jdW1lbnRMb2FkZXIqIGxvYWRlcikKICAgICByZXR1cm4g cG9pbnRlckFzSWQobG9hZGVyKTsKIH0KIAordm9pZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OmZyYW1l RGVzdHJveWVkKEZyYW1lKiBmcmFtZSkKK3sKKyAgICBIYXNoTWFwPEZyYW1lKiwgdW5zaWduZWQg aW50Pjo6aXRlcmF0b3IgaXRlcmF0b3IgPSBtX2ZyYW1lVG9JZGVudGlmaWVyLmZpbmQoZnJhbWUp OworICAgIEFTU0VSVChpdGVyYXRvciAhPSBtX2ZyYW1lVG9JZGVudGlmaWVyLmVuZCgpKTsKKyAg ICBtX2lkZW50aWZpZXJUb0ZyYW1lLnJlbW92ZShpdGVyYXRvci0+c2Vjb25kKTsKKyAgICBtX2Zy YW1lVG9JZGVudGlmaWVyLnJlbW92ZShpdGVyYXRvcik7Cit9CisKIFBhc3NSZWZQdHI8SW5zcGVj dG9yT2JqZWN0PiBJbnNwZWN0b3JQYWdlQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yRnJhbWUoRnJhbWUq IGZyYW1lKQogewogICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGZyYW1lT2JqZWN0ID0gSW5z cGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JQYWdlQWdlbnQuaAppbmRleCBjMTJkNzliLi5hNzA5MzhlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmgKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCkBAIC0zMyw4ICszMywxMCBAQAog CiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKIAorI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAi SW5zcGVjdG9yRnJvbnRlbmQuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgorI2luY2x1 ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KICNpbmNsdWRl IDx3dGYvVmVjdG9yLmg+CiAKQEAgLTk4LDYgKzEwMCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGxv YWRFdmVudEZpcmVkKCk7CiAgICAgdm9pZCBmcmFtZU5hdmlnYXRlZChEb2N1bWVudExvYWRlciop OwogICAgIHZvaWQgZnJhbWVEZXRhY2hlZChGcmFtZSopOworICAgIHZvaWQgZnJhbWVEZXN0cm95 ZWQoRnJhbWUqKTsKIAogICAgIC8vIEluc3BlY3RvciBDb250cm9sbGVyIEFQSQogICAgIHZvaWQg c2V0RnJvbnRlbmQoSW5zcGVjdG9yRnJvbnRlbmQqKTsKQEAgLTEyMCw2ICsxMjMsOCBAQCBwcml2 YXRlOgogICAgIEluamVjdGVkU2NyaXB0TWFuYWdlciogbV9pbmplY3RlZFNjcmlwdE1hbmFnZXI7 CiAgICAgSW5zcGVjdG9yRnJvbnRlbmQ6OlBhZ2UqIG1fZnJvbnRlbmQ7CiAgICAgVmVjdG9yPFN0 cmluZz4gbV9zY3JpcHRzVG9FdmFsdWF0ZU9uTG9hZDsKKyAgICBIYXNoTWFwPEZyYW1lKiwgdW5z aWduZWQgaW50PiBtX2ZyYW1lVG9JZGVudGlmaWVyOworICAgIEhhc2hNYXA8dW5zaWduZWQgaW50 LCBGcmFtZSo+IG1faWRlbnRpZmllclRvRnJhbWU7CiB9OwogCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAK aW5kZXggMDQxNzNjOS4uOWRjYzQ5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKQEAgLTU3LDYgKzU3 LDcgQEAKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJIVE1MVGFibGVDZWxsRWxl bWVudC5oIgogI2luY2x1ZGUgIkhpdFRlc3RSZXN1bHQuaCIKKyNpbmNsdWRlICJJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb24uaCIKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiTWVkaWFG ZWF0dXJlTmFtZXMuaCIKICNpbmNsdWRlICJNZWRpYVN0cmVhbUZyYW1lQ29udHJvbGxlci5oIgpA QCAtMjM4LDYgKzIzOSw4IEBAIEZyYW1lOjp+RnJhbWUoKQogICAgIGZvciAoSGFzaFNldDxGcmFt ZURlc3RydWN0aW9uT2JzZXJ2ZXIqPjo6aXRlcmF0b3IgaXQgPSBtX2Rlc3RydWN0aW9uT2JzZXJ2 ZXJzLmJlZ2luKCk7IGl0ICE9IHN0b3A7ICsraXQpCiAgICAgICAgICgqaXQpLT5mcmFtZURlc3Ry b3llZCgpOwogCisgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpmcmFtZURlc3Ryb3llZCh0 aGlzKTsKKwogICAgIGlmIChtX3ZpZXcpIHsKICAgICAgICAgbV92aWV3LT5oaWRlKCk7CiAgICAg ICAgIG1fdmlldy0+Y2xlYXJGcmFtZSgpOwo= 97292 2011-06-15 07:37:09 -0700 2011-06-15 07:59:21 -0700 patch frame-ids.diff text/plain 7677 caseq ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMDRkNGNkLi41N2Q4NzU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDYtMTUgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBwcm92aWRlIHVuaXF1ZSBpZGVudGlmaWVycyBmb3IgZnJhbWVzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjcyMQorCisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmZyYW1lRGVzdHJveWVkSW1wbCk6CisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpmcmFtZURlc3Ryb3llZCk6CisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JQYWdlQWdlbnQ6OmZyYW1lRm9ySWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFn ZUFnZW50OjpmcmFtZUlkKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclBhZ2VBZ2VudDo6 ZnJhbWVEZXN0cm95ZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQu aDoKKyAgICAgICAgKiBwYWdlL0ZyYW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjp+ RnJhbWUpOgorCiAyMDExLTA2LTEwICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCmluZGV4 IGQwODBhMzQuLjZjMzM4YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCkBAIC02MDgsNiArNjA4LDEyIEBAIHZvaWQg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDb21taXRMb2FkSW1wbChJbnN0cnVtZW50aW5n QWdlbnRzKiBpbnN0cnVtZW50CiAgICAgICAgIHBhZ2VBZ2VudC0+ZnJhbWVOYXZpZ2F0ZWQobG9h ZGVyKTsKIH0KIAordm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmZyYW1lRGVzdHJveWVk SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCBGcmFtZSogZnJh bWUpCit7CisgICAgaWYgKEluc3BlY3RvclBhZ2VBZ2VudCogaW5zcGVjdG9yUGFnZUFnZW50ID0g aW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yUGFnZUFnZW50KCkpCisgICAgICAgIGluc3Bl Y3RvclBhZ2VBZ2VudC0+ZnJhbWVEZXN0cm95ZWQoZnJhbWUpOworfQorCiBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb25Db29raWUgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsV3JpdGVIVE1M SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzLCB1bnNpZ25lZCBp bnQgbGVuZ3RoLCB1bnNpZ25lZCBpbnQgc3RhcnRMaW5lKQogewogICAgIGludCB0aW1lbGluZUFn ZW50SWQgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckluc3RydW1lbnRhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvcklu c3RydW1lbnRhdGlvbi5oCmluZGV4IDY1MGEwMDguLmU4NzU0YjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKQEAgLTEzMyw2 ICsxMzMsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgbG9hZEV2ZW50RmlyZWQoRnJhbWUq LCBjb25zdCBLVVJMJik7CiAgICAgc3RhdGljIHZvaWQgZnJhbWVEZXRhY2hlZEZyb21QYXJlbnQo RnJhbWUqKTsKICAgICBzdGF0aWMgdm9pZCBkaWRDb21taXRMb2FkKEZyYW1lKiwgRG9jdW1lbnRM b2FkZXIqKTsKKyAgICBzdGF0aWMgdm9pZCBmcmFtZURlc3Ryb3llZChGcmFtZSopOwogCiAgICAg c3RhdGljIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSB3aWxsV3JpdGVIVE1MKERvY3Vt ZW50KiwgdW5zaWduZWQgaW50IGxlbmd0aCwgdW5zaWduZWQgaW50IHN0YXJ0TGluZSk7CiAgICAg c3RhdGljIHZvaWQgZGlkV3JpdGVIVE1MKGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNv b2tpZSYsIHVuc2lnbmVkIGludCBlbmRMaW5lKTsKQEAgLTI1Nyw2ICsyNTgsNyBAQCBwcml2YXRl OgogICAgIHN0YXRpYyB2b2lkIGxvYWRFdmVudEZpcmVkSW1wbChJbnN0cnVtZW50aW5nQWdlbnRz KiwgRnJhbWUqLCBjb25zdCBLVVJMJik7CiAgICAgc3RhdGljIHZvaWQgZnJhbWVEZXRhY2hlZEZy b21QYXJlbnRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqLCBGcmFtZSopOwogICAgIHN0YXRpYyB2 b2lkIGRpZENvbW1pdExvYWRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqLCBQYWdlKiwgRG9jdW1l bnRMb2FkZXIqKTsKKyAgICBzdGF0aWMgdm9pZCBmcmFtZURlc3Ryb3llZEltcGwoSW5zdHJ1bWVu dGluZ0FnZW50cyosIEZyYW1lKik7CiAKICAgICBzdGF0aWMgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uQ29va2llIHdpbGxXcml0ZUhUTUxJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqLCB1bnNpZ25l ZCBpbnQgbGVuZ3RoLCB1bnNpZ25lZCBpbnQgc3RhcnRMaW5lKTsKICAgICBzdGF0aWMgdm9pZCBk aWRXcml0ZUhUTUxJbXBsKGNvbnN0IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSYsIHVu c2lnbmVkIGludCBlbmRMaW5lKTsKQEAgLTgyMyw2ICs4MjUsMTcgQEAgaW5saW5lIHZvaWQgSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDb21taXRMb2FkKEZyYW1lKiBmcmFtZSwgRG9jdW1l bnRMb2FkZXIKICNlbmRpZgogfQogCitpbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OmZyYW1lRGVzdHJveWVkKEZyYW1lKiBmcmFtZSkKK3sKKyNpZiBFTkFCTEUoSU5TUEVDVE9S KQorICAgIFBhZ2UqIHBhZ2UgPSBmcmFtZS0+cGFnZSgpOworICAgIGlmICghcGFnZSkKKyAgICAg ICAgcmV0dXJuOworICAgIGlmIChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdl bnRzID0gaW5zdHJ1bWVudGluZ0FnZW50c0ZvclBhZ2UocGFnZSkpCisgICAgICAgIGZyYW1lRGVz dHJveWVkSW1wbChpbnN0cnVtZW50aW5nQWdlbnRzLCBmcmFtZSk7CisjZW5kaWYKK30KKwogaW5s aW5lIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OndpbGxXcml0ZUhUTUwoRG9jdW1lbnQqIGRvY3VtZW50LCB1bnNpZ25lZCBpbnQgbGVuZ3Ro LCB1bnNpZ25lZCBpbnQgc3RhcnRMaW5lKQogewogI2lmIEVOQUJMRShJTlNQRUNUT1IpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCmluZGV4IDE5 MzQ5OTcuLjA2MGM5YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JQYWdlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JQYWdlQWdlbnQuY3BwCkBAIC02OSw2ICs2OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5h bWVzcGFjZSB7CiAvLyBUaGlzIHNob3VsZCBiZSBrZXB0IHRoZSBzYW1lIGFzIHRoZSBvbmUgaW4g ZnJvbnQtZW5kL3V0aWxpdGllcy5qcwogc3RhdGljIGNvbnN0IGNoYXIgcmVnZXhTcGVjaWFsQ2hh cmFjdGVyc1tdID0gIltdKCl7fSstKi4sP1xcXiR8IjsKK3N0YXRpYyB1bnNpZ25lZCBpbnQgc19s YXN0RnJhbWVJZGVudGlmaWVyID0gMDsKIH0KIAogc3RhdGljIGJvb2wgZGVjb2RlU2hhcmVkQnVm ZmVyKFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBidWZmZXIsIGNvbnN0IFN0cmluZyYgdGV4dEVu Y29kaW5nTmFtZSwgU3RyaW5nKiByZXN1bHQpCkBAIC01NjIsMTcgKzU2MywyNCBAQCBzdGF0aWMg U3RyaW5nIHBvaW50ZXJBc0lkKHZvaWQqIHBvaW50ZXIpCiAKIEZyYW1lKiBJbnNwZWN0b3JQYWdl QWdlbnQ6OmZyYW1lRm9ySWQoY29uc3QgU3RyaW5nJiBmcmFtZUlkKQogewotICAgIEZyYW1lKiBt YWluRnJhbWUgPSBtX3BhZ2UtPm1haW5GcmFtZSgpOwotICAgIGZvciAoRnJhbWUqIGZyYW1lID0g bWFpbkZyYW1lOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLT50cmF2ZXJzZU5leHQobWFp bkZyYW1lKSkgewotICAgICAgICBpZiAocG9pbnRlckFzSWQoZnJhbWUpID09IGZyYW1lSWQpCi0g ICAgICAgICAgICByZXR1cm4gZnJhbWU7Ci0gICAgfQotICAgIHJldHVybiAwOworICAgIGJvb2wg b2sgPSBmYWxzZTsKKyAgICB1bnNpZ25lZCBpbnQgaWRlbnRpZmllciA9IGZyYW1lSWQudG9VSW50 U3RyaWN0KCZvayk7CisgICAgaWYgKCFvayB8fCAhaWRlbnRpZmllcikKKyAgICAgICAgcmV0dXJu IDA7CisgICAgcmV0dXJuIG1faWRlbnRpZmllclRvRnJhbWUuZ2V0KGlkZW50aWZpZXIpOwogfQog CiBTdHJpbmcgSW5zcGVjdG9yUGFnZUFnZW50OjpmcmFtZUlkKEZyYW1lKiBmcmFtZSkKIHsKLSAg ICByZXR1cm4gcG9pbnRlckFzSWQoZnJhbWUpOworICAgIGlmICghZnJhbWUpCisgICAgICAgIHJl dHVybiAiIjsKKyAgICB1bnNpZ25lZCBpbnQgaWRlbnRpZmllciA9IG1fZnJhbWVUb0lkZW50aWZp ZXIuZ2V0KGZyYW1lKTsKKyAgICBpZiAoIWlkZW50aWZpZXIpIHsKKyAgICAgICAgaWRlbnRpZmll ciA9ICsrc19sYXN0RnJhbWVJZGVudGlmaWVyOworICAgICAgICBtX2ZyYW1lVG9JZGVudGlmaWVy LnNldChmcmFtZSwgaWRlbnRpZmllcik7CisgICAgICAgIG1faWRlbnRpZmllclRvRnJhbWUuc2V0 KGlkZW50aWZpZXIsIGZyYW1lKTsKKyAgICB9IAorICAgIHJldHVybiBTdHJpbmc6Om51bWJlcihp ZGVudGlmaWVyKTsKIH0KIAogU3RyaW5nIEluc3BlY3RvclBhZ2VBZ2VudDo6bG9hZGVySWQoRG9j dW1lbnRMb2FkZXIqIGxvYWRlcikKQEAgLTU4MCw2ICs1ODgsMTUgQEAgU3RyaW5nIEluc3BlY3Rv clBhZ2VBZ2VudDo6bG9hZGVySWQoRG9jdW1lbnRMb2FkZXIqIGxvYWRlcikKICAgICByZXR1cm4g cG9pbnRlckFzSWQobG9hZGVyKTsKIH0KIAordm9pZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OmZyYW1l RGVzdHJveWVkKEZyYW1lKiBmcmFtZSkKK3sKKyAgICBIYXNoTWFwPEZyYW1lKiwgdW5zaWduZWQg aW50Pjo6aXRlcmF0b3IgaXRlcmF0b3IgPSBtX2ZyYW1lVG9JZGVudGlmaWVyLmZpbmQoZnJhbWUp OworICAgIGlmIChpdGVyYXRvciAhPSBtX2ZyYW1lVG9JZGVudGlmaWVyLmVuZCgpKSB7CisgICAg ICAgIG1faWRlbnRpZmllclRvRnJhbWUucmVtb3ZlKGl0ZXJhdG9yLT5zZWNvbmQpOworICAgICAg ICBtX2ZyYW1lVG9JZGVudGlmaWVyLnJlbW92ZShpdGVyYXRvcik7CisgICAgfQorfQorCiBQYXNz UmVmUHRyPEluc3BlY3Rvck9iamVjdD4gSW5zcGVjdG9yUGFnZUFnZW50OjpidWlsZE9iamVjdEZv ckZyYW1lKEZyYW1lKiBmcmFtZSkKIHsKICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBmcmFt ZU9iamVjdCA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmgKaW5kZXggYzEyZDc5Yi4uYTcwOTM4ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuaApAQCAtMzMs OCArMzMsMTAgQEAKIAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCiAKKyNpbmNsdWRlICJGcmFtZS5o IgogI2luY2x1ZGUgIkluc3BlY3RvckZyb250ZW5kLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1TdHJp bmcuaCIKKyNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVk Lmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCkBAIC05OCw2ICsxMDAsNyBAQCBwdWJsaWM6 CiAgICAgdm9pZCBsb2FkRXZlbnRGaXJlZCgpOwogICAgIHZvaWQgZnJhbWVOYXZpZ2F0ZWQoRG9j dW1lbnRMb2FkZXIqKTsKICAgICB2b2lkIGZyYW1lRGV0YWNoZWQoRnJhbWUqKTsKKyAgICB2b2lk IGZyYW1lRGVzdHJveWVkKEZyYW1lKik7CiAKICAgICAvLyBJbnNwZWN0b3IgQ29udHJvbGxlciBB UEkKICAgICB2b2lkIHNldEZyb250ZW5kKEluc3BlY3RvckZyb250ZW5kKik7CkBAIC0xMjAsNiAr MTIzLDggQEAgcHJpdmF0ZToKICAgICBJbmplY3RlZFNjcmlwdE1hbmFnZXIqIG1faW5qZWN0ZWRT Y3JpcHRNYW5hZ2VyOwogICAgIEluc3BlY3RvckZyb250ZW5kOjpQYWdlKiBtX2Zyb250ZW5kOwog ICAgIFZlY3RvcjxTdHJpbmc+IG1fc2NyaXB0c1RvRXZhbHVhdGVPbkxvYWQ7CisgICAgSGFzaE1h cDxGcmFtZSosIHVuc2lnbmVkIGludD4gbV9mcmFtZVRvSWRlbnRpZmllcjsKKyAgICBIYXNoTWFw PHVuc2lnbmVkIGludCwgRnJhbWUqPiBtX2lkZW50aWZpZXJUb0ZyYW1lOwogfTsKIAogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWUuY3BwCmluZGV4IDA0MTczYzkuLjlkY2M0OTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3Bw CkBAIC01Nyw2ICs1Nyw3IEBACiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAiSFRN TFRhYmxlQ2VsbEVsZW1lbnQuaCIKICNpbmNsdWRlICJIaXRUZXN0UmVzdWx0LmgiCisjaW5jbHVk ZSAiSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2lu Y2x1ZGUgIk1lZGlhRmVhdHVyZU5hbWVzLmgiCiAjaW5jbHVkZSAiTWVkaWFTdHJlYW1GcmFtZUNv bnRyb2xsZXIuaCIKQEAgLTIzOCw2ICsyMzksOCBAQCBGcmFtZTo6fkZyYW1lKCkKICAgICBmb3Ig KEhhc2hTZXQ8RnJhbWVEZXN0cnVjdGlvbk9ic2VydmVyKj46Oml0ZXJhdG9yIGl0ID0gbV9kZXN0 cnVjdGlvbk9ic2VydmVycy5iZWdpbigpOyBpdCAhPSBzdG9wOyArK2l0KQogICAgICAgICAoKml0 KS0+ZnJhbWVEZXN0cm95ZWQoKTsKIAorICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZnJh bWVEZXN0cm95ZWQodGhpcyk7CisKICAgICBpZiAobV92aWV3KSB7CiAgICAgICAgIG1fdmlldy0+ aGlkZSgpOwogICAgICAgICBtX3ZpZXctPmNsZWFyRnJhbWUoKTsK