Revert "Cleanup CPDF_MeshStream"

This reverts commit 9787a7441a905e582b10d9ffc425098b3233d36c.

Reason for revert: Reverting chain to see if fixes Chrome roll.

Original change's description:
> Cleanup CPDF_MeshStream
> 
> This CL converts the MeshVertex to a point and the TransformPoint to the
> CFX_PointF override.
> 
> Change-Id: I3faa5c14cedcf5af6aafca1c566acbc68577cca7
> Reviewed-on: https://pdfium-review.googlesource.com/2610
> Commit-Queue: dsinclair <dsinclair@chromium.org>
> Reviewed-by: Nicolás Peña <npm@chromium.org>
> 

TBR=tsepez@chromium.org,dsinclair@chromium.org,npm@chromium.org,caryclark@google.com,pdfium-reviews@googlegroups.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: Ie1b1dae3ede7581128a81cf7cd86a348c651233b
Reviewed-on: https://pdfium-review.googlesource.com/2695
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
index 0af43d08b2..61efb48529 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
@@ -99,7 +99,7 @@ CFX_FloatRect GetShadingBBox(CPDF_ShadingPattern* pShading,
   while (!stream.BitStream()->IsEOF()) {
     uint32_t flag = 0;
     if (type != kLatticeFormGouraudTriangleMeshShading)
-      flag = stream.ReadFlag();
+      flag = stream.GetFlag();
 
     if (!bGouraud && flag) {
       point_count -= 4;
@@ -107,11 +107,13 @@ CFX_FloatRect GetShadingBBox(CPDF_ShadingPattern* pShading,
     }
 
     for (int i = 0; i < point_count; i++) {
-      CFX_PointF origin = stream.ReadCoords();
+      FX_FLOAT x;
+      FX_FLOAT y;
+      stream.GetCoords(x, y);
       if (bStarted) {
-        rect.UpdateRect(origin.x, origin.y);
+        rect.UpdateRect(x, y);
       } else {
-        rect.InitRect(origin.x, origin.y);
+        rect.InitRect(x, y);
         bStarted = true;
       }
     }