Changeset 174262 in webkit

Timestamp:

Oct 3, 2014 2:25:08 AM (10 years ago)

Author:

Csaba Osztrogonác

Message:

[GTK] URTBF after r174231.

• WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:

(webkit_web_page_get_dom_document):

• WebProcess/WebPage/DrawingAreaImpl.cpp:

(WebKit::DrawingAreaImpl::didInstallPageOverlay): Deleted.
(WebKit::DrawingAreaImpl::didUninstallPageOverlay): Deleted.
(WebKit::DrawingAreaImpl::setPageOverlayNeedsDisplay): Deleted.
(WebKit::DrawingAreaImpl::setPageOverlayOpacity): Deleted.

• WebProcess/WebPage/DrawingAreaImpl.h:
• WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:

(WebKit::LayerTreeHostGtk::createPageOverlayLayer):
(WebKit::LayerTreeHostGtk::destroyPageOverlayLayer):
(WebKit::LayerTreeHostGtk::didInstallPageOverlay): Deleted.
(WebKit::LayerTreeHostGtk::didUninstallPageOverlay): Deleted.
(WebKit::LayerTreeHostGtk::setPageOverlayNeedsDisplay): Deleted.

• WebProcess/WebPage/gtk/LayerTreeHostGtk.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (modified) (2 diffs)
• WebProcess/WebPage/DrawingAreaImpl.cpp (modified) (1 diff)
• WebProcess/WebPage/DrawingAreaImpl.h (modified) (1 diff)
• WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (modified) (3 diffs)
• WebProcess/WebPage/gtk/LayerTreeHostGtk.h (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-10-03  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [GTK] URTBF after r174231.
+
+        * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+        (webkit_web_page_get_dom_document):
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::didInstallPageOverlay): Deleted.
+        (WebKit::DrawingAreaImpl::didUninstallPageOverlay): Deleted.
+        (WebKit::DrawingAreaImpl::setPageOverlayNeedsDisplay): Deleted.
+        (WebKit::DrawingAreaImpl::setPageOverlayOpacity): Deleted.
+        * WebProcess/WebPage/DrawingAreaImpl.h:
+        * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+        (WebKit::LayerTreeHostGtk::createPageOverlayLayer):
+        (WebKit::LayerTreeHostGtk::destroyPageOverlayLayer):
+        (WebKit::LayerTreeHostGtk::didInstallPageOverlay): Deleted.
+        (WebKit::LayerTreeHostGtk::didUninstallPageOverlay): Deleted.
+        (WebKit::LayerTreeHostGtk::setPageOverlayNeedsDisplay): Deleted.
+        * WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
+
 2014-10-03  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp

@@ -40 +40 @@
 #include <WebCore/Frame.h>
 #include <WebCore/FrameView.h>
+#include <WebCore/MainFrame.h>
 #include <glib/gi18n-lib.h>
 #include <wtf/NeverDestroyed.h>
@@ -421 +422 @@
     g_return_val_if_fail(WEBKIT_IS_WEB_PAGE(webPage), 0);
 
-    Frame* coreFrame = webPage->priv->webPage->mainFrame();
+    MainFrame* coreFrame = webPage->priv->webPage->mainFrame();
     if (!coreFrame)
         return 0;

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp

@@ -216 +216 @@
 }
 
-void DrawingAreaImpl::didInstallPageOverlay(PageOverlay* pageOverlay)
-{
-    if (m_layerTreeHost)
-        m_layerTreeHost->didInstallPageOverlay(pageOverlay);
-}
-
-void DrawingAreaImpl::didUninstallPageOverlay(PageOverlay* pageOverlay)
-{
-    if (m_layerTreeHost)
-        m_layerTreeHost->didUninstallPageOverlay(pageOverlay);
-
-    setNeedsDisplay();
-}
-
-void DrawingAreaImpl::setPageOverlayNeedsDisplay(PageOverlay* pageOverlay, const IntRect& rect)
-{
-    if (m_layerTreeHost) {
-        m_layerTreeHost->setPageOverlayNeedsDisplay(pageOverlay, rect);
-        return;
-    }
-
-    setNeedsDisplayInRect(rect);
-}
-
-void DrawingAreaImpl::setPageOverlayOpacity(PageOverlay* pageOverlay, float value)
-{
-    if (m_layerTreeHost)
-        m_layerTreeHost->setPageOverlayOpacity(pageOverlay, value);
-}
-
 void DrawingAreaImpl::setPaintingEnabled(bool paintingEnabled)
 {

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h

@@ -59 +59 @@
     virtual void forceRepaint();
     virtual bool forceRepaintAsync(uint64_t callbackID);
-
-    virtual void didInstallPageOverlay(PageOverlay*);
-    virtual void didUninstallPageOverlay(PageOverlay*);
-    virtual void setPageOverlayNeedsDisplay(PageOverlay*, const WebCore::IntRect&);
-    virtual void setPageOverlayOpacity(PageOverlay*, float);
 
     virtual void setPaintingEnabled(bool);

trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp

@@ -242 +242 @@
 }
 
