AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SkPDF: clean up uses of deprecated calls in SkPDFDevice.

Browse Source 
Clean up reference count handling to avoid churn and follow pattern used elsewhere in SkPDF.

BUG=skia:3585

Review URL: https://codereview.chromium.org/1103163002
This commit is contained in:
halcanary 2015-04-28 06:21:01 -07:00 committed by Commit bot
parent f4219ddf31
commit 438de49857
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/pdf/SkPDFDevice.cpp
View File

@ -1464,26 +1464,30 @@ bool SkPDFDevice::handlePointAnnotation(const SkPoint* points, size_t count,
return false;
}
SkPDFDict* SkPDFDevice::createLinkAnnotation(const SkRect& r,
const SkMatrix& matrix) {
SkMatrix transform = matrix;
transform.postConcat(fInitialTransform);
SkRect translatedRect;
transform.mapRect(&translatedRect, r);
void SkPDFDevice::addAnnotation(SkPDFDict* annotation) {
if (NULL == fAnnotations) {
fAnnotations = SkNEW(SkPDFArray);
}
SkPDFDict* annotation(SkNEW_ARGS(SkPDFDict, ("Annot")));
fAnnotations->appendObject(annotation);
}
static SkPDFDict* create_link_annotation(const SkRect& r,
const SkMatrix& initialTransform,
const SkMatrix& matrix) {
SkMatrix transform = matrix;
transform.postConcat(initialTransform);
SkRect translatedRect;
transform.mapRect(&translatedRect, r);
SkAutoTUnref<SkPDFDict> annotation(SkNEW_ARGS(SkPDFDict, ("Annot")));
annotation->insertName("Subtype", "Link");
fAnnotations->append(annotation);
SkAutoTUnref<SkPDFArray> border(SkNEW(SkPDFArray));
border->reserve(3);
border->appendInt(0); // Horizontal corner radius.
border->appendInt(0); // Vertical corner radius.
border->appendInt(0); // Width, 0 = no border.
annotation->insert("Border", border.get());
annotation->insertObject("Border", border.detach());
SkAutoTUnref<SkPDFArray> rect(SkNEW(SkPDFArray));
rect->reserve(4);
@ -1491,29 +1495,33 @@ SkPDFDict* SkPDFDevice::createLinkAnnotation(const SkRect& r,
rect->appendScalar(translatedRect.fTop);
rect->appendScalar(translatedRect.fRight);
rect->appendScalar(translatedRect.fBottom);
annotation->insert("Rect", rect.get());
annotation->insertObject("Rect", rect.detach());
return annotation;
return annotation.detach();
}
void SkPDFDevice::handleLinkToURL(SkData* urlData, const SkRect& r,
const SkMatrix& matrix) {
SkAutoTUnref<SkPDFDict> annotation(createLinkAnnotation(r, matrix));
SkAutoTUnref<SkPDFDict> annotation(
create_link_annotation(r, fInitialTransform, matrix));
SkString url(static_cast<const char *>(urlData->data()),
urlData->size() - 1);
SkAutoTUnref<SkPDFDict> action(SkNEW_ARGS(SkPDFDict, ("Action")));
action->insertName("S", "URI");
action->insertString("URI", url);
annotation->insert("A", action.get());
annotation->insertObject("A", action.detach());
this->addAnnotation(annotation.detach());
}
void SkPDFDevice::handleLinkToNamedDest(SkData* nameData, const SkRect& r,
const SkMatrix& matrix) {
SkAutoTUnref<SkPDFDict> annotation(createLinkAnnotation(r, matrix));
SkAutoTUnref<SkPDFDict> annotation(
create_link_annotation(r, fInitialTransform, matrix));
SkString name(static_cast<const char *>(nameData->data()),
nameData->size() - 1);
annotation->insertName("Dest", name);
this->addAnnotation(annotation.detach());
}
struct NamedDestination {

2
src/pdf/SkPDFDevice.h
View File

@ -297,7 +297,7 @@ private:
const SkPaint& paint);
bool handlePointAnnotation(const SkPoint* points, size_t count,
const SkMatrix& matrix, const SkPaint& paint);
SkPDFDict* createLinkAnnotation(const SkRect& r, const SkMatrix& matrix);
void addAnnotation(SkPDFDict*);
void handleLinkToURL(SkData* urlData, const SkRect& r,
const SkMatrix& matrix);
void handleLinkToNamedDest(SkData* nameData, const SkRect& r,