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

Side by Side Diff: Source/web/WebCachedURLRequest.cpp

Issue 169653006: [not for commit] (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: return nullptr_t overload, just do it right Created 6 years, 10 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/platform/exported/WebAudioBus.cpp ('k') | Source/web/WebDOMMediaStreamTrack.cpp » ('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 24 matching lines...) Expand all
35 #include "platform/exported/WrappedResourceRequest.h" 35 #include "platform/exported/WrappedResourceRequest.h"
36 #include "public/platform/WebURLRequest.h" 36 #include "public/platform/WebURLRequest.h"
37 37
38 using namespace WebCore; 38 using namespace WebCore;
39 39
40 namespace blink { 40 namespace blink {
41 41
42 void WebCachedURLRequest::reset() 42 void WebCachedURLRequest::reset()
43 { 43 {
44 m_resourceRequestWrapper.reset(0); 44 m_resourceRequestWrapper.reset(0);
45 m_private = 0; 45 m_private = nullptr;
46 } 46 }
47 47
48 const WebURLRequest& WebCachedURLRequest::urlRequest() const 48 const WebURLRequest& WebCachedURLRequest::urlRequest() const
49 { 49 {
50 if (!m_resourceRequestWrapper.get()) 50 if (!m_resourceRequestWrapper.get())
51 m_resourceRequestWrapper.reset(new WrappedResourceRequest(m_private->res ourceRequest())); 51 m_resourceRequestWrapper.reset(new WrappedResourceRequest(m_private->res ourceRequest()));
52 else 52 else
53 m_resourceRequestWrapper->bind(m_private->resourceRequest()); 53 m_resourceRequestWrapper->bind(m_private->resourceRequest());
54 return *m_resourceRequestWrapper.get(); 54 return *m_resourceRequestWrapper.get();
55 } 55 }
(...skipping 12 matching lines...) Expand all
68 { 68 {
69 return WebString(m_private->options().initiatorInfo.name); 69 return WebString(m_private->options().initiatorInfo.name);
70 } 70 }
71 71
72 WebCachedURLRequest::WebCachedURLRequest(FetchRequest* request) 72 WebCachedURLRequest::WebCachedURLRequest(FetchRequest* request)
73 : m_private(request) 73 : m_private(request)
74 { 74 {
75 } 75 }
76 76
77 } // namespace blink 77 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/exported/WebAudioBus.cpp ('k') | Source/web/WebDOMMediaStreamTrack.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698