Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Side by Side Diff: Source/WebKit/chromium/src/WebCachedURLRequest.cpp

Issue 14672042: Prepare to add more initiator info to CachedResource(Request) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/WebKit/chromium/public/WebCachedURLRequest.h ('k') | Source/core/core.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "WebCachedURLRequest.h" 32 #include "WebCachedURLRequest.h"
33 33
34 #include "core/dom/Element.h"
35 #include "core/loader/cache/CachedResourceRequest.h" 34 #include "core/loader/cache/CachedResourceRequest.h"
36 #include "core/platform/chromium/support/WrappedResourceRequest.h" 35 #include "core/platform/chromium/support/WrappedResourceRequest.h"
37 #include <public/WebURLRequest.h> 36 #include <public/WebURLRequest.h>
38 37
39 using namespace WebCore; 38 using namespace WebCore;
40 39
41 namespace WebKit { 40 namespace WebKit {
42 41
43 void WebCachedURLRequest::reset() 42 void WebCachedURLRequest::reset()
44 { 43 {
(...skipping 15 matching lines...) Expand all
60 return WebString(m_private->charset()); 59 return WebString(m_private->charset());
61 } 60 }
62 61
63 bool WebCachedURLRequest::forPreload() const 62 bool WebCachedURLRequest::forPreload() const
64 { 63 {
65 return m_private->forPreload(); 64 return m_private->forPreload();
66 } 65 }
67 66
68 WebString WebCachedURLRequest::initiatorName() const 67 WebString WebCachedURLRequest::initiatorName() const
69 { 68 {
70 return WebString(m_private->initiatorName()); 69 return WebString(m_private->initiatorInfo().name);
71 }
72
73 WebElement WebCachedURLRequest::initiatorElement() const
74 {
75 return WebElement(m_private->initiatorElement());
76 } 70 }
77 71
78 WebCachedURLRequest::WebCachedURLRequest(CachedResourceRequest* request) 72 WebCachedURLRequest::WebCachedURLRequest(CachedResourceRequest* request)
79 : m_private(request) 73 : m_private(request)
80 { 74 {
81 } 75 }
82 76
83 } // namespace WebKit 77 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/public/WebCachedURLRequest.h ('k') | Source/core/core.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698