Diff
Modified: trunk/Source/WebKit2/ChangeLog (174261 => 174262)
--- trunk/Source/WebKit2/ChangeLog 2014-10-03 08:00:43 UTC (rev 174261)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-03 09:25:08 UTC (rev 174262)
@@ -1,3 +1,23 @@
+2014-10-03 Csaba Osztrogonác <[email protected]>
+
+ [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 <[email protected]>
[EFL] Fix build break since r174231 and r174256
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (174261 => 174262)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2014-10-03 08:00:43 UTC (rev 174261)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2014-10-03 09:25:08 UTC (rev 174262)
@@ -39,6 +39,7 @@
#include <WebCore/DocumentLoader.h>
#include <WebCore/Frame.h>
#include <WebCore/FrameView.h>
+#include <WebCore/MainFrame.h>
#include <glib/gi18n-lib.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -420,7 +421,7 @@
{
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;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (174261 => 174262)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2014-10-03 08:00:43 UTC (rev 174261)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2014-10-03 09:25:08 UTC (rev 174262)
@@ -215,36 +215,6 @@
return m_layerTreeHost && m_layerTreeHost->forceRepaintAsync(callbackID);
}
-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)
{
m_isPaintingEnabled = paintingEnabled;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h (174261 => 174262)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2014-10-03 08:00:43 UTC (rev 174261)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2014-10-03 09:25:08 UTC (rev 174262)
@@ -59,11 +59,6 @@
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);
virtual void updatePreferences(const WebPreferencesStore&) override;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (174261 => 174262)
--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2014-10-03 08:00:43 UTC (rev 174261)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2014-10-03 09:25:08 UTC (rev 174262)
@@ -241,28 +241,6 @@
scheduleLayerFlush();
}
-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)
{
if (graphicsLayer == m_nonCompositedContentLayer.get()) {
@@ -349,7 +327,7 @@
}
}
-void LayerTreeHostGtk::createPageOverlayLayer(PageOverlay* pageOverlay)
+void LayerTreeHostGtk::createPageOverlayLayer(WebCore::PageOverlay* pageOverlay)
{
std::unique_ptr<GraphicsLayer> layer = GraphicsLayer::create(graphicsLayerFactory(), *this);
#ifndef NDEBUG
@@ -366,7 +344,7 @@
m_pageOverlayLayers.add(pageOverlay, WTF::move(layer));
}
-void LayerTreeHostGtk::destroyPageOverlayLayer(PageOverlay* pageOverlay)
+void LayerTreeHostGtk::destroyPageOverlayLayer(WebCore::PageOverlay* pageOverlay)
{
std::unique_ptr<GraphicsLayer> layer = m_pageOverlayLayers.take(pageOverlay);
ASSERT(layer);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h (174261 => 174262)
--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2014-10-03 08:00:43 UTC (rev 174261)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2014-10-03 09:25:08 UTC (rev 174262)
@@ -34,6 +34,7 @@
#include "TextureMapperLayer.h"
#include <WebCore/GLContext.h>
#include <WebCore/GraphicsLayerClient.h>
+#include <WebCore/PageOverlay.h>
#include <wtf/HashMap.h>
#include <wtf/OwnPtr.h>
#include <wtf/gobject/GMainLoopSource.h>
@@ -72,17 +73,13 @@
virtual void setNonCompositedContentsNeedDisplayInRect(const WebCore::IntRect&) override;
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;
bool flushPendingLayerChanges();
- void createPageOverlayLayer(PageOverlay*);
- void destroyPageOverlayLayer(PageOverlay*);
+ void createPageOverlayLayer(WebCore::PageOverlay*);
+ void destroyPageOverlayLayer(WebCore::PageOverlay*);
enum CompositePurpose { ForResize, NotForResize };
void compositeLayersToContext(CompositePurpose = NotForResize);
@@ -99,7 +96,7 @@
bool m_notifyAfterScheduledLayerFlush;
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;
OwnPtr<WebCore::GLContext> m_context;
