diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-28 13:01:36 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-28 13:01:36 +0000 |
| commit | 6c1d947968dd660991dde16d3a1e9995df7ae957 (patch) | |
| tree | 3819d035d342a0253dc95e645640a6840ebae01f /printing | |
| parent | 81d459df4f80733911ffb21b4ec99b9f13c55c9b (diff) | |
| download | chromium_src-6c1d947968dd660991dde16d3a1e9995df7ae957.zip chromium_src-6c1d947968dd660991dde16d3a1e9995df7ae957.tar.gz chromium_src-6c1d947968dd660991dde16d3a1e9995df7ae957.tar.bz2 | |
Fixed "taking the address of a temporary object" warnings.
BUG=224532
TBR=timurrrr
Review URL: https://chromiumcodereview.appspot.com/13149002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/emf_win.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/printing/emf_win.cc b/printing/emf_win.cc index 5c01c4b2..98c8f8f 100644 --- a/printing/emf_win.cc +++ b/printing/emf_win.cc @@ -125,7 +125,8 @@ class RasterBitmap { NOTREACHED() << "Raster bitmap creation for printing failed"; saved_object_ = ::SelectObject(context_, bitmap_); - ::FillRect(context_, &bitmap_rect.ToRECT(), + RECT rect = bitmap_rect.ToRECT(); + ::FillRect(context_, &rect, static_cast<HBRUSH>(::GetStockObject(WHITE_BRUSH))); } @@ -229,11 +230,12 @@ bool Emf::SafePlayback(HDC context) const { } Emf::EnumerationContext playback_context; playback_context.base_matrix = &base_matrix; + RECT rect = GetPageBounds(1).ToRECT(); return EnumEnhMetaFile(context, emf_, &Emf::SafePlaybackProc, reinterpret_cast<void*>(&playback_context), - &GetPageBounds(1).ToRECT()) != 0; + &rect) != 0; } gfx::Rect Emf::GetPageBounds(unsigned int page_number) const { @@ -615,7 +617,8 @@ Emf* Emf::RasterizeMetafile(int raster_area_in_pixels) const { RasterBitmap bitmap(page_size); gfx::Rect bitmap_rect(page_size); - Playback(bitmap.context(), &bitmap_rect.ToRECT()); + RECT rect = bitmap_rect.ToRECT(); + Playback(bitmap.context(), &rect); scoped_ptr<Emf> result(new Emf); result->Init(); @@ -663,8 +666,8 @@ Emf* Emf::RasterizeAlphaBlend() const { skia::InitializeDC(hdc); HDC bitmap_dc = bitmap.context(); - ::EnumEnhMetaFile(hdc, emf(), &RasterizeAlphaBlendProc, &bitmap_dc, - &page_bounds.ToRECT()); + RECT rect = page_bounds.ToRECT(); + ::EnumEnhMetaFile(hdc, emf(), &RasterizeAlphaBlendProc, &bitmap_dc, &rect); result->FinishDocument(); |