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

Side by Side Diff: chromeos/display/output_configurator_unittest.cc

Issue 132983002: Replace OutputSnapshot |is_internal| with check against 'type == OUTPUT_TYPE_INTERNAL' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 11 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 (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 "chromeos/display/output_configurator.h" 5 #include "chromeos/display/output_configurator.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <cstdarg> 8 #include <cstdarg>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 383
384 OutputConfigurator::ModeInfo big_mode_info; 384 OutputConfigurator::ModeInfo big_mode_info;
385 big_mode_info.width = kBigModeWidth; 385 big_mode_info.width = kBigModeWidth;
386 big_mode_info.height = kBigModeHeight; 386 big_mode_info.height = kBigModeHeight;
387 387
388 OutputConfigurator::OutputSnapshot* o = &outputs_[0]; 388 OutputConfigurator::OutputSnapshot* o = &outputs_[0];
389 o->output = 1; 389 o->output = 1;
390 o->crtc = 10; 390 o->crtc = 10;
391 o->current_mode = kSmallModeId; 391 o->current_mode = kSmallModeId;
392 o->native_mode = kSmallModeId; 392 o->native_mode = kSmallModeId;
393 o->is_internal = true;
394 o->type = OUTPUT_TYPE_INTERNAL; 393 o->type = OUTPUT_TYPE_INTERNAL;
395 o->is_aspect_preserving_scaling = true; 394 o->is_aspect_preserving_scaling = true;
396 o->mode_infos[kSmallModeId] = small_mode_info; 395 o->mode_infos[kSmallModeId] = small_mode_info;
397 o->has_display_id = true; 396 o->has_display_id = true;
398 o->display_id = 123; 397 o->display_id = 123;
399 o->index = 0; 398 o->index = 0;
400 399
401 o = &outputs_[1]; 400 o = &outputs_[1];
402 o->output = 2; 401 o->output = 2;
403 o->crtc = 11; 402 o->crtc = 11;
404 o->current_mode = kBigModeId; 403 o->current_mode = kBigModeId;
405 o->native_mode = kBigModeId; 404 o->native_mode = kBigModeId;
406 o->is_internal = false;
407 o->type = OUTPUT_TYPE_HDMI; 405 o->type = OUTPUT_TYPE_HDMI;
408 o->is_aspect_preserving_scaling = true; 406 o->is_aspect_preserving_scaling = true;
409 o->mode_infos[kSmallModeId] = small_mode_info; 407 o->mode_infos[kSmallModeId] = small_mode_info;
410 o->mode_infos[kBigModeId] = big_mode_info; 408 o->mode_infos[kBigModeId] = big_mode_info;
411 o->has_display_id = true; 409 o->has_display_id = true;
412 o->display_id = 456; 410 o->display_id = 456;
413 o->index = 1; 411 o->index = 1;
414 412
415 UpdateOutputs(2, false); 413 UpdateOutputs(2, false);
416 } 414 }
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
1400 GetCrtcAction(outputs_[1].crtc, 0, 1398 GetCrtcAction(outputs_[1].crtc, 0,
1401 outputs_[1].mode_infos[kFirstMode].height + 1399 outputs_[1].mode_infos[kFirstMode].height +
1402 OutputConfigurator::kVerticalGap, kFirstMode + 3, 1400 OutputConfigurator::kVerticalGap, kFirstMode + 3,
1403 outputs_[1].output).c_str(), 1401 outputs_[1].output).c_str(),
1404 kUngrab, kProjectingOn, NULL), 1402 kUngrab, kProjectingOn, NULL),
1405 delegate_->GetActionsAndClear()); 1403 delegate_->GetActionsAndClear());
1406 1404
1407 } 1405 }
1408 1406
1409 } // namespace chromeos 1407 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/display/output_configurator.cc ('k') | chromeos/display/real_output_configurator_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698