FCL/sf/mw/uiaccelerator: comparison uiacceltk/hitchcock/coretoolkit/src/huicanvaswspainter.cpp

equal deleted inserted replaced

-:15bf7259bb7c
+:8f67d927ea57
 */
 const TBool KHuiCanvasAutomaticRenderBufferUsage = EFalse; // Disbaled until all UI isses has been solved
 const TInt KHuiCanvasDisableRenderBufferHandleInterval = 100; // Milliseconds
 const TInt KHuiCanvasEnableRenderBufferHandleInterval = 500;  // Milliseconds
-/** Internal constant to identify complex command buffers */
-const TInt KPossiblePerformanceProblemInWindow = 64;
 /** ETrue - use SelectGcL to select gc implementation,
 EFalse - use KHuiDefaultCanvasWsGc. */
 const TBool KHuiUseSelectGc = ETrue;
 /** Change this to select default rendering ws gc implementation.
 RDebug::Print(_L(">> CHuiCanvasWsPainter::HandleBufferL - relativeOrientation = %i "), relativeOrientation);
 #endif
 /* If window shape region has been changed, we should clear the window to get rid of old content.
 * We also set all command buffers to "not drawn" state so that everything will be redrawn.
+* Actual clearing is done after BeginActionL, because drawing phase will start only after calling it.
 */
+if(iShapeRegionClearingPending)
+{
+// Cause a full redraw for the canvas visual
+SetAllBuffersChanged(ETrue);
+ClearAllBufferStatusFlags(EHuiCanvasBufferStatusDrawn);
+}
+/* Check if we have buffers that are not yet been drawn (or we render buffer is disabled) */
+TBool cachePrepared = !HasCommandBuffersWithoutFlags(EHuiCanvasBufferStatusDrawn) || !iCanvasWsGc->IsRenderBufferEnabled();
+/* Begin draw. If render buffer is used this sets up the render buffer if needed */
+iCanvasWsGc->BeginActionL(aAction,aDisplayRect,aUser,cachePrepared,iFullUpdateRegion);
 TBool isFullUpdateRegionCleared = EFalse;
 if(iShapeRegionClearingPending)
 {
 #ifdef HUI_DEBUG_PRINT_PERFORMANCE_INTERVAL
 RDebug::Print(_L(">> CHuiCanvasWsPainter::HandleBufferL - Clearing fullupdateregion"));
 #endif
 // Clear the window update region area
 TBool doClear = ETrue;
 iCanvasWsGc->EnableUpdateRegion(iFullUpdateRegion, doClear);
 iCanvasWsGc->DisableUpdateRegion();
 isFullUpdateRegionCleared = ETrue;
-// Cause a full redraw for the canvas visual
-SetAllBuffersChanged(ETrue);
-ClearAllBufferStatusFlags(EHuiCanvasBufferStatusDrawn);
 iShapeRegionClearingPending = EFalse;
 }
-/* Check if we have buffers that are not yet been drawn (or we render buffer is disabled) */
-TBool cachePrepared = !HasCommandBuffersWithoutFlags(EHuiCanvasBufferStatusDrawn) || !iCanvasWsGc->IsRenderBufferEnabled();
-/* Begin draw. If render buffer is used this sets up the render buffer if needed */
-iCanvasWsGc->BeginActionL(aAction,aDisplayRect,aUser,cachePrepared,iFullUpdateRegion);
 #ifdef HUI_DEBUG_PRINT_PERFORMANCE_INTERVAL
 if (iCanvasWsGc->IsRenderBufferEnabled())
 {
 RDebug::Print(_L(">> CHuiCanvasWsPainter::HandleBufferL renderbuffer is ENABLED"));
 {
 TBool didRemoveBuffers = EFalse;
 TInt originalBufferCount = iCommandBuffers.Count();
 RemoveBuffersWithoutRealDrawing();
-RemoveBuffersWithOldDisplayRect();
+// Remove buffers only with moved display rect and modify the clip region
+// of buffers with changed size instead of completely removing all.
+RemoveBuffersWithMovedDisplayRect();
+ModifyBuffersWithChangedDisplayRect();
+//RemoveBuffersWithOldDisplayRect();
 RemoveBuffersWithEmptyUpdateRegion();
 RemoveBuffersWithOverlappingUpdateRegion();
 didRemoveBuffers = (originalBufferCount != iCommandBuffers.Count());
 return didRemoveBuffers;
+}
+void CHuiCanvasWsPainter::RemoveBuffersWithMovedDisplayRect()
+{
+TInt bufferCount = iCommandBuffers.Count();
+TRect canvas = iCanvasVisual->DisplayRect().Round();
+for (TInt cb = bufferCount - 1; cb >= 0; cb--)
+{
+CHuiCanvasCommandBuffer* buffer = iCommandBuffers[cb];
+TRect bufRect = buffer->iOriginalDisplayRect.Round();
+// If the visual has moved, delete the old buffer
+if (bufRect.iTl != canvas.iTl)
+{
+DestroyBuffer(cb);
+}
+}
+}
+void CHuiCanvasWsPainter::ModifyBuffersWithChangedDisplayRect()
+{
+TInt bufferCount = iCommandBuffers.Count();
+TRect canvasRect = iCanvasVisual->DisplayRect().Round();
+TRegionFix<1> region(canvasRect);
+// If the buffers have different update region than CanvasVisual, clip
+// the drawing to canvas visual's & cmdbuffer's updateregions' intersection.
+for (TInt cb = 0; cb < bufferCount; cb++)
+{
+CHuiCanvasCommandBuffer* cmdbuffer = iCommandBuffers[cb];
+if (cmdbuffer->iOriginalDisplayRect.Round() != canvasRect)
+{
+cmdbuffer->iUpdateRegion.Copy(cmdbuffer->iOriginalUpdateRegion);
+cmdbuffer->iUpdateRegion.Intersect(region);
+cmdbuffer->iUpdateRegion.Tidy();
+}
+}
 }
 void CHuiCanvasWsPainter::RemoveBuffersWithoutRealDrawing()
 {
 TInt bufferCount = iCommandBuffers.Count();
 return EFalse;
 }
 TInt CHuiCanvasWsPainter::EnableRenderBuffer(TBool aEnable)
 {
-if (aEnable != iCanvasWsGc->IsRenderBufferEnabled())
+iEnableRenderBuffer = aEnable;
+if (iCanvasWsGc && ( aEnable != iCanvasWsGc->IsRenderBufferEnabled() ) )
 {
 if (aEnable)
 {
 // Must redraw all buffers to render buffer at next frame
 RenewAllBuffers();
 // Clear caches of non-used GCs
 if ( oldGc && oldGc != iCanvasWsGc )
 {
 oldGc->ClearCache();
+}
+if ( iCanvasWsGc )
+{
+// Forward 'enable render buffer' setting to new GC.
+iCanvasWsGc->EnableRenderbuffer( iEnableRenderBuffer );
 }
 #ifdef HUI_DEBUG_TRACK_DRAWING
 CHuiCanvasWsGc* realGc = iCanvasWsGc;
 iCanvasWsGc = CHuiCanvasDebugWsGc::NewL( realGc, *iCommandDebugger );

changeset 13	8f67d927ea57
parent 0	15bf7259bb7c
child 14	83d2d132aa58