Title: [149345] trunk/Source/WebCore
- Revision
- 149345
- Author
- [email protected]
- Date
- 2013-04-29 18:44:29 -0700 (Mon, 29 Apr 2013)
Log Message
Fix build.
* platform/graphics/SimpleFontData.cpp:
(WebCore::SimpleFontData::DerivedFontData::~DerivedFontData):
* platform/graphics/mac/SimpleFontDataMac.mm:
(WebCore::SimpleFontData::getCompositeFontReferenceFontData):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149344 => 149345)
--- trunk/Source/WebCore/ChangeLog 2013-04-30 01:22:32 UTC (rev 149344)
+++ trunk/Source/WebCore/ChangeLog 2013-04-30 01:44:29 UTC (rev 149345)
@@ -1,3 +1,12 @@
+2013-04-29 Anders Carlsson <[email protected]>
+
+ Fix build.
+
+ * platform/graphics/SimpleFontData.cpp:
+ (WebCore::SimpleFontData::DerivedFontData::~DerivedFontData):
+ * platform/graphics/mac/SimpleFontDataMac.mm:
+ (WebCore::SimpleFontData::getCompositeFontReferenceFontData):
+
2013-04-29 Simon Fraser <[email protected]>
Don't do CGContext flipping when painting subframes in WebKit1 on post-MountainLion OSes
Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp (149344 => 149345)
--- trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp 2013-04-30 01:22:32 UTC (rev 149344)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp 2013-04-30 01:44:29 UTC (rev 149345)
@@ -271,7 +271,7 @@
SimpleFontData** fonts = stash.data();
CFDictionaryGetKeysAndValues(dictionary, 0, (const void **)fonts);
while (count-- > 0 && *fonts) {
- OwnPtr<SimpleFontData> afont = adoptPtr(*fonts++);
+ RefPtr<SimpleFontData> afont = adoptRef(*fonts++);
GlyphPageTreeNode::pruneTreeCustomFontData(afont.get());
}
}
Modified: trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm (149344 => 149345)
--- trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2013-04-30 01:22:32 UTC (rev 149344)
+++ trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2013-04-30 01:44:29 UTC (rev 149345)
@@ -100,10 +100,10 @@
bool syntheticOblique = platformData().syntheticOblique() && !(traits & kCTFontItalicTrait);
FontPlatformData substitutePlatform(substituteFont, platformData().size(), isUsingPrinterFont, syntheticBold, syntheticOblique, platformData().orientation(), platformData().widthVariant());
- SimpleFontData* value = new SimpleFontData(substitutePlatform, isCustomFont());
- if (value) {
- CFDictionaryAddValue(dictionary, key, value);
- return value;
+ if (RefPtr<SimpleFontData> value = adoptRef(new SimpleFontData(substitutePlatform, isCustomFont()))) {
+ SimpleFontData* valuePtr = value.get();
+ CFDictionaryAddValue(dictionary, key, value.release().leakRef());
+ return valuePtr;
}
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
