align top and bounds computations

src/pathops/SkOpContour.cpp

 /*
 * Copyright 2013 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 #include "SkOpContour.h"
 #include "SkOpTAllocator.h"
 #include "SkPathWriter.h"
 #include "SkReduceOrder.h"
@@ skipping 51 matching lines @@
 void SkOpContour::toPath(SkPathWriter* path) const {
     const SkPoint& pt = fHead.pts()[0];
     path->deferredMove(pt);
     const SkOpSegment* segment = &fHead;
     do {
         segment->addCurveTo(segment->head(), segment->tail(), path, true);
     } while ((segment = segment->next()));
     path->close();
 }
 
-void SkOpContour::topSortableSegment(const SkPoint& topLeft, SkPoint* bestXY,
+void SkOpContour::topSortableSegment(const SkDPoint& topLeft, SkDPoint* bestXY,
         SkOpSegment** topStart) {
     int segmentCount = fSortedSegments.count();
     SkASSERT(segmentCount > 0);
     int sortedIndex = fFirstSorted;
     fDone = true;  // may be cleared below
     for ( ; sortedIndex < segmentCount; ++sortedIndex) {
         SkOpSegment* testSegment = fSortedSegments[sortedIndex];
         if (testSegment->done()) {
             if (sortedIndex == fFirstSorted) {
                 ++fFirstSorted;
             }
             continue;
         }
         fDone = false;
-        SkPoint testXY = testSegment->activeLeftTop(NULL);
+        SkDPoint testXY = testSegment->activeLeftTop(NULL);
         if (*topStart) {
             if (testXY.fY < topLeft.fY) {
                 continue;
             }
             if (testXY.fY == topLeft.fY && testXY.fX < topLeft.fX) {
                 continue;
             }
             if (bestXY->fY < testXY.fY) {
                 continue;
             }
@@ skipping 10 matching lines @@
     SkOpSegment* segment = &fHead;
     do {
         if (segment->done()) {
             continue;
         }
         segment->undoneSpan(startPtr, endPtr);
         return segment;
     } while ((segment = segment->next()));
     return NULL;
 }