Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp - Issue 546973004: Revert 181541 "Merge FontPlatformDataHarfBuzz and FontPlatformData headers"

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: Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp

Issue 546973004: Revert 181541 "Merge FontPlatformDataHarfBuzz and FontPlatformData headers" (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 3 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 | « Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.h ('k') | Source/platform/fonts/harfbuzz/HarfBuzzFaceCoreText.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp

diff --git a/Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp b/Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp

index e1ed13a6dad30dd1ced0959e89574bc981191761..5b99405d2f5ed948a5e6d983b6ba6d2e7bdf00fc 100644

--- a/Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp

+++ b/Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp

@@ -29,7 +29,7 @@

#include "config.h"

-#include "platform/fonts/FontPlatformData.h"

+#include "platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.h"

#include "SkTypeface.h"

#include "platform/fonts/harfbuzz/HarfBuzzFace.h"

@@ -148,7 +148,7 @@ FontPlatformData::~FontPlatformData()

{

}

-const FontPlatformData& FontPlatformData::operator=(const FontPlatformData& src)

+FontPlatformData& FontPlatformData::operator=(const FontPlatformData& src)

{

m_typeface = src.m_typeface;

#if !OS(WIN)

@@ -218,11 +218,6 @@ bool FontPlatformData::isFixedPitch() const

return typeface() && typeface()->isFixedPitch();

}

-SkTypeface* FontPlatformData::typeface() const

- return m_typeface.get();

HarfBuzzFace* FontPlatformData::harfBuzzFace() const

{

if (!m_harfBuzzFace)