Title: [116057] trunk/Source/WebCore
- Revision
- 116057
- Author
- mary...@torchmobile.com.cn
- Date
- 2012-05-03 18:28:11 -0700 (Thu, 03 May 2012)
Log Message
[BlackBerry] Add missed member in CrossThreadResourceRequestData
https://bugs.webkit.org/show_bug.cgi?id=85448
Reviewed by Antonio Gomes.
* platform/network/blackberry/ResourceRequest.h:
(CrossThreadResourceRequestData):
* platform/network/blackberry/ResourceRequestBlackBerry.cpp:
(WebCore::ResourceRequest::doPlatformCopyData):
(WebCore::ResourceRequest::doPlatformAdopt):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (116056 => 116057)
--- trunk/Source/WebCore/ChangeLog 2012-05-04 01:21:50 UTC (rev 116056)
+++ trunk/Source/WebCore/ChangeLog 2012-05-04 01:28:11 UTC (rev 116057)
@@ -1,3 +1,16 @@
+2012-05-03 Mary Wu <mary...@torchmobile.com.cn>
+
+ [BlackBerry] Add missed member in CrossThreadResourceRequestData
+ https://bugs.webkit.org/show_bug.cgi?id=85448
+
+ Reviewed by Antonio Gomes.
+
+ * platform/network/blackberry/ResourceRequest.h:
+ (CrossThreadResourceRequestData):
+ * platform/network/blackberry/ResourceRequestBlackBerry.cpp:
+ (WebCore::ResourceRequest::doPlatformCopyData):
+ (WebCore::ResourceRequest::doPlatformAdopt):
+
2012-05-03 Adam Barth <aba...@webkit.org>
CSP shouldn't block about:blank for iframes
Modified: trunk/Source/WebCore/platform/network/blackberry/ResourceRequest.h (116056 => 116057)
--- trunk/Source/WebCore/platform/network/blackberry/ResourceRequest.h 2012-05-04 01:21:50 UTC (rev 116056)
+++ trunk/Source/WebCore/platform/network/blackberry/ResourceRequest.h 2012-05-04 01:28:11 UTC (rev 116057)
@@ -149,10 +149,12 @@
struct CrossThreadResourceRequestData : public CrossThreadResourceRequestDataBase {
String m_token;
String m_anchorText;
+ String m_overrideContentType;
bool m_isXMLHTTPRequest;
bool m_mustHandleInternally;
bool m_isRequestedByPlugin;
bool m_forceDownload;
+ ResourceRequest::TargetType m_targetType;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/network/blackberry/ResourceRequestBlackBerry.cpp (116056 => 116057)
--- trunk/Source/WebCore/platform/network/blackberry/ResourceRequestBlackBerry.cpp 2012-05-04 01:21:50 UTC (rev 116056)
+++ trunk/Source/WebCore/platform/network/blackberry/ResourceRequestBlackBerry.cpp 2012-05-04 01:28:11 UTC (rev 116057)
@@ -233,9 +233,12 @@
{
data->m_token = m_token;
data->m_anchorText = m_anchorText;
+ data->m_overrideContentType = m_overrideContentType;
data->m_isXMLHTTPRequest = m_isXMLHTTPRequest;
data->m_mustHandleInternally = m_mustHandleInternally;
data->m_isRequestedByPlugin = m_isRequestedByPlugin;
+ data->m_forceDownload = m_forceDownload;
+ data->m_targetType = m_targetType;
return data;
}
@@ -243,10 +246,12 @@
{
m_token = data->m_token;
m_anchorText = data->m_anchorText;
+ m_overrideContentType = data->m_overrideContentType;
m_isXMLHTTPRequest = data->m_isXMLHTTPRequest;
m_mustHandleInternally = data->m_mustHandleInternally;
m_isRequestedByPlugin = data->m_isRequestedByPlugin;
m_forceDownload = data->m_forceDownload;
+ m_targetType = data->m_targetType;
}
void ResourceRequest::clearHTTPContentLength()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
