From 0863572d73ddd51cdf1361d8fdf2730a27d3bc5c Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Tue, 21 Nov 2017 21:26:06 +0100 Subject: [PATCH] RemoteDrawingEngine: Whitespace cleanup and a simplification. --- .../app/drawing/interface/remote/RemoteDrawingEngine.cpp | 4 +--- .../app/drawing/interface/remote/RemoteDrawingEngine.h | 9 +++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.cpp b/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.cpp index a279f5e233..cc60de6867 100644 --- a/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.cpp +++ b/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.cpp @@ -802,9 +802,7 @@ RemoteDrawingEngine::FillTriangle(BPoint* points, const BRect& bounds, RemoteMessage message(NULL, fHWInterface->SendBuffer()); message.Start(RP_FILL_TRIANGLE_GRADIENT); message.Add(fToken); - message.Add(points[0]); - message.Add(points[1]); - message.Add(points[2]); + message.AddList(points, 3); message.Add(bounds); message.AddGradient(gradient); } diff --git a/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.h b/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.h index 1f62313f04..6fc3e71d24 100644 --- a/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.h +++ b/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.h @@ -113,7 +113,7 @@ public: const BPoint& viewToScreenOffset, float viewScale); virtual void FillShape(const BRect& bounds, - int32 opCount, const uint32* opList, + int32 opCount, const uint32* opList, int32 pointCount, const BPoint* pointList, const BGradient& gradient, const BPoint& viewToScreenOffset, @@ -137,7 +137,7 @@ public: virtual BPoint DrawString(const char* string, int32 length, const BPoint& point, escapement_delta* delta = NULL); -virtual BPoint DrawString(const char* string, int32 length, + virtual BPoint DrawString(const char* string, int32 length, const BPoint* offsets); virtual float StringWidth(const char* string, int32 length, @@ -155,7 +155,7 @@ private: RemoteMessage& message); BRect _BuildBounds(BPoint* points, int32 pointCount); - status_t _ExtractBitmapRegions(ServerBitmap& bitmap, + status_t _ExtractBitmapRegions(ServerBitmap& bitmap, uint32 options, const BRect& bitmapRect, const BRect& viewRect, double xScale, double yScale, BRegion& region, @@ -174,7 +174,8 @@ private: float fStringWidthResult; BBitmap* fReadBitmapResult; - BitmapDrawingEngine* fBitmapDrawingEngine; + BitmapDrawingEngine* + fBitmapDrawingEngine; }; #endif // REMOTE_DRAWING_ENGINE_H