Diff
Modified: trunk/Source/WebCore/ChangeLog (157914 => 157915)
--- trunk/Source/WebCore/ChangeLog 2013-10-24 06:31:21 UTC (rev 157914)
+++ trunk/Source/WebCore/ChangeLog 2013-10-24 06:43:11 UTC (rev 157915)
@@ -1,3 +1,17 @@
+2013-10-23 ChangSeok Oh <changseok...@collabora.com>
+
+ Unreviewed build fix since r157823.
+ FilterOperation::getOperationType() is renamed FilterOperation::type().
+
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (WebCore::prepareFilterProgram):
+ (WebCore::TextureMapperGL::drawTexture):
+ (WebCore::TextureMapperGL::drawUsingCustomFilter):
+ (WebCore::TextureMapperGL::drawFiltered):
+ (WebCore::BitmapTextureGL::applyFilters):
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp:
+ (WebCore::CoordinatedGraphicsScene::injectCachedCustomFilterPrograms):
+
2013-10-23 Ryuan Choi <ryuan.c...@samsung.com>
Unreviewed build fix on CMake based ports when CMAKE_BUILD_TYPE is not given.
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (157914 => 157915)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2013-10-24 06:31:21 UTC (rev 157914)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2013-10-24 06:43:11 UTC (rev 157915)
@@ -471,7 +471,7 @@
RefPtr<GraphicsContext3D> context = program->context();
context->useProgram(program->programID());
- switch (operation.getOperationType()) {
+ switch (operation.type()) {
case FilterOperation::GRAYSCALE:
case FilterOperation::SEPIA:
case FilterOperation::SATURATE:
@@ -567,7 +567,7 @@
if (filter) {
if (data().filterInfo->contentTexture)
filterContentTextureID = toBitmapTextureGL(data().filterInfo->contentTexture.get())->id();
- options |= optionsForFilterType(filter->getOperationType(), data().filterInfo->pass);
+ options |= optionsForFilterType(filter->type(), data().filterInfo->pass);
if (filter->affectsOpacity())
flags |= ShouldBlend;
}
@@ -879,7 +879,7 @@
bool TextureMapperGL::drawUsingCustomFilter(BitmapTexture& target, const BitmapTexture& source, const FilterOperation& filter)
{
RefPtr<CustomFilterRenderer> renderer;
- switch (filter.getOperationType()) {
+ switch (filter.type()) {
case FilterOperation::CUSTOM: {
// WebKit2 pipeline is using the CustomFilterOperation, that's because of the "de-serialization" that
// happens in CoordinatedGraphicsArgumentCoders.
@@ -933,7 +933,7 @@
void TextureMapperGL::drawFiltered(const BitmapTexture& sampler, const BitmapTexture* contentTexture, const FilterOperation& filter, int pass)
{
// For standard filters, we always draw the whole texture without transformations.
- TextureMapperShaderProgram::Options options = optionsForFilterType(filter.getOperationType(), pass);
+ TextureMapperShaderProgram::Options options = optionsForFilterType(filter.type(), pass);
RefPtr<TextureMapperShaderProgram> program = data().sharedGLData().getShaderProgram(options);
ASSERT(program);
@@ -968,9 +968,9 @@
RefPtr<FilterOperation> filter = filters.operations()[i];
ASSERT(filter);
- bool custom = isCustomFilter(filter->getOperationType());
+ bool custom = isCustomFilter(filter->type());
- int numPasses = getPassesRequiredForFilter(filter->getOperationType());
+ int numPasses = getPassesRequiredForFilter(filter->type());
for (int j = 0; j < numPasses; ++j) {
bool last = (i == filters.size() - 1) && (j == numPasses - 1);
if (custom || !last) {
@@ -992,7 +992,7 @@
}
texmapGL->drawFiltered(*resultSurface.get(), spareSurface.get(), *filter, j);
- if (!j && filter->getOperationType() == FilterOperation::DROP_SHADOW) {
+ if (!j && filter->type() == FilterOperation::DROP_SHADOW) {
spareSurface = resultSurface;
resultSurface.clear();
}
Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp (157914 => 157915)
--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp 2013-10-24 06:31:21 UTC (rev 157914)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp 2013-10-24 06:43:11 UTC (rev 157915)
@@ -256,7 +256,7 @@
{
for (size_t i = 0; i < filters.size(); ++i) {
FilterOperation* operation = filters.operations().at(i).get();
- if (operation->getOperationType() != FilterOperation::CUSTOM)
+ if (operation->type() != FilterOperation::CUSTOM)
continue;
CoordinatedCustomFilterOperation* customOperation = static_cast<CoordinatedCustomFilterOperation*>(operation);
Modified: trunk/Source/WebKit2/ChangeLog (157914 => 157915)
--- trunk/Source/WebKit2/ChangeLog 2013-10-24 06:31:21 UTC (rev 157914)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-24 06:43:11 UTC (rev 157915)
@@ -1,3 +1,13 @@
+2013-10-23 ChangSeok Oh <changseok...@collabora.com>
+
+ Unreviewed build fix since r157823.
+ FilterOperation::getOperationType() is renamed FilterOperation::type().
+
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+ (CoreIPC::::encode):
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+ (WebKit::CoordinatedLayerTreeHost::checkCustomFilterProgramProxies):
+
2013-10-23 Tibor Meszaros <tmesza...@inf.u-szeged.hu>
Web Inspector: Make WebKitEFL port work with chromedevtools
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (157914 => 157915)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2013-10-24 06:31:21 UTC (rev 157914)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2013-10-24 06:43:11 UTC (rev 157915)
@@ -85,7 +85,7 @@
encoder << static_cast<uint32_t>(filters.size());
for (size_t i = 0; i < filters.size(); ++i) {
const FilterOperation* filter = filters.at(i);
- FilterOperation::OperationType type = filter->getOperationType();
+ FilterOperation::OperationType type = filter->type();
encoder.encodeEnum(type);
switch (type) {
case FilterOperation::GRAYSCALE:
Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (157914 => 157915)
--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2013-10-24 06:31:21 UTC (rev 157914)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2013-10-24 06:43:11 UTC (rev 157915)
@@ -252,7 +252,7 @@
// At that point the program will only be serialized once. All the other times it will only use the ID of the program.
for (size_t i = 0; i < filters.size(); ++i) {
const FilterOperation* operation = filters.at(i);
- if (operation->getOperationType() != FilterOperation::VALIDATED_CUSTOM)
+ if (operation->type() != FilterOperation::VALIDATED_CUSTOM)
continue;
const ValidatedCustomFilterOperation* customOperation = static_cast<const ValidatedCustomFilterOperation*>(operation);
ASSERT(customOperation->validatedProgram()->isInitialized());