-void LayerTreeHostGtk::didInstallPageOverlay(PageOverlay* pageOverlay)
-{
-    createPageOverlayLayer(pageOverlay);
-    scheduleLayerFlush();
-}
-
-void LayerTreeHostGtk::didUninstallPageOverlay(PageOverlay* pageOverlay)
-{
-    destroyPageOverlayLayer(pageOverlay);
-    scheduleLayerFlush();
-}
-
-void LayerTreeHostGtk::setPageOverlayNeedsDisplay(PageOverlay* pageOverlay, const IntRect& rect)
-{
-    GraphicsLayer* layer = m_pageOverlayLayers.get(pageOverlay);
-    if (!layer)
-        return;
-
-    layer->setNeedsDisplayInRect(rect);
-    scheduleLayerFlush();
-}
-
 void LayerTreeHostGtk::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const FloatRect& clipRect)
 {
@@ -350 +328 @@
 }
 
-void LayerTreeHostGtk::createPageOverlayLayer(PageOverlay* pageOverlay)
+void LayerTreeHostGtk::createPageOverlayLayer(WebCore::PageOverlay* pageOverlay)
 {
     std::unique_ptr<GraphicsLayer> layer = GraphicsLayer::create(graphicsLayerFactory(), *this);
@@ -367 +345 @@
 }
 
-void LayerTreeHostGtk::destroyPageOverlayLayer(PageOverlay* pageOverlay)
+void LayerTreeHostGtk::destroyPageOverlayLayer(WebCore::PageOverlay* pageOverlay)
 {
     std::unique_ptr<GraphicsLayer> layer = m_pageOverlayLayers.take(pageOverlay);

trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h

@@ -35 +35 @@
 #include <WebCore/GLContext.h>
 #include <WebCore/GraphicsLayerClient.h>
+#include <WebCore/PageOverlay.h>
 #include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>
@@ -73 +74 @@
     virtual void scrollNonCompositedContents(const WebCore::IntRect& scrollRect) override;
 
-    virtual void didInstallPageOverlay(PageOverlay*) override;
-    virtual void didUninstallPageOverlay(PageOverlay*) override;
-    virtual void setPageOverlayNeedsDisplay(PageOverlay*, const WebCore::IntRect&) override;
-
     // GraphicsLayerClient
     virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& clipRect) override;
@@ -82 +79 @@
     bool flushPendingLayerChanges();
 
-    void createPageOverlayLayer(PageOverlay*);
-    void destroyPageOverlayLayer(PageOverlay*);
+    void createPageOverlayLayer(WebCore::PageOverlay*);
+    void destroyPageOverlayLayer(WebCore::PageOverlay*);
 
     enum CompositePurpose { ForResize, NotForResize };
@@ -100 +97 @@
     std::unique_ptr<WebCore::GraphicsLayer> m_rootLayer;
     std::unique_ptr<WebCore::GraphicsLayer> m_nonCompositedContentLayer;
-    typedef HashMap<PageOverlay*, std::unique_ptr<WebCore::GraphicsLayer>> PageOverlayLayerMap;
+    typedef HashMap<WebCore::PageOverlay*, std::unique_ptr<WebCore::GraphicsLayer>> PageOverlayLayerMap;
     PageOverlayLayerMap m_pageOverlayLayers;
     std::unique_ptr<WebCore::TextureMapper> m_textureMapper;