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 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
404 && net::IsSupportedMimeType(mime_type)) { | 404 && net::IsSupportedMimeType(mime_type)) { |
405 mimetype_out = WebString::fromUTF8(mime_type); | 405 mimetype_out = WebString::fromUTF8(mime_type); |
406 charset_out = WebString::fromUTF8(char_set); | 406 charset_out = WebString::fromUTF8(char_set); |
407 return data; | 407 return data; |
408 } | 408 } |
409 return WebData(); | 409 return WebData(); |
410 } | 410 } |
411 | 411 |
412 WebURLError WebKitPlatformSupportImpl::cancelledError( | 412 WebURLError WebKitPlatformSupportImpl::cancelledError( |
413 const WebURL& unreachableURL) const { | 413 const WebURL& unreachableURL) const { |
414 return WebURLLoaderImpl::CreateError(unreachableURL, net::ERR_ABORTED); | 414 return WebURLLoaderImpl::CreateError(unreachableURL, false, net::ERR_ABORTED); |
415 } | 415 } |
416 | 416 |
417 void WebKitPlatformSupportImpl::decrementStatsCounter(const char* name) { | 417 void WebKitPlatformSupportImpl::decrementStatsCounter(const char* name) { |
418 base::StatsCounter(name).Decrement(); | 418 base::StatsCounter(name).Decrement(); |
419 } | 419 } |
420 | 420 |
421 void WebKitPlatformSupportImpl::incrementStatsCounter(const char* name) { | 421 void WebKitPlatformSupportImpl::incrementStatsCounter(const char* name) { |
422 base::StatsCounter(name).Increment(); | 422 base::StatsCounter(name).Increment(); |
423 } | 423 } |
424 | 424 |
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
938 if (--shared_timer_suspended_ == 0 && | 938 if (--shared_timer_suspended_ == 0 && |
939 (!shared_timer_.IsRunning() || | 939 (!shared_timer_.IsRunning() || |
940 shared_timer_fire_time_was_set_while_suspended_)) { | 940 shared_timer_fire_time_was_set_while_suspended_)) { |
941 shared_timer_fire_time_was_set_while_suspended_ = false; | 941 shared_timer_fire_time_was_set_while_suspended_ = false; |
942 setSharedTimerFireInterval( | 942 setSharedTimerFireInterval( |
943 shared_timer_fire_time_ - monotonicallyIncreasingTime()); | 943 shared_timer_fire_time_ - monotonicallyIncreasingTime()); |
944 } | 944 } |
945 } | 945 } |
946 | 946 |
947 } // namespace webkit_glue | 947 } // namespace webkit_glue |
OLD | NEW |