Title: [187601] trunk/Source/WebCore
Revision
187601
Author
achristen...@apple.com
Date
2015-07-30 13:15:31 -0700 (Thu, 30 Jul 2015)

Log Message

Fix Windows build after r187587.

* loader/SubresourceLoader.h:
* loader/cache/CachedResource.h:
* platform/graphics/Font.h:
(WebCore::Font::DerivedFontData::DerivedFontData):
* rendering/RenderLayerFilterInfo.h:
Visual Studio doesn't like making std::unique_ptrs of private nested classes.
It tries to make a std::default_delete with the private class as a template parameter.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (187600 => 187601)


--- trunk/Source/WebCore/ChangeLog	2015-07-30 19:40:56 UTC (rev 187600)
+++ trunk/Source/WebCore/ChangeLog	2015-07-30 20:15:31 UTC (rev 187601)
@@ -1,3 +1,15 @@
+2015-07-30  Alex Christensen  <achristen...@webkit.org>
+
+        Fix Windows build after r187587.
+
+        * loader/SubresourceLoader.h:
+        * loader/cache/CachedResource.h:
+        * platform/graphics/Font.h:
+        (WebCore::Font::DerivedFontData::DerivedFontData):
+        * rendering/RenderLayerFilterInfo.h:
+        Visual Studio doesn't like making std::unique_ptrs of private nested classes.
+        It tries to make a std::default_delete with the private class as a template parameter.
+
 2015-07-30  Simon Fraser  <simon.fra...@apple.com>
 
         Convert Path applier to use std::function

Modified: trunk/Source/WebCore/loader/SubresourceLoader.h (187600 => 187601)


--- trunk/Source/WebCore/loader/SubresourceLoader.h	2015-07-30 19:40:56 UTC (rev 187600)
+++ trunk/Source/WebCore/loader/SubresourceLoader.h	2015-07-30 20:15:31 UTC (rev 187601)
@@ -106,7 +106,9 @@
     };
 
     class RequestCountTracker {
+#if !COMPILER(MSVC)
         WTF_MAKE_FAST_ALLOCATED;
+#endif
     public:
         RequestCountTracker(CachedResourceLoader&, CachedResource*);
         ~RequestCountTracker();

Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (187600 => 187601)


--- trunk/Source/WebCore/loader/cache/CachedResource.h	2015-07-30 19:40:56 UTC (rev 187600)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h	2015-07-30 20:15:31 UTC (rev 187601)
@@ -348,7 +348,9 @@
 };
 
 class CachedResource::Callback {
+#if !COMPILER(MSVC)
     WTF_MAKE_FAST_ALLOCATED;
+#endif
 public:
     Callback(CachedResource&, CachedResourceClient&);
 

Modified: trunk/Source/WebCore/platform/graphics/Font.h (187600 => 187601)


--- trunk/Source/WebCore/platform/graphics/Font.h	2015-07-30 19:40:56 UTC (rev 187600)
+++ trunk/Source/WebCore/platform/graphics/Font.h	2015-07-30 20:15:31 UTC (rev 187601)
@@ -267,7 +267,9 @@
     Glyph m_zeroWidthSpaceGlyph;
 
     struct DerivedFontData {
+#if !COMPILER(MSVC)
         WTF_MAKE_FAST_ALLOCATED;
+#endif
     public:
         explicit DerivedFontData(bool custom)
             : forCustomFont(custom)

Modified: trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h (187600 => 187601)


--- trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h	2015-07-30 19:40:56 UTC (rev 187600)
+++ trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h	2015-07-30 20:15:31 UTC (rev 187601)
@@ -41,7 +41,9 @@
 class Element;
 
 class RenderLayer::FilterInfo final : private CachedSVGDocumentClient {
+#if !COMPILER(MSVC)
     WTF_MAKE_FAST_ALLOCATED;
+#endif
 public:
     static FilterInfo& get(RenderLayer&);
     static FilterInfo* getIfExists(const RenderLayer&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to