Title: [188389] trunk/Source
- Revision
- 188389
- Author
- [email protected]
- Date
- 2015-08-13 12:08:42 -0700 (Thu, 13 Aug 2015)
Log Message
FilterOperation.h should not include FilterEffect.h
https://bugs.webkit.org/show_bug.cgi?id=147970
Reviewed by Daniel Bates.
FilterEffect.h pulls in lots of JSC goop via runtime/Uint8ClampedArray.h,
so move its include to FilterOperation.cpp.
Causes include bloat because FilterOperation.h is pulled in via RenderStyle.h.
Source/WebCore:
* platform/graphics/filters/FilterOperation.cpp:
(WebCore::ReferenceFilterOperation::setFilterEffect):
* platform/graphics/filters/FilterOperation.h:
(WebCore::ReferenceFilterOperation::setFilterEffect): Deleted.
Source/WebKit2:
* UIProcess/ios/WebVideoFullscreenManagerProxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (188388 => 188389)
--- trunk/Source/WebCore/ChangeLog 2015-08-13 19:08:37 UTC (rev 188388)
+++ trunk/Source/WebCore/ChangeLog 2015-08-13 19:08:42 UTC (rev 188389)
@@ -1,5 +1,22 @@
2015-08-13 Simon Fraser <[email protected]>
+ FilterOperation.h should not include FilterEffect.h
+ https://bugs.webkit.org/show_bug.cgi?id=147970
+
+ Reviewed by Daniel Bates.
+
+ FilterEffect.h pulls in lots of JSC goop via runtime/Uint8ClampedArray.h,
+ so move its include to FilterOperation.cpp.
+
+ Causes include bloat because FilterOperation.h is pulled in via RenderStyle.h.
+
+ * platform/graphics/filters/FilterOperation.cpp:
+ (WebCore::ReferenceFilterOperation::setFilterEffect):
+ * platform/graphics/filters/FilterOperation.h:
+ (WebCore::ReferenceFilterOperation::setFilterEffect): Deleted.
+
+2015-08-13 Simon Fraser <[email protected]>
+
ScriptExecutionContext.h pulls in all the JSC headers
https://bugs.webkit.org/show_bug.cgi?id=147969
Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperation.cpp (188388 => 188389)
--- trunk/Source/WebCore/platform/graphics/filters/FilterOperation.cpp 2015-08-13 19:08:37 UTC (rev 188388)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperation.cpp 2015-08-13 19:08:42 UTC (rev 188389)
@@ -28,6 +28,7 @@
#include "AnimationUtilities.h"
#include "CachedSVGDocumentReference.h"
+#include "FilterEffect.h"
namespace WebCore {
@@ -65,6 +66,11 @@
return m_cachedSVGDocumentReference.get();
}
+void ReferenceFilterOperation::setFilterEffect(PassRefPtr<FilterEffect> filterEffect)
+{
+ m_filterEffect = filterEffect;
+}
+
PassRefPtr<FilterOperation> BasicColorMatrixFilterOperation::blend(const FilterOperation* from, double progress, bool blendToPassthrough)
{
if (from && !from->isSameType(*this))
Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h (188388 => 188389)
--- trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2015-08-13 19:08:37 UTC (rev 188388)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2015-08-13 19:08:42 UTC (rev 188389)
@@ -27,7 +27,6 @@
#define FilterOperation_h
#include "Color.h"
-#include "FilterEffect.h"
#include "LayoutSize.h"
#include "Length.h"
#include <wtf/RefCounted.h>
@@ -44,6 +43,7 @@
// CSS Filters
class CachedSVGDocumentReference;
+class FilterEffect;
class FilterOperation : public RefCounted<FilterOperation> {
public:
@@ -188,7 +188,7 @@
CachedSVGDocumentReference* getOrCreateCachedSVGDocumentReference();
FilterEffect* filterEffect() const { return m_filterEffect.get(); }
- void setFilterEffect(PassRefPtr<FilterEffect> filterEffect) { m_filterEffect = filterEffect; }
+ void setFilterEffect(PassRefPtr<FilterEffect>);
private:
ReferenceFilterOperation(const String& url, const String& fragment);
Modified: trunk/Source/WebKit2/ChangeLog (188388 => 188389)
--- trunk/Source/WebKit2/ChangeLog 2015-08-13 19:08:37 UTC (rev 188388)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-13 19:08:42 UTC (rev 188389)
@@ -1,3 +1,17 @@
+2015-08-13 Simon Fraser <[email protected]>
+
+ FilterOperation.h should not include FilterEffect.h
+ https://bugs.webkit.org/show_bug.cgi?id=147970
+
+ Reviewed by Daniel Bates.
+
+ FilterEffect.h pulls in lots of JSC goop via runtime/Uint8ClampedArray.h,
+ so move its include to FilterOperation.cpp.
+
+ Causes include bloat because FilterOperation.h is pulled in via RenderStyle.h.
+
+ * UIProcess/ios/WebVideoFullscreenManagerProxy.h:
+
2015-08-12 Anders Carlsson <[email protected]>
Use WTF::Optional in WindowFeatures
Modified: trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h (188388 => 188389)
--- trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h 2015-08-13 19:08:37 UTC (rev 188388)
+++ trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h 2015-08-13 19:08:42 UTC (rev 188389)
@@ -32,6 +32,7 @@
#include <WebCore/GraphicsLayer.h>
#include <WebCore/WebVideoFullscreenInterfaceAVKit.h>
#include <WebCore/WebVideoFullscreenModel.h>
+#include <wtf/HashMap.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
