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

Unified Diff: ui/ozone/platform/dri/dri_surface_factory_unittest.cc

Issue 758853005: Remove Initialize/Shutdown from DriSurfaceFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: GN Created 6 years 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 side-by-side diff with in-line comments
Download patch
Index: ui/ozone/platform/dri/dri_surface_factory_unittest.cc
diff --git a/ui/ozone/platform/dri/dri_surface_factory_unittest.cc b/ui/ozone/platform/dri/dri_surface_factory_unittest.cc
deleted file mode 100644
index afd7e48d3c5c5cb37ee9623aada7c424d31198bd..0000000000000000000000000000000000000000
--- a/ui/ozone/platform/dri/dri_surface_factory_unittest.cc
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <vector>
-
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkImageInfo.h"
-#include "ui/ozone/platform/dri/dri_buffer.h"
-#include "ui/ozone/platform/dri/dri_surface.h"
-#include "ui/ozone/platform/dri/dri_surface_factory.h"
-#include "ui/ozone/platform/dri/dri_window_delegate_impl.h"
-#include "ui/ozone/platform/dri/dri_window_delegate_manager.h"
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
-#include "ui/ozone/platform/dri/screen_manager.h"
-#include "ui/ozone/platform/dri/test/mock_dri_wrapper.h"
-#include "ui/ozone/public/surface_factory_ozone.h"
-#include "ui/ozone/public/surface_ozone_canvas.h"
-
-namespace {
-
-// Mode of size 6x4.
-const drmModeModeInfo kDefaultMode =
- {0, 6, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, {'\0'}};
-
-const uint32_t kDefaultCrtc = 1;
-const uint32_t kDefaultConnector = 2;
-
-class MockScreenManager : public ui::ScreenManager {
- public:
- MockScreenManager(ui::DriWrapper* dri,
- ui::ScanoutBufferGenerator* buffer_generator)
- : ScreenManager(dri, buffer_generator),
- dri_(dri) {}
- ~MockScreenManager() override {}
-
- // Normally we'd use DRM to figure out the controller configuration. But we
- // can't use DRM in unit tests, so we just create a fake configuration.
- void ForceInitializationOfPrimaryDisplay() override {
- ConfigureDisplayController(
- kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode);
- }
-
- private:
- ui::DriWrapper* dri_; // Not owned.
-
- DISALLOW_COPY_AND_ASSIGN(MockScreenManager);
-};
-
-} // namespace
-
-class DriSurfaceFactoryTest : public testing::Test {
- public:
- DriSurfaceFactoryTest() {}
-
- void SetUp() override;
- void TearDown() override;
-
- protected:
- scoped_ptr<base::MessageLoop> message_loop_;
- scoped_ptr<ui::MockDriWrapper> dri_;
- scoped_ptr<ui::DriBufferGenerator> buffer_generator_;
- scoped_ptr<MockScreenManager> screen_manager_;
- scoped_ptr<ui::DriSurfaceFactory> factory_;
- scoped_ptr<ui::DriWindowDelegateManager> window_delegate_manager_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DriSurfaceFactoryTest);
-};
-
-void DriSurfaceFactoryTest::SetUp() {
- message_loop_.reset(new base::MessageLoopForUI);
- dri_.reset(new ui::MockDriWrapper(3));
- buffer_generator_.reset(new ui::DriBufferGenerator(dri_.get()));
- screen_manager_.reset(new MockScreenManager(dri_.get(),
- buffer_generator_.get()));
- window_delegate_manager_.reset(new ui::DriWindowDelegateManager());
- factory_.reset(
- new ui::DriSurfaceFactory(dri_.get(), window_delegate_manager_.get()));
-
- scoped_ptr<ui::DriWindowDelegate> window_delegate(
- new ui::DriWindowDelegateImpl(ui::DriSurfaceFactory::kDefaultWidgetHandle,
- dri_.get(), window_delegate_manager_.get(),
- screen_manager_.get()));
- window_delegate->Initialize();
- window_delegate_manager_->AddWindowDelegate(
- ui::DriSurfaceFactory::kDefaultWidgetHandle, window_delegate.Pass());
-}
-
-void DriSurfaceFactoryTest::TearDown() {
- scoped_ptr<ui::DriWindowDelegate> delegate =
- window_delegate_manager_->RemoveWindowDelegate(
- ui::DriSurfaceFactory::kDefaultWidgetHandle);
- delegate->Shutdown();
- factory_.reset();
- message_loop_.reset();
-}
-
-TEST_F(DriSurfaceFactoryTest, FailInitialization) {
- dri_->fail_init();
- EXPECT_EQ(ui::DriSurfaceFactory::FAILED, factory_->InitializeHardware());
-}
-
-TEST_F(DriSurfaceFactoryTest, SuccessfulInitialization) {
- EXPECT_EQ(ui::DriSurfaceFactory::INITIALIZED,
- factory_->InitializeHardware());
-}
-
-TEST_F(DriSurfaceFactoryTest, SuccessfulWidgetRealization) {
- EXPECT_EQ(ui::DriSurfaceFactory::INITIALIZED,
- factory_->InitializeHardware());
-
- EXPECT_TRUE(factory_->CreateCanvasForWidget(
- ui::DriSurfaceFactory::kDefaultWidgetHandle));
-}
« no previous file with comments | « ui/ozone/platform/dri/dri_surface_factory.cc ('k') | ui/ozone/platform/dri/dri_window_delegate_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698