aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/core/SkCoverageDelta.h4
-rw-r--r--src/core/SkScan_DAAPath.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/core/SkCoverageDelta.h b/src/core/SkCoverageDelta.h
index e0ecb9d7e6..bf0baf234b 100644
--- a/src/core/SkCoverageDelta.h
+++ b/src/core/SkCoverageDelta.h
@@ -44,7 +44,11 @@ using SkCoverageDeltaAllocator = SkSTArenaAlloc<256>;
class SkCoverageDeltaList {
public:
// We can store INIT_ROW_SIZE deltas per row (i.e., per y-scanline) initially
+#ifndef GOOGLE3
static constexpr int INIT_ROW_SIZE = 32;
+#else
+ static constexpr int INIT_ROW_SIZE = 8; // google3 has 16k stack limit
+#endif
static constexpr int RESERVED_HEIGHT = 128; // reserve this many rows on stack memory
SkCoverageDeltaList(SkCoverageDeltaAllocator* alloc, int top, int bottom, bool forceRLE);
diff --git a/src/core/SkScan_DAAPath.cpp b/src/core/SkScan_DAAPath.cpp
index 295d621446..0c199f43f1 100644
--- a/src/core/SkScan_DAAPath.cpp
+++ b/src/core/SkScan_DAAPath.cpp
@@ -321,7 +321,7 @@ void SkScan::DAAFillPath(const SkPath& path, const SkRegion& origClip, SkBlitter
SkRect rect;
if (!isInverse && path.isRect(&rect) && clippedIR.height() >= 3 && clippedIR.width() >= 3) {
// The overhead of even constructing SkCoverageDeltaList/Mask is too big. So just blit.
- bool nonEmpty = rect.intersect(SkRect::MakeFromIRect(clipBounds));
+ bool nonEmpty = rect.intersect(SkRect::Make(clipBounds));
SkASSERT(nonEmpty); // do_fill_path should have already handled the empty case
if (nonEmpty) {
blitter->blitFatAntiRect(rect);