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

Side by Side Diff: ui/gfx/font_render_params_linux_unittest.cc

Issue 2031223003: Support underline on Linux again. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed the gtk2_ui as well. Created 4 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
« no previous file with comments | « ui/gfx/font_list_unittest.cc ('k') | ui/gfx/linux_font_delegate.h » ('j') | 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 "ui/gfx/font_render_params.h" 5 #include "ui/gfx/font_render_params.h"
6 6
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 13 matching lines...) Expand all
24 TestFontDelegate() {} 24 TestFontDelegate() {}
25 ~TestFontDelegate() override {} 25 ~TestFontDelegate() override {}
26 26
27 void set_params(const FontRenderParams& params) { params_ = params; } 27 void set_params(const FontRenderParams& params) { params_ = params; }
28 28
29 FontRenderParams GetDefaultFontRenderParams() const override { 29 FontRenderParams GetDefaultFontRenderParams() const override {
30 return params_; 30 return params_;
31 } 31 }
32 void GetDefaultFontDescription(std::string* family_out, 32 void GetDefaultFontDescription(std::string* family_out,
33 int* size_pixels_out, 33 int* size_pixels_out,
34 bool* italic_out, 34 int* style_out,
35 Font::Weight* weight_out, 35 Font::Weight* weight_out,
36 FontRenderParams* params_out) const override { 36 FontRenderParams* params_out) const override {
37 NOTIMPLEMENTED(); 37 NOTIMPLEMENTED();
38 } 38 }
39 39
40 private: 40 private:
41 FontRenderParams params_; 41 FontRenderParams params_;
42 42
43 DISALLOW_COPY_AND_ASSIGN(TestFontDelegate); 43 DISALLOW_COPY_AND_ASSIGN(TestFontDelegate);
44 }; 44 };
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 EXPECT_EQ("Verdana", suggested_family); 379 EXPECT_EQ("Verdana", suggested_family);
380 380
381 query.families.clear(); 381 query.families.clear();
382 query.families.push_back("Arial"); 382 query.families.push_back("Arial");
383 suggested_family.clear(); 383 suggested_family.clear();
384 GetFontRenderParams(query, &suggested_family); 384 GetFontRenderParams(query, &suggested_family);
385 EXPECT_EQ("Verdana", suggested_family); 385 EXPECT_EQ("Verdana", suggested_family);
386 } 386 }
387 387
388 } // namespace gfx 388 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/font_list_unittest.cc ('k') | ui/gfx/linux_font_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698