diff options
author | halcanary <halcanary@google.com> | 2015-01-08 09:03:22 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-08 17:04:06 +0000 |
commit | 5c2d68a04c4f5ce03f941656ad940b938dbf9f64 (patch) | |
tree | 3be3226542e3d7f33470a351397b9ceef8e6c593 /ui | |
parent | a5de1667737547bf54f80f8491226091ab19ee28 (diff) | |
download | chromium_src-5c2d68a04c4f5ce03f941656ad940b938dbf9f64.zip chromium_src-5c2d68a04c4f5ce03f941656ad940b938dbf9f64.tar.gz chromium_src-5c2d68a04c4f5ce03f941656ad940b938dbf9f64.tar.bz2 |
Revert of Remove calls to deprecated SkPDFDevice and SkPDFDocuemnt. (patchset #6 id:140001 of https://codereview.chromium.org/821703005/)
Reason for revert:
A bisect proved that this change caused
https://code.google.com/p/chromium/issues/detail?id=446729
Original issue's description:
> Remove calls to deprecated SkPDFDevice and SkPDFDocuemnt.
>
> This relands http://crrev.com/694213002
>
> In the PdfMetafileSkia class, Instead of storing a
> SkPDFDocument, store a vector of pages as
> SkPictures. This allows access to individual at any
> time. When FinishDocument() is called, use the
> SkDocument API to print all pages to PDF.
>
> In PrintWebViewHelper::RenderPageContent, skip clipping
> content to content area, since Windows printing prints
> content just outside of the content area, as noted in
> http://crbug.com/434079 .
>
> BUG=278148
>
> Committed: https://crrev.com/18387e7ebb0eae6e4944e841d63ea058adab6e11
> Cr-Commit-Position: refs/heads/master@{#310032}
TBR=vitalybuka@chromium.org,reed@google.com,danakj@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=278148
BUG=446729
Review URL: https://codereview.chromium.org/788053006
Cr-Commit-Position: refs/heads/master@{#310517}
Diffstat (limited to 'ui')
-rw-r--r-- | ui/gfx/skia_util.cc | 9 | ||||
-rw-r--r-- | ui/gfx/skia_util.h | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/ui/gfx/skia_util.cc b/ui/gfx/skia_util.cc index 63827e3..0bdf4e9 100644 --- a/ui/gfx/skia_util.cc +++ b/ui/gfx/skia_util.cc @@ -47,15 +47,6 @@ RectF SkRectToRectF(const SkRect& rect) { SkScalarToFloat(rect.height())); } -SkSize SizeFToSkSize(const SizeF& size) { - return SkSize::Make(SkFloatToScalar(size.width()), - SkFloatToScalar(size.height())); -} - -SizeF SkSizeToSizeF(const SkSize& size) { - return SizeF(SkScalarToFloat(size.width()), SkScalarToFloat(size.height())); -} - void TransformToFlattenedSkMatrix(const gfx::Transform& transform, SkMatrix* flattened) { // Convert from 4x4 to 3x3 by dropping the third row and column. diff --git a/ui/gfx/skia_util.h b/ui/gfx/skia_util.h index 303044d..0c75983 100644 --- a/ui/gfx/skia_util.h +++ b/ui/gfx/skia_util.h @@ -12,7 +12,6 @@ #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkRect.h" #include "third_party/skia/include/core/SkShader.h" -#include "ui/gfx/geometry/size.h" #include "ui/gfx/gfx_export.h" class SkBitmap; @@ -32,8 +31,6 @@ GFX_EXPORT SkIRect RectToSkIRect(const Rect& rect); GFX_EXPORT Rect SkIRectToRect(const SkIRect& rect); GFX_EXPORT SkRect RectFToSkRect(const RectF& rect); GFX_EXPORT RectF SkRectToRectF(const SkRect& rect); -GFX_EXPORT SkSize SizeFToSkSize(const SizeF& size); -GFX_EXPORT SizeF SkSizeToSizeF(const SkSize& size); GFX_EXPORT void TransformToFlattenedSkMatrix(const gfx::Transform& transform, SkMatrix* flattened); |