Determine maxZoomScale from bitmap/text drawing

bug:7247750

Change-Id: I8238acc2c20942ab2f42936d16a03226909aebcd

2 files changed, 7 insertions, 4 deletions

diff --git a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp
index 867ff56..c865a54 100644
--- a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp
+++ b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.cpp
@@ -498,7 +498,7 @@ PlatformGraphicsContextRecording::PlatformGraphicsContextRecording(Recording* re
     , mPicture(0)
     , mRecording(recording)
     , mOperationState(0)
-    , m_hasText(false)
+    , m_maxZoomScale(1)
     , m_isEmpty(true)
     , m_canvasProxy(this)
 {
@@ -524,7 +524,7 @@ bool PlatformGraphicsContextRecording::isPaintingDisabled()
 
 SkCanvas* PlatformGraphicsContextRecording::recordingCanvas()
 {
-    m_hasText = true;
+    m_maxZoomScale = 1e6f;
     return &m_canvasProxy;
 }
 
@@ -779,6 +779,9 @@ void PlatformGraphicsContextRecording::drawBitmapRect(const SkBitmap& bitmap,
                                    const SkIRect* src, const SkRect& dst,
                                    CompositeOperator op)
 {
+    float widthScale = dst.width() == 0 ? 1 : bitmap.width() / dst.width();
+    float heightScale = dst.height() == 0 ? 1 : bitmap.height() / dst.height();
+    m_maxZoomScale = std::max(m_maxZoomScale, std::max(widthScale, heightScale));
     appendDrawingOperation(NEW_OP(DrawBitmapRect)(bitmap, *src, dst, op), dst);
 }
 
diff --git a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h
index 061ee0e..930f1f2 100644
--- a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h
+++ b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h
@@ -143,7 +143,7 @@ public:
                                  bool translucent = false, bool drawBackground = true,
                                  const IntRect& thumb = IntRect());
 
-    bool hasText() { return m_hasText; }
+    float maxZoomScale() { return m_maxZoomScale; }
     bool isEmpty() { return m_isEmpty; }
 private:
 
@@ -206,7 +206,7 @@ private:
     Vector<SkMatrix> mMatrixStack;
     State* mOperationState;
 
-    bool m_hasText;
+    float m_maxZoomScale;
     bool m_isEmpty;
     RecordingContextCanvasProxy m_canvasProxy;
 };