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 "content/browser/renderer_host/image_transport_factory.h" | 5 #include "content/browser/renderer_host/image_transport_factory.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <map> | 8 #include <map> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
495 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 495 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
496 if (command_line->HasSwitch(switches::kUIMaxFramesPending)) { | 496 if (command_line->HasSwitch(switches::kUIMaxFramesPending)) { |
497 std::string string_value = command_line->GetSwitchValueASCII( | 497 std::string string_value = command_line->GetSwitchValueASCII( |
498 switches::kUIMaxFramesPending); | 498 switches::kUIMaxFramesPending); |
499 int int_value; | 499 int int_value; |
500 if (base::StringToInt(string_value, &int_value)) | 500 if (base::StringToInt(string_value, &int_value)) |
501 capabilities_.max_frames_pending = int_value; | 501 capabilities_.max_frames_pending = int_value; |
502 else | 502 else |
503 LOG(ERROR) << "Trouble parsing --" << switches::kUIMaxFramesPending; | 503 LOG(ERROR) << "Trouble parsing --" << switches::kUIMaxFramesPending; |
504 } | 504 } |
| 505 capabilities_.has_parent_compositor = false; |
505 DetachFromThread(); | 506 DetachFromThread(); |
506 } | 507 } |
507 | 508 |
508 virtual ~BrowserCompositorOutputSurface() { | 509 virtual ~BrowserCompositorOutputSurface() { |
509 DCHECK(CalledOnValidThread()); | 510 DCHECK(CalledOnValidThread()); |
510 if (!HasClient()) | 511 if (!HasClient()) |
511 return; | 512 return; |
512 output_surface_proxy_->RemoveSurface(surface_id_); | 513 output_surface_proxy_->RemoveSurface(surface_id_); |
513 } | 514 } |
514 | 515 |
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1047 delete g_factory; | 1048 delete g_factory; |
1048 g_factory = NULL; | 1049 g_factory = NULL; |
1049 } | 1050 } |
1050 | 1051 |
1051 // static | 1052 // static |
1052 ImageTransportFactory* ImageTransportFactory::GetInstance() { | 1053 ImageTransportFactory* ImageTransportFactory::GetInstance() { |
1053 return g_factory; | 1054 return g_factory; |
1054 } | 1055 } |
1055 | 1056 |
1056 } // namespace content | 1057 } // namespace content |
OLD | NEW |