From 4576aa36e9a9671459299c7963ac95aa94beaea9 Mon Sep 17 00:00:00 2001
From: "Shimeng (Simon) Wang" <swang@google.com>
Date: Tue, 7 Dec 2010 17:22:45 -0800
Subject: Merge WebKit at r73109: Initial merge by git.

Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
---
 WebKit/chromium/public/WebURLResponse.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'WebKit/chromium/public/WebURLResponse.h')

diff --git a/WebKit/chromium/public/WebURLResponse.h b/WebKit/chromium/public/WebURLResponse.h
index f78c2db..c50f88e 100644
--- a/WebKit/chromium/public/WebURLResponse.h
+++ b/WebKit/chromium/public/WebURLResponse.h
@@ -42,7 +42,7 @@ namespace WebKit {
 
 class WebCString;
 class WebHTTPHeaderVisitor;
-class WebResourceRawHeaders;
+class WebHTTPLoadInfo;
 class WebString;
 class WebURL;
 class WebURLLoadTiming;
@@ -84,8 +84,8 @@ public:
     WEBKIT_API WebURLLoadTiming loadTiming();
     WEBKIT_API void setLoadTiming(const WebURLLoadTiming&);
 
-    WEBKIT_API WebResourceRawHeaders resourceRawHeaders();
-    WEBKIT_API void setResourceRawHeaders(const WebResourceRawHeaders&);
+    WEBKIT_API WebHTTPLoadInfo httpLoadInfo();
+    WEBKIT_API void setHTTPLoadInfo(const WebHTTPLoadInfo&);
 
     WEBKIT_API double responseTime() const;
     WEBKIT_API void setResponseTime(double);
-- 
cgit v1.1