Fix the issue that accelerated overflow scrolling become invisible

[framework/web/webkit-efl.git] / Source / WebKit2 / WebProcess / WebPage / LayerTreeCoordinator / WebGraphicsLayer.h

diff --git a/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/WebGraphicsLayer.h b/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/WebGraphicsLayer.h
index d21d812..4c2cc7f 100755 (executable)
--- a/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/WebGraphicsLayer.h
+++ b/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/WebGraphicsLayer.h
@@ -38,10 +38,6 @@
 #include <WebCore/RunLoop.h>
 #include <wtf/text/StringHash.h>
 
-#if ENABLE(TIZEN_RECORDING_SURFACE_SET)
-#include "../WebPage/cairo/RecordingSurfaceSetCairo.h"
-#endif
-
 #if ENABLE(TIZEN_RECORDING_SURFACE_PAINT_THREAD)
 #include <wtf/threads/BinarySemaphore.h>
 #endif
@@ -60,9 +56,6 @@ class TileCutOffInfo;
 }
 
 namespace WebKit {
-#if ENABLE(TIZEN_RECORDING_SURFACE_SET)
-class RecordingSurfaceSet;
-#endif
 
 class WebGraphicsLayerClient {
 public:
@@ -94,12 +87,6 @@ public:
     virtual void syncFixedLayers() = 0;
     virtual PassOwnPtr<WebCore::GraphicsContext> beginContentUpdate(const WebCore::IntSize&, ShareableBitmap::Flags, ShareableSurface::Handle&, WebCore::IntPoint&) = 0;
 
-#if ENABLE(TIZEN_RECORDING_SURFACE_SET)
-    virtual bool recordingSurfaceSetEnableGet() = 0;
-    virtual bool recordingSurfaceSetLoadStartGet() = 0;
-    virtual bool recordingSurfaceSetLoadFinishedGet() = 0;
-#endif
-
 #if ENABLE(TIZEN_RUNTIME_BACKEND_SELECTION)
     virtual bool isGLAccelerationMode() const = 0;
 #endif
@@ -209,6 +196,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();
@@ -220,13 +209,7 @@ public:
     virtual bool drawTileInfo() const;
 #endif
 
-#if ENABLE(TIZEN_RECORDING_SURFACE_SET)
-    virtual IntRect dirtyUnionRect();
-    void setNonCompositedLayer(bool);
-#endif
-
 #if ENABLE(TIZEN_CSS_OVERFLOW_SCROLL_ACCELERATION)
-    void setVisibleRect(const IntRect& rect) { m_visibleRect = rect; }
     void setIsOverflow(const bool b);
     bool isOverflow() const { return m_isOverflow; }
 #endif
@@ -304,41 +287,10 @@ private:
     OwnPtr<WebCore::TiledBackingStore> m_mainBackingStore;
     OwnPtr<WebCore::TiledBackingStore> m_previousBackingStore;
     float m_contentsScale;
-
-#if ENABLE(TIZEN_RECORDING_SURFACE_SET)
-    bool recordingSurfaceSetEnableGet();
-    bool recordingSurfaceSetLoadStartGet();
-    bool recordingSurfaceSetLoadFinishedGet();
-    void recordingSurfaceSetRecord();
-    void recordingSurfaceSetReplay(WebCore::GraphicsContext&, const WebCore::IntRect&);
-    void recordingSurfaceSetRebuild(WebKit::RecordingSurfaceSet*, float scale);
-    void setDirtyUnionRect(const IntRect& rect);
-    void uniteDirtyUnionRect(const IntRect& rect);
-    void setDirtyRect(const IntRect& rect);
-    void dirtyRectInvalidate();
-
-    enum RecordingSurfaceSetStatus {
-        RecordingSurfaceSetInit,
-        RecordingSurfaceSetComplete
-    };
-
-    bool m_nonCompositedLayer;
-    IntRect m_dirtyUnionRect;
-    bool m_changedZoomSet;
-    bool m_recordingSurfaceSetIsReplaying;
-    RecordingSurfaceSetStatus m_recordingSurfaceSetStatus;
-    WebKit::RecordingSurfaceSet* m_recordingSurfaceSet;
-    Vector<WebCore::IntRect> m_dirtyRects;
-
-#if ENABLE(TIZEN_RECORDING_SURFACE_PAINT_THREAD)
-    void updateTileBuffers();
-    void scheduleUpdateTileBuffersAsync();
-    WTF::BinarySemaphore m_waitForSyncSemaphore;
-#endif
-#endif
-#if ENABLE(TIZEN_CSS_OVERFLOW_SCROLL_ACCELERATION)
-    IntRect m_visibleRect;
+#if ENABLE(TIZEN_USE_FIXED_SCALE_ANIMATION)
+    float m_fixedAnimationScale;
 #endif
+
     PlatformLayer* m_canvasPlatformLayer;
     Timer<WebGraphicsLayer> m_animationStartedTimer;
     GraphicsLayerAnimations m_animations;