Title: [105062] trunk/Source/WebKit2
- Revision
- 105062
- Author
- [email protected]
- Date
- 2012-01-16 06:28:27 -0800 (Mon, 16 Jan 2012)
Log Message
[Qt] Remove references to PagePointer in the FrameNetworkingContext
https://bugs.webkit.org/show_bug.cgi?id=76342
Patch by Alexander Færøy <[email protected]> on 2012-01-16
Reviewed by Simon Hausmann.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::createNetworkingContext):
* WebProcess/qt/QtNetworkAccessManager.cpp:
(WebKit::QtNetworkAccessManager::obtainOriginatingWebPage):
* WebProcess/qt/QtNetworkAccessManager.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (105061 => 105062)
--- trunk/Source/WebKit2/ChangeLog 2012-01-16 14:04:25 UTC (rev 105061)
+++ trunk/Source/WebKit2/ChangeLog 2012-01-16 14:28:27 UTC (rev 105062)
@@ -1,3 +1,16 @@
+2012-01-16 Alexander Færøy <[email protected]>
+
+ [Qt] Remove references to PagePointer in the FrameNetworkingContext
+ https://bugs.webkit.org/show_bug.cgi?id=76342
+
+ Reviewed by Simon Hausmann.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::createNetworkingContext):
+ * WebProcess/qt/QtNetworkAccessManager.cpp:
+ (WebKit::QtNetworkAccessManager::obtainOriginatingWebPage):
+ * WebProcess/qt/QtNetworkAccessManager.h:
+
2012-01-14 Dan Bernstein <[email protected]>
<rdar://problem/10696295> Crash in WebProcess at com.apple.CFNetwork: URLCredentialStorage::CreateCurrentPersistentCredentials + 298
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (105061 => 105062)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2012-01-16 14:04:25 UTC (rev 105061)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2012-01-16 14:28:27 UTC (rev 105062)
@@ -1439,12 +1439,6 @@
PassRefPtr<FrameNetworkingContext> WebFrameLoaderClient::createNetworkingContext()
{
RefPtr<WebFrameNetworkingContext> context = WebFrameNetworkingContext::create(m_frame);
-#if PLATFORM(QT)
- // We encapsulate the WebPage pointer as a property of the originating QObject.
- QObject* originatingObject = context->originatingObject();
- ASSERT(originatingObject);
- originatingObject->setProperty("PagePointer", QVariant::fromValue(static_cast<void*>(m_frame->page())));
-#endif
return context.release();
}
Modified: trunk/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp (105061 => 105062)
--- trunk/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp 2012-01-16 14:04:25 UTC (rev 105061)
+++ trunk/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.cpp 2012-01-16 14:28:27 UTC (rev 105062)
@@ -41,25 +41,14 @@
{
}
-QtNetworkAccessManager::QtNetworkAccessManager(QObject* parent)
- : QNetworkAccessManager(parent)
- , m_webProcess(0)
-{
-}
-
WebPage* QtNetworkAccessManager::obtainOriginatingWebPage(const QNetworkRequest& request)
{
QObject* originatingObject = request.originatingObject();
if (!originatingObject)
return 0;
- QVariant pagePtr = originatingObject->property("PagePointer");
- if (!pagePtr.isValid() || !pagePtr.canConvert<void*>())
- return 0;
-
- WebPage* webPage = static_cast<WebPage*>(pagePtr.value<void*>());
- Q_ASSERT(webPage);
- return webPage;
+ qulonglong pageID = originatingObject->property("pageID").toULongLong();
+ return m_webProcess->webPage(pageID);
}
QNetworkReply* QtNetworkAccessManager::createRequest(Operation operation, const QNetworkRequest& request, QIODevice* outData)
Modified: trunk/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.h (105061 => 105062)
--- trunk/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.h 2012-01-16 14:04:25 UTC (rev 105061)
+++ trunk/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.h 2012-01-16 14:28:27 UTC (rev 105062)
@@ -38,15 +38,15 @@
class QtNetworkAccessManager : public QNetworkAccessManager {
Q_OBJECT
public:
- QtNetworkAccessManager(QObject* parent);
QtNetworkAccessManager(WebProcess*);
void registerApplicationScheme(const WebPage*, const QString& scheme);
protected:
virtual QNetworkReply* createRequest(Operation, const QNetworkRequest&, QIODevice* outgoingData = 0) OVERRIDE;
- static WebPage* obtainOriginatingWebPage(const QNetworkRequest&);
private:
+ WebPage* obtainOriginatingWebPage(const QNetworkRequest&);
+
QMultiHash<const WebPage*, QString> m_applicationSchemes;
WebProcess* m_webProcess;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
