<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[200104] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/200104">200104</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-04-26 12:49:19 -0700 (Tue, 26 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use auto-generated operators in FontPlatformData
https://bugs.webkit.org/show_bug.cgi?id=157037
Reviewed by Geoffrey Garen.
The only reason why they weren't used before is because Cairo was
using a raw pointer. However, RefPtr supports Cairo types, so this
patch migrates that pointer to a RefPtr. Therefore, we can remove
our custom operators (because they work the same way as auto-
generated ones do).
No new tests because there is no behavior change.
* platform/graphics/FontPlatformData.cpp:
(WebCore::FontPlatformData::FontPlatformData): Deleted.
(WebCore::FontPlatformData::operator=): Deleted.
* platform/graphics/FontPlatformData.h:
(WebCore::FontPlatformData::scaledFont):
(WebCore::FontPlatformData::hash):
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
(WebCore::FontPlatformData::~FontPlatformData): Deleted.
(WebCore::FontPlatformData::platformDataInit): Deleted.
(WebCore::FontPlatformData::platformDataAssign): Deleted.
* platform/graphics/win/FontPlatformDataCGWin.cpp:
(WebCore::FontPlatformData::~FontPlatformData): Deleted.
(WebCore::FontPlatformData::platformDataInit): Deleted.
(WebCore::FontPlatformData::platformDataAssign): Deleted.
* platform/graphics/win/FontPlatformDataCairoWin.cpp:
(WebCore::FontPlatformData::platformDataInit):
(WebCore::FontPlatformData::FontPlatformData):
(WebCore::FontPlatformData::~FontPlatformData): Deleted.
(WebCore::FontPlatformData::platformDataAssign): Deleted.
* platform/graphics/win/FontPlatformDataWin.cpp:
(WebCore::FontPlatformData::FontPlatformData): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontPlatformDatacpp">trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontPlatformDatah">trunk/Source/WebCore/platform/graphics/FontPlatformData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontPlatformDataCGWincpp">trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontPlatformDataCairoWincpp">trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontPlatformDataWincpp">trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200103 => 200104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-26 19:07:14 UTC (rev 200103)
+++ trunk/Source/WebCore/ChangeLog 2016-04-26 19:49:19 UTC (rev 200104)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-04-26 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Use auto-generated operators in FontPlatformData
+ https://bugs.webkit.org/show_bug.cgi?id=157037
+
+ Reviewed by Geoffrey Garen.
+
+ The only reason why they weren't used before is because Cairo was
+ using a raw pointer. However, RefPtr supports Cairo types, so this
+ patch migrates that pointer to a RefPtr. Therefore, we can remove
+ our custom operators (because they work the same way as auto-
+ generated ones do).
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/FontPlatformData.cpp:
+ (WebCore::FontPlatformData::FontPlatformData): Deleted.
+ (WebCore::FontPlatformData::operator=): Deleted.
+ * platform/graphics/FontPlatformData.h:
+ (WebCore::FontPlatformData::scaledFont):
+ (WebCore::FontPlatformData::hash):
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ (WebCore::FontPlatformData::~FontPlatformData): Deleted.
+ (WebCore::FontPlatformData::platformDataInit): Deleted.
+ (WebCore::FontPlatformData::platformDataAssign): Deleted.
+ * platform/graphics/win/FontPlatformDataCGWin.cpp:
+ (WebCore::FontPlatformData::~FontPlatformData): Deleted.
+ (WebCore::FontPlatformData::platformDataInit): Deleted.
+ (WebCore::FontPlatformData::platformDataAssign): Deleted.
+ * platform/graphics/win/FontPlatformDataCairoWin.cpp:
+ (WebCore::FontPlatformData::platformDataInit):
+ (WebCore::FontPlatformData::FontPlatformData):
+ (WebCore::FontPlatformData::~FontPlatformData): Deleted.
+ (WebCore::FontPlatformData::platformDataAssign): Deleted.
+ * platform/graphics/win/FontPlatformDataWin.cpp:
+ (WebCore::FontPlatformData::FontPlatformData): Deleted.
+
</ins><span class="cx"> 2016-04-26 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Add renderer address and needslayout state to inlineboxtree dump.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontPlatformDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp (200103 => 200104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp 2016-04-26 19:07:14 UTC (rev 200103)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp 2016-04-26 19:49:19 UTC (rev 200104)
</span><span class="lines">@@ -62,15 +62,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-FontPlatformData::FontPlatformData(const FontPlatformData& source)
- : FontPlatformData(source.m_size, source.m_syntheticBold, source.m_syntheticOblique, source.m_orientation, source.m_widthVariant, source.m_textRenderingMode)
-{
- m_isHashTableDeletedValue = source.m_isHashTableDeletedValue;
- m_isColorBitmapFont = source.m_isColorBitmapFont;
- m_isSystemFont = source.m_isSystemFont;
- platformDataInit(source);
-}
-
</del><span class="cx"> FontPlatformData FontPlatformData::cloneWithOrientation(const FontPlatformData& source, FontOrientation orientation)
</span><span class="cx"> {
</span><span class="cx"> FontPlatformData copy(source);
</span><span class="lines">@@ -92,23 +83,4 @@
</span><span class="cx"> return copy;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const FontPlatformData& FontPlatformData::operator=(const FontPlatformData& other)
-{
- // Check for self-assignment.
- if (this == &other)
- return *this;
-
- m_isHashTableDeletedValue = other.m_isHashTableDeletedValue;
- m_syntheticBold = other.m_syntheticBold;
- m_syntheticOblique = other.m_syntheticOblique;
- m_orientation = other.m_orientation;
- m_size = other.m_size;
- m_widthVariant = other.m_widthVariant;
- m_isColorBitmapFont = other.m_isColorBitmapFont;
- m_textRenderingMode = other.m_textRenderingMode;
- m_isSystemFont = other.m_isSystemFont;
-
- return platformDataAssign(other);
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontPlatformDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (200103 => 200104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2016-04-26 19:07:14 UTC (rev 200103)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2016-04-26 19:49:19 UTC (rev 200104)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(CAIRO)
</span><ins>+#include "RefPtrCairo.h"
</ins><span class="cx"> #include <wtf/HashFunctions.h>
</span><span class="cx"> #include <cairo.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -80,7 +81,8 @@
</span><span class="cx"> public:
</span><span class="cx"> FontPlatformData(WTF::HashTableDeletedValueType);
</span><span class="cx"> FontPlatformData();
</span><del>- FontPlatformData(const FontPlatformData&);
</del><ins>+ FontPlatformData(const FontPlatformData&) = default;
+ FontPlatformData(FontPlatformData&&) = default;
</ins><span class="cx"> FontPlatformData(const FontDescription&, const AtomicString& family);
</span><span class="cx"> FontPlatformData(float size, bool syntheticBold, bool syntheticOblique, FontOrientation = Horizontal, FontWidthVariant = RegularWidth, TextRenderingMode = AutoTextRendering);
</span><span class="cx">
</span><span class="lines">@@ -106,8 +108,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- WEBCORE_EXPORT ~FontPlatformData();
-
</del><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> HFONT hfont() const { return m_font ? m_font->get() : 0; }
</span><span class="cx"> bool useGDI() const { return m_useGDI; }
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> bool isForTextCombine() const { return widthVariant() != RegularWidth; } // Keep in sync with callers of FontDescription::setWidthVariant().
</span><span class="cx">
</span><span class="cx"> #if USE(CAIRO)
</span><del>- cairo_scaled_font_t* scaledFont() const { return m_scaledFont; }
</del><ins>+ cairo_scaled_font_t* scaledFont() const { return m_scaledFont.get(); }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> unsigned hash() const
</span><span class="lines">@@ -163,11 +163,11 @@
</span><span class="cx"> uintptr_t hashCodes[3] = { fontHash, m_widthVariant, flags };
</span><span class="cx"> return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
</span><span class="cx"> #elif USE(CAIRO)
</span><del>- return PtrHash<cairo_scaled_font_t*>::hash(m_scaledFont);
</del><ins>+ return PtrHash<cairo_scaled_font_t*>::hash(m_scaledFont.get());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const FontPlatformData& operator=(const FontPlatformData&);
</del><ins>+ FontPlatformData& operator=(const FontPlatformData&) = default;
</ins><span class="cx">
</span><span class="cx"> bool operator==(const FontPlatformData& other) const
</span><span class="cx"> {
</span><span class="lines">@@ -206,8 +206,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool platformIsEqual(const FontPlatformData&) const;
</span><del>- void platformDataInit(const FontPlatformData&);
- const FontPlatformData& platformDataAssign(const FontPlatformData&);
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> CGFloat ctFontSize() const;
</span><span class="cx"> #endif
</span><span class="lines">@@ -227,7 +225,7 @@
</span><span class="cx"> RetainPtr<CGFontRef> m_cgFont;
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(CAIRO)
</span><del>- cairo_scaled_font_t* m_scaledFont { nullptr };
</del><ins>+ RefPtr<cairo_scaled_font_t> m_scaledFont;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // The values below are common to all ports
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (200103 => 200104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2016-04-26 19:07:14 UTC (rev 200103)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2016-04-26 19:49:19 UTC (rev 200104)
</span><span class="lines">@@ -54,37 +54,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FontPlatformData::~FontPlatformData()
-{
-}
-
-void FontPlatformData::platformDataInit(const FontPlatformData& f)
-{
- m_font = f.m_font;
-
- m_cgFont = f.m_cgFont;
- m_ctFont = f.m_ctFont;
-
-#if PLATFORM(IOS)
- m_isEmoji = f.m_isEmoji;
-#endif
-}
-
-const FontPlatformData& FontPlatformData::platformDataAssign(const FontPlatformData& f)
-{
- m_cgFont = f.m_cgFont;
- if (m_font && f.m_font && CFEqual(m_font.get(), f.m_font.get()))
- return *this;
- m_font = f.m_font;
- m_ctFont = f.m_ctFont;
-
-#if PLATFORM(IOS)
- m_isEmoji = f.m_isEmoji;
-#endif
-
- return *this;
-}
-
</del><span class="cx"> bool FontPlatformData::platformIsEqual(const FontPlatformData& other) const
</span><span class="cx"> {
</span><span class="cx"> bool result = false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontPlatformDataCGWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp (200103 => 200104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp 2016-04-26 19:07:14 UTC (rev 200103)
+++ trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp 2016-04-26 19:49:19 UTC (rev 200104)
</span><span class="lines">@@ -130,26 +130,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FontPlatformData::~FontPlatformData()
-{
-}
-
-void FontPlatformData::platformDataInit(const FontPlatformData& source)
-{
- m_font = source.m_font;
- m_cgFont = source.m_cgFont;
- m_useGDI = source.m_useGDI;
-}
-
-const FontPlatformData& FontPlatformData::platformDataAssign(const FontPlatformData& other)
-{
- m_font = other.m_font;
- m_cgFont = other.m_cgFont;
- m_useGDI = other.m_useGDI;
-
- return *this;
-}
-
</del><span class="cx"> bool FontPlatformData::platformIsEqual(const FontPlatformData& other) const
</span><span class="cx"> {
</span><span class="cx"> return m_font == other.m_font
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontPlatformDataCairoWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp (200103 => 200104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp 2016-04-26 19:07:14 UTC (rev 200103)
+++ trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp 2016-04-26 19:49:19 UTC (rev 200104)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> cairo_font_options_set_antialias(fontOptions, CAIRO_ANTIALIAS_SUBPIXEL);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_scaledFont = cairo_scaled_font_create(fontFace, &sizeMatrix, &ctm, fontOptions);
</del><ins>+ m_scaledFont = adoptRef(cairo_scaled_font_create(fontFace, &sizeMatrix, &ctm, fontOptions));
</ins><span class="cx"> cairo_font_face_destroy(fontFace);
</span><span class="cx">
</span><span class="cx"> if (!m_useGDI && m_size)
</span><span class="lines">@@ -64,22 +64,21 @@
</span><span class="cx"> , m_size(size)
</span><span class="cx"> , m_orientation(Horizontal)
</span><span class="cx"> , m_widthVariant(RegularWidth)
</span><del>- , m_scaledFont(0)
</del><span class="cx"> , m_isColorBitmapFont(false)
</span><span class="cx"> , m_syntheticBold(bold)
</span><span class="cx"> , m_syntheticOblique(oblique)
</span><span class="cx"> , m_useGDI(false)
</span><span class="cx"> {
</span><del>- cairo_matrix_t fontMatrix;
- cairo_matrix_init_scale(&fontMatrix, size, size);
- cairo_matrix_t ctm;
- cairo_matrix_init_identity(&ctm);
- cairo_font_options_t* options = cairo_font_options_create();
</del><ins>+ cairo_matrix_t fontMatrix;
+ cairo_matrix_init_scale(&fontMatrix, size, size);
+ cairo_matrix_t ctm;
+ cairo_matrix_init_identity(&ctm);
+ cairo_font_options_t* options = cairo_font_options_create();
</ins><span class="cx">
</span><del>- // We force antialiasing and disable hinting to provide consistent
- // typographic qualities for custom fonts on all platforms.
- cairo_font_options_set_hint_style(options, CAIRO_HINT_STYLE_NONE);
- cairo_font_options_set_antialias(options, CAIRO_ANTIALIAS_BEST);
</del><ins>+ // We force antialiasing and disable hinting to provide consistent
+ // typographic qualities for custom fonts on all platforms.
+ cairo_font_options_set_hint_style(options, CAIRO_HINT_STYLE_NONE);
+ cairo_font_options_set_antialias(options, CAIRO_ANTIALIAS_BEST);
</ins><span class="cx">
</span><span class="cx"> if (syntheticOblique()) {
</span><span class="cx"> static const float syntheticObliqueSkew = -tanf(14 * acosf(0) / 90);
</span><span class="lines">@@ -87,39 +86,10 @@
</span><span class="cx"> cairo_matrix_multiply(&fontMatrix, &skew, &fontMatrix);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_scaledFont = cairo_scaled_font_create(fontFace, &fontMatrix, &ctm, options);
- cairo_font_options_destroy(options);
</del><ins>+ m_scaledFont = adoptRef(cairo_scaled_font_create(fontFace, &fontMatrix, &ctm, options));
+ cairo_font_options_destroy(options);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-FontPlatformData::~FontPlatformData()
-{
- if (m_scaledFont)
- cairo_scaled_font_destroy(m_scaledFont);
-}
-
-void FontPlatformData::platformDataInit(const FontPlatformData& source)
-{
- m_font = source.m_font;
- m_useGDI = source.m_useGDI;
- m_scaledFont = nullptr;
-
- if (source.m_scaledFont)
- m_scaledFont = cairo_scaled_font_reference(source.m_scaledFont);
-}
-
-const FontPlatformData& FontPlatformData::platformDataAssign(const FontPlatformData& other)
-{
- m_font = other.m_font;
- m_useGDI = other.m_useGDI;
-
- if (m_scaledFont)
- cairo_scaled_font_destroy(m_scaledFont);
-
- m_scaledFont = cairo_scaled_font_reference(other.m_scaledFont);
-
- return *this;
-}
-
</del><span class="cx"> bool FontPlatformData::platformIsEqual(const FontPlatformData& other) const
</span><span class="cx"> {
</span><span class="cx"> return m_font == other.m_font
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontPlatformDataWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp (200103 => 200104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp 2016-04-26 19:07:14 UTC (rev 200103)
+++ trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp 2016-04-26 19:49:19 UTC (rev 200104)
</span><span class="lines">@@ -42,11 +42,6 @@
</span><span class="cx"> , m_size(size)
</span><span class="cx"> , m_orientation(Horizontal)
</span><span class="cx"> , m_widthVariant(RegularWidth)
</span><del>-#if USE(CG)
- , m_cgFont(0)
-#elif USE(CAIRO)
- , m_scaledFont(0)
-#endif
</del><span class="cx"> , m_isColorBitmapFont(false)
</span><span class="cx"> , m_syntheticBold(bold)
</span><span class="cx"> , m_syntheticOblique(oblique)
</span></span></pre>
</div>
</div>
</body>
</html>