42293 2010-07-14 15:10:09 -0700 [Qt] Remove FrameLoaderClientQt::webFrame() to use NetworkingContext to get the WebFrame to avoid layering violations 2010-09-16 05:39:11 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED Qt P2 Normal --- 42292 1 jesus diegohcg commit-queue diegohcg kenneth tonikitoo webkit-ews oldest_to_newest 251451 0 jesus 2010-07-14 15:10:09 -0700 After we have something like a PlatformWebFrame and a FrameLoaderClient::platformWebFrame we should remove all layering violations related to this. 251463 1 61574 jesus 2010-07-14 15:29:09 -0700 Created attachment 61574 patch 252166 2 tonikitoo 2010-07-15 15:22:04 -0700 Good you are looking into it! An yet-not-perfect-alternate-approach would be replacing the use of FrameLoaderClientQt in WebCore by ... QWebFrame* QWebFramePrivate::core(Frame*) ... method. Given a Frame, it returns the associated QWebFrame. Of course, you'd be eliminating all direct accesses to FrameLoaderClientQt from WebCore *but* including qwebframe_p.h. Again, it is not perfect, but works better anyways to me. 252193 3 tonikitoo 2010-07-15 15:58:18 -0700 (In reply to comment #2) > QWebFrame* QWebFramePrivate::core(Frame*) s/core/kit 263904 4 jesus 2010-08-12 12:06:11 -0700 After NetworkingContext (bug 42292) is reviewed and landed, we should probably review the need of having FrameLoaderClientQt::webFrame(). 279172 5 67606 diegohcg 2010-09-14 14:27:16 -0700 Created attachment 67606 Patch 279178 6 webkit-ews 2010-09-14 14:36:52 -0700 Attachment 67606 did not build on qt: Build output: http://queues.webkit.org/results/4019008 279441 7 67606 kenneth 2010-09-15 00:51:44 -0700 Comment on attachment 67606 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=67606&action=prettypatch > WebKit/qt/Api/qwebframe.cpp:898 > + QWebFrame* webFrame = static_cast<QWebFrame*>(loader->networkingContext()->originatingObject()); qobject_cast? > WebKit/qt/Api/qwebframe.cpp:1457 > + return static_cast<QWebFrame*>(coreFrame->loader()->networkingContext()->originatingObject()); qobject_cast? > WebKit/qt/Api/qwebpage.cpp:1921 > + return static_cast<QWebFrame*>(frame->loader()->networkingContext()->originatingObject()); qobject_cast? > WebKit/qt/WebCoreSupport/ChromeClientQt.cpp:298 > + QWebFrame* webFrame = static_cast<QWebFrame*>(f->loader()->networkingContext()->originatingObject()); here > WebKit/qt/WebCoreSupport/ChromeClientQt.cpp:305 > + QWebFrame* webFrame = static_cast<QWebFrame*>(f->loader()->networkingContext()->originatingObject()); here as well > WebKit/qt/WebCoreSupport/ChromeClientQt.cpp:312 > + QWebFrame* webFrame = static_cast<QWebFrame*>(f->loader()->networkingContext()->originatingObject()); and here :-) 279524 8 67670 diegohcg 2010-09-15 06:38:51 -0700 Created attachment 67670 Patch v2 279526 9 webkit-ews 2010-09-15 06:45:59 -0700 Attachment 67670 did not build on qt: Build output: http://queues.webkit.org/results/3997020 279528 10 67670 diegohcg 2010-09-15 06:48:50 -0700 Comment on attachment 67670 Patch v2 Wrong patch. :( 279529 11 tonikitoo 2010-09-15 06:57:50 -0700 since static_cast is faster , in this case it wont't fail, and he is not null-checking anyways, I thought it was ok as is. no strong preference. (In reply to comment #7) > (From update of attachment 67606 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=67606&action=prettypatch > > > WebKit/qt/Api/qwebframe.cpp:898 > > + QWebFrame* webFrame = static_cast<QWebFrame*>(loader->networkingContext()->originatingObject()); > qobject_cast? > > > WebKit/qt/Api/qwebframe.cpp:1457 > > + return static_cast<QWebFrame*>(coreFrame->loader()->networkingContext()->originatingObject()); > qobject_cast? > > > WebKit/qt/Api/qwebpage.cpp:1921 > > + return static_cast<QWebFrame*>(frame->loader()->networkingContext()->originatingObject()); > qobject_cast? > > > WebKit/qt/WebCoreSupport/ChromeClientQt.cpp:298 > > + QWebFrame* webFrame = static_cast<QWebFrame*>(f->loader()->networkingContext()->originatingObject()); > here > > > WebKit/qt/WebCoreSupport/ChromeClientQt.cpp:305 > > + QWebFrame* webFrame = static_cast<QWebFrame*>(f->loader()->networkingContext()->originatingObject()); > here as well > > > WebKit/qt/WebCoreSupport/ChromeClientQt.cpp:312 > > + QWebFrame* webFrame = static_cast<QWebFrame*>(f->loader()->networkingContext()->originatingObject()); > and here :-) 279530 12 67672 diegohcg 2010-09-15 07:06:24 -0700 Created attachment 67672 Patch v3 280029 13 67672 commit-queue 2010-09-16 05:39:05 -0700 Comment on attachment 67672 Patch v3 Clearing flags on attachment: 67672 Committed r67608: <http://trac.webkit.org/changeset/67608> 280030 14 commit-queue 2010-09-16 05:39:11 -0700 All reviewed patches have been landed. Closing bug. 61574 2010-07-14 15:29:09 -0700 2010-09-14 14:27:16 -0700 patch 0001-Qt-QtWebKit-has-layering-violations-due-to-FrameLoad.patch text/plain 10824 jesus RnJvbSAwOTA0YjY3NjEzZGE0ODY2NDBkYWZlYTFmMzg1YWU5ZmQwZTViZWM4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZXN1cyBTYW5jaGV6LVBhbGVuY2lhIDxqZXN1cy5wYWxlbmNp YUBvcGVuYm9zc2Eub3JnPgpEYXRlOiBXZWQsIDE0IEp1bCAyMDEwIDE5OjMxOjEzIC0wMzAwClN1 YmplY3Q6IFtQQVRDSF0gW1F0XSBRdFdlYktpdCBoYXMgbGF5ZXJpbmcgdmlvbGF0aW9ucyBkdWUg dG8gRnJhbWVMb2FkZXJDbGllbnRRdDo6d2ViRnJhbWUoKQogaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQyMjkzCgpXZWJDb3JlOgoKUGF0Y2ggYnkgSmVzdXMgU2FuY2hl ei1QYWxlbmNpYSA8amVzdXNAd2Via2l0Lm9yZz4gb24gMjAxMC0wNy0xNApSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KClJlbW92ZSBsYXllciB2aW9sYXRpb25zIGJ5IHVzaW5nIEZyYW1lTG9h ZGVyQ2xpZW50OjpwbGF0Zm9ybVdlYkZyYW1lKCkgaW5zdGVhZApvZiB1c2luZyBhIGNhc3QgdG8g RnJhbWVMb2FkZXJDbGllbnRRdCBhbmQgY2FsbGluZyB3ZWJGcmFtZSgpLgoKKiBwbGF0Zm9ybS9u ZXR3b3JrL3F0L1Jlc291cmNlSGFuZGxlUXQuY3BwOgooV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6 OnN0YXJ0KToKKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpsb2FkUmVzb3VyY2VTeW5jaHJvbm91 c2x5KToKKiBwbGF0Zm9ybS9xdC9Db29raWVKYXJRdC5jcHA6CihXZWJDb3JlOjpjb29raWVKYXIp OgoKV2ViS2l0L3F0OgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpOb3cgdXNpbmcgRnJh bWVMb2FkZXJDbGllbnQ6OnBsYXRmb3JtV2ViRnJhbWUoKSBpbnN0ZWFkIG9mCkZyYW1lTG9hZGVy Q2xpZW50UXQ6OndlYkZyYW1lKCkuCgoqIEFwaS9xd2ViZnJhbWUuY3BwOgooUVdlYkZyYW1lOjpj aGlsZEZyYW1lcyk6CihRV2ViRnJhbWVQcml2YXRlOjpraXQpOgoqIEFwaS9xd2VicGFnZS5jcHA6 CihRV2ViUGFnZTo6Y3VycmVudEZyYW1lKToKKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRR dC5jcHA6CihXZWJDb3JlOjpDaHJvbWVDbGllbnRRdDo6cnVuSmF2YVNjcmlwdEFsZXJ0KToKKFdl YkNvcmU6OkNocm9tZUNsaWVudFF0OjpydW5KYXZhU2NyaXB0Q29uZmlybSk6CihXZWJDb3JlOjpD aHJvbWVDbGllbnRRdDo6cnVuSmF2YVNjcmlwdFByb21wdCk6CiogV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRRdC5jcHA6CihXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpjaG9v c2VGaWxlKToKKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OnBsYXRmb3JtV2ViRnJhbWUp OgoqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaDoKLS0tCiBXZWJDb3JlL0No YW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE2ICsrKysrKysrKysr KysrCiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUmVzb3VyY2VIYW5kbGVRdC5jcHAgfCAg ICA0ICstCiBXZWJDb3JlL3BsYXRmb3JtL3F0L0Nvb2tpZUphclF0LmNwcCAgICAgICAgICAgICAg fCAgICAyICstCiBXZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAgICAgICAgICAgICAgICAgICAg ICAgfCAgICA0ICstCiBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCAgICAgICAgICAgICAgICAg ICAgICAgfCAgICAyICstCiBXZWJLaXQvcXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgfCAgIDI0ICsrKysrKysrKysrKysrKysrKysrKysKIFdlYktpdC9xdC9XZWJDb3Jl U3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHAgICAgICB8ICAgIDkgKystLS0tLQogV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwIHwgICAxMiArKysrKy0tLS0t CiBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oICAgfCAgICAz ICstCiA5IGZpbGVzIGNoYW5nZWQsIDU3IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTBhMTRmMy4uODg2Njk4NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyMiBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgogCisgICAgICAgIFtRdF0gUXRXZWJLaXQgaGFzIGxheWVyaW5nIHZpb2xh dGlvbnMgZHVlIHRvIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OndlYkZyYW1lKCkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMjkzCisKKyAgICAgICAgUmVt b3ZlIGxheWVyIHZpb2xhdGlvbnMgYnkgdXNpbmcgRnJhbWVMb2FkZXJDbGllbnQ6OnBsYXRmb3Jt V2ViRnJhbWUoKSBpbnN0ZWFkCisgICAgICAgIG9mIHVzaW5nIGEgY2FzdCB0byBGcmFtZUxvYWRl ckNsaWVudFF0IGFuZCBjYWxsaW5nIHdlYkZyYW1lKCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9u ZXR3b3JrL3F0L1Jlc291cmNlSGFuZGxlUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VIYW5kbGU6OnN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpsb2Fk UmVzb3VyY2VTeW5jaHJvbm91c2x5KToKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9Db29raWVKYXJR dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb29raWVKYXIpOgorCisyMDEwLTA3LTE0ICBKZXN1 cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXNAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBBZGQgUGxhdGZvcm1XZWJGcmFtZSB0byBh dm9pZCBsYXllciB2aW9sYXRpb25zCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00MjI5MgogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvcXQvUmVzb3VyY2VIYW5kbGVRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQv UmVzb3VyY2VIYW5kbGVRdC5jcHAKaW5kZXggZmY3NWE5NC4uOTNlNTY1MSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1Jlc291cmNlSGFuZGxlUXQuY3BwCisrKyBiL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9SZXNvdXJjZUhhbmRsZVF0LmNwcApAQCAtMTM2LDcg KzEzNiw3IEBAIGJvb2wgUmVzb3VyY2VIYW5kbGU6OnN0YXJ0KEZyYW1lKiBmcmFtZSkKICAgICAg ICAgZC0+bV9yZXF1ZXN0LnNldFVSTCh1cmxXaXRoQ3JlZGVudGlhbHMpOwogICAgIH0KIAotICAg IGdldEludGVybmFsKCktPm1fZnJhbWUgPSBzdGF0aWNfY2FzdDxGcmFtZUxvYWRlckNsaWVudFF0 Kj4oZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKSktPndlYkZyYW1lKCk7CisgICAgZ2V0SW50ZXJu YWwoKS0+bV9mcmFtZSA9IGZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCktPnBsYXRmb3JtV2ViRnJh bWUoKTsKICAgICBSZXNvdXJjZUhhbmRsZUludGVybmFsICpkID0gZ2V0SW50ZXJuYWwoKTsKICAg ICBkLT5tX2pvYiA9IG5ldyBRTmV0d29ya1JlcGx5SGFuZGxlcih0aGlzLCBRTmV0d29ya1JlcGx5 SGFuZGxlcjo6TG9hZE1vZGUoZC0+bV9kZWZlcnNMb2FkaW5nKSk7CiAgICAgcmV0dXJuIHRydWU7 CkBAIC0yMDAsNyArMjAwLDcgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6bG9hZFJlc291cmNlU3lu Y2hyb25vdXNseShjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFMKICAgICAgICAgdXJs V2l0aENyZWRlbnRpYWxzLnNldFBhc3MoZC0+bV9wYXNzKTsKICAgICAgICAgZC0+bV9yZXF1ZXN0 LnNldFVSTCh1cmxXaXRoQ3JlZGVudGlhbHMpOwogICAgIH0KLSAgICBkLT5tX2ZyYW1lID0gc3Rh dGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRRdCo+KGZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCkp LT53ZWJGcmFtZSgpOworICAgIGQtPm1fZnJhbWUgPSBmcmFtZS0+bG9hZGVyKCktPmNsaWVudCgp LT5wbGF0Zm9ybVdlYkZyYW1lKCk7CiAgICAgZC0+bV9qb2IgPSBuZXcgUU5ldHdvcmtSZXBseUhh bmRsZXIoaGFuZGxlLmdldCgpLCBRTmV0d29ya1JlcGx5SGFuZGxlcjo6TG9hZE5vcm1hbCk7CiAK ICAgICBzeW5jTG9hZGVyLndhaXRGb3JDb21wbGV0aW9uKCk7CmRpZmYgLS1naXQgYS9XZWJDb3Jl L3BsYXRmb3JtL3F0L0Nvb2tpZUphclF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ29va2ll SmFyUXQuY3BwCmluZGV4IDE1MDUzZWIuLjBlMThmZWYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxh dGZvcm0vcXQvQ29va2llSmFyUXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ29va2ll SmFyUXQuY3BwCkBAIC01MSw3ICs1MSw3IEBAIHN0YXRpYyBRTmV0d29ya0Nvb2tpZUphciAqY29v a2llSmFyKGNvbnN0IERvY3VtZW50ICpkb2N1bWVudCkKICAgICBGcmFtZUxvYWRlciAqbG9hZGVy ID0gZnJhbWUtPmxvYWRlcigpOwogICAgIGlmICghbG9hZGVyKQogICAgICAgICByZXR1cm4gMDsK LSAgICBRV2ViRnJhbWUqIHdlYkZyYW1lID0gc3RhdGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRR dCo+KGxvYWRlci0+Y2xpZW50KCkpLT53ZWJGcmFtZSgpOworICAgIFFXZWJGcmFtZSogd2ViRnJh bWUgPSBsb2FkZXItPmNsaWVudCgpLT5wbGF0Zm9ybVdlYkZyYW1lKCk7CiAgICAgUVdlYlBhZ2Uq IHBhZ2UgPSB3ZWJGcmFtZS0+cGFnZSgpOwogICAgIFFOZXR3b3JrQWNjZXNzTWFuYWdlciogbWFu YWdlciA9IHBhZ2UtPm5ldHdvcmtBY2Nlc3NNYW5hZ2VyKCk7CiAgICAgUU5ldHdvcmtDb29raWVK YXIqIGphciA9IG1hbmFnZXItPmNvb2tpZUphcigpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0Fw aS9xd2ViZnJhbWUuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCmluZGV4IGQxNzQx Y2EuLjllOTY0M2YgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAorKysg Yi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKQEAgLTg1NSw3ICs4NTUsNyBAQCBRTGlzdDxR V2ViRnJhbWUqPiBRV2ViRnJhbWU6OmNoaWxkRnJhbWVzKCkgY29uc3QKICAgICAgICAgICAgIEZy YW1lTG9hZGVyICpsb2FkZXIgPSBjaGlsZC0+bG9hZGVyKCk7CiAgICAgICAgICAgICBGcmFtZUxv YWRlckNsaWVudFF0ICpjbGllbnQgPSBzdGF0aWNfY2FzdDxGcmFtZUxvYWRlckNsaWVudFF0Kj4o bG9hZGVyLT5jbGllbnQoKSk7CiAgICAgICAgICAgICBpZiAoY2xpZW50KQotICAgICAgICAgICAg ICAgIHJjLmFwcGVuZChjbGllbnQtPndlYkZyYW1lKCkpOworICAgICAgICAgICAgICAgIHJjLmFw cGVuZChjbGllbnQtPnBsYXRmb3JtV2ViRnJhbWUoKSk7CiAgICAgICAgIH0KIAogICAgIH0KQEAg LTEzOTksNyArMTM5OSw3IEBAIFdlYkNvcmU6OkZyYW1lKiBRV2ViRnJhbWVQcml2YXRlOjpjb3Jl KFFXZWJGcmFtZSogd2ViRnJhbWUpCiAKIFFXZWJGcmFtZSogUVdlYkZyYW1lUHJpdmF0ZTo6a2l0 KFdlYkNvcmU6OkZyYW1lKiBjb3JlRnJhbWUpCiB7Ci0gICAgcmV0dXJuIHN0YXRpY19jYXN0PEZy YW1lTG9hZGVyQ2xpZW50UXQqPihjb3JlRnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKSktPndlYkZy YW1lKCk7CisgICAgcmV0dXJuIGNvcmVGcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpLT5wbGF0Zm9y bVdlYkZyYW1lKCk7CiB9CiAKIApkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5j cHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAppbmRleCAzNTIxOWE5Li5mYThjMGI3IDEw MDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAorKysgYi9XZWJLaXQvcXQvQXBp L3F3ZWJwYWdlLmNwcApAQCAtMTkxMyw3ICsxOTEzLDcgQEAgUVdlYkZyYW1lICpRV2ViUGFnZTo6 bWFpbkZyYW1lKCkgY29uc3QKIFFXZWJGcmFtZSAqUVdlYlBhZ2U6OmN1cnJlbnRGcmFtZSgpIGNv bnN0CiB7CiAgICAgZC0+Y3JlYXRlTWFpbkZyYW1lKCk7Ci0gICAgcmV0dXJuIHN0YXRpY19jYXN0 PFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQgKj4oZC0+cGFnZS0+Zm9jdXNDb250cm9sbGVy KCktPmZvY3VzZWRPck1haW5GcmFtZSgpLT5sb2FkZXIoKS0+Y2xpZW50KCkpLT53ZWJGcmFtZSgp OworICAgIHJldHVybiBkLT5wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZy YW1lKCktPmxvYWRlcigpLT5jbGllbnQoKS0+cGxhdGZvcm1XZWJGcmFtZSgpOwogfQogCiAKZGlm ZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4 IDE2MDI0MGYuLjQ2NTlhZmIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIv V2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEwLTA3LTE0ICBKZXN1cyBT YW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFAb3BlbmJvc3NhLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFF0V2ViS2l0IGhh cyBsYXllcmluZyB2aW9sYXRpb25zIGR1ZSB0byBGcmFtZUxvYWRlckNsaWVudFF0Ojp3ZWJGcmFt ZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjI5 MworCisgICAgICAgIE5vdyB1c2luZyBGcmFtZUxvYWRlckNsaWVudDo6cGxhdGZvcm1XZWJGcmFt ZSgpIGluc3RlYWQgb2YKKyAgICAgICAgRnJhbWVMb2FkZXJDbGllbnRRdDo6d2ViRnJhbWUoKS4K KworICAgICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgorICAgICAgICAoUVdlYkZyYW1lOjpjaGls ZEZyYW1lcyk6CisgICAgICAgIChRV2ViRnJhbWVQcml2YXRlOjpraXQpOgorICAgICAgICAqIEFw aS9xd2VicGFnZS5jcHA6CisgICAgICAgIChRV2ViUGFnZTo6Y3VycmVudEZyYW1lKToKKyAgICAg ICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDaHJvbWVDbGllbnRRdDo6cnVuSmF2YVNjcmlwdEFsZXJ0KToKKyAgICAgICAgKFdlYkNvcmU6 OkNocm9tZUNsaWVudFF0OjpydW5KYXZhU2NyaXB0Q29uZmlybSk6CisgICAgICAgIChXZWJDb3Jl OjpDaHJvbWVDbGllbnRRdDo6cnVuSmF2YVNjcmlwdFByb21wdCk6CisgICAgICAgICogV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFt ZUxvYWRlckNsaWVudFF0OjpjaG9vc2VGaWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9h ZGVyQ2xpZW50UXQ6OnBsYXRmb3JtV2ViRnJhbWUpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaDoKKwogMjAxMC0wNy0wNyAgVG9yIEFybmUgVmVzdGLDuCAg PHRvci5hcm5lLnZlc3Rib0Bub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4g QWRsZXIuCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50 UXQuY3BwIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNwcAppbmRl eCBmYWVjNzA1Li5lYjNkY2QzIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQv Q2hyb21lQ2xpZW50UXQuY3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVD bGllbnRRdC5jcHAKQEAgLTI5MSwyMiArMjkxLDE5IEBAIHZvaWQgQ2hyb21lQ2xpZW50UXQ6OmNs b3NlV2luZG93U29vbigpCiB2b2lkIENocm9tZUNsaWVudFF0OjpydW5KYXZhU2NyaXB0QWxlcnQo RnJhbWUqIGYsIGNvbnN0IFN0cmluZyYgbXNnKQogewogICAgIFFTdHJpbmcgeCA9IG1zZzsKLSAg ICBGcmFtZUxvYWRlckNsaWVudFF0KiBmbCA9IHN0YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xpZW50 UXQqPihmLT5sb2FkZXIoKS0+Y2xpZW50KCkpOwotICAgIG1fd2ViUGFnZS0+amF2YVNjcmlwdEFs ZXJ0KGZsLT53ZWJGcmFtZSgpLCB4KTsKKyAgICBtX3dlYlBhZ2UtPmphdmFTY3JpcHRBbGVydChm LT5sb2FkZXIoKS0+Y2xpZW50KCktPnBsYXRmb3JtV2ViRnJhbWUoKSwgeCk7CiB9CiAKIGJvb2wg Q2hyb21lQ2xpZW50UXQ6OnJ1bkphdmFTY3JpcHRDb25maXJtKEZyYW1lKiBmLCBjb25zdCBTdHJp bmcmIG1zZykKIHsKICAgICBRU3RyaW5nIHggPSBtc2c7Ci0gICAgRnJhbWVMb2FkZXJDbGllbnRR dCogZmwgPSBzdGF0aWNfY2FzdDxGcmFtZUxvYWRlckNsaWVudFF0Kj4oZi0+bG9hZGVyKCktPmNs aWVudCgpKTsKLSAgICByZXR1cm4gbV93ZWJQYWdlLT5qYXZhU2NyaXB0Q29uZmlybShmbC0+d2Vi RnJhbWUoKSwgeCk7CisgICAgcmV0dXJuIG1fd2ViUGFnZS0+amF2YVNjcmlwdENvbmZpcm0oZi0+ bG9hZGVyKCktPmNsaWVudCgpLT5wbGF0Zm9ybVdlYkZyYW1lKCksIHgpOwogfQogCiBib29sIENo cm9tZUNsaWVudFF0OjpydW5KYXZhU2NyaXB0UHJvbXB0KEZyYW1lKiBmLCBjb25zdCBTdHJpbmcm IG1lc3NhZ2UsIGNvbnN0IFN0cmluZyYgZGVmYXVsdFZhbHVlLCBTdHJpbmcmIHJlc3VsdCkKIHsK ICAgICBRU3RyaW5nIHggPSByZXN1bHQ7Ci0gICAgRnJhbWVMb2FkZXJDbGllbnRRdCogZmwgPSBz dGF0aWNfY2FzdDxGcmFtZUxvYWRlckNsaWVudFF0Kj4oZi0+bG9hZGVyKCktPmNsaWVudCgpKTsK LSAgICBib29sIHJjID0gbV93ZWJQYWdlLT5qYXZhU2NyaXB0UHJvbXB0KGZsLT53ZWJGcmFtZSgp LCAoUVN0cmluZyltZXNzYWdlLCAoUVN0cmluZylkZWZhdWx0VmFsdWUsICZ4KTsKKyAgICBib29s IHJjID0gbV93ZWJQYWdlLT5qYXZhU2NyaXB0UHJvbXB0KGYtPmxvYWRlcigpLT5jbGllbnQoKS0+ cGxhdGZvcm1XZWJGcmFtZSgpLCAoUVN0cmluZyltZXNzYWdlLCAoUVN0cmluZylkZWZhdWx0VmFs dWUsICZ4KTsKIAogICAgIC8vIEZpeCB1cCBhIHF1aXJrIGluIHRoZSBRSW5wdXREaWFsb2cgY2xh c3MuIElmIG5vIGlucHV0IGhhcHBlbmVkIHRoZSBzdHJpbmcgc2hvdWxkIGJlIGVtcHR5CiAgICAg Ly8gYnV0IGl0IGlzIG51bGwuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzA5MTQuCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRRdC5jcHAgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRRdC5jcHAKaW5kZXggZmMwZjZjMy4uYjVjZjY1YSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCisrKyBiL1dlYktpdC9xdC9X ZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcApAQCAtMjIyLDExICsyMjIsNiBA QCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OnNldEZyYW1lKFFXZWJGcmFtZSogd2ViRnJhbWUs IEZyYW1lKiBmcmFtZSkKICAgICAgICAgICAgIG1fd2ViRnJhbWUsIFNJR05BTCh0aXRsZUNoYW5n ZWQoUVN0cmluZykpKTsKIH0KIAotUVdlYkZyYW1lKiBGcmFtZUxvYWRlckNsaWVudFF0Ojp3ZWJG cmFtZSgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fd2ViRnJhbWU7Ci19Ci0KIHZvaWQgRnJhbWVM b2FkZXJDbGllbnRRdDo6Y2FsbFBvbGljeUZ1bmN0aW9uKEZyYW1lUG9saWN5RnVuY3Rpb24gZnVu Y3Rpb24sIFBvbGljeUFjdGlvbiBhY3Rpb24pCiB7CiAgICAgKG1fZnJhbWUtPmxvYWRlcigpLT5w b2xpY3lDaGVja2VyKCktPipmdW5jdGlvbikoYWN0aW9uKTsKQEAgLTE0OTIsNyArMTQ4NywxMiBA QCBTdHJpbmcgRnJhbWVMb2FkZXJDbGllbnRRdDo6b3ZlcnJpZGVNZWRpYVR5cGUoKSBjb25zdAog CiBRU3RyaW5nIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNob29zZUZpbGUoY29uc3QgUVN0cmluZyYg b2xkRmlsZSkKIHsKLSAgICByZXR1cm4gd2ViRnJhbWUoKS0+cGFnZSgpLT5jaG9vc2VGaWxlKHdl YkZyYW1lKCksIG9sZEZpbGUpOworICAgIHJldHVybiBwbGF0Zm9ybVdlYkZyYW1lKCktPnBhZ2Uo KS0+Y2hvb3NlRmlsZShwbGF0Zm9ybVdlYkZyYW1lKCksIG9sZEZpbGUpOworfQorCitQbGF0Zm9y bVdlYkZyYW1lIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OnBsYXRmb3JtV2ViRnJhbWUoKSBjb25zdAor eworICAgIHJldHVybiBtX3dlYkZyYW1lOwogfQogCiB9CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQv V2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oIGIvV2ViS2l0L3F0L1dlYkNvcmVT dXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaAppbmRleCBlYzY3MmY1Li5mM2RhN2IzIDEwMDY0 NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oCisr KyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmgKQEAgLTcy LDcgKzcyLDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBmcmFtZUxvYWRlckRlc3Ryb3ll ZCgpOwogCiAgICAgdm9pZCBzZXRGcmFtZShRV2ViRnJhbWUqIHdlYkZyYW1lLCBGcmFtZSogZnJh bWUpOwotICAgIFFXZWJGcmFtZSogd2ViRnJhbWUoKSBjb25zdDsKIAogICAgIHZpcnR1YWwgYm9v bCBoYXNXZWJWaWV3KCkgY29uc3Q7IC8vIG1haW5seSBmb3IgYXNzZXJ0aW9ucwogCkBAIC0yMTIs NiArMjExLDggQEAgcHVibGljOgogCiAgICAgUVN0cmluZyBjaG9vc2VGaWxlKGNvbnN0IFFTdHJp bmcmIG9sZEZpbGUpOwogCisgICAgdmlydHVhbCBQbGF0Zm9ybVdlYkZyYW1lIHBsYXRmb3JtV2Vi RnJhbWUoKSBjb25zdDsKKwogICAgIHN0YXRpYyBib29sIGR1bXBGcmFtZUxvYWRlckNhbGxiYWNr czsKICAgICBzdGF0aWMgYm9vbCBkdW1wUmVzb3VyY2VMb2FkQ2FsbGJhY2tzOwogICAgIHN0YXRp YyBib29sIGR1bXBSZXNvdXJjZVJlc3BvbnNlTUlNRVR5cGVzOwotLSAKMS43LjAuMwoK 67606 2010-09-14 14:27:16 -0700 2010-09-15 06:39:07 -0700 Patch 0001-Qt-Remove-FrameLoaderClientQt-webFrame-to-use-Network.diff text/plain 8596 diegohcg RnJvbSBiNThjZGFiMjg0Y2FiMGIwYzY4YWU5YjNlMTk3OGQ1ODliNTQ3YzA0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ29oY2dAd2Via2l0Lm9yZz4K RGF0ZTogVHVlLCAxNCBTZXAgMjAxMCAxNzoyNTozNCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gUmVtb3ZlIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OndlYkZyYW1lKCkgdG8gdXNlIE5ldHdvcmtp bmdDb250ZXh0IHRvIGdldCB0aGUgV2ViRnJhbWUgdG8gYXZvaWQgbGF5ZXJpbmcgdmlvbGF0aW9u cwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMjkzCgpSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogQXBpL3F3ZWJmcmFtZS5jcHA6CihRV2ViRnJhbWU6OmNo aWxkRnJhbWVzKToKKFFXZWJGcmFtZVByaXZhdGU6OmtpdCk6CiogQXBpL3F3ZWJwYWdlLmNwcDoK KFFXZWJQYWdlOjpjdXJyZW50RnJhbWUpOgoqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0 LmNwcDoKKFdlYkNvcmU6OkNocm9tZUNsaWVudFF0OjpydW5KYXZhU2NyaXB0QWxlcnQpOgooV2Vi Q29yZTo6Q2hyb21lQ2xpZW50UXQ6OnJ1bkphdmFTY3JpcHRDb25maXJtKToKKFdlYkNvcmU6OkNo cm9tZUNsaWVudFF0OjpydW5KYXZhU2NyaXB0UHJvbXB0KToKKFdlYkNvcmU6OkNocm9tZUNsaWVu dFF0Ojpjb250ZW50c1NpemVDaGFuZ2VkKToKKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNs aWVudFF0LmNwcDoKKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNob29zZUZpbGUpOgoq IFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaDoKLS0tCiBXZWJLaXQvcXQvQXBp L3F3ZWJmcmFtZS5jcHAgICAgICAgICAgICAgICAgICAgICAgfCAgICA5ICsrKysrLS0tLQogV2Vi S2l0L3F0L0FwaS9xd2VicGFnZS5jcHAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgNCArKyst CiBXZWJLaXQvcXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDIx ICsrKysrKysrKysrKysrKysrKysrKwogV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNs aWVudFF0LmNwcCAgICAgIHwgICAxNiArKysrKysrKystLS0tLS0tCiBXZWJLaXQvcXQvV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAgfCAgICA3ICstLS0tLS0KIFdlYktpdC9x dC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmggICB8ICAgIDEgLQogNiBmaWxl cyBjaGFuZ2VkLCAzOSBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5j cHAKaW5kZXggNGVjNjg1Mi4uOTYxM2VhYiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2Vi ZnJhbWUuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcApAQCAtNTYsNiArNTYs NyBAQAogI2luY2x1ZGUgIlY4RE9NV3JhcHBlci5oIgogI2luY2x1ZGUgIlY4RE9NV2luZG93U2hl bGwuaCIKICNlbmRpZgorI2luY2x1ZGUgIk5ldHdvcmtpbmdDb250ZXh0LmgiCiAjaW5jbHVkZSAi Tm9kZUxpc3QuaCIKICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1Nb3VzZUV2 ZW50LmgiCkBAIC04OTQsOSArODk1LDkgQEAgUUxpc3Q8UVdlYkZyYW1lKj4gUVdlYkZyYW1lOjpj aGlsZEZyYW1lcygpIGNvbnN0CiAgICAgICAgIEZyYW1lVHJlZSAqdHJlZSA9IGQtPmZyYW1lLT50 cmVlKCk7CiAgICAgICAgIGZvciAoRnJhbWUgKmNoaWxkID0gdHJlZS0+Zmlyc3RDaGlsZCgpOyBj aGlsZDsgY2hpbGQgPSBjaGlsZC0+dHJlZSgpLT5uZXh0U2libGluZygpKSB7CiAgICAgICAgICAg ICBGcmFtZUxvYWRlciAqbG9hZGVyID0gY2hpbGQtPmxvYWRlcigpOwotICAgICAgICAgICAgRnJh bWVMb2FkZXJDbGllbnRRdCAqY2xpZW50ID0gc3RhdGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRR dCo+KGxvYWRlci0+Y2xpZW50KCkpOwotICAgICAgICAgICAgaWYgKGNsaWVudCkKLSAgICAgICAg ICAgICAgICByYy5hcHBlbmQoY2xpZW50LT53ZWJGcmFtZSgpKTsKKyAgICAgICAgICAgIFFXZWJG cmFtZSogd2ViRnJhbWUgPSBzdGF0aWNfY2FzdDxRV2ViRnJhbWUqPihsb2FkZXItPm5ldHdvcmtp bmdDb250ZXh0KCktPm9yaWdpbmF0aW5nT2JqZWN0KCkpOworICAgICAgICAgICAgaWYgKHdlYkZy YW1lKQorICAgICAgICAgICAgICAgIHJjLmFwcGVuZCh3ZWJGcmFtZSk7CiAgICAgICAgIH0KIAog ICAgIH0KQEAgLTE0NTMsNyArMTQ1NCw3IEBAIFdlYkNvcmU6OkZyYW1lKiBRV2ViRnJhbWVQcml2 YXRlOjpjb3JlKGNvbnN0IFFXZWJGcmFtZSogd2ViRnJhbWUpCiAKIFFXZWJGcmFtZSogUVdlYkZy YW1lUHJpdmF0ZTo6a2l0KGNvbnN0IFdlYkNvcmU6OkZyYW1lKiBjb3JlRnJhbWUpCiB7Ci0gICAg cmV0dXJuIHN0YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xpZW50UXQqPihjb3JlRnJhbWUtPmxvYWRl cigpLT5jbGllbnQoKSktPndlYkZyYW1lKCk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PFFXZWJG cmFtZSo+KGNvcmVGcmFtZS0+bG9hZGVyKCktPm5ldHdvcmtpbmdDb250ZXh0KCktPm9yaWdpbmF0 aW5nT2JqZWN0KCkpOwogfQogCiAKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2Uu Y3BwIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKaW5kZXggNGY1ZTcxMS4uOGQ4NGEyMSAx MDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvV2ViS2l0L3F0L0Fw aS9xd2VicGFnZS5jcHAKQEAgLTY0LDYgKzY0LDcgQEAKICNpbmNsdWRlICJGb2N1c0NvbnRyb2xs ZXIuaCIKICNpbmNsdWRlICJFZGl0b3IuaCIKICNpbmNsdWRlICJTY3JvbGxiYXIuaCIKKyNpbmNs dWRlICJOZXR3b3JraW5nQ29udGV4dC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtS2V5Ym9hcmRFdmVu dC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtV2hlZWxFdmVudC5oIgogI2luY2x1ZGUgIlBsdWdpbkRh dGFiYXNlLmgiCkBAIC0xOTE2LDcgKzE5MTcsOCBAQCBRV2ViRnJhbWUgKlFXZWJQYWdlOjptYWlu RnJhbWUoKSBjb25zdAogUVdlYkZyYW1lICpRV2ViUGFnZTo6Y3VycmVudEZyYW1lKCkgY29uc3QK IHsKICAgICBkLT5jcmVhdGVNYWluRnJhbWUoKTsKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8V2Vi Q29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdCAqPihkLT5wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS0+ Zm9jdXNlZE9yTWFpbkZyYW1lKCktPmxvYWRlcigpLT5jbGllbnQoKSktPndlYkZyYW1lKCk7Cisg ICAgV2ViQ29yZTo6RnJhbWUgKmZyYW1lID0gZC0+cGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPmZv Y3VzZWRPck1haW5GcmFtZSgpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxRV2ViRnJhbWUqPihm cmFtZS0+bG9hZGVyKCktPm5ldHdvcmtpbmdDb250ZXh0KCktPm9yaWdpbmF0aW5nT2JqZWN0KCkp OwogfQogCiAKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hh bmdlTG9nCmluZGV4IDAyYjczZmUuLmUwYzM3OGMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFu Z2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEwLTA5 LTE0ICBEaWVnbyBHb256YWxleiAgPGRpZWdvaGNnQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBSZW1vdmUgRnJhbWVMb2Fk ZXJDbGllbnRRdDo6d2ViRnJhbWUoKSB0byB1c2UgTmV0d29ya2luZ0NvbnRleHQgdG8gZ2V0IHRo ZSBXZWJGcmFtZSB0byBhdm9pZCBsYXllcmluZyB2aW9sYXRpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjI5MworCisgICAgICAgICogQXBpL3F3 ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2ViRnJhbWU6OmNoaWxkRnJhbWVzKToKKyAgICAgICAg KFFXZWJGcmFtZVByaXZhdGU6OmtpdCk6CisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAg ICAgICAgKFFXZWJQYWdlOjpjdXJyZW50RnJhbWUpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0 L0Nocm9tZUNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudFF0Ojpy dW5KYXZhU2NyaXB0QWxlcnQpOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50UXQ6OnJ1 bkphdmFTY3JpcHRDb25maXJtKToKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudFF0Ojpy dW5KYXZhU2NyaXB0UHJvbXB0KToKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudFF0Ojpj b250ZW50c1NpemVDaGFuZ2VkKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNo b29zZUZpbGUpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQu aDoKKwogMjAxMC0wOS0xNCAgRW5yaWNvIFJvcyAgPGVyb3NAY29kZWF1cm9yYS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9X ZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHAgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBv cnQvQ2hyb21lQ2xpZW50UXQuY3BwCmluZGV4IDc0MDY1NTAuLjJhOGYwNDMgMTAwNjQ0Ci0tLSBh L1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHAKKysrIGIvV2ViS2l0 L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNwcApAQCAtNDQsNiArNDQsNyBAQAog I2luY2x1ZGUgIkdlb2xvY2F0aW9uUGVybWlzc2lvbkNsaWVudFF0LmgiCiAjaW5jbHVkZSAiSGl0 VGVzdFJlc3VsdC5oIgogI2luY2x1ZGUgIkljb24uaCIKKyNpbmNsdWRlICJOZXR3b3JraW5nQ29u dGV4dC5oIgogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCiAjaW5jbHVkZSAiTm90aWZpY2F0 aW9uUHJlc2VudGVyQ2xpZW50UXQuaCIKICNpbmNsdWRlICJQYWdlQ2xpZW50UXQuaCIKQEAgLTI5 NCwyMiArMjk1LDIyIEBAIHZvaWQgQ2hyb21lQ2xpZW50UXQ6OmNsb3NlV2luZG93U29vbigpCiB2 b2lkIENocm9tZUNsaWVudFF0OjpydW5KYXZhU2NyaXB0QWxlcnQoRnJhbWUqIGYsIGNvbnN0IFN0 cmluZyYgbXNnKQogewogICAgIFFTdHJpbmcgeCA9IG1zZzsKLSAgICBGcmFtZUxvYWRlckNsaWVu dFF0KiBmbCA9IHN0YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xpZW50UXQqPihmLT5sb2FkZXIoKS0+ Y2xpZW50KCkpOwotICAgIG1fd2ViUGFnZS0+amF2YVNjcmlwdEFsZXJ0KGZsLT53ZWJGcmFtZSgp LCB4KTsKKyAgICBRV2ViRnJhbWUqIHdlYkZyYW1lID0gc3RhdGljX2Nhc3Q8UVdlYkZyYW1lKj4o Zi0+bG9hZGVyKCktPm5ldHdvcmtpbmdDb250ZXh0KCktPm9yaWdpbmF0aW5nT2JqZWN0KCkpOwor ICAgIG1fd2ViUGFnZS0+amF2YVNjcmlwdEFsZXJ0KHdlYkZyYW1lLCB4KTsKIH0KIAogYm9vbCBD aHJvbWVDbGllbnRRdDo6cnVuSmF2YVNjcmlwdENvbmZpcm0oRnJhbWUqIGYsIGNvbnN0IFN0cmlu ZyYgbXNnKQogewogICAgIFFTdHJpbmcgeCA9IG1zZzsKLSAgICBGcmFtZUxvYWRlckNsaWVudFF0 KiBmbCA9IHN0YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xpZW50UXQqPihmLT5sb2FkZXIoKS0+Y2xp ZW50KCkpOwotICAgIHJldHVybiBtX3dlYlBhZ2UtPmphdmFTY3JpcHRDb25maXJtKGZsLT53ZWJG cmFtZSgpLCB4KTsKKyAgICBRV2ViRnJhbWUqIHdlYkZyYW1lID0gc3RhdGljX2Nhc3Q8UVdlYkZy YW1lKj4oZi0+bG9hZGVyKCktPm5ldHdvcmtpbmdDb250ZXh0KCktPm9yaWdpbmF0aW5nT2JqZWN0 KCkpOworICAgIHJldHVybiBtX3dlYlBhZ2UtPmphdmFTY3JpcHRDb25maXJtKHdlYkZyYW1lLCB4 KTsKIH0KIAogYm9vbCBDaHJvbWVDbGllbnRRdDo6cnVuSmF2YVNjcmlwdFByb21wdChGcmFtZSog ZiwgY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBjb25zdCBTdHJpbmcmIGRlZmF1bHRWYWx1ZSwgU3Ry aW5nJiByZXN1bHQpCiB7CiAgICAgUVN0cmluZyB4ID0gcmVzdWx0OwotICAgIEZyYW1lTG9hZGVy Q2xpZW50UXQqIGZsID0gc3RhdGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRRdCo+KGYtPmxvYWRl cigpLT5jbGllbnQoKSk7Ci0gICAgYm9vbCByYyA9IG1fd2ViUGFnZS0+amF2YVNjcmlwdFByb21w dChmbC0+d2ViRnJhbWUoKSwgKFFTdHJpbmcpbWVzc2FnZSwgKFFTdHJpbmcpZGVmYXVsdFZhbHVl LCAmeCk7CisgICAgUVdlYkZyYW1lKiB3ZWJGcmFtZSA9IHN0YXRpY19jYXN0PFFXZWJGcmFtZSo+ KGYtPmxvYWRlcigpLT5uZXR3b3JraW5nQ29udGV4dCgpLT5vcmlnaW5hdGluZ09iamVjdCgpKTsK KyAgICBib29sIHJjID0gbV93ZWJQYWdlLT5qYXZhU2NyaXB0UHJvbXB0KHdlYkZyYW1lLCAoUVN0 cmluZyltZXNzYWdlLCAoUVN0cmluZylkZWZhdWx0VmFsdWUsICZ4KTsKIAogICAgIC8vIEZpeCB1 cCBhIHF1aXJrIGluIHRoZSBRSW5wdXREaWFsb2cgY2xhc3MuIElmIG5vIGlucHV0IGhhcHBlbmVk IHRoZSBzdHJpbmcgc2hvdWxkIGJlIGVtcHR5CiAgICAgLy8gYnV0IGl0IGlzIG51bGwuIFNlZSBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA5MTQuCkBAIC00NDQsNyAr NDQ1LDggQEAgUGxhdGZvcm1QYWdlQ2xpZW50IENocm9tZUNsaWVudFF0OjpwbGF0Zm9ybVBhZ2VD bGllbnQoKSBjb25zdAogCiB2b2lkIENocm9tZUNsaWVudFF0Ojpjb250ZW50c1NpemVDaGFuZ2Vk KEZyYW1lKiBmcmFtZSwgY29uc3QgSW50U2l6ZSYgc2l6ZSkgY29uc3QKIHsKLSAgICBlbWl0IFFX ZWJGcmFtZVByaXZhdGU6OmtpdChmcmFtZSktPmNvbnRlbnRzU2l6ZUNoYW5nZWQoc2l6ZSk7Cisg ICAgaWYgKGZyYW1lLT5sb2FkZXIoKS0+bmV0d29ya2luZ0NvbnRleHQoKSkKKyAgICAgICAgUVdl YkZyYW1lUHJpdmF0ZTo6a2l0KGZyYW1lKS0+Y29udGVudHNTaXplQ2hhbmdlZChzaXplKTsKIH0K IAogdm9pZCBDaHJvbWVDbGllbnRRdDo6bW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQoY29uc3QgSGl0 VGVzdFJlc3VsdCYgcmVzdWx0LCB1bnNpZ25lZCkKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcCBiL1dlYktpdC9xdC9XZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAppbmRleCBhNjYxODQ4Li4xNjE3MzJhIDEwMDY0 NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAK KysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCkBA IC0yMzAsMTEgKzIzMCw2IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6c2V0RnJhbWUoUVdl YkZyYW1lKiB3ZWJGcmFtZSwgRnJhbWUqIGZyYW1lKQogICAgICAgICAgICAgbV93ZWJGcmFtZSwg U0lHTkFMKHRpdGxlQ2hhbmdlZChRU3RyaW5nKSkpOwogfQogCi1RV2ViRnJhbWUqIEZyYW1lTG9h ZGVyQ2xpZW50UXQ6OndlYkZyYW1lKCkgY29uc3QKLXsKLSAgICByZXR1cm4gbV93ZWJGcmFtZTsK LX0KLQogdm9pZCBGcmFtZUxvYWRlckNsaWVudFF0OjpjYWxsUG9saWN5RnVuY3Rpb24oRnJhbWVQ b2xpY3lGdW5jdGlvbiBmdW5jdGlvbiwgUG9saWN5QWN0aW9uIGFjdGlvbikKIHsKICAgICAobV9m cmFtZS0+bG9hZGVyKCktPnBvbGljeUNoZWNrZXIoKS0+KmZ1bmN0aW9uKShhY3Rpb24pOwpAQCAt MTUyNSw3ICsxNTIwLDcgQEAgU3RyaW5nIEZyYW1lTG9hZGVyQ2xpZW50UXQ6Om92ZXJyaWRlTWVk aWFUeXBlKCkgY29uc3QKIAogUVN0cmluZyBGcmFtZUxvYWRlckNsaWVudFF0OjpjaG9vc2VGaWxl KGNvbnN0IFFTdHJpbmcmIG9sZEZpbGUpCiB7Ci0gICAgcmV0dXJuIHdlYkZyYW1lKCktPnBhZ2Uo KS0+Y2hvb3NlRmlsZSh3ZWJGcmFtZSgpLCBvbGRGaWxlKTsKKyAgICByZXR1cm4gbV93ZWJGcmFt ZS0+cGFnZSgpLT5jaG9vc2VGaWxlKG1fd2ViRnJhbWUsIG9sZEZpbGUpOwogfQogCiBQYXNzUmVm UHRyPEZyYW1lTmV0d29ya2luZ0NvbnRleHQ+IEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNyZWF0ZU5l dHdvcmtpbmdDb250ZXh0KCkKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9G cmFtZUxvYWRlckNsaWVudFF0LmggYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRRdC5oCmluZGV4IDUyNjUzNTQuLjcwYWM3YzQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9x dC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmgKKysrIGIvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaApAQCAtNzUsNyArNzUsNiBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCB2b2lkIGZyYW1lTG9hZGVyRGVzdHJveWVkKCk7CiAKICAgICB2b2lk IHNldEZyYW1lKFFXZWJGcmFtZSogd2ViRnJhbWUsIEZyYW1lKiBmcmFtZSk7Ci0gICAgUVdlYkZy YW1lKiB3ZWJGcmFtZSgpIGNvbnN0OwogCiAgICAgdmlydHVhbCBib29sIGhhc1dlYlZpZXcoKSBj b25zdDsgLy8gbWFpbmx5IGZvciBhc3NlcnRpb25zCiAKLS0gCjEuNy4wLjQKCg== 67670 2010-09-15 06:38:51 -0700 2010-09-15 07:06:24 -0700 Patch v2 0001-Qt-Remove-FrameLoaderClientQt-webFrame-to-use-Network.diff text/plain 10410 diegohcg RnJvbSBhMjQzODE1Y2ZmZWJjZDBhZTJhZWI2OTQzZTE1NDhiOGM2MTkyYTFkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ29oY2dAd2Via2l0Lm9yZz4K RGF0ZTogV2VkLCAxNSBTZXAgMjAxMCAwOTozNjo0MiAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gUmVtb3ZlIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OndlYkZyYW1lKCkgdG8gdXNlIE5ldHdvcmtp bmdDb250ZXh0IHRvIGdldCB0aGUgV2ViRnJhbWUgdG8gYXZvaWQgbGF5ZXJpbmcgdmlvbGF0aW9u cwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMjkzCgpSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KCldlYkNvcmU6CgpObyBuZXcgdGVzdHMuIChPT1BTISkKCiog cGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwOgooV2ViQ29yZTo6 TWVkaWFQbGF5ZXJQcml2YXRlOjpjb21taXRMb2FkKToKCldlYktpdC9xdDoKCiogQXBpL3F3ZWJm cmFtZS5jcHA6CihRV2ViRnJhbWU6OmNoaWxkRnJhbWVzKToKKFFXZWJGcmFtZVByaXZhdGU6Omtp dCk6CiogQXBpL3F3ZWJwYWdlLmNwcDoKKFFXZWJQYWdlOjpjdXJyZW50RnJhbWUpOgoqIFdlYkNv cmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNwcDoKKFdlYkNvcmU6OkNocm9tZUNsaWVudFF0Ojpy dW5KYXZhU2NyaXB0QWxlcnQpOgooV2ViQ29yZTo6Q2hyb21lQ2xpZW50UXQ6OnJ1bkphdmFTY3Jp cHRDb25maXJtKToKKFdlYkNvcmU6OkNocm9tZUNsaWVudFF0OjpydW5KYXZhU2NyaXB0UHJvbXB0 KToKKFdlYkNvcmU6OkNocm9tZUNsaWVudFF0Ojpjb250ZW50c1NpemVDaGFuZ2VkKToKKiBXZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcDoKKFdlYkNvcmU6OkZyYW1lTG9hZGVy Q2xpZW50UXQ6OmNob29zZUZpbGUpOgoqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50 UXQuaDoKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB8ICAgMTIgKysrKysrKysrKysKIC4uLi9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBs YXllclByaXZhdGVRdC5jcHAgIHwgICAgMiArLQogV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3Bw ICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA5ICsrKystLS0KIFdlYktpdC9xdC9BcGkvcXdl YnBhZ2UuY3BwICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgNCArKy0KIFdlYktpdC9xdC9D aGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyMSArKysrKysrKysr KysrKysrKysrKwogV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNwcCAg ICAgICAgfCAgIDE2ICsrKysrKysrLS0tLS0tCiBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRRdC5jcHAgICB8ICAgIDcgKy0tLS0tCiBXZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oICAgICB8ICAgIDEgLQogOCBmaWxlcyBjaGFuZ2Vk LCA1MiBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3Jl L0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDliYjczYzguLjg0ZGE0ZTcgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTUgQEAKKzIwMTAtMDktMTUgIERpZWdvIEdvbnphbGV6ICA8ZGllZ29oY2dAd2Via2l0 Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb UXRdIFJlbW92ZSBGcmFtZUxvYWRlckNsaWVudFF0Ojp3ZWJGcmFtZSgpIHRvIHVzZSBOZXR3b3Jr aW5nQ29udGV4dCB0byBnZXQgdGhlIFdlYkZyYW1lIHRvIGF2b2lkIGxheWVyaW5nIHZpb2xhdGlv bnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMjkz CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGU6OmNvbW1pdExvYWQpOgorCiAyMDEwLTA5LTE0ICBCYWxhenMgS2Vs ZW1lbiAgPGtiQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFz IEtsaW5nLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBs YXllclByaXZhdGVRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxh eWVyUHJpdmF0ZVF0LmNwcAppbmRleCA2MDVkY2I3Li5iNjczZjI0IDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcAorKysgYi9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcApAQCAt MTkyLDggKzE5Miw4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlOjpjb21taXRMb2FkKGNvbnN0 IFN0cmluZyYgdXJsKQogCiAgICAgICAgIC8vIEdyYWIgdGhlIGZyYW1lIGFuZCBuZXR3b3JrIG1h bmFnZXIKICAgICAgICAgRnJhbWUqIGZyYW1lID0gZG9jdW1lbnQgPyBkb2N1bWVudC0+ZnJhbWUo KSA6IDA7CisgICAgICAgIFFOZXR3b3JrQWNjZXNzTWFuYWdlciogbWFuYWdlciA9IGZyYW1lID8g ZnJhbWUtPmxvYWRlcigpLT5uZXR3b3JraW5nQ29udGV4dCgpLT5uZXR3b3JrQWNjZXNzTWFuYWdl cigpIDogMDsKICAgICAgICAgRnJhbWVMb2FkZXJDbGllbnRRdCogZnJhbWVMb2FkZXIgPSAgZnJh bWUgPyBzdGF0aWNfY2FzdDxGcmFtZUxvYWRlckNsaWVudFF0Kj4oZnJhbWUtPmxvYWRlcigpLT5j bGllbnQoKSkgOiAwOwotICAgICAgICBRTmV0d29ya0FjY2Vzc01hbmFnZXIqIG1hbmFnZXIgPSBm cmFtZUxvYWRlciA/IGZyYW1lTG9hZGVyLT53ZWJGcmFtZSgpLT5wYWdlKCktPm5ldHdvcmtBY2Nl c3NNYW5hZ2VyKCkgOiAwOwogCiAgICAgICAgIGlmIChkb2N1bWVudCAmJiBtYW5hZ2VyKSB7CiAg ICAgICAgICAgICAvLyBTZXQgdGhlIGNvb2tpZXMKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkv cXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAppbmRleCA0ZWM2ODUy Li5iZTYwMGJkIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIv V2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCkBAIC01Niw2ICs1Niw3IEBACiAjaW5jbHVkZSAi VjhET01XcmFwcGVyLmgiCiAjaW5jbHVkZSAiVjhET01XaW5kb3dTaGVsbC5oIgogI2VuZGlmCisj aW5jbHVkZSAiTmV0d29ya2luZ0NvbnRleHQuaCIKICNpbmNsdWRlICJOb2RlTGlzdC5oIgogI2lu Y2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJQbGF0Zm9ybU1vdXNlRXZlbnQuaCIKQEAgLTg5NCw5 ICs4OTUsOSBAQCBRTGlzdDxRV2ViRnJhbWUqPiBRV2ViRnJhbWU6OmNoaWxkRnJhbWVzKCkgY29u c3QKICAgICAgICAgRnJhbWVUcmVlICp0cmVlID0gZC0+ZnJhbWUtPnRyZWUoKTsKICAgICAgICAg Zm9yIChGcmFtZSAqY2hpbGQgPSB0cmVlLT5maXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNo aWxkLT50cmVlKCktPm5leHRTaWJsaW5nKCkpIHsKICAgICAgICAgICAgIEZyYW1lTG9hZGVyICps b2FkZXIgPSBjaGlsZC0+bG9hZGVyKCk7Ci0gICAgICAgICAgICBGcmFtZUxvYWRlckNsaWVudFF0 ICpjbGllbnQgPSBzdGF0aWNfY2FzdDxGcmFtZUxvYWRlckNsaWVudFF0Kj4obG9hZGVyLT5jbGll bnQoKSk7Ci0gICAgICAgICAgICBpZiAoY2xpZW50KQotICAgICAgICAgICAgICAgIHJjLmFwcGVu ZChjbGllbnQtPndlYkZyYW1lKCkpOworICAgICAgICAgICAgUVdlYkZyYW1lKiB3ZWJGcmFtZSA9 IHFvYmplY3RfY2FzdDxRV2ViRnJhbWUqPihsb2FkZXItPm5ldHdvcmtpbmdDb250ZXh0KCktPm9y aWdpbmF0aW5nT2JqZWN0KCkpOworICAgICAgICAgICAgaWYgKHdlYkZyYW1lKQorICAgICAgICAg ICAgICAgIHJjLmFwcGVuZCh3ZWJGcmFtZSk7CiAgICAgICAgIH0KIAogICAgIH0KQEAgLTE0NTMs NyArMTQ1NCw3IEBAIFdlYkNvcmU6OkZyYW1lKiBRV2ViRnJhbWVQcml2YXRlOjpjb3JlKGNvbnN0 IFFXZWJGcmFtZSogd2ViRnJhbWUpCiAKIFFXZWJGcmFtZSogUVdlYkZyYW1lUHJpdmF0ZTo6a2l0 KGNvbnN0IFdlYkNvcmU6OkZyYW1lKiBjb3JlRnJhbWUpCiB7Ci0gICAgcmV0dXJuIHN0YXRpY19j YXN0PEZyYW1lTG9hZGVyQ2xpZW50UXQqPihjb3JlRnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKSkt PndlYkZyYW1lKCk7CisgICAgcmV0dXJuIHFvYmplY3RfY2FzdDxRV2ViRnJhbWUqPihjb3JlRnJh bWUtPmxvYWRlcigpLT5uZXR3b3JraW5nQ29udGV4dCgpLT5vcmlnaW5hdGluZ09iamVjdCgpKTsK IH0KIAogCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCBiL1dlYktpdC9x dC9BcGkvcXdlYnBhZ2UuY3BwCmluZGV4IDRmNWU3MTEuLjFmNzVmYTIgMTAwNjQ0Ci0tLSBhL1dl YktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3Bw CkBAIC02NCw2ICs2NCw3IEBACiAjaW5jbHVkZSAiRm9jdXNDb250cm9sbGVyLmgiCiAjaW5jbHVk ZSAiRWRpdG9yLmgiCiAjaW5jbHVkZSAiU2Nyb2xsYmFyLmgiCisjaW5jbHVkZSAiTmV0d29ya2lu Z0NvbnRleHQuaCIKICNpbmNsdWRlICJQbGF0Zm9ybUtleWJvYXJkRXZlbnQuaCIKICNpbmNsdWRl ICJQbGF0Zm9ybVdoZWVsRXZlbnQuaCIKICNpbmNsdWRlICJQbHVnaW5EYXRhYmFzZS5oIgpAQCAt MTkxNiw3ICsxOTE3LDggQEAgUVdlYkZyYW1lICpRV2ViUGFnZTo6bWFpbkZyYW1lKCkgY29uc3QK IFFXZWJGcmFtZSAqUVdlYlBhZ2U6OmN1cnJlbnRGcmFtZSgpIGNvbnN0CiB7CiAgICAgZC0+Y3Jl YXRlTWFpbkZyYW1lKCk7Ci0gICAgcmV0dXJuIHN0YXRpY19jYXN0PFdlYkNvcmU6OkZyYW1lTG9h ZGVyQ2xpZW50UXQgKj4oZC0+cGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1haW5G cmFtZSgpLT5sb2FkZXIoKS0+Y2xpZW50KCkpLT53ZWJGcmFtZSgpOworICAgIFdlYkNvcmU6OkZy YW1lICpmcmFtZSA9IGQtPnBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2VkT3JNYWluRnJh bWUoKTsKKyAgICByZXR1cm4gcW9iamVjdF9jYXN0PFFXZWJGcmFtZSo+KGZyYW1lLT5sb2FkZXIo KS0+bmV0d29ya2luZ0NvbnRleHQoKS0+b3JpZ2luYXRpbmdPYmplY3QoKSk7CiB9CiAKIApkaWZm IC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXgg MDJiNzNmZS4uZmI5Y2UyMSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9X ZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTAtMDktMTUgIERpZWdvIEdv bnphbGV6ICA8ZGllZ29oY2dAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFJlbW92ZSBGcmFtZUxvYWRlckNsaWVudFF0Ojp3 ZWJGcmFtZSgpIHRvIHVzZSBOZXR3b3JraW5nQ29udGV4dCB0byBnZXQgdGhlIFdlYkZyYW1lIHRv IGF2b2lkIGxheWVyaW5nIHZpb2xhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQyMjkzCisKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmNwcDoK KyAgICAgICAgKFFXZWJGcmFtZTo6Y2hpbGRGcmFtZXMpOgorICAgICAgICAoUVdlYkZyYW1lUHJp dmF0ZTo6a2l0KToKKyAgICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdlYlBh Z2U6OmN1cnJlbnRGcmFtZSk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50 UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50UXQ6OnJ1bkphdmFTY3JpcHRB bGVydCk6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRRdDo6cnVuSmF2YVNjcmlwdENv bmZpcm0pOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50UXQ6OnJ1bkphdmFTY3JpcHRQ cm9tcHQpOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50UXQ6OmNvbnRlbnRzU2l6ZUNo YW5nZWQpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6Y2hvb3NlRmlsZSk6Cisg ICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oOgorCiAyMDEwLTA5 LTE0ICBFbnJpY28gUm9zICA8ZXJvc0Bjb2RlYXVyb3JhLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBBbmRyZWFzIEtsaW5nLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L0Nocm9tZUNsaWVudFF0LmNwcCBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGll bnRRdC5jcHAKaW5kZXggNzQwNjU1MC4uMTUzMTgyMiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNwcAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwCkBAIC00NCw2ICs0NCw3IEBACiAjaW5jbHVkZSAiR2Vv bG9jYXRpb25QZXJtaXNzaW9uQ2xpZW50UXQuaCIKICNpbmNsdWRlICJIaXRUZXN0UmVzdWx0Lmgi CiAjaW5jbHVkZSAiSWNvbi5oIgorI2luY2x1ZGUgIk5ldHdvcmtpbmdDb250ZXh0LmgiCiAjaW5j bHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJOb3RpZmljYXRpb25QcmVzZW50ZXJD bGllbnRRdC5oIgogI2luY2x1ZGUgIlBhZ2VDbGllbnRRdC5oIgpAQCAtMjk0LDIyICsyOTUsMjIg QEAgdm9pZCBDaHJvbWVDbGllbnRRdDo6Y2xvc2VXaW5kb3dTb29uKCkKIHZvaWQgQ2hyb21lQ2xp ZW50UXQ6OnJ1bkphdmFTY3JpcHRBbGVydChGcmFtZSogZiwgY29uc3QgU3RyaW5nJiBtc2cpCiB7 CiAgICAgUVN0cmluZyB4ID0gbXNnOwotICAgIEZyYW1lTG9hZGVyQ2xpZW50UXQqIGZsID0gc3Rh dGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRRdCo+KGYtPmxvYWRlcigpLT5jbGllbnQoKSk7Ci0g ICAgbV93ZWJQYWdlLT5qYXZhU2NyaXB0QWxlcnQoZmwtPndlYkZyYW1lKCksIHgpOworICAgIFFX ZWJGcmFtZSogd2ViRnJhbWUgPSBxb2JqZWN0X2Nhc3Q8UVdlYkZyYW1lKj4oZi0+bG9hZGVyKCkt Pm5ldHdvcmtpbmdDb250ZXh0KCktPm9yaWdpbmF0aW5nT2JqZWN0KCkpOworICAgIG1fd2ViUGFn ZS0+amF2YVNjcmlwdEFsZXJ0KHdlYkZyYW1lLCB4KTsKIH0KIAogYm9vbCBDaHJvbWVDbGllbnRR dDo6cnVuSmF2YVNjcmlwdENvbmZpcm0oRnJhbWUqIGYsIGNvbnN0IFN0cmluZyYgbXNnKQogewog ICAgIFFTdHJpbmcgeCA9IG1zZzsKLSAgICBGcmFtZUxvYWRlckNsaWVudFF0KiBmbCA9IHN0YXRp Y19jYXN0PEZyYW1lTG9hZGVyQ2xpZW50UXQqPihmLT5sb2FkZXIoKS0+Y2xpZW50KCkpOwotICAg IHJldHVybiBtX3dlYlBhZ2UtPmphdmFTY3JpcHRDb25maXJtKGZsLT53ZWJGcmFtZSgpLCB4KTsK KyAgICBRV2ViRnJhbWUqIHdlYkZyYW1lID0gcW9iamVjdF9jYXN0PFFXZWJGcmFtZSo+KGYtPmxv YWRlcigpLT5uZXR3b3JraW5nQ29udGV4dCgpLT5vcmlnaW5hdGluZ09iamVjdCgpKTsKKyAgICBy ZXR1cm4gbV93ZWJQYWdlLT5qYXZhU2NyaXB0Q29uZmlybSh3ZWJGcmFtZSwgeCk7CiB9CiAKIGJv b2wgQ2hyb21lQ2xpZW50UXQ6OnJ1bkphdmFTY3JpcHRQcm9tcHQoRnJhbWUqIGYsIGNvbnN0IFN0 cmluZyYgbWVzc2FnZSwgY29uc3QgU3RyaW5nJiBkZWZhdWx0VmFsdWUsIFN0cmluZyYgcmVzdWx0 KQogewogICAgIFFTdHJpbmcgeCA9IHJlc3VsdDsKLSAgICBGcmFtZUxvYWRlckNsaWVudFF0KiBm bCA9IHN0YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xpZW50UXQqPihmLT5sb2FkZXIoKS0+Y2xpZW50 KCkpOwotICAgIGJvb2wgcmMgPSBtX3dlYlBhZ2UtPmphdmFTY3JpcHRQcm9tcHQoZmwtPndlYkZy YW1lKCksIChRU3RyaW5nKW1lc3NhZ2UsIChRU3RyaW5nKWRlZmF1bHRWYWx1ZSwgJngpOworICAg IFFXZWJGcmFtZSogd2ViRnJhbWUgPSBxb2JqZWN0X2Nhc3Q8UVdlYkZyYW1lKj4oZi0+bG9hZGVy KCktPm5ldHdvcmtpbmdDb250ZXh0KCktPm9yaWdpbmF0aW5nT2JqZWN0KCkpOworICAgIGJvb2wg cmMgPSBtX3dlYlBhZ2UtPmphdmFTY3JpcHRQcm9tcHQod2ViRnJhbWUsIChRU3RyaW5nKW1lc3Nh Z2UsIChRU3RyaW5nKWRlZmF1bHRWYWx1ZSwgJngpOwogCiAgICAgLy8gRml4IHVwIGEgcXVpcmsg aW4gdGhlIFFJbnB1dERpYWxvZyBjbGFzcy4gSWYgbm8gaW5wdXQgaGFwcGVuZWQgdGhlIHN0cmlu ZyBzaG91bGQgYmUgZW1wdHkKICAgICAvLyBidXQgaXQgaXMgbnVsbC4gU2VlIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDkxNC4KQEAgLTQ0NCw3ICs0NDUsOCBAQCBQ bGF0Zm9ybVBhZ2VDbGllbnQgQ2hyb21lQ2xpZW50UXQ6OnBsYXRmb3JtUGFnZUNsaWVudCgpIGNv bnN0CiAKIHZvaWQgQ2hyb21lQ2xpZW50UXQ6OmNvbnRlbnRzU2l6ZUNoYW5nZWQoRnJhbWUqIGZy YW1lLCBjb25zdCBJbnRTaXplJiBzaXplKSBjb25zdAogewotICAgIGVtaXQgUVdlYkZyYW1lUHJp dmF0ZTo6a2l0KGZyYW1lKS0+Y29udGVudHNTaXplQ2hhbmdlZChzaXplKTsKKyAgICBpZiAoZnJh bWUtPmxvYWRlcigpLT5uZXR3b3JraW5nQ29udGV4dCgpKQorICAgICAgICBRV2ViRnJhbWVQcml2 YXRlOjpraXQoZnJhbWUpLT5jb250ZW50c1NpemVDaGFuZ2VkKHNpemUpOwogfQogCiB2b2lkIENo cm9tZUNsaWVudFF0Ojptb3VzZURpZE1vdmVPdmVyRWxlbWVudChjb25zdCBIaXRUZXN0UmVzdWx0 JiByZXN1bHQsIHVuc2lnbmVkKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1l TG9hZGVyQ2xpZW50UXQuY3BwCmluZGV4IGE2NjE4NDguLjE2MTczMmEgMTAwNjQ0Ci0tLSBhL1dl YktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAorKysgYi9XZWJL aXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKQEAgLTIzMCwxMSAr MjMwLDYgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudFF0OjpzZXRGcmFtZShRV2ViRnJhbWUqIHdl YkZyYW1lLCBGcmFtZSogZnJhbWUpCiAgICAgICAgICAgICBtX3dlYkZyYW1lLCBTSUdOQUwodGl0 bGVDaGFuZ2VkKFFTdHJpbmcpKSk7CiB9CiAKLVFXZWJGcmFtZSogRnJhbWVMb2FkZXJDbGllbnRR dDo6d2ViRnJhbWUoKSBjb25zdAotewotICAgIHJldHVybiBtX3dlYkZyYW1lOwotfQotCiB2b2lk IEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNhbGxQb2xpY3lGdW5jdGlvbihGcmFtZVBvbGljeUZ1bmN0 aW9uIGZ1bmN0aW9uLCBQb2xpY3lBY3Rpb24gYWN0aW9uKQogewogICAgIChtX2ZyYW1lLT5sb2Fk ZXIoKS0+cG9saWN5Q2hlY2tlcigpLT4qZnVuY3Rpb24pKGFjdGlvbik7CkBAIC0xNTI1LDcgKzE1 MjAsNyBAQCBTdHJpbmcgRnJhbWVMb2FkZXJDbGllbnRRdDo6b3ZlcnJpZGVNZWRpYVR5cGUoKSBj b25zdAogCiBRU3RyaW5nIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNob29zZUZpbGUoY29uc3QgUVN0 cmluZyYgb2xkRmlsZSkKIHsKLSAgICByZXR1cm4gd2ViRnJhbWUoKS0+cGFnZSgpLT5jaG9vc2VG aWxlKHdlYkZyYW1lKCksIG9sZEZpbGUpOworICAgIHJldHVybiBtX3dlYkZyYW1lLT5wYWdlKCkt PmNob29zZUZpbGUobV93ZWJGcmFtZSwgb2xkRmlsZSk7CiB9CiAKIFBhc3NSZWZQdHI8RnJhbWVO ZXR3b3JraW5nQ29udGV4dD4gRnJhbWVMb2FkZXJDbGllbnRRdDo6Y3JlYXRlTmV0d29ya2luZ0Nv bnRleHQoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVy Q2xpZW50UXQuaCBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0 LmgKaW5kZXggNTI2NTM1NC4uNzBhYzdjNCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVT dXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oCkBAIC03NSw3ICs3NSw2IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIHZvaWQgZnJhbWVMb2FkZXJEZXN0cm95ZWQoKTsKIAogICAgIHZvaWQgc2V0RnJhbWUo UVdlYkZyYW1lKiB3ZWJGcmFtZSwgRnJhbWUqIGZyYW1lKTsKLSAgICBRV2ViRnJhbWUqIHdlYkZy YW1lKCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIGJvb2wgaGFzV2ViVmlldygpIGNvbnN0OyAvLyBt YWlubHkgZm9yIGFzc2VydGlvbnMKIAotLSAKMS43LjAuNAoK 67672 2010-09-15 07:06:24 -0700 2010-09-16 05:39:05 -0700 Patch v3 0001-Qt-Remove-FrameLoaderClientQt-webFrame-to-use-Network.diff text/plain 10569 diegohcg RnJvbSA5MTBhYTNkZjYwMGE3MjY4OWNhZjNjNDhjMjkzYTgxNWQ3OTAyYjc4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ29oY2dAd2Via2l0Lm9yZz4K RGF0ZTogV2VkLCAxNSBTZXAgMjAxMCAwOTozNjo0MiAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gUmVtb3ZlIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OndlYkZyYW1lKCkgdG8gdXNlIE5ldHdvcmtp bmdDb250ZXh0IHRvIGdldCB0aGUgV2ViRnJhbWUgdG8gYXZvaWQgbGF5ZXJpbmcgdmlvbGF0aW9u cwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMjkzCgpSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KCldlYkNvcmU6CgoqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L01l ZGlhUGxheWVyUHJpdmF0ZVF0LmNwcDoKKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZTo6Y29t bWl0TG9hZCk6CgpXZWJLaXQvcXQ6CgoqIEFwaS9xd2ViZnJhbWUuY3BwOgooUVdlYkZyYW1lOjpj aGlsZEZyYW1lcyk6CihRV2ViRnJhbWVQcml2YXRlOjpraXQpOgoqIEFwaS9xd2VicGFnZS5jcHA6 CihRV2ViUGFnZTo6Y3VycmVudEZyYW1lKToKKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRR dC5jcHA6CihXZWJDb3JlOjpDaHJvbWVDbGllbnRRdDo6cnVuSmF2YVNjcmlwdEFsZXJ0KToKKFdl YkNvcmU6OkNocm9tZUNsaWVudFF0OjpydW5KYXZhU2NyaXB0Q29uZmlybSk6CihXZWJDb3JlOjpD aHJvbWVDbGllbnRRdDo6cnVuSmF2YVNjcmlwdFByb21wdCk6CihXZWJDb3JlOjpDaHJvbWVDbGll bnRRdDo6Y29udGVudHNTaXplQ2hhbmdlZCk6CiogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRRdC5jcHA6CihXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpjaG9vc2VGaWxlKToK KiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0Lmg6Ci0tLQogV2ViQ29yZS9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEwICsrKysrKysrKwog Li4uL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcCAgfCAgICAz ICstCiBXZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAgICAgICAgICAgICAgICAgICAgICAgICB8 ICAgIDkgKysrKy0tLQogV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAgICAgICAgICAgICAgICAg ICAgICAgICAgfCAgICA0ICsrLQogV2ViS2l0L3F0L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDIxICsrKysrKysrKysrKysrKysrKysrCiBXZWJLaXQvcXQvV2Vi Q29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwICAgICAgICB8ICAgMTYgKysrKysrKystLS0t LS0KIFdlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcCAgIHwg ICAgNyArLS0tLS0KIFdlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0 LmggICAgIHwgICAgMSAtCiA4IGZpbGVzIGNoYW5nZWQsIDUxIGluc2VydGlvbnMoKyksIDIwIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFu Z2VMb2cKaW5kZXggOWJiNzNjOC4uZGM5NTU1ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VM b2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0wOS0xNSAg RGllZ28gR29uemFsZXogIDxkaWVnb2hjZ0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUmVtb3ZlIEZyYW1lTG9hZGVyQ2xp ZW50UXQ6OndlYkZyYW1lKCkgdG8gdXNlIE5ldHdvcmtpbmdDb250ZXh0IHRvIGdldCB0aGUgV2Vi RnJhbWUgdG8gYXZvaWQgbGF5ZXJpbmcgdmlvbGF0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDIyOTMKKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZTo6Y29tbWl0TG9hZCk6CisKIDIwMTAtMDktMTQgIEJhbGF6cyBLZWxl bWVuICA8a2JAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZHJlYXMg S2xpbmcuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxh eWVyUHJpdmF0ZVF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5 ZXJQcml2YXRlUXQuY3BwCmluZGV4IDYwNWRjYjcuLjFiZjFhM2QgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCisrKyBiL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCkBAIC0y NSw2ICsyNSw3IEBACiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0LmgiCiAjaW5jbHVkZSAiSFRN TE1lZGlhRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxWaWRlb0VsZW1lbnQuaCIKKyNpbmNsdWRl ICJOZXR3b3JraW5nQ29udGV4dC5oIgogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCiAjaW5j bHVkZSAiVGltZVJhbmdlcy5oIgogI2luY2x1ZGUgIldpZGdldC5oIgpAQCAtMTkyLDggKzE5Myw4 IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlOjpjb21taXRMb2FkKGNvbnN0IFN0cmluZyYgdXJs KQogCiAgICAgICAgIC8vIEdyYWIgdGhlIGZyYW1lIGFuZCBuZXR3b3JrIG1hbmFnZXIKICAgICAg ICAgRnJhbWUqIGZyYW1lID0gZG9jdW1lbnQgPyBkb2N1bWVudC0+ZnJhbWUoKSA6IDA7CisgICAg ICAgIFFOZXR3b3JrQWNjZXNzTWFuYWdlciogbWFuYWdlciA9IGZyYW1lID8gZnJhbWUtPmxvYWRl cigpLT5uZXR3b3JraW5nQ29udGV4dCgpLT5uZXR3b3JrQWNjZXNzTWFuYWdlcigpIDogMDsKICAg ICAgICAgRnJhbWVMb2FkZXJDbGllbnRRdCogZnJhbWVMb2FkZXIgPSAgZnJhbWUgPyBzdGF0aWNf Y2FzdDxGcmFtZUxvYWRlckNsaWVudFF0Kj4oZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKSkgOiAw OwotICAgICAgICBRTmV0d29ya0FjY2Vzc01hbmFnZXIqIG1hbmFnZXIgPSBmcmFtZUxvYWRlciA/ IGZyYW1lTG9hZGVyLT53ZWJGcmFtZSgpLT5wYWdlKCktPm5ldHdvcmtBY2Nlc3NNYW5hZ2VyKCkg OiAwOwogCiAgICAgICAgIGlmIChkb2N1bWVudCAmJiBtYW5hZ2VyKSB7CiAgICAgICAgICAgICAv LyBTZXQgdGhlIGNvb2tpZXMKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNw cCBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAppbmRleCA0ZWM2ODUyLi5iZTYwMGJkIDEw MDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L0Fw aS9xd2ViZnJhbWUuY3BwCkBAIC01Niw2ICs1Niw3IEBACiAjaW5jbHVkZSAiVjhET01XcmFwcGVy LmgiCiAjaW5jbHVkZSAiVjhET01XaW5kb3dTaGVsbC5oIgogI2VuZGlmCisjaW5jbHVkZSAiTmV0 d29ya2luZ0NvbnRleHQuaCIKICNpbmNsdWRlICJOb2RlTGlzdC5oIgogI2luY2x1ZGUgIlBhZ2Uu aCIKICNpbmNsdWRlICJQbGF0Zm9ybU1vdXNlRXZlbnQuaCIKQEAgLTg5NCw5ICs4OTUsOSBAQCBR TGlzdDxRV2ViRnJhbWUqPiBRV2ViRnJhbWU6OmNoaWxkRnJhbWVzKCkgY29uc3QKICAgICAgICAg RnJhbWVUcmVlICp0cmVlID0gZC0+ZnJhbWUtPnRyZWUoKTsKICAgICAgICAgZm9yIChGcmFtZSAq Y2hpbGQgPSB0cmVlLT5maXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT50cmVlKCkt Pm5leHRTaWJsaW5nKCkpIHsKICAgICAgICAgICAgIEZyYW1lTG9hZGVyICpsb2FkZXIgPSBjaGls ZC0+bG9hZGVyKCk7Ci0gICAgICAgICAgICBGcmFtZUxvYWRlckNsaWVudFF0ICpjbGllbnQgPSBz dGF0aWNfY2FzdDxGcmFtZUxvYWRlckNsaWVudFF0Kj4obG9hZGVyLT5jbGllbnQoKSk7Ci0gICAg ICAgICAgICBpZiAoY2xpZW50KQotICAgICAgICAgICAgICAgIHJjLmFwcGVuZChjbGllbnQtPndl YkZyYW1lKCkpOworICAgICAgICAgICAgUVdlYkZyYW1lKiB3ZWJGcmFtZSA9IHFvYmplY3RfY2Fz dDxRV2ViRnJhbWUqPihsb2FkZXItPm5ldHdvcmtpbmdDb250ZXh0KCktPm9yaWdpbmF0aW5nT2Jq ZWN0KCkpOworICAgICAgICAgICAgaWYgKHdlYkZyYW1lKQorICAgICAgICAgICAgICAgIHJjLmFw cGVuZCh3ZWJGcmFtZSk7CiAgICAgICAgIH0KIAogICAgIH0KQEAgLTE0NTMsNyArMTQ1NCw3IEBA IFdlYkNvcmU6OkZyYW1lKiBRV2ViRnJhbWVQcml2YXRlOjpjb3JlKGNvbnN0IFFXZWJGcmFtZSog d2ViRnJhbWUpCiAKIFFXZWJGcmFtZSogUVdlYkZyYW1lUHJpdmF0ZTo6a2l0KGNvbnN0IFdlYkNv cmU6OkZyYW1lKiBjb3JlRnJhbWUpCiB7Ci0gICAgcmV0dXJuIHN0YXRpY19jYXN0PEZyYW1lTG9h ZGVyQ2xpZW50UXQqPihjb3JlRnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKSktPndlYkZyYW1lKCk7 CisgICAgcmV0dXJuIHFvYmplY3RfY2FzdDxRV2ViRnJhbWUqPihjb3JlRnJhbWUtPmxvYWRlcigp LT5uZXR3b3JraW5nQ29udGV4dCgpLT5vcmlnaW5hdGluZ09iamVjdCgpKTsKIH0KIAogCmRpZmYg LS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYnBh Z2UuY3BwCmluZGV4IDRmNWU3MTEuLjFmNzVmYTIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkv cXdlYnBhZ2UuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCkBAIC02NCw2ICs2 NCw3IEBACiAjaW5jbHVkZSAiRm9jdXNDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiRWRpdG9yLmgi CiAjaW5jbHVkZSAiU2Nyb2xsYmFyLmgiCisjaW5jbHVkZSAiTmV0d29ya2luZ0NvbnRleHQuaCIK ICNpbmNsdWRlICJQbGF0Zm9ybUtleWJvYXJkRXZlbnQuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVdo ZWVsRXZlbnQuaCIKICNpbmNsdWRlICJQbHVnaW5EYXRhYmFzZS5oIgpAQCAtMTkxNiw3ICsxOTE3 LDggQEAgUVdlYkZyYW1lICpRV2ViUGFnZTo6bWFpbkZyYW1lKCkgY29uc3QKIFFXZWJGcmFtZSAq UVdlYlBhZ2U6OmN1cnJlbnRGcmFtZSgpIGNvbnN0CiB7CiAgICAgZC0+Y3JlYXRlTWFpbkZyYW1l KCk7Ci0gICAgcmV0dXJuIHN0YXRpY19jYXN0PFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQg Kj4oZC0+cGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1haW5GcmFtZSgpLT5sb2Fk ZXIoKS0+Y2xpZW50KCkpLT53ZWJGcmFtZSgpOworICAgIFdlYkNvcmU6OkZyYW1lICpmcmFtZSA9 IGQtPnBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2VkT3JNYWluRnJhbWUoKTsKKyAgICBy ZXR1cm4gcW9iamVjdF9jYXN0PFFXZWJGcmFtZSo+KGZyYW1lLT5sb2FkZXIoKS0+bmV0d29ya2lu Z0NvbnRleHQoKS0+b3JpZ2luYXRpbmdPYmplY3QoKSk7CiB9CiAKIApkaWZmIC0tZ2l0IGEvV2Vi S2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggMDJiNzNmZS4uZmI5 Y2UyMSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9XZWJLaXQvcXQvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTAtMDktMTUgIERpZWdvIEdvbnphbGV6ICA8ZGll Z29oY2dAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbUXRdIFJlbW92ZSBGcmFtZUxvYWRlckNsaWVudFF0Ojp3ZWJGcmFtZSgpIHRv IHVzZSBOZXR3b3JraW5nQ29udGV4dCB0byBnZXQgdGhlIFdlYkZyYW1lIHRvIGF2b2lkIGxheWVy aW5nIHZpb2xhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTQyMjkzCisKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmNwcDoKKyAgICAgICAgKFFX ZWJGcmFtZTo6Y2hpbGRGcmFtZXMpOgorICAgICAgICAoUVdlYkZyYW1lUHJpdmF0ZTo6a2l0KToK KyAgICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdlYlBhZ2U6OmN1cnJlbnRG cmFtZSk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50UXQ6OnJ1bkphdmFTY3JpcHRBbGVydCk6CisgICAg ICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRRdDo6cnVuSmF2YVNjcmlwdENvbmZpcm0pOgorICAg ICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50UXQ6OnJ1bkphdmFTY3JpcHRQcm9tcHQpOgorICAg ICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50UXQ6OmNvbnRlbnRzU2l6ZUNoYW5nZWQpOgorICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6Y2hvb3NlRmlsZSk6CisgICAgICAgICogV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oOgorCiAyMDEwLTA5LTE0ICBFbnJpY28g Um9zICA8ZXJvc0Bjb2RlYXVyb3JhLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFz IEtsaW5nLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVu dFF0LmNwcCBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHAKaW5k ZXggNzQwNjU1MC4uMTUzMTgyMiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L0Nocm9tZUNsaWVudFF0LmNwcAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21l Q2xpZW50UXQuY3BwCkBAIC00NCw2ICs0NCw3IEBACiAjaW5jbHVkZSAiR2VvbG9jYXRpb25QZXJt aXNzaW9uQ2xpZW50UXQuaCIKICNpbmNsdWRlICJIaXRUZXN0UmVzdWx0LmgiCiAjaW5jbHVkZSAi SWNvbi5oIgorI2luY2x1ZGUgIk5ldHdvcmtpbmdDb250ZXh0LmgiCiAjaW5jbHVkZSAiTm90SW1w bGVtZW50ZWQuaCIKICNpbmNsdWRlICJOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdC5oIgog I2luY2x1ZGUgIlBhZ2VDbGllbnRRdC5oIgpAQCAtMjk0LDIyICsyOTUsMjIgQEAgdm9pZCBDaHJv bWVDbGllbnRRdDo6Y2xvc2VXaW5kb3dTb29uKCkKIHZvaWQgQ2hyb21lQ2xpZW50UXQ6OnJ1bkph dmFTY3JpcHRBbGVydChGcmFtZSogZiwgY29uc3QgU3RyaW5nJiBtc2cpCiB7CiAgICAgUVN0cmlu ZyB4ID0gbXNnOwotICAgIEZyYW1lTG9hZGVyQ2xpZW50UXQqIGZsID0gc3RhdGljX2Nhc3Q8RnJh bWVMb2FkZXJDbGllbnRRdCo+KGYtPmxvYWRlcigpLT5jbGllbnQoKSk7Ci0gICAgbV93ZWJQYWdl LT5qYXZhU2NyaXB0QWxlcnQoZmwtPndlYkZyYW1lKCksIHgpOworICAgIFFXZWJGcmFtZSogd2Vi RnJhbWUgPSBxb2JqZWN0X2Nhc3Q8UVdlYkZyYW1lKj4oZi0+bG9hZGVyKCktPm5ldHdvcmtpbmdD b250ZXh0KCktPm9yaWdpbmF0aW5nT2JqZWN0KCkpOworICAgIG1fd2ViUGFnZS0+amF2YVNjcmlw dEFsZXJ0KHdlYkZyYW1lLCB4KTsKIH0KIAogYm9vbCBDaHJvbWVDbGllbnRRdDo6cnVuSmF2YVNj cmlwdENvbmZpcm0oRnJhbWUqIGYsIGNvbnN0IFN0cmluZyYgbXNnKQogewogICAgIFFTdHJpbmcg eCA9IG1zZzsKLSAgICBGcmFtZUxvYWRlckNsaWVudFF0KiBmbCA9IHN0YXRpY19jYXN0PEZyYW1l TG9hZGVyQ2xpZW50UXQqPihmLT5sb2FkZXIoKS0+Y2xpZW50KCkpOwotICAgIHJldHVybiBtX3dl YlBhZ2UtPmphdmFTY3JpcHRDb25maXJtKGZsLT53ZWJGcmFtZSgpLCB4KTsKKyAgICBRV2ViRnJh bWUqIHdlYkZyYW1lID0gcW9iamVjdF9jYXN0PFFXZWJGcmFtZSo+KGYtPmxvYWRlcigpLT5uZXR3 b3JraW5nQ29udGV4dCgpLT5vcmlnaW5hdGluZ09iamVjdCgpKTsKKyAgICByZXR1cm4gbV93ZWJQ YWdlLT5qYXZhU2NyaXB0Q29uZmlybSh3ZWJGcmFtZSwgeCk7CiB9CiAKIGJvb2wgQ2hyb21lQ2xp ZW50UXQ6OnJ1bkphdmFTY3JpcHRQcm9tcHQoRnJhbWUqIGYsIGNvbnN0IFN0cmluZyYgbWVzc2Fn ZSwgY29uc3QgU3RyaW5nJiBkZWZhdWx0VmFsdWUsIFN0cmluZyYgcmVzdWx0KQogewogICAgIFFT dHJpbmcgeCA9IHJlc3VsdDsKLSAgICBGcmFtZUxvYWRlckNsaWVudFF0KiBmbCA9IHN0YXRpY19j YXN0PEZyYW1lTG9hZGVyQ2xpZW50UXQqPihmLT5sb2FkZXIoKS0+Y2xpZW50KCkpOwotICAgIGJv b2wgcmMgPSBtX3dlYlBhZ2UtPmphdmFTY3JpcHRQcm9tcHQoZmwtPndlYkZyYW1lKCksIChRU3Ry aW5nKW1lc3NhZ2UsIChRU3RyaW5nKWRlZmF1bHRWYWx1ZSwgJngpOworICAgIFFXZWJGcmFtZSog d2ViRnJhbWUgPSBxb2JqZWN0X2Nhc3Q8UVdlYkZyYW1lKj4oZi0+bG9hZGVyKCktPm5ldHdvcmtp bmdDb250ZXh0KCktPm9yaWdpbmF0aW5nT2JqZWN0KCkpOworICAgIGJvb2wgcmMgPSBtX3dlYlBh Z2UtPmphdmFTY3JpcHRQcm9tcHQod2ViRnJhbWUsIChRU3RyaW5nKW1lc3NhZ2UsIChRU3RyaW5n KWRlZmF1bHRWYWx1ZSwgJngpOwogCiAgICAgLy8gRml4IHVwIGEgcXVpcmsgaW4gdGhlIFFJbnB1 dERpYWxvZyBjbGFzcy4gSWYgbm8gaW5wdXQgaGFwcGVuZWQgdGhlIHN0cmluZyBzaG91bGQgYmUg ZW1wdHkKICAgICAvLyBidXQgaXQgaXMgbnVsbC4gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zMDkxNC4KQEAgLTQ0NCw3ICs0NDUsOCBAQCBQbGF0Zm9ybVBhZ2VD bGllbnQgQ2hyb21lQ2xpZW50UXQ6OnBsYXRmb3JtUGFnZUNsaWVudCgpIGNvbnN0CiAKIHZvaWQg Q2hyb21lQ2xpZW50UXQ6OmNvbnRlbnRzU2l6ZUNoYW5nZWQoRnJhbWUqIGZyYW1lLCBjb25zdCBJ bnRTaXplJiBzaXplKSBjb25zdAogewotICAgIGVtaXQgUVdlYkZyYW1lUHJpdmF0ZTo6a2l0KGZy YW1lKS0+Y29udGVudHNTaXplQ2hhbmdlZChzaXplKTsKKyAgICBpZiAoZnJhbWUtPmxvYWRlcigp LT5uZXR3b3JraW5nQ29udGV4dCgpKQorICAgICAgICBRV2ViRnJhbWVQcml2YXRlOjpraXQoZnJh bWUpLT5jb250ZW50c1NpemVDaGFuZ2VkKHNpemUpOwogfQogCiB2b2lkIENocm9tZUNsaWVudFF0 Ojptb3VzZURpZE1vdmVPdmVyRWxlbWVudChjb25zdCBIaXRUZXN0UmVzdWx0JiByZXN1bHQsIHVu c2lnbmVkKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVy Q2xpZW50UXQuY3BwIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50 UXQuY3BwCmluZGV4IGE2NjE4NDguLjE2MTczMmEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAorKysgYi9XZWJLaXQvcXQvV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKQEAgLTIzMCwxMSArMjMwLDYgQEAgdm9p ZCBGcmFtZUxvYWRlckNsaWVudFF0OjpzZXRGcmFtZShRV2ViRnJhbWUqIHdlYkZyYW1lLCBGcmFt ZSogZnJhbWUpCiAgICAgICAgICAgICBtX3dlYkZyYW1lLCBTSUdOQUwodGl0bGVDaGFuZ2VkKFFT dHJpbmcpKSk7CiB9CiAKLVFXZWJGcmFtZSogRnJhbWVMb2FkZXJDbGllbnRRdDo6d2ViRnJhbWUo KSBjb25zdAotewotICAgIHJldHVybiBtX3dlYkZyYW1lOwotfQotCiB2b2lkIEZyYW1lTG9hZGVy Q2xpZW50UXQ6OmNhbGxQb2xpY3lGdW5jdGlvbihGcmFtZVBvbGljeUZ1bmN0aW9uIGZ1bmN0aW9u LCBQb2xpY3lBY3Rpb24gYWN0aW9uKQogewogICAgIChtX2ZyYW1lLT5sb2FkZXIoKS0+cG9saWN5 Q2hlY2tlcigpLT4qZnVuY3Rpb24pKGFjdGlvbik7CkBAIC0xNTI1LDcgKzE1MjAsNyBAQCBTdHJp bmcgRnJhbWVMb2FkZXJDbGllbnRRdDo6b3ZlcnJpZGVNZWRpYVR5cGUoKSBjb25zdAogCiBRU3Ry aW5nIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNob29zZUZpbGUoY29uc3QgUVN0cmluZyYgb2xkRmls ZSkKIHsKLSAgICByZXR1cm4gd2ViRnJhbWUoKS0+cGFnZSgpLT5jaG9vc2VGaWxlKHdlYkZyYW1l KCksIG9sZEZpbGUpOworICAgIHJldHVybiBtX3dlYkZyYW1lLT5wYWdlKCktPmNob29zZUZpbGUo bV93ZWJGcmFtZSwgb2xkRmlsZSk7CiB9CiAKIFBhc3NSZWZQdHI8RnJhbWVOZXR3b3JraW5nQ29u dGV4dD4gRnJhbWVMb2FkZXJDbGllbnRRdDo6Y3JlYXRlTmV0d29ya2luZ0NvbnRleHQoKQpkaWZm IC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaCBi L1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmgKaW5kZXggNTI2 NTM1NC4uNzBhYzdjNCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1l TG9hZGVyQ2xpZW50UXQuaAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRRdC5oCkBAIC03NSw3ICs3NSw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQg ZnJhbWVMb2FkZXJEZXN0cm95ZWQoKTsKIAogICAgIHZvaWQgc2V0RnJhbWUoUVdlYkZyYW1lKiB3 ZWJGcmFtZSwgRnJhbWUqIGZyYW1lKTsKLSAgICBRV2ViRnJhbWUqIHdlYkZyYW1lKCkgY29uc3Q7 CiAKICAgICB2aXJ0dWFsIGJvb2wgaGFzV2ViVmlldygpIGNvbnN0OyAvLyBtYWlubHkgZm9yIGFz c2VydGlvbnMKIAotLSAKMS43LjAuNAoK