Merge "Perform check for text/content on recording context PicturePiles"

2 files changed, 10 insertions, 0 deletions

diff --git a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp
index df0ffd6..f11154d 100644
--- a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp
+++ b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp
@@ -162,6 +162,8 @@ PlatformGraphicsContextRecording::PlatformGraphicsContextRecording(Recording* re
     , mRecording(recording)
     , mOperationState(0)
     , mOperationMatrix(0)
+    , m_hasText(false)
+    , m_isEmpty(true)
 {
     pushMatrix();
     if (mRecording)
@@ -188,6 +190,8 @@ void PlatformGraphicsContextRecording::endRecording(const SkRect& bounds)
     GraphicsOperation::DrawComplexText* text = new GraphicsOperation::DrawComplexText(mPicture);
     appendDrawingOperation(text, bounds);
     mPicture = 0;
+
+    m_hasText = true;
 }
 
 //**************************************
@@ -599,6 +603,7 @@ void PlatformGraphicsContextRecording::appendDrawingOperation(
         ALOGW("Empty bounds for %s(%s)!", operation->name(), operation->parameters().ascii().data());
         return;
     }
+    m_isEmpty = false;
     SkRect bounds;
     mCurrentMatrix->mapRect(&bounds, untranslatedBounds);
     if (mRecordingStateStack.size()) {
diff --git a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h
index 6c51852..89f9bbb 100644
--- a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h
+++ b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h
@@ -136,6 +136,8 @@ public:
     virtual void strokePath(const Path& pathToStroke);
     virtual void strokeRect(const FloatRect& rect, float lineWidth);
 
+    bool hasText() { return m_hasText; }
+    bool isEmpty() { return m_isEmpty; }
 private:
 
     virtual bool shadowsIgnoreTransforms() const {
@@ -194,6 +196,9 @@ private:
     Vector<SkMatrix> mMatrixStack;
     State* mOperationState;
     SkMatrix* mOperationMatrix;
+
+    bool m_hasText;
+    bool m_isEmpty;
 };
 
 }