Title: [135583] trunk/Source/WebCore
- Revision
- 135583
- Author
- [email protected]
- Date
- 2012-11-23 03:22:39 -0800 (Fri, 23 Nov 2012)
Log Message
REGRESSION (r135455): Compilation without SVG enabled broken
https://bugs.webkit.org/show_bug.cgi?id=103108
Reviewed by Yury Semikhatsky.
Move SVG-only code behind #if ENABLE(SVG) that was accidentially moved
outside of the #if block during the refactoring.
* platform/graphics/filters/FilterOperation.h:
(ReferenceFilterOperation):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135582 => 135583)
--- trunk/Source/WebCore/ChangeLog 2012-11-23 11:17:50 UTC (rev 135582)
+++ trunk/Source/WebCore/ChangeLog 2012-11-23 11:22:39 UTC (rev 135583)
@@ -1,3 +1,16 @@
+2012-11-23 Jochen Eisinger <[email protected]>
+
+ REGRESSION (r135455): Compilation without SVG enabled broken
+ https://bugs.webkit.org/show_bug.cgi?id=103108
+
+ Reviewed by Yury Semikhatsky.
+
+ Move SVG-only code behind #if ENABLE(SVG) that was accidentially moved
+ outside of the #if block during the refactoring.
+
+ * platform/graphics/filters/FilterOperation.h:
+ (ReferenceFilterOperation):
+
2012-11-23 Julian Pastarmov <[email protected]>
REGRESSION (r128633): td changes size during re-layout of table although it shouldn't
Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h (135582 => 135583)
--- trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2012-11-23 11:17:50 UTC (rev 135582)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2012-11-23 11:22:39 UTC (rev 135583)
@@ -28,7 +28,6 @@
#if ENABLE(CSS_FILTERS)
-#include "CachedSVGDocumentReference.h"
#include "Color.h"
#include "FilterEffect.h"
#include "LayoutSize.h"
@@ -42,6 +41,10 @@
#include <wtf/ThreadSafeRefCounted.h>
#endif
+#if ENABLE(SVG)
+#include "CachedSVGDocumentReference.h"
+#endif
+
// Annoyingly, wingdi.h #defines this.
#ifdef PASSTHROUGH
#undef PASSTHROUGH
@@ -170,8 +173,10 @@
const String& url() const { return m_url; }
const String& fragment() const { return m_fragment; }
+#if ENABLE(SVG)
CachedSVGDocumentReference* cachedSVGDocumentReference() const { return m_cachedSVGDocumentReference.get(); }
void setCachedSVGDocumentReference(PassOwnPtr<CachedSVGDocumentReference> cachedSVGDocumentReference) { m_cachedSVGDocumentReference = cachedSVGDocumentReference; }
+#endif
FilterEffect* filterEffect() const { return m_filterEffect.get(); }
void setFilterEffect(PassRefPtr<FilterEffect> filterEffect) { m_filterEffect = filterEffect; }
@@ -195,7 +200,9 @@
String m_url;
String m_fragment;
+#if ENABLE(SVG)
OwnPtr<CachedSVGDocumentReference> m_cachedSVGDocumentReference;
+#endif
RefPtr<FilterEffect> m_filterEffect;
};
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
