Kaydet (Commit) 9d81a7ae authored tarafından Noel Grandin's avatar Noel Grandin

rename some mpOutdev fields to mpOutdevProvider

to help my little brain keep the two things distinct

Change-Id: Iaf866c410b3ce3c4720d5efff4497507f1bd57c5
Reviewed-on: https://gerrit.libreoffice.org/51210Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 3bbdf715
......@@ -50,11 +50,11 @@ namespace vclcanvas
void CanvasBitmapHelper::setBitmap( const BitmapEx& rBitmap )
{
ENSURE_OR_THROW( mpOutDev,
ENSURE_OR_THROW( mpOutDevProvider,
"Invalid reference device" );
mpBackBuffer.reset( new BitmapBackBuffer( rBitmap,
mpOutDev->getOutDev() ) );
mpOutDevProvider->getOutDev() ) );
// tell canvas helper about the new target OutDev (don't
// protect state, it's our own VirDev, anyways)
......@@ -289,7 +289,7 @@ namespace vclcanvas
rendering::IntegerBitmapLayout CanvasBitmapHelper::getMemoryLayout()
{
if( !mpOutDev.get() )
if( !mpOutDevProvider.get() )
return rendering::IntegerBitmapLayout(); // we're disposed
rendering::IntegerBitmapLayout aBitmapLayout( ::canvas::tools::getStdMemoryLayout(getSize()) );
......
......@@ -294,13 +294,13 @@ namespace vclcanvas
css::rendering::XGraphicDevice* mpDevice;
/// Rendering to this outdev preserves its state
OutDevProviderSharedPtr mpProtectedOutDev;
OutDevProviderSharedPtr mpProtectedOutDevProvider;
/// Rendering to this outdev does not preserve its state
OutDevProviderSharedPtr mpOutDev;
OutDevProviderSharedPtr mpOutDevProvider;
/// Rendering to this outdev does not preserve its state
OutDevProviderSharedPtr mp2ndOutDev;
OutDevProviderSharedPtr mp2ndOutDevProvider;
/// When true, content is able to represent alpha
bool mbHaveAlpha;
......
......@@ -576,9 +576,9 @@ namespace vclcanvas
ENSURE_ARG_OR_THROW( textures.getLength(),
"CanvasHelper::fillTexturedPolyPolygon: empty texture sequence");
if( mpOutDev )
if( mpOutDevProvider )
{
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
const int nTransparency( setupOutDevState( viewState, renderState, IGNORE_COLOR ) );
::tools::PolyPolygon aPolyPoly( tools::mapPolyPolygon(
......@@ -618,8 +618,8 @@ namespace vclcanvas
// TODO(E1): Return value
// TODO(F1): FillRule
gradientFill( mpOutDev->getOutDev(),
mp2ndOutDev.get() ? &mp2ndOutDev->getOutDev() : nullptr,
gradientFill( mpOutDevProvider->getOutDev(),
mp2ndOutDevProvider.get() ? &mp2ndOutDevProvider->getOutDev() : nullptr,
rValues,
aColors,
aPolyPoly,
......@@ -859,7 +859,7 @@ namespace vclcanvas
const sal_Int32 nTilesY( textures[0].RepeatModeX == rendering::TexturingMode::NONE ?
1 : nY2 - nY1 );
OutputDevice& rOutDev( mpOutDev->getOutDev() );
OutputDevice& rOutDev( mpOutDevProvider->getOutDev() );
if( bRectangularPolygon )
{
......@@ -902,9 +902,9 @@ namespace vclcanvas
aSz,
aGrfAttr );
if( mp2ndOutDev )
if( mp2ndOutDevProvider )
{
OutputDevice& r2ndOutDev( mp2ndOutDev->getOutDev() );
OutputDevice& r2ndOutDev( mp2ndOutDevProvider->getOutDev() );
r2ndOutDev.IntersectClipRegion( aPolygonDeviceRect );
textureFill( r2ndOutDev,
*pGrfObj,
......@@ -967,8 +967,8 @@ namespace vclcanvas
rOutDev.DrawBitmapEx( aPolygonDeviceRect.TopLeft(),
aOutputBmpEx );
if( mp2ndOutDev )
mp2ndOutDev->getOutDev().DrawBitmapEx( aPolygonDeviceRect.TopLeft(),
if( mp2ndOutDevProvider )
mp2ndOutDevProvider->getOutDev().DrawBitmapEx( aPolygonDeviceRect.TopLeft(),
aOutputBmpEx );
}
else
......@@ -989,9 +989,9 @@ namespace vclcanvas
aGrfAttr );
rOutDev.Pop();
if( mp2ndOutDev )
if( mp2ndOutDevProvider )
{
OutputDevice& r2ndOutDev( mp2ndOutDev->getOutDev() );
OutputDevice& r2ndOutDev( mp2ndOutDevProvider->getOutDev() );
r2ndOutDev.Push( PushFlags::CLIPREGION );
r2ndOutDev.IntersectClipRegion( aPolyClipRegion );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment