--- a/javauis/lcdui_akn/lcdui/inc/CMIDCanvas.h	Tue Sep 14 21:06:50 2010 +0300
+++ b/javauis/lcdui_akn/lcdui/inc/CMIDCanvas.h	Wed Sep 15 12:05:25 2010 +0300
@@ -478,7 +478,7 @@
      * @since  S60 v3.0
       * @param  aRect Content bounds.
      */
-    void MdcAddContentBounds(const TRect& aRect);
+    void MdcAddMMAPIContentBounds(const TRect& aRect);
 
     /**
      * From MDirectContainer.
@@ -487,7 +487,7 @@
      * @since  S60 v3.2
      * @param  aRect Content bound to be removed.
      */
-    void MdcRemoveContentBounds(const TRect& aRect);
+    void MdcRemoveMMAPIContentBounds(const TRect& aRect);
 
     /**
      * From MDirectContainer.
@@ -1211,6 +1211,11 @@
      * @see MMIDCanvas::MidletExiting()
      */
     void MidletExiting();
+
+    /**
+     * @see MMIDCanvas::IsVideoOverlayActive()
+     */
+    TBool IsVideoOverlayActive();
 private:
     /**
      * Blits pbuffer surface scaled to window surface
@@ -1400,6 +1405,14 @@
      * @since S60 9.2
      */
     void PostForcedPaint();
+    
+    /**
+     * Used only in video overlay case.
+     * Sets frame buffer alpha channel back to 0xFF after MMAPI content area have been
+     * removed from canvas. Must be called only in LCDUI thread.
+     * @since S60 9.2
+     */
+    void CheckDirectContentUpdated();
 #endif // RD_JAVA_NGA_ENABLED
 
 private: // data
@@ -1764,7 +1777,7 @@
     TUint8* iTexturePixels;
 
     /**
-     * OpenGL coordinate arrays used fo r rendering filled rectangles
+     * OpenGL coordinate arrays used for rendering filled rectangles
      */
     GLshort* iVertexArray;
     GLubyte* iTriangleStrip;
@@ -1773,6 +1786,13 @@
      * ETrue, when midlet is exiting and this canvas is the current displayable
      */
     TBool iExiting;
+    
+    /**
+     * Indicates if MMAPI content areas have been updated.
+     * This flag is accessed from MMAPI and LCDUI threads.
+     */
+    TBool iMMAPIAreaUpdated;
+
 #endif // RD_JAVA_NGA_ENABLED
 
     /**