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

Side by Side Diff: ui/ozone/platform/dri/dri_window_delegate_impl_unittest.cc

Issue 937793002: [Ozone-Dri] Remove unneeded param to DriWindowDelegateImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « ui/ozone/platform/dri/dri_window_delegate_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <vector> 5 #include <vector>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "third_party/skia/include/core/SkCanvas.h" 10 #include "third_party/skia/include/core/SkCanvas.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 buffer_generator_.reset(new ui::DriBufferGenerator()); 59 buffer_generator_.reset(new ui::DriBufferGenerator());
60 screen_manager_.reset(new ui::ScreenManager(buffer_generator_.get())); 60 screen_manager_.reset(new ui::ScreenManager(buffer_generator_.get()));
61 screen_manager_->AddDisplayController(dri_, kDefaultCrtc, kDefaultConnector); 61 screen_manager_->AddDisplayController(dri_, kDefaultCrtc, kDefaultConnector);
62 screen_manager_->ConfigureDisplayController( 62 screen_manager_->ConfigureDisplayController(
63 dri_, kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode); 63 dri_, kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode);
64 64
65 drm_device_manager_.reset(new ui::DrmDeviceManager(dri_)); 65 drm_device_manager_.reset(new ui::DrmDeviceManager(dri_));
66 window_delegate_manager_.reset(new ui::DriWindowDelegateManager()); 66 window_delegate_manager_.reset(new ui::DriWindowDelegateManager());
67 67
68 scoped_ptr<ui::DriWindowDelegate> window_delegate( 68 scoped_ptr<ui::DriWindowDelegate> window_delegate(
69 new ui::DriWindowDelegateImpl( 69 new ui::DriWindowDelegateImpl(kDefaultWidgetHandle,
70 kDefaultWidgetHandle, drm_device_manager_.get(), 70 drm_device_manager_.get(),
71 window_delegate_manager_.get(), screen_manager_.get())); 71 screen_manager_.get()));
72 window_delegate->Initialize(); 72 window_delegate->Initialize();
73 window_delegate_manager_->AddWindowDelegate(kDefaultWidgetHandle, 73 window_delegate_manager_->AddWindowDelegate(kDefaultWidgetHandle,
74 window_delegate.Pass()); 74 window_delegate.Pass());
75 } 75 }
76 76
77 void DriWindowDelegateImplTest::TearDown() { 77 void DriWindowDelegateImplTest::TearDown() {
78 scoped_ptr<ui::DriWindowDelegate> delegate = 78 scoped_ptr<ui::DriWindowDelegate> delegate =
79 window_delegate_manager_->RemoveWindowDelegate(kDefaultWidgetHandle); 79 window_delegate_manager_->RemoveWindowDelegate(kDefaultWidgetHandle);
80 delegate->Shutdown(); 80 delegate->Shutdown();
81 message_loop_.reset(); 81 message_loop_.reset();
(...skipping 30 matching lines...) Expand all
112 for (int i = 0; i < cursor.height(); ++i) { 112 for (int i = 0; i < cursor.height(); ++i) {
113 for (int j = 0; j < cursor.width(); ++j) { 113 for (int j = 0; j < cursor.width(); ++j) {
114 if (j < info.width() && i < info.height()) 114 if (j < info.width() && i < info.height())
115 EXPECT_EQ(SK_ColorWHITE, cursor.getColor(j, i)); 115 EXPECT_EQ(SK_ColorWHITE, cursor.getColor(j, i));
116 else 116 else
117 EXPECT_EQ(static_cast<SkColor>(SK_ColorTRANSPARENT), 117 EXPECT_EQ(static_cast<SkColor>(SK_ColorTRANSPARENT),
118 cursor.getColor(j, i)); 118 cursor.getColor(j, i));
119 } 119 }
120 } 120 }
121 } 121 }
OLDNEW
« no previous file with comments | « ui/ozone/platform/dri/dri_window_delegate_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698