content/child/blink_platform_impl.h - Issue 459363002: Revert of Wire 'blink::Platform::isHostnameReservedIPAddress()' to 'net::IsReservedIPAddress()'.

Side by Side Diff: content/child/blink_platform_impl.h

Issue 459363002: Revert of Wire 'blink::Platform::isHostnameReservedIPAddress()' to 'net::IsReservedIPAddress()'. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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 | « no previous file | content/child/blink_platform_impl.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_	5 #ifndef CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_

6 #define CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_	6 #define CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_

7	7

8 #include "base/compiler_specific.h"	8 #include "base/compiler_specific.h"

9 #include "base/debug/trace_event.h"	9 #include "base/debug/trace_event.h"

10 #include "base/threading/thread_local_storage.h"	10 #include "base/threading/thread_local_storage.h"

(...skipping 63 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
74 size_t bytes);	74 size_t bytes);

75 virtual size_t maxDecodedImageBytes() OVERRIDE;	75 virtual size_t maxDecodedImageBytes() OVERRIDE;

76 virtual blink::WebURLLoader* createURLLoader();	76 virtual blink::WebURLLoader* createURLLoader();

77 virtual blink::WebSocketStreamHandle* createSocketStreamHandle();	77 virtual blink::WebSocketStreamHandle* createSocketStreamHandle();

78 virtual blink::WebSocketHandle* createWebSocketHandle() OVERRIDE;	78 virtual blink::WebSocketHandle* createWebSocketHandle() OVERRIDE;

79 virtual blink::WebString userAgent();	79 virtual blink::WebString userAgent();

80 virtual blink::WebData parseDataURL(	80 virtual blink::WebData parseDataURL(

81 const blink::WebURL& url, blink::WebString& mimetype,	81 const blink::WebURL& url, blink::WebString& mimetype,

82 blink::WebString& charset);	82 blink::WebString& charset);

83 virtual blink::WebURLError cancelledError(const blink::WebURL& url) const;	83 virtual blink::WebURLError cancelledError(const blink::WebURL& url) const;

84 virtual bool isReservedIPAddress(

85 const blink::WebSecurityOrigin&) const OVERRIDE;

86 virtual bool isReservedIPAddress(const blink::WebURL&) const OVERRIDE;

87 virtual blink::WebThread* createThread(const char* name);	84 virtual blink::WebThread* createThread(const char* name);

88 virtual blink::WebThread* currentThread();	85 virtual blink::WebThread* currentThread();

89 virtual blink::WebWaitableEvent* createWaitableEvent();	86 virtual blink::WebWaitableEvent* createWaitableEvent();

90 virtual blink::WebWaitableEvent* waitMultipleEvents(	87 virtual blink::WebWaitableEvent* waitMultipleEvents(

91 const blink::WebVector<blink::WebWaitableEvent*>& events);	88 const blink::WebVector<blink::WebWaitableEvent*>& events);

92 virtual void decrementStatsCounter(const char* name);	89 virtual void decrementStatsCounter(const char* name);

93 virtual void incrementStatsCounter(const char* name);	90 virtual void incrementStatsCounter(const char* name);

94 virtual void histogramCustomCounts(	91 virtual void histogramCustomCounts(

95 const char* name, int sample, int min, int max, int bucket_count);	92 const char* name, int sample, int min, int max, int bucket_count);

96 virtual void histogramEnumeration(	93 virtual void histogramEnumeration(

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
177 bool shared_timer_fire_time_was_set_while_suspended_;	174 bool shared_timer_fire_time_was_set_while_suspended_;

178 int shared_timer_suspended_; // counter	175 int shared_timer_suspended_; // counter

179 scoped_ptr<FlingCurveConfiguration> fling_curve_configuration_;	176 scoped_ptr<FlingCurveConfiguration> fling_curve_configuration_;

180 base::ThreadLocalStorage::Slot current_thread_slot_;	177 base::ThreadLocalStorage::Slot current_thread_slot_;

181 WebCryptoImpl web_crypto_;	178 WebCryptoImpl web_crypto_;

182 };	179 };

183	180

184 } // namespace content	181 } // namespace content

185	182

186 #endif // CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_	183 #endif // CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_

OLD	NEW