Fix the issue that webgl displays nothing after returning from home screen.(on emulator)

[Title] Fix the issue that webgl displays nothing after returning from home screen.(on emulator)
[Issue#] N_SE-33336
[Problem] Webgl displays nothing after returning from home screen.
[Cause] Updating flag was not checked.
[Solution] Set updating flag before going to home screen.

Change-Id: I9f6968a1a64d87bf0286118253a1ec94f2fa7306

diff --git a/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp b/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp
index 015e539..5267752 100644 (file)
--- a/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp
@@ -814,6 +814,21 @@ PassOwnPtr<WebCore::GraphicsContext> LayerTreeCoordinator::beginContentUpdate(co
     return m_updateAtlases.last()->beginPaintingOnAvailableBuffer(handle, size, offset);
 }
 
+#if ENABLE(TIZEN_WEBKIT2_TILED_AC) && !ENABLE(TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE)
+void LayerTreeCoordinator::pauseRendering()
+{
+    m_isSuspended = true;
+#if ENABLE(WEBGL)
+    // Make sure compositing webgl layer after returning from home screen.
+    HashSet<WebCore::WebGraphicsLayer*>::iterator end = m_registeredLayers.end();
+    for (HashSet<WebCore::WebGraphicsLayer*>::iterator it = m_registeredLayers.begin(); it != end; ++it) {
+        if ((*it)->contentType() == WebLayerInfo::Canvas3DContentType)
+            (*it)->markCanvasPlatformLayerNeedsUpdate();
+    }
+#endif
+}
+#endif
+
 #if ENABLE(TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE)
 void LayerTreeCoordinator::freePlatformSurface(int layerID, int platformSurfaceId)
 {

diff --git a/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h b/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h
index b752338..94ec95e 100644 (file)
--- a/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h
+++ b/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h
@@ -59,7 +59,11 @@ public:
     virtual void setPageOverlayOpacity(float);
     virtual bool pageOverlayShouldApplyFadeWhenPainting() const { return false; }
 
+#if ENABLE(TIZEN_WEBKIT2_TILED_AC) && !ENABLE(TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE)
+    virtual void pauseRendering();
+#else
     virtual void pauseRendering() { m_isSuspended = true; }
+#endif
     virtual void resumeRendering() { m_isSuspended = false; scheduleLayerFlush(); }
     virtual void deviceScaleFactorDidChange() { }
     virtual int64_t adoptImageBackingStore(WebCore::Image*);

diff --git a/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/WebGraphicsLayer.h b/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/WebGraphicsLayer.h
index d21d812..59c0e73 100755 (executable)
--- a/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/WebGraphicsLayer.h
+++ b/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/WebGraphicsLayer.h
@@ -209,6 +209,8 @@ public:
     void freePlatformSurface(int platformSurfaceID);
     void removePlatformSurface(int platformSurfaceID);
     bool swapPlatformSurfaces();
+#else
+    void markCanvasPlatformLayerNeedsUpdate() { m_canvasNeedsDisplay = true; }
 #endif
 #if ENABLE(TIZEN_ACCELERATED_2D_CANVAS_EFL)
     void flushPlatformSurfaces();