gecko/gfx/2d/PathRecording.cpp
Nathan Froyd 8780083336 Bug 1161627 - part 2 - machine-convert TemporaryRef<T> to already_AddRefed<T>; r=ehsan
This conversion was done with the script:

  find . -name '*.cpp' -o -name '*.h' -o -name '*.mm' -o -name '*.idl' | \
    egrep -v 'cairo-win32-refptr.h|RefPtr.h|TestRefPtr.cpp' | \
    xargs sed -i -e 's/mozilla::TemporaryRef</already_AddRefed</g' \
                 -e 's/TemporaryRef</already_AddRefed</g'

Manual fixups were performed in the following instances:

- We handled mfbt/RefPtr.h manually so as to not convert TemporaryRef itself
  into already_AddRefed.

- The following files had explicit Move() calls added to make up for the lack
  of a copy constructor on already_AddRefed:

  dom/base/ImageEncoder.cpp
  dom/media/MediaTaskQueue.{h,cpp}
  dom/media/webaudio/PannerNode.cpp

- A redundant overload for MediaTaskQueue::Dispatch was deleted.

- A few manual fixups were required in mfbt/tests/TestRefPtr.cpp.

- Comments, using declarations, and forward declarations relating to
  TemporaryRef in dom/canvas/ and gfx/layers/ were changed to refer to
  already_AddRefed.
2015-06-17 10:00:52 -04:00

121 lines
3.0 KiB
C++

/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "PathRecording.h"
#include "DrawEventRecorder.h"
namespace mozilla {
namespace gfx {
using namespace std;
void
PathBuilderRecording::MoveTo(const Point &aPoint)
{
PathOp op;
op.mType = PathOp::OP_MOVETO;
op.mP1 = aPoint;
mPathOps.push_back(op);
mPathBuilder->MoveTo(aPoint);
}
void
PathBuilderRecording::LineTo(const Point &aPoint)
{
PathOp op;
op.mType = PathOp::OP_LINETO;
op.mP1 = aPoint;
mPathOps.push_back(op);
mPathBuilder->LineTo(aPoint);
}
void
PathBuilderRecording::BezierTo(const Point &aCP1, const Point &aCP2, const Point &aCP3)
{
PathOp op;
op.mType = PathOp::OP_BEZIERTO;
op.mP1 = aCP1;
op.mP2 = aCP2;
op.mP3 = aCP3;
mPathOps.push_back(op);
mPathBuilder->BezierTo(aCP1, aCP2, aCP3);
}
void
PathBuilderRecording::QuadraticBezierTo(const Point &aCP1, const Point &aCP2)
{
PathOp op;
op.mType = PathOp::OP_QUADRATICBEZIERTO;
op.mP1 = aCP1;
op.mP2 = aCP2;
mPathOps.push_back(op);
mPathBuilder->QuadraticBezierTo(aCP1, aCP2);
}
void
PathBuilderRecording::Close()
{
PathOp op;
op.mType = PathOp::OP_CLOSE;
mPathOps.push_back(op);
mPathBuilder->Close();
}
Point
PathBuilderRecording::CurrentPoint() const
{
return mPathBuilder->CurrentPoint();
}
already_AddRefed<Path>
PathBuilderRecording::Finish()
{
RefPtr<Path> path = mPathBuilder->Finish();
return MakeAndAddRef<PathRecording>(path, mPathOps, mFillRule);
}
PathRecording::~PathRecording()
{
for (size_t i = 0; i < mStoredRecorders.size(); i++) {
mStoredRecorders[i]->RemoveStoredPath(this);
mStoredRecorders[i]->RecordEvent(RecordedPathDestruction(this));
}
}
already_AddRefed<PathBuilder>
PathRecording::CopyToBuilder(FillRule aFillRule) const
{
RefPtr<PathBuilder> pathBuilder = mPath->CopyToBuilder(aFillRule);
RefPtr<PathBuilderRecording> recording = new PathBuilderRecording(pathBuilder, aFillRule);
recording->mPathOps = mPathOps;
return recording.forget();
}
already_AddRefed<PathBuilder>
PathRecording::TransformedCopyToBuilder(const Matrix &aTransform, FillRule aFillRule) const
{
RefPtr<PathBuilder> pathBuilder = mPath->TransformedCopyToBuilder(aTransform, aFillRule);
RefPtr<PathBuilderRecording> recording = new PathBuilderRecording(pathBuilder, aFillRule);
typedef std::vector<PathOp> pathOpVec;
for (pathOpVec::const_iterator iter = mPathOps.begin(); iter != mPathOps.end(); iter++) {
PathOp newPathOp;
newPathOp.mType = iter->mType;
if (sPointCount[newPathOp.mType] >= 1) {
newPathOp.mP1 = aTransform * iter->mP1;
}
if (sPointCount[newPathOp.mType] >= 2) {
newPathOp.mP2 = aTransform * iter->mP2;
}
if (sPointCount[newPathOp.mType] >= 3) {
newPathOp.mP3 = aTransform * iter->mP3;
}
recording->mPathOps.push_back(newPathOp);
}
return recording.forget();
}
}
}