third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp - Issue 2050123002: Remove OwnPtr from Blink.

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/platform/fonts/FontCustomPlatformData.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: First attempt to land. 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.h ('k') | third_party/WebKit/Source/platform/fonts/GlyphMetricsMap.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp

diff --git a/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp b/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp

index 5b80c62a6e485f9da6aee3476525e39a3e06428c..c38d495fb0f6809f566002237f28cbc670b137f4 100644

--- a/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp

+++ b/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp

@@ -39,7 +39,8 @@

#include "platform/fonts/WebFontDecoder.h"

#include "third_party/skia/include/core/SkStream.h"

#include "third_party/skia/include/core/SkTypeface.h"

-#include "wtf/PassOwnPtr.h"

+#include "wtf/PtrUtil.h"

+#include <memory>

namespace blink {

@@ -56,7 +57,7 @@ FontPlatformData FontCustomPlatformData::fontPlatformData(float size, bool bold,

return FontPlatformData(m_typeface.get(), "", size, bold && !m_typeface->isBold(), italic && !m_typeface->isItalic(), orientation);

}

-PassOwnPtr<FontCustomPlatformData> FontCustomPlatformData::create(SharedBuffer* buffer, String& otsParseMessage)

+std::unique_ptr<FontCustomPlatformData> FontCustomPlatformData::create(SharedBuffer* buffer, String& otsParseMessage)

{

DCHECK(buffer);

WebFontDecoder decoder;

@@ -65,7 +66,7 @@ PassOwnPtr<FontCustomPlatformData> FontCustomPlatformData::create(SharedBuffer*

otsParseMessage = decoder.getErrorString();

return nullptr;

}

- return adoptPtr(new FontCustomPlatformData(typeface.release()));

+ return wrapUnique(new FontCustomPlatformData(typeface.release()));

}

bool FontCustomPlatformData::supportsFormat(const String& format)