82935 2012-04-02 13:28:11 -0700 Simplify main resource load start/end in FrameLoader and DocumentLoader. 2012-04-02 15:08:42 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 japhet japhet abarth ap webkit.review.bot oldest_to_newest 593753 0 japhet 2012-04-02 13:28:11 -0700 Examples: * A circular call in FrameLoader -> DocumentLoader::prepareForLoadStart() -> FrameLoader::prepareForLoadStart(). * DocumentLoader::m_primaryLoadComplete is basically the same as a non-null m_mainResourceLoader. I've got a couple of other small ones, patch shortly. 593769 1 135170 japhet 2012-04-02 13:33:46 -0700 Created attachment 135170 patch 593839 2 135170 abarth 2012-04-02 14:23:29 -0700 Comment on attachment 135170 patch View in context: https://bugs.webkit.org/attachment.cgi?id=135170&action=review > Source/WebCore/WebCore.exp.in:-330 > -__ZN7WebCore14DocumentLoader19prepareForLoadStartEv Are there no callers in the WebKit-layer anymore? 593844 3 japhet 2012-04-02 14:26:36 -0700 (In reply to comment #2) > (From update of attachment 135170 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=135170&action=review > > > Source/WebCore/WebCore.exp.in:-330 > > -__ZN7WebCore14DocumentLoader19prepareForLoadStartEv > > Are there no callers in the WebKit-layer anymore? According to http://code.google.com/searchframe#search/&exact_package=chromium&q=prepareForLoadStart&type=cs , it's only called from FrameLoader. 593848 4 135170 abarth 2012-04-02 14:30:26 -0700 Comment on attachment 135170 patch Ok. 593900 5 135170 webkit.review.bot 2012-04-02 15:08:37 -0700 Comment on attachment 135170 patch Clearing flags on attachment: 135170 Committed r112949: <http://trac.webkit.org/changeset/112949> 593901 6 webkit.review.bot 2012-04-02 15:08:42 -0700 All reviewed patches have been landed. Closing bug. 135170 2012-04-02 13:33:46 -0700 2012-04-02 15:08:37 -0700 patch fldl.txt text/plain 9985 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCShyZXZpc2lvbiAxMTI4OTcpCisrKyBTb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLmV4cC5pbgkod29ya2luZyBjb3B5KQpAQCAtMzI3LDcgKzMyNyw2IEBACiBf X1pON1dlYkNvcmUxNERvY3VtZW50TG9hZGVyMTNhdHRhY2hUb0ZyYW1lRXYKIF9fWk43V2ViQ29y ZTE0RG9jdW1lbnRMb2FkZXIxNWRldGFjaEZyb21GcmFtZUV2CiBfX1pON1dlYkNvcmUxNERvY3Vt ZW50TG9hZGVyMThhZGRBcmNoaXZlUmVzb3VyY2VFTjNXVEYxMFBhc3NSZWZQdHJJTlNfMTVBcmNo aXZlUmVzb3VyY2VFRUUKLV9fWk43V2ViQ29yZTE0RG9jdW1lbnRMb2FkZXIxOXByZXBhcmVGb3JM b2FkU3RhcnRFdgogX19aTjdXZWJDb3JlMTREb2N1bWVudExvYWRlcjIxYWRkUGx1Z0luU3RyZWFt TG9hZGVyRVBOU18xNFJlc291cmNlTG9hZGVyRQogX19aTjdXZWJDb3JlMTREb2N1bWVudExvYWRl cjIyYWRkQWxsQXJjaGl2ZVJlc291cmNlc0VQTlNfN0FyY2hpdmVFCiBfX1pON1dlYkNvcmUxNERv Y3VtZW50TG9hZGVyMjJjYW5jZWxNYWluUmVzb3VyY2VMb2FkRVJLTlNfMTNSZXNvdXJjZUVycm9y RQpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTEyOTI0KQorKysgU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTItMDQtMDIgIE5hdGUg Q2hhcGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KKworICAgICAgICBTaW1wbGlmeSBtYWluIHJl c291cmNlIGxvYWQgc3RhcnQvZW5kIGluIEZyYW1lTG9hZGVyCisgICAgICAgIGFuZCBEb2N1bWVu dExvYWRlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTgyOTM1CisKKyAgICAgICAgMS4gSGF2ZSBGcmFtZUxvYWRlciBjYWxsIHByZXBhcmVGb3JMb2Fk U3RhcnQoKSBvbiBpdHNlbGYgZGlyZWN0bHksIHJhdGhlcgorICAgICAgICAgICAgdGhhbiB0aHJv dWdoIERvY3VtZW50TG9hZGVyLgorICAgICAgICAyLiBSZW1vdmUgRG9jdW1lbnRMb2FkZXI6Om1f cHJpbWFyeUxvYWRDb21wbGV0ZSwgc2luY2UgdGhpcyBpcyBiYXNpY2FsbHkgZXF1aXZhbGVudAor ICAgICAgICAgICAgdG8gbV9tYWluUmVzb3VyY2VMb2FkZXIuCisgICAgICAgIDMuIFJlbmFtZSBz ZXRQcmltYXJ5TG9hZENvbXBsZXRlKCkgdG8gY2xlYXJNYWluUmVzb3VyY2VMb2FkZXIoKSwgYW5k IG9ubHkgY2FsbCBpdCBhdAorICAgICAgICAgICAgdGhlIGVuZCBvZiB0aGUgbWFpbiByZXNvdXJj ZSBsb2FkLgorICAgICAgICA0LiBNb3ZlIGNsZWFyaW5nIERvY3VtZW50TG9hZGVyOjptX21haW5S ZXNvdXJjZUVycm9yIGludG8gc3RhcnRMb2FkaW5nTWFpblJlc291cmNlKCksCisgICAgICAgICAg ICB3aGljaCBsZWF2ZXMgRG9jdW1lbnRMb2FkZXI6OnByZXBhcmVGb3JMb2FkU3RhcnQoKSBlbXB0 eS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIHJlZmFjdG9yIG9ubHkuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAg ICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9j dW1lbnRMb2FkZXI6OkRvY3VtZW50TG9hZGVyKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAg ICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6Om1haW5SZWNlaXZlZEVycm9yKToKKyAgICAgICAg KFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpmaW5pc2hlZExvYWRpbmcpOgorICAgICAgICAoV2Vi Q29yZTo6RG9jdW1lbnRMb2FkZXI6OmNsZWFyTWFpblJlc291cmNlTG9hZGVyKToKKyAgICAgICAg KFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjppc0xvYWRpbmdJbkFQSVNlbnNlKToKKyAgICAgICAg KFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpzdGFydExvYWRpbmdNYWluUmVzb3VyY2UpOgorICAg ICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5oOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxv YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y29tbWl0UHJvdmlzaW9u YWxMb2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjb250aW51ZUxvYWRBZnRl cldpbGxTdWJtaXRGb3JtKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpsb2FkUHJv dmlzaW9uYWxJdGVtRnJvbUNhY2hlZFBhZ2UpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRl ci5oOiBwcmVwYXJlRm9yTG9hZFN0YXJ0KCkgaXMgbm93IGNhbGxlZCBkaXJlY3RseSwKKyAgICAg ICAgICAgIHNvIG1ha2UgaXQgcHJpdmF0ZS4KKwogMjAxMi0wNC0wMiAgRGFyaW4gRmlzaGVyICA8 ZGFyaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEhpc3RvcnlJdGVtIG5vdCB1cGRhdGVkIHBy b3Blcmx5IHdoZW4gYSBmb3JtIHN1Ym1pc3Npb24gYmVnaW5zIGJlZm9yZSBhCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHJldmlzaW9uIDExMjg5NykKKysrIFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3MzIs OCArMTczMiw2IEBACiAgICAgICAgIAogICAgICAgICBwYWdlQ2FjaGUoKS0+cmVtb3ZlKGhpc3Rv cnkoKS0+Y3VycmVudEl0ZW0oKSk7CiAKLSAgICAgICAgbV9kb2N1bWVudExvYWRlci0+c2V0UHJp bWFyeUxvYWRDb21wbGV0ZSh0cnVlKTsKLQogICAgICAgICAvLyBGSVhNRTogV2h5IG9ubHkgdGhp cyBmcmFtZSBhbmQgbm90IHBhcmVudCBmcmFtZXM/CiAgICAgICAgIGNoZWNrTG9hZENvbXBsZXRl Rm9yVGhpc0ZyYW1lKCk7CiAgICAgfQpAQCAtMjE5OSw4ICsyMTk3LDcgQEAKICAgICBpZiAoIW1f cHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gRG9j dW1lbnRMb2FkZXIgY2FsbHMgYmFjayB0byBvdXIgcHJlcGFyZUZvckxvYWRTdGFydAotICAgIG1f cHJvdmlzaW9uYWxEb2N1bWVudExvYWRlci0+cHJlcGFyZUZvckxvYWRTdGFydCgpOworICAgIHBy ZXBhcmVGb3JMb2FkU3RhcnQoKTsKICAgICAKICAgICAvLyBUaGUgbG9hZCBtaWdodCBiZSBjYW5j ZWxsZWQgaW5zaWRlIG9mIHByZXBhcmVGb3JMb2FkU3RhcnQoKSwgbnVsbGluZyBvdXQgdGhlIG1f cHJvdmlzaW9uYWxEb2N1bWVudExvYWRlciwgCiAgICAgLy8gc28gd2UgbmVlZCB0byBudWxsIGNo ZWNrIGl0IGFnYWluLgpAQCAtMjkwNiw3ICsyOTAzLDcgQEAKICAgICBEb2N1bWVudExvYWRlciog cHJvdmlzaW9uYWxMb2FkZXIgPSBwcm92aXNpb25hbERvY3VtZW50TG9hZGVyKCk7CiAgICAgTE9H KFBhZ2VDYWNoZSwgIldlYkNvcmVQYWdlQ2FjaGU6IExvYWRpbmcgcHJvdmlzaW9uYWwgRG9jdW1l bnRMb2FkZXIgJXAgd2l0aCBVUkwgJyVzJyBmcm9tIENhY2hlZFBhZ2UiLCBwcm92aXNpb25hbERv Y3VtZW50TG9hZGVyKCksIHByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIoKS0+dXJsKCkuc3RyaW5n KCkudXRmOCgpLmRhdGEoKSk7CiAKLSAgICBwcm92aXNpb25hbExvYWRlci0+cHJlcGFyZUZvckxv YWRTdGFydCgpOworICAgIHByZXBhcmVGb3JMb2FkU3RhcnQoKTsKIAogICAgIG1fbG9hZGluZ0Zy b21DYWNoZWRQYWdlID0gdHJ1ZTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3Vt ZW50TG9hZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50 TG9hZGVyLmgJKHJldmlzaW9uIDExMjg5NykKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1 bWVudExvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTgsMTMgKzExOCwxMSBAQAogICAgICAg ICBjb25zdCBSZXNvdXJjZUVycm9yJiBtYWluRG9jdW1lbnRFcnJvcigpIGNvbnN0IHsgcmV0dXJu IG1fbWFpbkRvY3VtZW50RXJyb3I7IH0KICAgICAgICAgdm9pZCBtYWluUmVjZWl2ZWRFcnJvcihj b25zdCBSZXNvdXJjZUVycm9yJik7CiAgICAgICAgIHZvaWQgc2V0UmVzcG9uc2UoY29uc3QgUmVz b3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpIHsgbV9yZXNwb25zZSA9IHJlc3BvbnNlOyB9Ci0gICAg ICAgIHZvaWQgcHJlcGFyZUZvckxvYWRTdGFydCgpOwogICAgICAgICBib29sIGlzQ2xpZW50UmVk aXJlY3QoKSBjb25zdCB7IHJldHVybiBtX2lzQ2xpZW50UmVkaXJlY3Q7IH0KICAgICAgICAgdm9p ZCBzZXRJc0NsaWVudFJlZGlyZWN0KGJvb2wgaXNDbGllbnRSZWRpcmVjdCkgeyBtX2lzQ2xpZW50 UmVkaXJlY3QgPSBpc0NsaWVudFJlZGlyZWN0OyB9CiAgICAgICAgIHZvaWQgaGFuZGxlZE9ubG9h ZEV2ZW50cygpOwogICAgICAgICBib29sIHdhc09ubG9hZEhhbmRsZWQoKSB7IHJldHVybiBtX3dh c09ubG9hZEhhbmRsZWQ7IH0KICAgICAgICAgYm9vbCBpc0xvYWRpbmdJbkFQSVNlbnNlKCkgY29u c3Q7Ci0gICAgICAgIHZvaWQgc2V0UHJpbWFyeUxvYWRDb21wbGV0ZShib29sKTsKICAgICAgICAg dm9pZCBzZXRUaXRsZShjb25zdCBTdHJpbmdXaXRoRGlyZWN0aW9uJik7CiAgICAgICAgIGNvbnN0 IFN0cmluZyYgb3ZlcnJpZGVFbmNvZGluZygpIGNvbnN0IHsgcmV0dXJuIG1fb3ZlcnJpZGVFbmNv ZGluZzsgfQogCkBAIC0yNTQsMTEgKzI1MiwxMSBAQAogICAgIHByaXZhdGU6CiAgICAgICAgIHZv aWQgc2V0dXBGb3JSZXBsYWNlKCk7CiAgICAgICAgIHZvaWQgY29tbWl0SWZSZWFkeSgpOwotICAg ICAgICB2b2lkIGNsZWFyRXJyb3JzKCk7CiAgICAgICAgIHZvaWQgc2V0TWFpbkRvY3VtZW50RXJy b3IoY29uc3QgUmVzb3VyY2VFcnJvciYpOwogICAgICAgICB2b2lkIGNvbW1pdExvYWQoY29uc3Qg Y2hhciosIGludCk7CiAgICAgICAgIGJvb2wgZG9lc1Byb2dyZXNzaXZlTG9hZChjb25zdCBTdHJp bmcmIE1JTUVUeXBlKSBjb25zdDsKICAgICAgICAgdm9pZCBjaGVja0xvYWRDb21wbGV0ZSgpOwor ICAgICAgICB2b2lkIGNsZWFyTWFpblJlc291cmNlTG9hZGVyKCk7CiAKICAgICAgICAgdm9pZCBk ZWxpdmVyU3Vic3RpdHV0ZVJlc291cmNlc0FmdGVyRGVsYXkoKTsKICAgICAgICAgdm9pZCBzdWJz dGl0dXRlUmVzb3VyY2VEZWxpdmVyeVRpbWVyRmlyZWQoVGltZXI8RG9jdW1lbnRMb2FkZXI+Kik7 CkBAIC0yOTgsNyArMjk2LDYgQEAKICAgICAgICAgYm9vbCBtX2NvbW1pdHRlZDsKICAgICAgICAg Ym9vbCBtX2lzU3RvcHBpbmc7CiAgICAgICAgIGJvb2wgbV9nb3RGaXJzdEJ5dGU7Ci0gICAgICAg IGJvb2wgbV9wcmltYXJ5TG9hZENvbXBsZXRlOwogICAgICAgICBib29sIG1faXNDbGllbnRSZWRp cmVjdDsKIAogICAgICAgICAvLyBGSVhNRTogRG9jdW1lbnQ6Om1fcHJvY2Vzc2luZ0xvYWRFdmVu dCBhbmQgRG9jdW1lbnRMb2FkZXI6Om1fd2FzT25sb2FkSGFuZGxlZCBhcmUgcm91Z2hseSB0aGUg c2FtZQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCShyZXZp c2lvbiAxMTI4OTcpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC05MSw3ICs5MSw2IEBACiAgICAgLCBtX2NvbW1pdHRlZChmYWxz ZSkKICAgICAsIG1faXNTdG9wcGluZyhmYWxzZSkKICAgICAsIG1fZ290Rmlyc3RCeXRlKGZhbHNl KQotICAgICwgbV9wcmltYXJ5TG9hZENvbXBsZXRlKGZhbHNlKQogICAgICwgbV9pc0NsaWVudFJl ZGlyZWN0KGZhbHNlKQogICAgICwgbV93YXNPbmxvYWRIYW5kbGVkKGZhbHNlKQogICAgICwgbV9z dG9wUmVjb3JkaW5nUmVzcG9uc2VzKGZhbHNlKQpAQCAtMTg4LDExICsxODcsNiBAQAogICAgIGZy YW1lTG9hZGVyKCktPmNsaWVudCgpLT5zZXRNYWluRG9jdW1lbnRFcnJvcih0aGlzLCBlcnJvcik7 CiB9CiAKLXZvaWQgRG9jdW1lbnRMb2FkZXI6OmNsZWFyRXJyb3JzKCkKLXsKLSAgICBtX21haW5E b2N1bWVudEVycm9yID0gUmVzb3VyY2VFcnJvcigpOwotfQotCiB2b2lkIERvY3VtZW50TG9hZGVy OjptYWluUmVjZWl2ZWRFcnJvcihjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKIHsKICAgICBB U1NFUlQoIWVycm9yLmlzTnVsbCgpKTsKQEAgLTIwMiw3ICsxOTYsNyBAQAogICAgIGlmICghZnJh bWVMb2FkZXIoKSkKICAgICAgICAgcmV0dXJuOwogICAgIHNldE1haW5Eb2N1bWVudEVycm9yKGVy cm9yKTsKLSAgICBzZXRQcmltYXJ5TG9hZENvbXBsZXRlKHRydWUpOworICAgIGNsZWFyTWFpblJl c291cmNlTG9hZGVyKCk7CiAgICAgZnJhbWVMb2FkZXIoKS0+cmVjZWl2ZWRNYWluUmVzb3VyY2VF cnJvcihlcnJvcik7CiB9CiAKQEAgLTI5NCw3ICsyODgsNyBAQAogICAgIG1fd3JpdGVyLmVuZCgp OwogICAgIGlmICghbV9tYWluRG9jdW1lbnRFcnJvci5pc051bGwoKSB8fCBmcmFtZUxvYWRlcigp LT5zdGF0ZU1hY2hpbmUoKS0+Y3JlYXRpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpKQogICAgICAg ICByZXR1cm47Ci0gICAgc2V0UHJpbWFyeUxvYWRDb21wbGV0ZSh0cnVlKTsKKyAgICBjbGVhck1h aW5SZXNvdXJjZUxvYWRlcigpOwogICAgIGZyYW1lTG9hZGVyKCktPmNoZWNrTG9hZENvbXBsZXRl KCk7CiB9CiAKQEAgLTQxNCwyNyArNDA4LDE1IEBACiAgICAgbV9mcmFtZSA9IDA7CiB9CiAKLXZv aWQgRG9jdW1lbnRMb2FkZXI6OnByZXBhcmVGb3JMb2FkU3RhcnQoKQordm9pZCBEb2N1bWVudExv YWRlcjo6Y2xlYXJNYWluUmVzb3VyY2VMb2FkZXIoKQogewotICAgIEFTU0VSVCghbV9pc1N0b3Bw aW5nKTsKLSAgICBzZXRQcmltYXJ5TG9hZENvbXBsZXRlKGZhbHNlKTsKLSAgICBBU1NFUlQoZnJh bWVMb2FkZXIoKSk7Ci0gICAgY2xlYXJFcnJvcnMoKTsKLSAgICBmcmFtZUxvYWRlcigpLT5wcmVw YXJlRm9yTG9hZFN0YXJ0KCk7Ci19Ci0KLXZvaWQgRG9jdW1lbnRMb2FkZXI6OnNldFByaW1hcnlM b2FkQ29tcGxldGUoYm9vbCBmbGFnKQotewotICAgIG1fcHJpbWFyeUxvYWRDb21wbGV0ZSA9IGZs YWc7Ci0gICAgaWYgKGZsYWcpIHsKLSAgICAgICAgaWYgKG1fbWFpblJlc291cmNlTG9hZGVyKSB7 Ci0gICAgICAgICAgICBtX21haW5SZXNvdXJjZURhdGEgPSBtX21haW5SZXNvdXJjZUxvYWRlci0+ cmVzb3VyY2VEYXRhKCk7Ci0gICAgICAgICAgICBtX21haW5SZXNvdXJjZUxvYWRlciA9IDA7Ci0g ICAgICAgIH0KLQotICAgICAgICBpZiAodGhpcyA9PSBmcmFtZUxvYWRlcigpLT5hY3RpdmVEb2N1 bWVudExvYWRlcigpKQotICAgICAgICAgICAgY2hlY2tMb2FkQ29tcGxldGUoKTsKKyAgICBpZiAo bV9tYWluUmVzb3VyY2VMb2FkZXIpIHsKKyAgICAgICAgbV9tYWluUmVzb3VyY2VEYXRhID0gbV9t YWluUmVzb3VyY2VMb2FkZXItPnJlc291cmNlRGF0YSgpOworICAgICAgICBtX21haW5SZXNvdXJj ZUxvYWRlciA9IDA7CiAgICAgfQorCisgICAgaWYgKHRoaXMgPT0gZnJhbWVMb2FkZXIoKS0+YWN0 aXZlRG9jdW1lbnRMb2FkZXIoKSkKKyAgICAgICAgY2hlY2tMb2FkQ29tcGxldGUoKTsKIH0KIAog Ym9vbCBEb2N1bWVudExvYWRlcjo6aXNMb2FkaW5nSW5BUElTZW5zZSgpIGNvbnN0CkBAIC00NDYs NyArNDI4LDcgQEAKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgIAogICAgICAgICBEb2N1 bWVudCogZG9jID0gbV9mcmFtZS0+ZG9jdW1lbnQoKTsKLSAgICAgICAgaWYgKCghbV9wcmltYXJ5 TG9hZENvbXBsZXRlIHx8ICFtX2ZyYW1lLT5kb2N1bWVudCgpLT5sb2FkRXZlbnRGaW5pc2hlZCgp KSAmJiBpc0xvYWRpbmcoKSkKKyAgICAgICAgaWYgKChtX21haW5SZXNvdXJjZUxvYWRlciB8fCAh bV9mcmFtZS0+ZG9jdW1lbnQoKS0+bG9hZEV2ZW50RmluaXNoZWQoKSkgJiYgaXNMb2FkaW5nKCkp CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgaWYgKGRvYy0+Y2FjaGVkUmVzb3Vy Y2VMb2FkZXIoKS0+cmVxdWVzdENvdW50KCkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKQEAg LTc5Nyw2ICs3NzksNyBAQAogCiB2b2lkIERvY3VtZW50TG9hZGVyOjpzdGFydExvYWRpbmdNYWlu UmVzb3VyY2UoKQogeworICAgIG1fbWFpbkRvY3VtZW50RXJyb3IgPSBSZXNvdXJjZUVycm9yKCk7 CiAgICAgdGltaW5nKCktPm1hcmtOYXZpZ2F0aW9uU3RhcnQobV9mcmFtZSk7CiAgICAgQVNTRVJU KCFtX21haW5SZXNvdXJjZUxvYWRlcik7CiAgICAgbV9tYWluUmVzb3VyY2VMb2FkZXIgPSBNYWlu UmVzb3VyY2VMb2FkZXI6OmNyZWF0ZShtX2ZyYW1lKTsKQEAgLTgwNSw3ICs3ODgsNyBAQAogICAg IC8vIElmIG5vdCwgaXQgd291bGQgYmUgZ3JlYXQgdG8gcmVtb3ZlIHRoaXMgbGluZSBvZiBjb2Rl LgogICAgIGZyYW1lTG9hZGVyKCktPmFkZEV4dHJhRmllbGRzVG9NYWluUmVzb3VyY2VSZXF1ZXN0 KG1fcmVxdWVzdCk7CiAgICAgCi0gICAgLy8gUHJvdGVjdCBNYWluUmVzb3VyY2VMb2FkZXI6Omxv YWQoKSBtZXRob2QgY2hhaW4gZnJvbSBzZXRQcmltYXJ5TG9hZENvbXBsZXRlKCkgc3RvbXBpbmcg bV9tYWluUmVzb3VyY2VMb2FkZXIuCisgICAgLy8gUHJvdGVjdCBNYWluUmVzb3VyY2VMb2FkZXI6 OmxvYWQoKSBtZXRob2QgY2hhaW4gZnJvbSBjbGVhck1haW5SZXNvdXJjZUxvYWRlcigpIHN0b21w aW5nIG1fbWFpblJlc291cmNlTG9hZGVyLgogICAgIFJlZlB0cjxNYWluUmVzb3VyY2VMb2FkZXI+ IHByb3RlY3RlZE1haW5SZXNvdXJjZUxvYWRlcihtX21haW5SZXNvdXJjZUxvYWRlcik7CiAgICAg aWYgKCFwcm90ZWN0ZWRNYWluUmVzb3VyY2VMb2FkZXItPmxvYWQobV9yZXF1ZXN0LCBtX3N1YnN0 aXR1dGVEYXRhKSkgewogICAgICAgICAvLyBGSVhNRTogSWYgdGhpcyBzaG91bGQgcmVhbGx5IGJl IGNhdWdodCwgd2Ugc2hvdWxkIGp1c3QgQVNTRVJUIHRoaXMgZG9lc24ndCBoYXBwZW47CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAkocmV2aXNpb24gMTEyODk3KQorKysgU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTk0LDcg Kzk0LDYgQEAKICAgICBJY29uQ29udHJvbGxlciogaWNvbigpIGNvbnN0IHsgcmV0dXJuICZtX2lj b247IH0KIAogICAgIHZvaWQgcHJlcGFyZUZvckhpc3RvcnlOYXZpZ2F0aW9uKCk7Ci0gICAgdm9p ZCBwcmVwYXJlRm9yTG9hZFN0YXJ0KCk7CiAgICAgdm9pZCBzZXR1cEZvclJlcGxhY2UoKTsKIAog ICAgIC8vIEZJWE1FOiBUaGVzZSBhcmUgYWxsIGZ1bmN0aW9ucyB3aGljaCBzdGFydCBsb2Fkcy4g V2UgaGF2ZSB0b28gbWFueS4KQEAgLTM1Nyw2ICszNTYsNyBAQAogCiAgICAgdm9pZCBsb2FkSW5T YW1lRG9jdW1lbnQoY29uc3QgS1VSTCYsIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSogc3RhdGVPYmpl Y3QsIGJvb2wgaXNOZXdOYXZpZ2F0aW9uKTsKIAorICAgIHZvaWQgcHJlcGFyZUZvckxvYWRTdGFy dCgpOwogICAgIHZvaWQgcHJvdmlzaW9uYWxMb2FkU3RhcnRlZCgpOwogCiAgICAgYm9vbCBkaWRP cGVuVVJMKCk7Cg==