Diff
Modified: trunk/Source/WebCore/ChangeLog (198734 => 198735)
--- trunk/Source/WebCore/ChangeLog 2016-03-28 14:06:42 UTC (rev 198734)
+++ trunk/Source/WebCore/ChangeLog 2016-03-28 15:23:01 UTC (rev 198735)
@@ -1,3 +1,30 @@
+2016-03-28 Konstantin Tokarev <annu...@yandex.ru>
+
+ Remove USE(TEXTURE_MAPPER) guards inside TextureMapper sources.
+ https://bugs.webkit.org/show_bug.cgi?id=155944
+
+ Reviewed by Michael Catanzaro.
+
+ After r196429 TextureMapper sources are built only in ports which actually
+ use TextureMapper, so USE(TEXTURE_MAPPER) guards in them are redundant now.
+
+ No new tests needed.
+
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
+ * platform/graphics/texmap/TextureMapper.cpp:
+ * platform/graphics/texmap/TextureMapper.h:
+ * platform/graphics/texmap/TextureMapperBackingStore.cpp:
+ * platform/graphics/texmap/TextureMapperBackingStore.h:
+ * platform/graphics/texmap/TextureMapperFPSCounter.cpp:
+ * platform/graphics/texmap/TextureMapperFPSCounter.h:
+ * platform/graphics/texmap/TextureMapperLayer.cpp:
+ * platform/graphics/texmap/TextureMapperLayer.h:
+ * platform/graphics/texmap/TextureMapperTile.cpp:
+ * platform/graphics/texmap/TextureMapperTile.h:
+ * platform/graphics/texmap/TextureMapperTiledBackingStore.cpp:
+ * platform/graphics/texmap/TextureMapperTiledBackingStore.h:
+
2016-03-28 Manuel Rego Casasnovas <r...@igalia.com>
[css-grid] Remove unneeded lines in offsetAndBreadthForPositionedChild()
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (198734 => 198735)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2016-03-28 14:06:42 UTC (rev 198734)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2016-03-28 15:23:01 UTC (rev 198735)
@@ -26,7 +26,7 @@
#include "TextureMapperAnimation.h"
#include <wtf/CurrentTime.h>
-#if USE(TEXTURE_MAPPER) && !USE(COORDINATED_GRAPHICS)
+#if !USE(COORDINATED_GRAPHICS)
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h (198734 => 198735)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2016-03-28 14:06:42 UTC (rev 198734)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2016-03-28 15:23:01 UTC (rev 198735)
@@ -20,7 +20,7 @@
#ifndef GraphicsLayerTextureMapper_h
#define GraphicsLayerTextureMapper_h
-#if USE(TEXTURE_MAPPER) && !USE(COORDINATED_GRAPHICS)
+#if !USE(COORDINATED_GRAPHICS)
#include "GraphicsLayer.h"
#include "GraphicsLayerClient.h"
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp (198734 => 198735)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2016-03-28 14:06:42 UTC (rev 198734)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2016-03-28 15:23:01 UTC (rev 198735)
@@ -26,8 +26,6 @@
#include "Timer.h"
#include <wtf/CurrentTime.h>
-#if USE(TEXTURE_MAPPER)
-
namespace WebCore {
PassRefPtr<BitmapTexture> TextureMapper::acquireTextureFromPool(const IntSize& size, const BitmapTexture::Flags flags)
@@ -54,5 +52,3 @@
{ }
} // namespace
-
-#endif
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h (198734 => 198735)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2016-03-28 14:06:42 UTC (rev 198734)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2016-03-28 15:23:01 UTC (rev 198735)
@@ -20,8 +20,6 @@
#ifndef TextureMapper_h
#define TextureMapper_h
-#if USE(TEXTURE_MAPPER)
-
#include "BitmapTexture.h"
#include "GraphicsContext.h"
#include "IntRect.h"
@@ -128,5 +126,3 @@
}
#endif
-
-#endif
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp (198734 => 198735)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp 2016-03-28 14:06:42 UTC (rev 198734)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp 2016-03-28 15:23:01 UTC (rev 198735)
@@ -19,7 +19,6 @@
#include "config.h"
-#if USE(TEXTURE_MAPPER)
#include "TextureMapperBackingStore.h"
#include "GraphicsLayer.h"
@@ -48,4 +47,3 @@
}
}
-#endif
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h (198734 => 198735)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h 2016-03-28 14:06:42 UTC (rev 198734)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h 2016-03-28 15:23:01 UTC (rev 198735)
@@ -20,8 +20,6 @@
#ifndef TextureMapperBackingStore_h
#define TextureMapperBackingStore_h
-#if USE(TEXTURE_MAPPER)
-
#include "FloatRect.h"
#include "Image.h"
#include "TextureMapper.h"
@@ -48,6 +46,5 @@
};
}
-#endif
#endif // TextureMapperBackingStore_h
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.cpp (198734 => 198735)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.cpp 2016-03-28 14:06:42 UTC (rev 198734)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.cpp 2016-03-28 15:23:01 UTC (rev 198735)
@@ -21,8 +21,6 @@
#include "config.h"
-#if USE(TEXTURE_MAPPER)
-
#include "TextureMapperFPSCounter.h"
#include "TextureMapper.h"
@@ -63,5 +61,3 @@
}
} // namespace WebCore
-
-#endif // USE(TEXTURE_MAPPER)
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.h (198734 => 198735)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.h 2016-03-28 14:06:42 UTC (rev 198734)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.h 2016-03-28 15:23:01 UTC (rev 198735)
@@ -22,7 +22,6 @@
#ifndef TextureMapperFPSCounter_h
#define TextureMapperFPSCounter_h
-#if USE(TEXTURE_MAPPER)
#include "FloatPoint.h"
#include "TransformationMatrix.h"
#include <wtf/Noncopyable.h>
@@ -47,8 +46,4 @@
} // namespace WebCore
-#endif // USE(TEXTURE_MAPPER)
-
#endif // TextureMapperFPSCounter_h
-
-
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (198734 => 198735)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2016-03-28 14:06:42 UTC (rev 198734)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2016-03-28 15:23:01 UTC (rev 198735)
@@ -25,8 +25,6 @@
#include "Region.h"
#include <wtf/MathExtras.h>
-#if USE(TEXTURE_MAPPER)
-
namespace WebCore {
class TextureMapperPaintOptions {
@@ -772,4 +770,3 @@
}
}
-#endif
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h (198734 => 198735)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h 2016-03-28 14:06:42 UTC (rev 198734)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h 2016-03-28 15:23:01 UTC (rev 198735)
@@ -20,8 +20,6 @@
#ifndef TextureMapperLayer_h
#define TextureMapperLayer_h
-#if USE(TEXTURE_MAPPER)
-
#include "FilterOperations.h"
#include "FloatRect.h"
#include "GraphicsLayerTransform.h"
@@ -264,6 +262,5 @@
};
}
-#endif
#endif // TextureMapperLayer_h
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.cpp (198734 => 198735)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.cpp 2016-03-28 14:06:42 UTC (rev 198734)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.cpp 2016-03-28 15:23:01 UTC (rev 198735)
@@ -18,7 +18,6 @@
*/
#include "config.h"
-#if USE(TEXTURE_MAPPER)
#include "TextureMapperTile.h"
#include "Image.h"
@@ -76,4 +75,3 @@
}
} // namespace WebCore
-#endif
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.h (198734 => 198735)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.h 2016-03-28 14:06:42 UTC (rev 198734)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.h 2016-03-28 15:23:01 UTC (rev 198735)
@@ -20,8 +20,6 @@
#ifndef TextureMapperTile_h
#define TextureMapperTile_h
-#if USE(TEXTURE_MAPPER)
-
#include "FloatRect.h"
#include "Image.h"
#include "TextureMapper.h"
@@ -55,6 +53,5 @@
};
}
-#endif
#endif
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp (198734 => 198735)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp 2016-03-28 14:06:42 UTC (rev 198734)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp 2016-03-28 15:23:01 UTC (rev 198735)
@@ -19,7 +19,6 @@
#include "config.h"
-#if USE(TEXTURE_MAPPER)
#include "TextureMapperTiledBackingStore.h"
#include "ImageBuffer.h"
@@ -175,4 +174,3 @@
}
} // namespace WebCore
-#endif
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.h (198734 => 198735)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.h 2016-03-28 14:06:42 UTC (rev 198734)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.h 2016-03-28 15:23:01 UTC (rev 198735)
@@ -20,8 +20,6 @@
#ifndef TextureMapperTiledBackingStore_h
#define TextureMapperTiledBackingStore_h
-#if USE(TEXTURE_MAPPER)
-
#include "FloatRect.h"
#include "Image.h"
#include "TextureMapperBackingStore.h"
@@ -69,6 +67,5 @@
};
} // namespace WebCore
-#endif
#endif
