| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "webkit/child/webkitplatformsupport_impl.h" | 5 #include "webkit/child/webkitplatformsupport_impl.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 && net::IsSupportedMimeType(mime_type)) { | 388 && net::IsSupportedMimeType(mime_type)) { |
| 389 mimetype_out = WebString::fromUTF8(mime_type); | 389 mimetype_out = WebString::fromUTF8(mime_type); |
| 390 charset_out = WebString::fromUTF8(char_set); | 390 charset_out = WebString::fromUTF8(char_set); |
| 391 return data; | 391 return data; |
| 392 } | 392 } |
| 393 return WebData(); | 393 return WebData(); |
| 394 } | 394 } |
| 395 | 395 |
| 396 WebURLError WebKitPlatformSupportImpl::cancelledError( | 396 WebURLError WebKitPlatformSupportImpl::cancelledError( |
| 397 const WebURL& unreachableURL) const { | 397 const WebURL& unreachableURL) const { |
| 398 return WebURLLoaderImpl::CreateError(unreachableURL, net::ERR_ABORTED); | 398 return WebURLLoaderImpl::CreateError(unreachableURL, false, net::ERR_ABORTED); |
| 399 } | 399 } |
| 400 | 400 |
| 401 void WebKitPlatformSupportImpl::decrementStatsCounter(const char* name) { | 401 void WebKitPlatformSupportImpl::decrementStatsCounter(const char* name) { |
| 402 base::StatsCounter(name).Decrement(); | 402 base::StatsCounter(name).Decrement(); |
| 403 } | 403 } |
| 404 | 404 |
| 405 void WebKitPlatformSupportImpl::incrementStatsCounter(const char* name) { | 405 void WebKitPlatformSupportImpl::incrementStatsCounter(const char* name) { |
| 406 base::StatsCounter(name).Increment(); | 406 base::StatsCounter(name).Increment(); |
| 407 } | 407 } |
| 408 | 408 |
| (...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 922 if (--shared_timer_suspended_ == 0 && | 922 if (--shared_timer_suspended_ == 0 && |
| 923 (!shared_timer_.IsRunning() || | 923 (!shared_timer_.IsRunning() || |
| 924 shared_timer_fire_time_was_set_while_suspended_)) { | 924 shared_timer_fire_time_was_set_while_suspended_)) { |
| 925 shared_timer_fire_time_was_set_while_suspended_ = false; | 925 shared_timer_fire_time_was_set_while_suspended_ = false; |
| 926 setSharedTimerFireInterval( | 926 setSharedTimerFireInterval( |
| 927 shared_timer_fire_time_ - monotonicallyIncreasingTime()); | 927 shared_timer_fire_time_ - monotonicallyIncreasingTime()); |
| 928 } | 928 } |
| 929 } | 929 } |
| 930 | 930 |
| 931 } // namespace webkit_glue | 931 } // namespace webkit_glue |
| OLD | NEW |