MCL/sf/mw/uiaccelerator: comparison uiacceltk/hitchcock/coretoolkit/src/HuiCanvasVisual.cpp

equal deleted inserted replaced

-:f93c875b566e
+:3a60ebea00d0
 // may be smaller than the visuals displayarea. In that case we dont expand
 // rect but make it smaller.
 HandleBuffer(scannedRect, EScanBuffer, NULL);
 // Note: this could be improved to take care of dirty rects
-if (Effect() && Display())
+if (Effect() && Display() && CHuiEnv::Static()->MemoryLevel() != EHuiMemoryLevelLowest )
 {
 // If there is effect enabled, we cannot say anything about dirty area so
 // we set whole screen dirty.
 scannedRect = TRect(TPoint(0,0), Display()->VisibleArea().Size());
 }
-else if (IsBackgroundDrawingEnabled() || IsExternalContentDrawingEnabled())
+else if (IsExternalContentDrawingEnabled())
 {
 // If the visual has external content or draws background,
 // set always the whole window area as a content.
 scannedRect = aRect;
 }
 return EFalse;
 }
 if (Effect())
 {
+TBool hasStoredContent = (IsDelayedEffectSource() || Freezed()) && (StoredRenderBuffer() ||  iCanvasVisualData->iStoredRenderBuffer);
 TBool semiTranparentEffectActive = Effect()->IsSemitransparent();
 if ((iOpacity.Now() <= EPSILON && !semiTranparentEffectActive))
 {
 return ETrue;
 }
 if( !childWindowEffectActive &&
 !effectAppliedToSurfacePixels &&
 !HasCommandBuffers(ETrue /*include children*/) &&
 !IsBackgroundDrawingEnabled() &&
 !IsExternalContentDrawingEnabled()&&
-!IsExternalContentDrawingEnabled(ETrue /*include children*/))
+!IsExternalContentDrawingEnabled(ETrue /*include children*/) &&
+!hasStoredContent )
 {
 return ETrue;
 }
 }
 else
 TBool transparent = EFalse;
 transparent |= (!(Flags() & EHuiVisualFlagOpaqueHint)); // Does not have opaque hint -> always transparent
 transparent |= iOpacity.Now() < 1.0f; // Opacity less than 1.0f -> always transparent
 TBool refreshCache = EFalse;
+TBool layer =  EFalse;
 if (EffectIsAppliedToChildren())
 {
 refreshCache |= ChildTreeChanged(EHuiCanvasFlagExcludeFromParentEffect);
 iCanvasVisualData->iPaintedRegion.Clear();
-CollectRecursivePaintedRegion(iCanvasVisualData->iPaintedRegion, EHuiCanvasFlagExcludeFromParentEffect);
+layer = CollectRecursivePaintedRegion(iCanvasVisualData->iPaintedRegion, EHuiCanvasFlagExcludeFromParentEffect);
 }
 else
 {
 refreshCache |= Changed();
 iCanvasVisualData->iPaintedRegion.Clear();
-CollectPaintedRegion(iCanvasVisualData->iPaintedRegion, 0);
+layer = CollectPaintedRegion(iCanvasVisualData->iPaintedRegion, 0);
 }
 if(Display()->RosterImpl().AlfEventWindow() == this)
 {
 refreshCache |= Display()->RosterImpl().NativeAppsContentChanged();
 }
-didDrawEffect = Effect()->CachedDraw(aGc, area, refreshCache, !transparent, iCanvasVisualData->iPaintedRegion);
+didDrawEffect = Effect()->CachedDraw(aGc, area, refreshCache, !transparent, iCanvasVisualData->iPaintedRegion,layer );
 }
 if ( !didDrawEffect )
 {
 RDebug::Print(_L("CHuiCanvasVisual::DrawSelf - tracked visual"));
 }
 #endif
 TBool alfEventWindow = (Display()->RosterImpl().AlfEventWindow() == this);
 TReal32 effectiveOpacity = EffectiveOpacity();
