[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 15:35:58 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5e768386925d822c46c661698031819b26c23bd8
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 9 01:05:37 2010 +0000
2010-11-08 Pierre-Antoine LaFayette <pierre.lafayette at gmail.com>
Reviewed by Darin Fisher.
[chromium] Adding hasUserGesture flag to the ResourceRequest
https://bugs.webkit.org/show_bug.cgi?id=37057
This flag is to be used on the browser side to indicate when a
download has been user initiated.
No new tests. This change will be tested through a browser UI test.
* platform/network/chromium/ResourceRequest.h:
(WebCore::ResourceRequest::ResourceRequest):
(WebCore::ResourceRequest::hasUserGesture):
(WebCore::ResourceRequest::setHasUserGesture):
2010-11-08 Pierre-Antoine LaFayette <pierre.lafayette at gmail.com>
Reviewed by Darin Fisher.
[chromium] Adding hasUserGesture flag to the ResourceRequest
https://bugs.webkit.org/show_bug.cgi?id=37057
This flag is to be used on the browser side to indicate when a
download has been user initiated.
* public/WebURLRequest.h:
* src/WebURLRequest.cpp:
(WebKit::WebURLRequest::hasUserGesture):
(WebKit::WebURLRequest::setHasUserGesture):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71587 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 93b9425..3253aec 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-11-08 Pierre-Antoine LaFayette <pierre.lafayette at gmail.com>
+
+ Reviewed by Darin Fisher.
+
+ [chromium] Adding hasUserGesture flag to the ResourceRequest
+ https://bugs.webkit.org/show_bug.cgi?id=37057
+
+ This flag is to be used on the browser side to indicate when a
+ download has been user initiated.
+
+ No new tests. This change will be tested through a browser UI test.
+
+ * platform/network/chromium/ResourceRequest.h:
+ (WebCore::ResourceRequest::ResourceRequest):
+ (WebCore::ResourceRequest::hasUserGesture):
+ (WebCore::ResourceRequest::setHasUserGesture):
+
2010-11-08 Chris Rogers <crogers at google.com>
Reviewed by Kenneth Russell.
diff --git a/WebCore/platform/network/chromium/ResourceRequest.cpp b/WebCore/platform/network/chromium/ResourceRequest.cpp
index a33895a..69591c1 100644
--- a/WebCore/platform/network/chromium/ResourceRequest.cpp
+++ b/WebCore/platform/network/chromium/ResourceRequest.cpp
@@ -42,6 +42,7 @@ PassOwnPtr<CrossThreadResourceRequestData> ResourceRequest::doPlatformCopyData(P
data->m_requestorID = m_requestorID;
data->m_requestorProcessID = m_requestorProcessID;
data->m_appCacheHostID = m_appCacheHostID;
+ data->m_hasUserGesture = m_hasUserGesture;
return data;
}
@@ -50,6 +51,7 @@ void ResourceRequest::doPlatformAdopt(PassOwnPtr<CrossThreadResourceRequestData>
m_requestorID = data->m_requestorID;
m_requestorProcessID = data->m_requestorProcessID;
m_appCacheHostID = data->m_appCacheHostID;
+ m_hasUserGesture = data->m_hasUserGesture;
}
} // namespace WebCore
diff --git a/WebCore/platform/network/chromium/ResourceRequest.h b/WebCore/platform/network/chromium/ResourceRequest.h
index 8571cf4..41ad6e0 100644
--- a/WebCore/platform/network/chromium/ResourceRequest.h
+++ b/WebCore/platform/network/chromium/ResourceRequest.h
@@ -41,6 +41,7 @@ namespace WebCore {
, m_requestorID(0)
, m_requestorProcessID(0)
, m_appCacheHostID(0)
+ , m_hasUserGesture(false)
{
}
@@ -49,6 +50,7 @@ namespace WebCore {
, m_requestorID(0)
, m_requestorProcessID(0)
, m_appCacheHostID(0)
+ , m_hasUserGesture(false)
{
}
@@ -57,6 +59,7 @@ namespace WebCore {
, m_requestorID(0)
, m_requestorProcessID(0)
, m_appCacheHostID(0)
+ , m_hasUserGesture(false)
{
setHTTPReferrer(referrer);
}
@@ -66,6 +69,7 @@ namespace WebCore {
, m_requestorID(0)
, m_requestorProcessID(0)
, m_appCacheHostID(0)
+ , m_hasUserGesture(false)
{
}
@@ -84,6 +88,10 @@ namespace WebCore {
int appCacheHostID() const { return m_appCacheHostID; }
void setAppCacheHostID(int id) { m_appCacheHostID = id; }
+ // True if request was user initiated.
+ bool hasUserGesture() const { return m_hasUserGesture; }
+ void setHasUserGesture(bool hasUserGesture) { m_hasUserGesture = hasUserGesture; }
+
private:
friend class ResourceRequestBase;
@@ -96,12 +104,14 @@ namespace WebCore {
int m_requestorID;
int m_requestorProcessID;
int m_appCacheHostID;
+ bool m_hasUserGesture;
};
struct CrossThreadResourceRequestData : public CrossThreadResourceRequestDataBase {
int m_requestorID;
int m_requestorProcessID;
int m_appCacheHostID;
+ bool m_hasUserGesture;
};
} // namespace WebCore
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6867714..5228533 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-08 Pierre-Antoine LaFayette <pierre.lafayette at gmail.com>
+
+ Reviewed by Darin Fisher.
+
+ [chromium] Adding hasUserGesture flag to the ResourceRequest
+ https://bugs.webkit.org/show_bug.cgi?id=37057
+
+ This flag is to be used on the browser side to indicate when a
+ download has been user initiated.
+
+ * public/WebURLRequest.h:
+ * src/WebURLRequest.cpp:
+ (WebKit::WebURLRequest::hasUserGesture):
+ (WebKit::WebURLRequest::setHasUserGesture):
+
2010-11-08 Alexey Proskuryakov <ap at apple.com>
Reviewed by Darin Adler.
diff --git a/WebKit/chromium/public/WebURLRequest.h b/WebKit/chromium/public/WebURLRequest.h
index c800452..7dd97ca 100644
--- a/WebKit/chromium/public/WebURLRequest.h
+++ b/WebKit/chromium/public/WebURLRequest.h
@@ -140,6 +140,10 @@ public:
WEBKIT_API TargetType targetType() const;
WEBKIT_API void setTargetType(TargetType);
+ // True if the request was user initiated.
+ WEBKIT_API bool hasUserGesture() const;
+ WEBKIT_API void setHasUserGesture(bool);
+
// A consumer controlled value intended to be used to identify the
// requestor.
WEBKIT_API int requestorID() const;
diff --git a/WebKit/chromium/src/WebURLRequest.cpp b/WebKit/chromium/src/WebURLRequest.cpp
index b243420..7a77ca3 100644
--- a/WebKit/chromium/src/WebURLRequest.cpp
+++ b/WebKit/chromium/src/WebURLRequest.cpp
@@ -221,6 +221,16 @@ WebURLRequest::TargetType WebURLRequest::targetType() const
return static_cast<TargetType>(m_private->m_resourceRequest->targetType());
}
+bool WebURLRequest::hasUserGesture() const
+{
+ return m_private->m_resourceRequest->hasUserGesture();
+}
+
+void WebURLRequest::setHasUserGesture(bool hasUserGesture)
+{
+ m_private->m_resourceRequest->setHasUserGesture(hasUserGesture);
+}
+
void WebURLRequest::setTargetType(TargetType targetType)
{
m_private->m_resourceRequest->setTargetType(
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list