summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-06-22 14:06:48 -0700
committerJohn Reck <jreck@google.com>2012-06-25 10:28:53 -0700
commitd746a876b64cc47df56008cb5c55df37679ea2cd (patch)
tree7a78b3b983e532b47fac6dfcbf656de3b4afadc5 /Source/WebCore/platform/graphics
parent746505b1ae8555ef6ca9325626ba6ce2ec164529 (diff)
downloadexternal_webkit-d746a876b64cc47df56008cb5c55df37679ea2cd.zip
external_webkit-d746a876b64cc47df56008cb5c55df37679ea2cd.tar.gz
external_webkit-d746a876b64cc47df56008cb5c55df37679ea2cd.tar.bz2
Enable RecordingContext by default
Performance seems comparable to SkPicture already, and this makes it easier to iterate on fixing some of the problem areas Change-Id: I2e7b6b282e6b53ba2dc68d8a62b3b982f2b5838d
Diffstat (limited to 'Source/WebCore/platform/graphics')
-rw-r--r--Source/WebCore/platform/graphics/android/context/GraphicsOperationCollection.cpp20
-rw-r--r--Source/WebCore/platform/graphics/android/context/GraphicsOperationCollection.h13
2 files changed, 1 insertions, 32 deletions
diff --git a/Source/WebCore/platform/graphics/android/context/GraphicsOperationCollection.cpp b/Source/WebCore/platform/graphics/android/context/GraphicsOperationCollection.cpp
index 829be2e..295c106 100644
--- a/Source/WebCore/platform/graphics/android/context/GraphicsOperationCollection.cpp
+++ b/Source/WebCore/platform/graphics/android/context/GraphicsOperationCollection.cpp
@@ -25,12 +25,8 @@ GraphicsOperationCollection::~GraphicsOperationCollection()
void GraphicsOperationCollection::apply(PlatformGraphicsContext* context)
{
- ALOGD("\nApply GraphicsOperationCollection %x, %d operations", this, m_operations.size());
- for (unsigned int i = 0; i < m_operations.size(); i++) {
- ALOGD("[%d] (%x) %s %s", i, this, m_operations[i]->name().ascii().data(),
- m_operations[i]->parameters().ascii().data());
+ for (unsigned int i = 0; i < m_operations.size(); i++)
m_operations[i]->apply(context);
- }
}
void GraphicsOperationCollection::append(GraphicsOperation::Operation* operation)
@@ -43,20 +39,6 @@ bool GraphicsOperationCollection::isEmpty()
return !m_operations.size();
}
-AutoGraphicsOperationCollection::AutoGraphicsOperationCollection()
-{
- m_graphicsOperationCollection = new GraphicsOperationCollection();
- m_platformGraphicsContext = new PlatformGraphicsContextRecording(m_graphicsOperationCollection);
- m_graphicsContext = new GraphicsContext(m_platformGraphicsContext);
-}
-
-AutoGraphicsOperationCollection::~AutoGraphicsOperationCollection()
-{
- SkSafeUnref(m_graphicsOperationCollection);
- delete m_graphicsContext;
- delete m_platformGraphicsContext;
-}
-
} // namespace WebCore
#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/android/context/GraphicsOperationCollection.h b/Source/WebCore/platform/graphics/android/context/GraphicsOperationCollection.h
index d3fc16b..a8696fe 100644
--- a/Source/WebCore/platform/graphics/android/context/GraphicsOperationCollection.h
+++ b/Source/WebCore/platform/graphics/android/context/GraphicsOperationCollection.h
@@ -51,19 +51,6 @@ private:
Vector<GraphicsOperation::Operation*> m_operations;
};
-class AutoGraphicsOperationCollection {
-public:
- AutoGraphicsOperationCollection();
- ~AutoGraphicsOperationCollection();
- GraphicsContext* context() { return m_graphicsContext; }
- GraphicsOperationCollection* picture() { return m_graphicsOperationCollection; }
-
-private:
- GraphicsOperationCollection* m_graphicsOperationCollection;
- PlatformGraphicsContext* m_platformGraphicsContext;
- GraphicsContext* m_graphicsContext;
-};
-
}
#endif // USE(ACCELERATED_COMPOSITING)