Merge WebKit at r72274: Initial merge by git.

Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb

2 files changed, 12 insertions, 0 deletions

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