+TBool hasStoredContent = (IsContentDrawingEnabled() && (IsDelayedEffectSource() || Freezed())) && (StoredRenderBuffer() || iCanvasVisualData->iStoredRenderBuffer);
-if ((effectiveOpacity <= 0 || !HasCommandBuffers(ETrue)) && !alfEventWindow)
+if ((effectiveOpacity <= 0 || !HasCommandBuffers(ETrue)) && !alfEventWindow && !hasStoredContent)
 {
 // In case background drawing is enabled, and even if we don't have command buffers we still
 // want to issue clear. If the background drawing is enabled here, it means that the
 // window bound to this visual has a background surface. If we dont do the clear, the
 // surface will be covered by the Alf surface, ie. the underlying surface is not visible
 {
 return;
 }
 }
-if (IsContentDrawingEnabled() && (IsDelayedEffectSource() || Freezed()))
+if (hasStoredContent)
 {
 // Select right draw mode
 THuiCanvasDrawMode drawMode = (Flags() & EHuiVisualFlagOpaqueHint) ? EHuiCanvasDrawModeNormal : EHuiCanvasDrawModeBlend;
 if (StoredRenderBuffer())
 else
 {
 PrepareCache();
 }
-SetChanged();
+// don't call setchanged directly here, as it changes all
+// the command buffers dirty. We don't want to do that
+// as the drawing area might be significantly smaller in
+// some cases
+CHuiLayout::SetChanged();
+Env().ContinueRefresh(ETrue);
 Env().CanvasTextureCache().EnableTouchCountCheck(EFalse);
 }
 EXPORT_C void CHuiCanvasVisual::AddPartialCommandSetL( const TDesC8& aMoreCommands, TBool aLastPart )
 {
 	    {
 		CHuiVisual::VisualExtension(aExtensionUid, aExtensionParams);
 		}
 }
-void CHuiCanvasVisual::CollectPaintedRegion(TRegion& aPaintRegion, TInt aExcludeCanvasFlags) const
+TBool CHuiCanvasVisual::CollectPaintedRegion(TRegion& aPaintRegion, TInt aExcludeCanvasFlags) const
 {
 // Only our own painted areas.
 TInt paintedAreaCount = PaintedAreaCount();
 for (TInt i=0; i<paintedAreaCount; i++ )
 {
 aPaintRegion.AddRect( CanvasPaintedArea(i).iPaintedRect.Round() );
 }
 aPaintRegion.Tidy();
-}
+return !iCanvasVisualData->iLayerExtent.IsEmpty();
+}
-void CHuiCanvasVisual::CollectRecursivePaintedRegion(TRegion& aRecursivePaintRegion, TInt aExcludeCanvasFlags) const
+TBool CHuiCanvasVisual::CollectRecursivePaintedRegion(TRegion& aRecursivePaintRegion, TInt aExcludeCanvasFlags) const
 {
 // First our own painted areas...
-CollectPaintedRegion(aRecursivePaintRegion, aExcludeCanvasFlags);
+TBool layer = CollectPaintedRegion(aRecursivePaintRegion, aExcludeCanvasFlags);
 // ...then children (and their children).
 const TInt count = Count();
 for(TInt i = 0; i < count; ++i)
 {
 {
 // If this is marked as Wserv visual, it should be safe to cast.
 if (visual->Flags() & EHuiVisualFlagWserv)
 {
 CHuiCanvasVisual* canvasVisual = (CHuiCanvasVisual*)visual;
-canvasVisual->CollectRecursivePaintedRegion(aRecursivePaintRegion, aExcludeCanvasFlags);
+layer |= canvasVisual->CollectRecursivePaintedRegion(aRecursivePaintRegion, aExcludeCanvasFlags);
 }
 }
 }
 }
 }
 aRecursivePaintRegion.Tidy();
+return layer;
 }
 EXPORT_C TRect CHuiCanvasVisual::CommandBufferCoverage(TInt aOrientation)
 {
 return iCanvasVisualData->iCanvasPainter->CommandBufferCoverage(aOrientation);

branch	RCL_3
changeset 13	3a60ebea00d0
parent 12	f93c875b566e
child 15	cd0ae4656946