45231 2010-09-04 12:09:31 -0700 [Qt] Update NetworkAccessManager in Qt FrameNetworkingContext 2010-09-07 01:35:06 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt P2 Normal --- 42292 1 diegohcg diegohcg commit-queue hausmann kbalazs kenneth tonikitoo webkit-ews oldest_to_newest 274374 0 diegohcg 2010-09-04 12:09:31 -0700 Make possible to get the current QNAM when NetwokingContext request it. 274375 1 66586 diegohcg 2010-09-04 12:15:28 -0700 Created attachment 66586 Patch 274376 2 webkit-ews 2010-09-04 12:22:34 -0700 Attachment 66586 did not build on qt: Build output: http://queues.webkit.org/results/3914125 274377 3 kenneth 2010-09-04 12:24:54 -0700 This should really build on Qt :) 274378 4 66586 kenneth 2010-09-04 12:29:10 -0700 Comment on attachment 66586 Patch > From 08ee72aae848a76e1ebd473cde1e5802062653b4 Mon Sep 17 00:00:00 2001 > From: Diego Gonzalez <diegohcg@webkit.org> > Date: Sat, 4 Sep 2010 15:12:49 -0400 > Subject: [PATCH] [Qt] Update NetworkAccessManager in Qt FrameNetworkingContext > https://bugs.webkit.org/show_bug.cgi?id=45231 > > Reviewed by NOBODY (OOPS!). > > Make possible to get the current QNAM when NetwokingContext request it. > > * WebCoreSupport/FrameNetworkingContextQt.cpp: > (WebCore::FrameNetworkingContextQt::networkAccessManager): > --- > WebKit/qt/ChangeLog | 12 ++++++++++++ > .../qt/WebCoreSupport/FrameNetworkingContextQt.cpp | 4 ++++ > 2 files changed, 16 insertions(+), 0 deletions(-) > > diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog > index 8f026a2..f5e4e31 100644 > --- a/WebKit/qt/ChangeLog > +++ b/WebKit/qt/ChangeLog > @@ -1,3 +1,15 @@ > +2010-09-04 Diego Gonzalez <diegohcg@webkit.org> > + > + Reviewed by NOBODY (OOPS!). > + > + [Qt] Update NetworkAccessManager in Qt FrameNetworkingContext > + https://bugs.webkit.org/show_bug.cgi?id=45231 > + > + Make possible to get the current QNAM when NetwokingContext request it. > + > + * WebCoreSupport/FrameNetworkingContextQt.cpp: > + (WebCore::FrameNetworkingContextQt::networkAccessManager): > + > 2010-09-03 Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> > > Reviewed by Darin Adler. > diff --git a/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp b/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp > index e502e2a..98e9f9a 100644 > --- a/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp > +++ b/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp > @@ -23,6 +23,8 @@ > > #include <QNetworkAccessManager> > #include <QObject> > +#include <QWebFrame> > +#include <QWebPage> > > namespace WebCore { > > @@ -45,6 +47,8 @@ QObject* FrameNetworkingContextQt::originatingObject() const > > QNetworkAccessManager* FrameNetworkingContextQt::networkAccessManager() const > { > + if (QWebFrame* webFrame = qobject_cast<QWebFrame*>(m_originatingObject)) > + m_networkAccessManager = webFrame->... Why not jist return here, and never use m_networkaccessmanager directly? Just call this method instead. 274632 5 66645 diegohcg 2010-09-06 07:55:16 -0700 Created attachment 66645 Patch 274645 6 66645 tonikitoo 2010-09-06 08:20:02 -0700 Comment on attachment 66645 Patch r=me 274797 7 66645 commit-queue 2010-09-06 16:01:47 -0700 Comment on attachment 66645 Patch Clearing flags on attachment: 66645 Committed r66853: <http://trac.webkit.org/changeset/66853> 274798 8 commit-queue 2010-09-06 16:01:52 -0700 All reviewed patches have been landed. Closing bug. 274898 9 kbalazs 2010-09-07 01:35:06 -0700 The m_networkingContext member should be removed according to this change, isn't it? 66586 2010-09-04 12:15:28 -0700 2010-09-06 07:55:16 -0700 Patch 0001-Qt-Update-NetworkAccessManager-in-Qt-FrameNetworkingC.diff text/plain 2151 diegohcg RnJvbSAwOGVlNzJhYWU4NDhhNzZlMWViZDQ3M2NkZTFlNTgwMjA2MjY1M2I0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ29oY2dAd2Via2l0Lm9yZz4K RGF0ZTogU2F0LCA0IFNlcCAyMDEwIDE1OjEyOjQ5IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gW1F0 XSBVcGRhdGUgTmV0d29ya0FjY2Vzc01hbmFnZXIgaW4gUXQgRnJhbWVOZXR3b3JraW5nQ29udGV4 dAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1MjMxCgpSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KCk1ha2UgcG9zc2libGUgdG8gZ2V0IHRoZSBjdXJyZW50IFFO QU0gd2hlbiBOZXR3b2tpbmdDb250ZXh0IHJlcXVlc3QgaXQuCgoqIFdlYkNvcmVTdXBwb3J0L0Zy YW1lTmV0d29ya2luZ0NvbnRleHRRdC5jcHA6CihXZWJDb3JlOjpGcmFtZU5ldHdvcmtpbmdDb250 ZXh0UXQ6Om5ldHdvcmtBY2Nlc3NNYW5hZ2VyKToKLS0tCiBXZWJLaXQvcXQvQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTIgKysrKysrKysrKysrCiAuLi4vcXQv V2ViQ29yZVN1cHBvcnQvRnJhbWVOZXR3b3JraW5nQ29udGV4dFF0LmNwcCB8ICAgIDQgKysrKwog MiBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAwIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDhm MDI2YTIuLmY1ZTRlMzEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2Vi S2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEwLTA5LTA0ICBEaWVnbyBHb256 YWxleiAgPGRpZWdvaGNnQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW1F0XSBVcGRhdGUgTmV0d29ya0FjY2Vzc01hbmFnZXIgaW4g UXQgRnJhbWVOZXR3b3JraW5nQ29udGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDUyMzEKKworICAgICAgICBNYWtlIHBvc3NpYmxlIHRvIGdldCB0 aGUgY3VycmVudCBRTkFNIHdoZW4gTmV0d29raW5nQ29udGV4dCByZXF1ZXN0IGl0LgorCisgICAg ICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVOZXR3b3JraW5nQ29udGV4dFF0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lTmV0d29ya2luZ0NvbnRleHRRdDo6bmV0d29ya0FjY2Vzc01hbmFn ZXIpOgorCiAyMDEwLTA5LTAzICBKZXN1cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5j aWFAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlm ZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZU5ldHdvcmtpbmdDb250ZXh0 UXQuY3BwIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTmV0d29ya2luZ0NvbnRleHRR dC5jcHAKaW5kZXggZTUwMmUyYS4uOThlOWY5YSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNv cmVTdXBwb3J0L0ZyYW1lTmV0d29ya2luZ0NvbnRleHRRdC5jcHAKKysrIGIvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0ZyYW1lTmV0d29ya2luZ0NvbnRleHRRdC5jcHAKQEAgLTIzLDYgKzIzLDgg QEAKIAogI2luY2x1ZGUgPFFOZXR3b3JrQWNjZXNzTWFuYWdlcj4KICNpbmNsdWRlIDxRT2JqZWN0 PgorI2luY2x1ZGUgPFFXZWJGcmFtZT4KKyNpbmNsdWRlIDxRV2ViUGFnZT4KIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCkBAIC00NSw2ICs0Nyw4IEBAIFFPYmplY3QqIEZyYW1lTmV0d29ya2luZ0Nv bnRleHRRdDo6b3JpZ2luYXRpbmdPYmplY3QoKSBjb25zdAogCiBRTmV0d29ya0FjY2Vzc01hbmFn ZXIqIEZyYW1lTmV0d29ya2luZ0NvbnRleHRRdDo6bmV0d29ya0FjY2Vzc01hbmFnZXIoKSBjb25z dAogeworICAgIGlmIChRV2ViRnJhbWUqIHdlYkZyYW1lID0gcW9iamVjdF9jYXN0PFFXZWJGcmFt ZSo+KG1fb3JpZ2luYXRpbmdPYmplY3QpKQorICAgICAgICBtX25ldHdvcmtBY2Nlc3NNYW5hZ2Vy ID0gd2ViRnJhbWUtPnBhZ2UoKS0+bmV0d29ya0FjY2Vzc01hbmFnZXIoKTsKICAgICByZXR1cm4g bV9uZXR3b3JrQWNjZXNzTWFuYWdlcjsKIH0KIAotLSAKMS43LjAuNAoK 66645 2010-09-06 07:55:16 -0700 2010-09-06 16:01:47 -0700 Patch 0001-Qt-Update-NetworkAccessManager-in-Qt-FrameNetworkingC.diff text/plain 2113 diegohcg RnJvbSAyNDE1MTM0ZjhkOTRmZDllNTIzZmQzYTUxYWZlODEyMDVkNjA1MzJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ29oY2dAd2Via2l0Lm9yZz4K RGF0ZTogU2F0LCA0IFNlcCAyMDEwIDE1OjEyOjQ5IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gW1F0 XSBVcGRhdGUgTmV0d29ya0FjY2Vzc01hbmFnZXIgaW4gUXQgRnJhbWVOZXR3b3JraW5nQ29udGV4 dAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1MjMxCgpSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KCk1ha2UgcG9zc2libGUgdG8gZ2V0IHRoZSBjdXJyZW50IFFO QU0gd2hlbiBOZXR3b2tpbmdDb250ZXh0IHJlcXVlc3QgaXQuCgoqIFdlYkNvcmVTdXBwb3J0L0Zy YW1lTmV0d29ya2luZ0NvbnRleHRRdC5jcHA6CihXZWJDb3JlOjpGcmFtZU5ldHdvcmtpbmdDb250 ZXh0UXQ6Om5ldHdvcmtBY2Nlc3NNYW5hZ2VyKToKLS0tCiBXZWJLaXQvcXQvQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTIgKysrKysrKysrKysrCiAuLi4vcXQv V2ViQ29yZVN1cHBvcnQvRnJhbWVOZXR3b3JraW5nQ29udGV4dFF0LmNwcCB8ICAgIDQgKysrLQog MiBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDFi OWM1MjkuLmRkNGUzMmMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2Vi S2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEwLTA5LTA0ICBEaWVnbyBHb256 YWxleiAgPGRpZWdvaGNnQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW1F0XSBVcGRhdGUgTmV0d29ya0FjY2Vzc01hbmFnZXIgaW4g UXQgRnJhbWVOZXR3b3JraW5nQ29udGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDUyMzEKKworICAgICAgICBNYWtlIHBvc3NpYmxlIHRvIGdldCB0 aGUgY3VycmVudCBRTkFNIHdoZW4gTmV0d29raW5nQ29udGV4dCByZXF1ZXN0IGl0LgorCisgICAg ICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVOZXR3b3JraW5nQ29udGV4dFF0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lTmV0d29ya2luZ0NvbnRleHRRdDo6bmV0d29ya0FjY2Vzc01hbmFn ZXIpOgorCiAyMDEwLTA5LTA2ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEF0dGVtcHQgdG8gZml4IHJhbmRvbSB0ZXN0IGNyYXNo ZXMgYWZ0ZXIgcjY2NzIwLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTmV0d29ya2luZ0NvbnRleHRRdC5jcHAgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJh bWVOZXR3b3JraW5nQ29udGV4dFF0LmNwcAppbmRleCBlNTAyZTJhLi5iM2IwZjAwIDEwMDY0NAot LS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVOZXR3b3JraW5nQ29udGV4dFF0LmNw cAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVOZXR3b3JraW5nQ29udGV4dFF0 LmNwcApAQCAtMjMsNiArMjMsOCBAQAogCiAjaW5jbHVkZSA8UU5ldHdvcmtBY2Nlc3NNYW5hZ2Vy PgogI2luY2x1ZGUgPFFPYmplY3Q+CisjaW5jbHVkZSA8UVdlYkZyYW1lPgorI2luY2x1ZGUgPFFX ZWJQYWdlPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTQ1LDcgKzQ3LDcgQEAgUU9iamVj dCogRnJhbWVOZXR3b3JraW5nQ29udGV4dFF0OjpvcmlnaW5hdGluZ09iamVjdCgpIGNvbnN0CiAK IFFOZXR3b3JrQWNjZXNzTWFuYWdlciogRnJhbWVOZXR3b3JraW5nQ29udGV4dFF0OjpuZXR3b3Jr QWNjZXNzTWFuYWdlcigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fbmV0d29ya0FjY2Vzc01hbmFn ZXI7CisgICAgcmV0dXJuIChxb2JqZWN0X2Nhc3Q8UVdlYkZyYW1lKj4obV9vcmlnaW5hdGluZ09i amVjdCkpLT5wYWdlKCktPm5ldHdvcmtBY2Nlc3NNYW5hZ2VyKCk7CiB9CiAKIH0KLS0gCjEuNy4w LjQKCg==