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

Side by Side Diff: content/browser/renderer_host/image_transport_factory.cc

Issue 16863005: cc: Add BeginFrameArgs (Closed) Base URL: http://git.chromium.org/chromium/src.git@nofrc12
Patch Set: Rebase Created 7 years, 6 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
OLDNEW
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 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 CommandLine* command_line = CommandLine::ForCurrentProcess(); 498 CommandLine* command_line = CommandLine::ForCurrentProcess();
499 if (command_line->HasSwitch(switches::kUIMaxFramesPending)) { 499 if (command_line->HasSwitch(switches::kUIMaxFramesPending)) {
500 std::string string_value = command_line->GetSwitchValueASCII( 500 std::string string_value = command_line->GetSwitchValueASCII(
501 switches::kUIMaxFramesPending); 501 switches::kUIMaxFramesPending);
502 int int_value; 502 int int_value;
503 if (base::StringToInt(string_value, &int_value)) 503 if (base::StringToInt(string_value, &int_value))
504 capabilities_.max_frames_pending = int_value; 504 capabilities_.max_frames_pending = int_value;
505 else 505 else
506 LOG(ERROR) << "Trouble parsing --" << switches::kUIMaxFramesPending; 506 LOG(ERROR) << "Trouble parsing --" << switches::kUIMaxFramesPending;
507 } 507 }
508 capabilities_.has_parent_compositor = false;
508 DetachFromThread(); 509 DetachFromThread();
509 } 510 }
510 511
511 virtual ~BrowserCompositorOutputSurface() { 512 virtual ~BrowserCompositorOutputSurface() {
512 DCHECK(CalledOnValidThread()); 513 DCHECK(CalledOnValidThread());
513 if (!HasClient()) 514 if (!HasClient())
514 return; 515 return;
515 output_surface_proxy_->RemoveSurface(surface_id_); 516 output_surface_proxy_->RemoveSurface(surface_id_);
516 } 517 }
517 518
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
1064 delete g_factory; 1065 delete g_factory;
1065 g_factory = NULL; 1066 g_factory = NULL;
1066 } 1067 }
1067 1068
1068 // static 1069 // static
1069 ImageTransportFactory* ImageTransportFactory::GetInstance() { 1070 ImageTransportFactory* ImageTransportFactory::GetInstance() {
1070 return g_factory; 1071 return g_factory;
1071 } 1072 }
1072 1073
1073 } // namespace content 1074 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698