Title: [129546] trunk/Source/WebCore
- Revision
- 129546
- Author
- [email protected]
- Date
- 2012-09-25 13:11:54 -0700 (Tue, 25 Sep 2012)
Log Message
Use USE(3D_GRAPHICS) in CSS SHADERS code when ENABLE(WEBGL) is true.
https://bugs.webkit.org/show_bug.cgi?id=97543
Patch by Huang Dongsung <[email protected]> on 2012-09-25
Reviewed by Dean Jackson.
This patch cleans remaining ENABLE(WEBGL) guards in CSS SHADERS code after
r122175, which made USE(3D_GRAPHICS) default to true when ENABLE(WEBGL) is true.
No new tests because of no behavior changes.
* rendering/FilterEffectRenderer.cpp:
(WebCore):
(WebCore::FilterEffectRenderer::build):
* rendering/RenderView.cpp:
(WebCore):
* rendering/RenderView.h:
(WebCore):
(RenderView):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (129545 => 129546)
--- trunk/Source/WebCore/ChangeLog 2012-09-25 20:01:33 UTC (rev 129545)
+++ trunk/Source/WebCore/ChangeLog 2012-09-25 20:11:54 UTC (rev 129546)
@@ -1,3 +1,24 @@
+2012-09-25 Huang Dongsung <[email protected]>
+
+ Use USE(3D_GRAPHICS) in CSS SHADERS code when ENABLE(WEBGL) is true.
+ https://bugs.webkit.org/show_bug.cgi?id=97543
+
+ Reviewed by Dean Jackson.
+
+ This patch cleans remaining ENABLE(WEBGL) guards in CSS SHADERS code after
+ r122175, which made USE(3D_GRAPHICS) default to true when ENABLE(WEBGL) is true.
+
+ No new tests because of no behavior changes.
+
+ * rendering/FilterEffectRenderer.cpp:
+ (WebCore):
+ (WebCore::FilterEffectRenderer::build):
+ * rendering/RenderView.cpp:
+ (WebCore):
+ * rendering/RenderView.h:
+ (WebCore):
+ (RenderView):
+
2012-09-25 Beth Dakin <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=95397
Modified: trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp (129545 => 129546)
--- trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2012-09-25 20:01:33 UTC (rev 129545)
+++ trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2012-09-25 20:11:54 UTC (rev 129546)
@@ -42,7 +42,7 @@
#include <algorithm>
#include <wtf/MathExtras.h>
-#if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
+#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
#include "CustomFilterGlobalContext.h"
#include "CustomFilterProgram.h"
#include "CustomFilterOperation.h"
@@ -84,7 +84,7 @@
return true;
}
-#if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
+#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
static bool isCSSCustomFilterEnabled(Document* document)
{
// We only want to enable shaders if WebGL is also enabled on this platform.
@@ -192,7 +192,7 @@
bool FilterEffectRenderer::build(Document* document, const FilterOperations& operations)
{
-#if !ENABLE(CSS_SHADERS) || !ENABLE(WEBGL)
+#if !ENABLE(CSS_SHADERS) || !USE(3D_GRAPHICS)
UNUSED_PARAM(document);
#endif
@@ -348,7 +348,7 @@
dropShadowOperation->x(), dropShadowOperation->y(), dropShadowOperation->color(), 1);
break;
}
-#if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
+#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
case FilterOperation::CUSTOM: {
CustomFilterOperation* customFilterOperation = static_cast<CustomFilterOperation*>(filterOperation);
effect = createCustomFilterEffect(this, document, customFilterOperation);
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (129545 => 129546)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2012-09-25 20:01:33 UTC (rev 129545)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2012-09-25 20:11:54 UTC (rev 129546)
@@ -45,7 +45,7 @@
#include "RenderLayerCompositor.h"
#endif
-#if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
+#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
#include "CustomFilterGlobalContext.h"
#endif
@@ -911,7 +911,7 @@
#endif
}
-#if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
+#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
CustomFilterGlobalContext* RenderView::customFilterGlobalContext()
{
if (!m_customFilterGlobalContext)
Modified: trunk/Source/WebCore/rendering/RenderView.h (129545 => 129546)
--- trunk/Source/WebCore/rendering/RenderView.h 2012-09-25 20:01:33 UTC (rev 129545)
+++ trunk/Source/WebCore/rendering/RenderView.h 2012-09-25 20:11:54 UTC (rev 129546)
@@ -38,7 +38,7 @@
class RenderLayerCompositor;
#endif
-#if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
+#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
class CustomFilterGlobalContext;
#endif
@@ -176,7 +176,7 @@
bool usesCompositing() const;
#endif
-#if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
+#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
CustomFilterGlobalContext* customFilterGlobalContext();
#endif
@@ -299,7 +299,7 @@
#if USE(ACCELERATED_COMPOSITING)
OwnPtr<RenderLayerCompositor> m_compositor;
#endif
-#if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
+#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
OwnPtr<CustomFilterGlobalContext> m_customFilterGlobalContext;
#endif
OwnPtr<FlowThreadController> m_flowThreadController;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
