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

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

Issue 192283002: Revert 255858 "Simplify the user agent code some more since afte..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 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
OLDNEW
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/platform_file.h" 10 #include "base/platform_file.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 virtual void stopHeapProfiling() OVERRIDE; 56 virtual void stopHeapProfiling() OVERRIDE;
57 virtual void dumpHeapProfiling(const blink::WebString& reason); 57 virtual void dumpHeapProfiling(const blink::WebString& reason);
58 virtual blink::WebString getHeapProfile() OVERRIDE; 58 virtual blink::WebString getHeapProfile() OVERRIDE;
59 59
60 virtual bool processMemorySizesInBytes(size_t* private_bytes, 60 virtual bool processMemorySizesInBytes(size_t* private_bytes,
61 size_t* shared_bytes); 61 size_t* shared_bytes);
62 virtual bool memoryAllocatorWasteInBytes(size_t* size); 62 virtual bool memoryAllocatorWasteInBytes(size_t* size);
63 virtual size_t maxDecodedImageBytes() OVERRIDE; 63 virtual size_t maxDecodedImageBytes() OVERRIDE;
64 virtual blink::WebURLLoader* createURLLoader(); 64 virtual blink::WebURLLoader* createURLLoader();
65 virtual blink::WebSocketStreamHandle* createSocketStreamHandle(); 65 virtual blink::WebSocketStreamHandle* createSocketStreamHandle();
66 virtual blink::WebString userAgent();
67 // TODO(jam): remove this after Blink is updated
68 virtual blink::WebString userAgent(const blink::WebURL& url); 66 virtual blink::WebString userAgent(const blink::WebURL& url);
69 virtual blink::WebData parseDataURL( 67 virtual blink::WebData parseDataURL(
70 const blink::WebURL& url, blink::WebString& mimetype, 68 const blink::WebURL& url, blink::WebString& mimetype,
71 blink::WebString& charset); 69 blink::WebString& charset);
72 virtual blink::WebURLError cancelledError(const blink::WebURL& url) const; 70 virtual blink::WebURLError cancelledError(const blink::WebURL& url) const;
73 virtual void decrementStatsCounter(const char* name); 71 virtual void decrementStatsCounter(const char* name);
74 virtual void incrementStatsCounter(const char* name); 72 virtual void incrementStatsCounter(const char* name);
75 virtual void histogramCustomCounts( 73 virtual void histogramCustomCounts(
76 const char* name, int sample, int min, int max, int bucket_count); 74 const char* name, int sample, int min, int max, int bucket_count);
77 virtual void histogramEnumeration( 75 virtual void histogramEnumeration(
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 base::OneShotTimer<BlinkPlatformImpl> shared_timer_; 147 base::OneShotTimer<BlinkPlatformImpl> shared_timer_;
150 void (*shared_timer_func_)(); 148 void (*shared_timer_func_)();
151 double shared_timer_fire_time_; 149 double shared_timer_fire_time_;
152 bool shared_timer_fire_time_was_set_while_suspended_; 150 bool shared_timer_fire_time_was_set_while_suspended_;
153 int shared_timer_suspended_; // counter 151 int shared_timer_suspended_; // counter
154 }; 152 };
155 153
156 } // namespace content 154 } // namespace content
157 155
158 #endif // CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_ 156 #endif // CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_
OLDNEW
« no previous file with comments | « trunk/src/content/browser/renderer_host/render_process_host_impl.cc ('k') | trunk/src/content/child/blink_platform_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698