third_party/WebKit/Source/core/css/CSSFontFaceSourceTest.cpp - Issue 2066323002: Remove SK_SUPPORT_LEGACY_TYPEFACE_PTR

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/css/CSSFontFaceSourceTest.cpp

Issue 2066323002: Remove SK_SUPPORT_LEGACY_TYPEFACE_PTR (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: moar Mac fixes 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:

Index: third_party/WebKit/Source/core/css/CSSFontFaceSourceTest.cpp

diff --git a/third_party/WebKit/Source/core/css/CSSFontFaceSourceTest.cpp b/third_party/WebKit/Source/core/css/CSSFontFaceSourceTest.cpp

index d5e045aa1dcf538209e929d690b3117e0961533f..4a66edeac4d9cb73e3837c8a9fe66e4194ef4987 100644

--- a/third_party/WebKit/Source/core/css/CSSFontFaceSourceTest.cpp

+++ b/third_party/WebKit/Source/core/css/CSSFontFaceSourceTest.cpp

@@ -8,6 +8,7 @@

#include "platform/fonts/FontDescription.h"

#include "platform/fonts/FontPlatformData.h"

#include "platform/fonts/SimpleFontData.h"

+#include "platform/graphics/skia/SkiaUtils.h"

#include "testing/gtest/include/gtest/gtest.h"

namespace blink {

@@ -16,7 +17,7 @@ class DummyFontFaceSource : public CSSFontFaceSource {

public:

PassRefPtr<SimpleFontData> createFontData(const FontDescription&) override

{

- return SimpleFontData::create(FontPlatformData(adoptRef(SkTypeface::RefDefault()), "", 0, false, false));

+ return SimpleFontData::create(FontPlatformData(fromSkSp(SkTypeface::MakeDefault()), "", 0, false, false));

}

DummyFontFaceSource() { }