93648 2012-08-09 13:29:42 -0700 [Qt] Add support for HTML5 state object history API in FrameLoaderClientQt 2012-08-11 06:26:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pierre.rossi pierre.rossi hausmann webkit.review.bot oldest_to_newest 691755 0 pierre.rossi 2012-08-09 13:29:42 -0700 [Qt] Add support for HTML5 state object history API in FrameLoaderClientQt 691786 1 157533 pierre.rossi 2012-08-09 13:42:27 -0700 Created attachment 157533 Patch 692210 2 157533 hausmann 2012-08-09 22:20:59 -0700 Comment on attachment 157533 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=157533&action=review > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:388 > +void FrameLoaderClientQt::dispatchDidNavigateWithinPage() > +{ > + if (!m_webFrame) > + return; > + > + FrameLoader* loader = m_frame->loader(); > + bool loaderCompleted = !(loader->activeDocumentLoader() && loader->activeDocumentLoader()->isLoadingInAPISense()); > + > + if (!loaderCompleted) > + return; > + > + dispatchDidCommitLoad(); > + dispatchDidFinishLoad(); > +} If this is all cross-platform, would it make sense to have this in the base class? Just wondering. How is it done in WK2? 692555 3 157735 pierre.rossi 2012-08-10 08:28:42 -0700 Created attachment 157735 Patch 692579 4 157735 kenneth 2012-08-10 08:59:32 -0700 Comment on attachment 157735 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=157735&action=review > Source/WebKit/qt/ChangeLog:8 > + Add support for push/replace/pop by implementing dispatchDidNavigateWithinPage. Basically all you are doing it to make sure the urlChanged signal is fired etc, all the history() methods already have the right state. 693111 5 157735 webkit.review.bot 2012-08-11 06:26:43 -0700 Comment on attachment 157735 Patch Clearing flags on attachment: 157735 Committed r125352: <http://trac.webkit.org/changeset/125352> 693112 6 webkit.review.bot 2012-08-11 06:26:47 -0700 All reviewed patches have been landed. Closing bug. 157533 2012-08-09 13:42:27 -0700 2012-08-10 08:28:37 -0700 Patch bug-93648-20120809224441.patch text/plain 4042 pierre.rossi U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1MTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDY2YzNhNmJjYTM5 ZTUyMjU0NmViNThkZDZmZTAwMTk3Mzg4NjIyNmQuLmY1NzdiNDVjYmJkMjRmOGMxYWQ1OGE3MjY4 NzMyYzgxZDQ0MDJiOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTItMDgt MDkgIFBpZXJyZSBSb3NzaSAgPHBpZXJyZS5yb3NzaUBnbWFpbC5jb20+CisKKyAgICAgICAgW1F0 XSBBZGQgc3VwcG9ydCBmb3IgSFRNTDUgc3RhdGUgb2JqZWN0IGhpc3RvcnkgQVBJIGluIEZyYW1l TG9hZGVyQ2xpZW50UXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTkzNjQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkIHN1cHBvcnQgZm9yIHB1c2gvcmVwbGFjZS9wb3AgYnkgaW1wbGVtZW50aW5nIGRp c3BhdGNoRGlkTmF2aWdhdGVXaXRoaW5QYWdlLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNs aWVudFF0OjpkaXNwYXRjaERpZE5hdmlnYXRlV2l0aGluUGFnZSk6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERpZFB1c2hTdGF0ZVdpdGhpblBhZ2UpOgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRSZXBsYWNl U3RhdGVXaXRoaW5QYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6 OmRpc3BhdGNoRGlkUG9wU3RhdGVXaXRoaW5QYWdlKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9y dC9GcmFtZUxvYWRlckNsaWVudFF0Lmg6CisgICAgICAgIChGcmFtZUxvYWRlckNsaWVudFF0KToK KwogMjAxMi0wOC0wOCAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+ CiAKICAgICAgICAgW1F0XSBQb3J0IGludGVybmFsIGZpbmRNZXRob2RJbmRleCBtZXRob2QgbWF0 Y2hlciB0byB1c2UgSlNDIEMgQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwIGIvU291cmNlL1dlYktpdC9xdC9XZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAppbmRleCA0YTE0NzJjNWE1Nzc1MTEx ZmM5MzUwNGMxNGJmMzcwYTM2Y2FhMmEzLi5iY2QxYTE4ZWNkYmFlYTk3N2U3YmM2ODNiNzM5MGVk Njk4MmEyMzc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKQEAgLTM3Miw2ICszNzIsMjAgQEAgdm9pZCBGcmFt ZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaFdpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3QoY29uc3Qg S1VSTCYgdXJsLCBkb3UKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCit2b2lkIEZyYW1lTG9h ZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGlkTmF2aWdhdGVXaXRoaW5QYWdlKCkKK3sKKyAgICBpZiAo IW1fd2ViRnJhbWUpCisgICAgICAgIHJldHVybjsKKworICAgIEZyYW1lTG9hZGVyKiBsb2FkZXIg PSBtX2ZyYW1lLT5sb2FkZXIoKTsKKyAgICBib29sIGxvYWRlckNvbXBsZXRlZCA9ICEobG9hZGVy LT5hY3RpdmVEb2N1bWVudExvYWRlcigpICYmIGxvYWRlci0+YWN0aXZlRG9jdW1lbnRMb2FkZXIo KS0+aXNMb2FkaW5nSW5BUElTZW5zZSgpKTsKKworICAgIGlmICghbG9hZGVyQ29tcGxldGVkKQor ICAgICAgICByZXR1cm47CisKKyAgICBkaXNwYXRjaERpZENvbW1pdExvYWQoKTsKKyAgICBkaXNw YXRjaERpZEZpbmlzaExvYWQoKTsKK30KIAogdm9pZCBGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNw YXRjaERpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZSgpCiB7CkBAIC0zOTEsNyArNDA1LDcgQEAg dm9pZCBGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERpZFB1c2hTdGF0ZVdpdGhpblBhZ2Uo KQogICAgIGlmIChkdW1wRnJhbWVMb2FkZXJDYWxsYmFja3MpCiAgICAgICAgIHByaW50ZigiJXMg LSBkaXNwYXRjaERpZFB1c2hTdGF0ZVdpdGhpblBhZ2VcbiIsIHFQcmludGFibGUoZHJ0RGVzY3Jp cHRpb25TdWl0YWJsZUZvclRlc3RSZXN1bHQobV9mcmFtZSkpKTsKIAotICAgIG5vdEltcGxlbWVu dGVkKCk7CisgICAgZGlzcGF0Y2hEaWROYXZpZ2F0ZVdpdGhpblBhZ2UoKTsKIH0KIAogdm9pZCBG cmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERpZFJlcGxhY2VTdGF0ZVdpdGhpblBhZ2UoKQpA QCAtMzk5LDcgKzQxMyw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRS ZXBsYWNlU3RhdGVXaXRoaW5QYWdlKCkKICAgICBpZiAoZHVtcEZyYW1lTG9hZGVyQ2FsbGJhY2tz KQogICAgICAgICBwcmludGYoIiVzIC0gZGlzcGF0Y2hEaWRSZXBsYWNlU3RhdGVXaXRoaW5QYWdl XG4iLCBxUHJpbnRhYmxlKGRydERlc2NyaXB0aW9uU3VpdGFibGVGb3JUZXN0UmVzdWx0KG1fZnJh bWUpKSk7CiAKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIGRpc3BhdGNoRGlkTmF2aWdhdGVX aXRoaW5QYWdlKCk7CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRQ b3BTdGF0ZVdpdGhpblBhZ2UoKQpAQCAtNDA3LDcgKzQyMSw3IEBAIHZvaWQgRnJhbWVMb2FkZXJD bGllbnRRdDo6ZGlzcGF0Y2hEaWRQb3BTdGF0ZVdpdGhpblBhZ2UoKQogICAgIGlmIChkdW1wRnJh bWVMb2FkZXJDYWxsYmFja3MpCiAgICAgICAgIHByaW50ZigiJXMgLSBkaXNwYXRjaERpZFBvcFN0 YXRlV2l0aGluUGFnZVxuIiwgcVByaW50YWJsZShkcnREZXNjcmlwdGlvblN1aXRhYmxlRm9yVGVz dFJlc3VsdChtX2ZyYW1lKSkpOwogCi0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAvLyBObyBu ZWVkIHRvIGNhbGwgZGlzcGF0Y2hEaWROYXZpZ2F0ZVdpdGhpblBhZ2UgaGVyZSwgaXQncyBhbHJl YWR5IGJlZW4gZG9uZSBpbiBsb2FkSW5TYW1lRG9jdW1lbnQoKS4KIH0KIAogdm9pZCBGcmFtZUxv YWRlckNsaWVudFF0OjpkaXNwYXRjaFdpbGxDbG9zZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaCBiL1NvdXJjZS9XZWJL aXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oCmluZGV4IDc4MTk3MWQx NTY0ZDgxODI0NjAxODc4ZWEyZTY0ZTUwODJhMzVkZmYuLjhkMWM3NzBjODJkNDEzNzc3MTA5NzNj NzBiZTEyYTQyYzNlOTAzYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oCkBAIC0xMDgsNiArMTA4LDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclBy b3Zpc2lvbmFsTG9hZCgpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZENhbmNlbENsaWVu dFJlZGlyZWN0KCk7CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoV2lsbFBlcmZvcm1DbGllbnRS ZWRpcmVjdChjb25zdCBLVVJMJiwgZG91YmxlIGludGVydmFsLCBkb3VibGUgZmlyZURhdGUpOwor ICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZE5hdmlnYXRlV2l0aGluUGFnZSgpIE9WRVJSSURF OwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZSgp OwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZFB1c2hTdGF0ZVdpdGhpblBhZ2UoKTsKICAg ICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZXBsYWNlU3RhdGVXaXRoaW5QYWdlKCk7Cg== 157735 2012-08-10 08:28:42 -0700 2012-08-11 06:26:43 -0700 Patch bug-93648-20120810173052.patch text/plain 6646 pierre.rossi U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1MTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDY2YzNhNmJjYTM5 ZTUyMjU0NmViNThkZDZmZTAwMTk3Mzg4NjIyNmQuLmJjNjc3OWQxN2RkZTIwNTY4YTNjOTZmYjA5 YmZkZjA0YjMzMTQwMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTItMDgt MDkgIFBpZXJyZSBSb3NzaSAgPHBpZXJyZS5yb3NzaUBnbWFpbC5jb20+CisKKyAgICAgICAgW1F0 XSBBZGQgc3VwcG9ydCBmb3IgSFRNTDUgc3RhdGUgb2JqZWN0IGhpc3RvcnkgQVBJIGluIEZyYW1l TG9hZGVyQ2xpZW50UXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTkzNjQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkIHN1cHBvcnQgZm9yIHB1c2gvcmVwbGFjZS9wb3AgYnkgaW1wbGVtZW50aW5nIGRp c3BhdGNoRGlkTmF2aWdhdGVXaXRoaW5QYWdlLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNs aWVudFF0OjpkaXNwYXRjaERpZE5hdmlnYXRlV2l0aGluUGFnZSk6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERpZFB1c2hTdGF0ZVdpdGhpblBhZ2UpOgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRSZXBsYWNl U3RhdGVXaXRoaW5QYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6 OmRpc3BhdGNoRGlkUG9wU3RhdGVXaXRoaW5QYWdlKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9y dC9GcmFtZUxvYWRlckNsaWVudFF0Lmg6CisgICAgICAgIChGcmFtZUxvYWRlckNsaWVudFF0KToK KyAgICAgICAgKiB0ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHA6CisgICAgICAgICh0 c3RfUVdlYkZyYW1lKToKKyAgICAgICAgKHRzdF9RV2ViRnJhbWU6OnNldFVybFVzaW5nU3RhdGVP YmplY3QpOiBBZGRlZC4gVGVzdHMgdGhhdCB0aGUgdXJsQ2hhbmdlZCBzaWduYWwgaXMgZmlyZWQu CisKIDIwMTItMDgtMDggIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29t PgogCiAgICAgICAgIFtRdF0gUG9ydCBpbnRlcm5hbCBmaW5kTWV0aG9kSW5kZXggbWV0aG9kIG1h dGNoZXIgdG8gdXNlIEpTQyBDIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9XZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKaW5kZXggNGExNDcyYzVhNTc3NTEx MWZjOTM1MDRjMTRiZjM3MGEzNmNhYTJhMy4uYmNkMWExOGVjZGJhZWE5NzdlN2JjNjgzYjczOTBl ZDY5ODJhMjM3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9G cmFtZUxvYWRlckNsaWVudFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBw b3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCkBAIC0zNzIsNiArMzcyLDIwIEBAIHZvaWQgRnJh bWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hXaWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0KGNvbnN0 IEtVUkwmIHVybCwgZG91CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAordm9pZCBGcmFtZUxv YWRlckNsaWVudFF0OjpkaXNwYXRjaERpZE5hdmlnYXRlV2l0aGluUGFnZSgpCit7CisgICAgaWYg KCFtX3dlYkZyYW1lKQorICAgICAgICByZXR1cm47CisKKyAgICBGcmFtZUxvYWRlciogbG9hZGVy ID0gbV9mcmFtZS0+bG9hZGVyKCk7CisgICAgYm9vbCBsb2FkZXJDb21wbGV0ZWQgPSAhKGxvYWRl ci0+YWN0aXZlRG9jdW1lbnRMb2FkZXIoKSAmJiBsb2FkZXItPmFjdGl2ZURvY3VtZW50TG9hZGVy KCktPmlzTG9hZGluZ0luQVBJU2Vuc2UoKSk7CisKKyAgICBpZiAoIWxvYWRlckNvbXBsZXRlZCkK KyAgICAgICAgcmV0dXJuOworCisgICAgZGlzcGF0Y2hEaWRDb21taXRMb2FkKCk7CisgICAgZGlz cGF0Y2hEaWRGaW5pc2hMb2FkKCk7Cit9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlz cGF0Y2hEaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2UoKQogewpAQCAtMzkxLDcgKzQwNSw3IEBA IHZvaWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRQdXNoU3RhdGVXaXRoaW5QYWdl KCkKICAgICBpZiAoZHVtcEZyYW1lTG9hZGVyQ2FsbGJhY2tzKQogICAgICAgICBwcmludGYoIiVz IC0gZGlzcGF0Y2hEaWRQdXNoU3RhdGVXaXRoaW5QYWdlXG4iLCBxUHJpbnRhYmxlKGRydERlc2Ny aXB0aW9uU3VpdGFibGVGb3JUZXN0UmVzdWx0KG1fZnJhbWUpKSk7CiAKLSAgICBub3RJbXBsZW1l bnRlZCgpOworICAgIGRpc3BhdGNoRGlkTmF2aWdhdGVXaXRoaW5QYWdlKCk7CiB9CiAKIHZvaWQg RnJhbWVMb2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hEaWRSZXBsYWNlU3RhdGVXaXRoaW5QYWdlKCkK QEAgLTM5OSw3ICs0MTMsNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGlk UmVwbGFjZVN0YXRlV2l0aGluUGFnZSgpCiAgICAgaWYgKGR1bXBGcmFtZUxvYWRlckNhbGxiYWNr cykKICAgICAgICAgcHJpbnRmKCIlcyAtIGRpc3BhdGNoRGlkUmVwbGFjZVN0YXRlV2l0aGluUGFn ZVxuIiwgcVByaW50YWJsZShkcnREZXNjcmlwdGlvblN1aXRhYmxlRm9yVGVzdFJlc3VsdChtX2Zy YW1lKSkpOwogCi0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBkaXNwYXRjaERpZE5hdmlnYXRl V2l0aGluUGFnZSgpOwogfQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmRpc3BhdGNoRGlk UG9wU3RhdGVXaXRoaW5QYWdlKCkKQEAgLTQwNyw3ICs0MjEsNyBAQCB2b2lkIEZyYW1lTG9hZGVy Q2xpZW50UXQ6OmRpc3BhdGNoRGlkUG9wU3RhdGVXaXRoaW5QYWdlKCkKICAgICBpZiAoZHVtcEZy YW1lTG9hZGVyQ2FsbGJhY2tzKQogICAgICAgICBwcmludGYoIiVzIC0gZGlzcGF0Y2hEaWRQb3BT dGF0ZVdpdGhpblBhZ2VcbiIsIHFQcmludGFibGUoZHJ0RGVzY3JpcHRpb25TdWl0YWJsZUZvclRl c3RSZXN1bHQobV9mcmFtZSkpKTsKIAotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgLy8gTm8g bmVlZCB0byBjYWxsIGRpc3BhdGNoRGlkTmF2aWdhdGVXaXRoaW5QYWdlIGhlcmUsIGl0J3MgYWxy ZWFkeSBiZWVuIGRvbmUgaW4gbG9hZEluU2FtZURvY3VtZW50KCkuCiB9CiAKIHZvaWQgRnJhbWVM b2FkZXJDbGllbnRRdDo6ZGlzcGF0Y2hXaWxsQ2xvc2UoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmggYi9Tb3VyY2UvV2Vi S2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaAppbmRleCA3ODE5NzFk MTU2NGQ4MTgyNDYwMTg3OGVhMmU2NGU1MDgyYTM1ZGZmLi44ZDFjNzcwYzgyZDQxMzc3NzEwOTcz YzcwYmUxMmE0MmMzZTkwM2EyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVT dXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaApAQCAtMTA4LDYgKzEwOCw3IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQ cm92aXNpb25hbExvYWQoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRDYW5jZWxDbGll bnRSZWRpcmVjdCgpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaFdpbGxQZXJmb3JtQ2xpZW50 UmVkaXJlY3QoY29uc3QgS1VSTCYsIGRvdWJsZSBpbnRlcnZhbCwgZG91YmxlIGZpcmVEYXRlKTsK KyAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWROYXZpZ2F0ZVdpdGhpblBhZ2UoKSBPVkVSUklE RTsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2Uo KTsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRQdXNoU3RhdGVXaXRoaW5QYWdlKCk7CiAg ICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkUmVwbGFjZVN0YXRlV2l0aGluUGFnZSgpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcApp bmRleCAzMWQ4N2I3NWE4Nzc2MTM4ZTBlOTM5ZjhiYzVkMzBmZWUxYTk1NjM4Li5kN2RiODQ3MjZk YjA1N2YwYTM3YTE2MDQ3ODcxZDY2YjAwYmMyMTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcApAQCAtOTAsNiArOTAsNyBAQCBw cml2YXRlIHNsb3RzOgogICAgIHZvaWQgc2V0VXJsVG9FbXB0eSgpOwogICAgIHZvaWQgc2V0VXJs VG9JbnZhbGlkKCk7CiAgICAgdm9pZCBzZXRVcmxIaXN0b3J5KCk7CisgICAgdm9pZCBzZXRVcmxV c2luZ1N0YXRlT2JqZWN0KCk7CiAgICAgdm9pZCBzZXRVcmxTYW1lVXJsKCk7CiAgICAgdm9pZCBz ZXRVcmxUaGVuTG9hZHNfZGF0YSgpOwogICAgIHZvaWQgc2V0VXJsVGhlbkxvYWRzKCk7CkBAIC0x MzA5LDYgKzEzMTAsNDggQEAgdm9pZCB0c3RfUVdlYkZyYW1lOjpzZXRVcmxIaXN0b3J5KCkKICAg ICBRQ09NUEFSRShtX3BhZ2UtPmhpc3RvcnkoKS0+Y291bnQoKSwgMik7CiB9CiAKK3ZvaWQgdHN0 X1FXZWJGcmFtZTo6c2V0VXJsVXNpbmdTdGF0ZU9iamVjdCgpCit7CisgICAgY29uc3QgUVVybCBh Ym91dEJsYW5rKCJhYm91dDpibGFuayIpOworICAgIFFVcmwgdXJsOworICAgIFFXZWJGcmFtZSog ZnJhbWUgPSBtX3BhZ2UtPm1haW5GcmFtZSgpOworICAgIFFTaWduYWxTcHkgdXJsQ2hhbmdlZFNw eShmcmFtZSwgU0lHTkFMKHVybENoYW5nZWQoUVVybCkpKTsKKyAgICBpbnQgZXhwZWN0ZWRVcmxD aGFuZ2VDb3VudCA9IDA7CisKKyAgICBRQ09NUEFSRShtX3BhZ2UtPmhpc3RvcnkoKS0+Y291bnQo KSwgMCk7CisKKyAgICB1cmwgPSBRVXJsKCJxcmM6L3Rlc3QxLmh0bWwiKTsKKyAgICBmcmFtZS0+ c2V0VXJsKHVybCk7CisgICAgd2FpdEZvclNpZ25hbChtX3BhZ2UsIFNJR05BTChsb2FkRmluaXNo ZWQoYm9vbCkpKTsKKyAgICBleHBlY3RlZFVybENoYW5nZUNvdW50Kys7CisgICAgUUNPTVBBUkUo dXJsQ2hhbmdlZFNweS5jb3VudCgpLCBleHBlY3RlZFVybENoYW5nZUNvdW50KTsKKyAgICBRQ09N UEFSRShmcmFtZS0+dXJsKCksIHVybCk7CisgICAgUUNPTVBBUkUobV9wYWdlLT5oaXN0b3J5KCkt PmNvdW50KCksIDEpOworCisgICAgZnJhbWUtPmV2YWx1YXRlSmF2YVNjcmlwdCgid2luZG93Lmhp c3RvcnkucHVzaFN0YXRlKG51bGwsJ3B1c2gnLCAnbmF2aWdhdGUvdG8vaGVyZScpIik7CisgICAg ZXhwZWN0ZWRVcmxDaGFuZ2VDb3VudCsrOworICAgIFFDT01QQVJFKHVybENoYW5nZWRTcHkuY291 bnQoKSwgZXhwZWN0ZWRVcmxDaGFuZ2VDb3VudCk7CisgICAgUUNPTVBBUkUoZnJhbWUtPnVybCgp LCBRVXJsKCJxcmM6L25hdmlnYXRlL3RvL2hlcmUiKSk7CisgICAgUUNPTVBBUkUobV9wYWdlLT5o aXN0b3J5KCktPmNvdW50KCksIDIpOworICAgIFFWRVJJRlkobV9wYWdlLT5oaXN0b3J5KCktPmNh bkdvQmFjaygpKTsKKworICAgIGZyYW1lLT5ldmFsdWF0ZUphdmFTY3JpcHQoIndpbmRvdy5oaXN0 b3J5LnJlcGxhY2VTdGF0ZShudWxsLCdyZXBsYWNlJywgJ2Fub3RoZXIvbG9jYXRpb24nKSIpOwor ICAgIGV4cGVjdGVkVXJsQ2hhbmdlQ291bnQrKzsKKyAgICBRQ09NUEFSRSh1cmxDaGFuZ2VkU3B5 LmNvdW50KCksIGV4cGVjdGVkVXJsQ2hhbmdlQ291bnQpOworICAgIFFDT01QQVJFKGZyYW1lLT51 cmwoKSwgUVVybCgicXJjOi9uYXZpZ2F0ZS90by9hbm90aGVyL2xvY2F0aW9uIikpOworICAgIFFD T01QQVJFKG1fcGFnZS0+aGlzdG9yeSgpLT5jb3VudCgpLCAyKTsKKyAgICBRVkVSSUZZKCFtX3Bh Z2UtPmhpc3RvcnkoKS0+Y2FuR29Gb3J3YXJkKCkpOworICAgIFFWRVJJRlkobV9wYWdlLT5oaXN0 b3J5KCktPmNhbkdvQmFjaygpKTsKKworICAgIGZyYW1lLT5ldmFsdWF0ZUphdmFTY3JpcHQoIndp bmRvdy5oaXN0b3J5LmJhY2soKSIpOworICAgIFFUZXN0OjpxV2FpdCgxMDApOworICAgIGV4cGVj dGVkVXJsQ2hhbmdlQ291bnQrKzsKKyAgICBRQ09NUEFSRSh1cmxDaGFuZ2VkU3B5LmNvdW50KCks IGV4cGVjdGVkVXJsQ2hhbmdlQ291bnQpOworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgUVVy bCgicXJjOi90ZXN0MS5odG1sIikpOworICAgIFFWRVJJRlkobV9wYWdlLT5oaXN0b3J5KCktPmNh bkdvRm9yd2FyZCgpKTsKKyAgICBRVkVSSUZZKCFtX3BhZ2UtPmhpc3RvcnkoKS0+Y2FuR29CYWNr KCkpOworfQorCiB2b2lkIHRzdF9RV2ViRnJhbWU6OnNldFVybFNhbWVVcmwoKQogewogICAgIGNv bnN0IFFVcmwgdXJsMSgicXJjOi90ZXN0MS5odG1sIik7Cg==