<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174262] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174262">174262</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-03 02:25:08 -0700 (Fri, 03 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] URTBF after <a href="http://trac.webkit.org/projects/webkit/changeset/174231">r174231</a>.
* 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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreaImplcpp">trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreaImplh">trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkh">trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174261 => 174262)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-10-03 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Fix build break since r174231 and r174256
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (174261 => 174262)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include <WebCore/DocumentLoader.h>
</span><span class="cx"> #include <WebCore/Frame.h>
</span><span class="cx"> #include <WebCore/FrameView.h>
</span><ins>+#include <WebCore/MainFrame.h>
</ins><span class="cx"> #include <glib/gi18n-lib.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -420,7 +421,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_WEB_PAGE(webPage), 0);
</span><span class="cx">
</span><del>- Frame* coreFrame = webPage->priv->webPage->mainFrame();
</del><ins>+ MainFrame* coreFrame = webPage->priv->webPage->mainFrame();
</ins><span class="cx"> if (!coreFrame)
</span><span class="cx"> return 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreaImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (174261 => 174262)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -215,36 +215,6 @@
</span><span class="cx"> return m_layerTreeHost && m_layerTreeHost->forceRepaintAsync(callbackID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> void DrawingAreaImpl::setPaintingEnabled(bool paintingEnabled)
</span><span class="cx"> {
</span><span class="cx"> m_isPaintingEnabled = paintingEnabled;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreaImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h (174261 => 174262)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -59,11 +59,6 @@
</span><span class="cx"> virtual void forceRepaint();
</span><span class="cx"> virtual bool forceRepaintAsync(uint64_t callbackID);
</span><span class="cx">
</span><del>- virtual void didInstallPageOverlay(PageOverlay*);
- virtual void didUninstallPageOverlay(PageOverlay*);
- virtual void setPageOverlayNeedsDisplay(PageOverlay*, const WebCore::IntRect&);
- virtual void setPageOverlayOpacity(PageOverlay*, float);
-
</del><span class="cx"> virtual void setPaintingEnabled(bool);
</span><span class="cx"> virtual void updatePreferences(const WebPreferencesStore&) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (174261 => 174262)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -241,28 +241,6 @@
</span><span class="cx"> scheduleLayerFlush();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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();
-}
-
</del><span class="cx"> void LayerTreeHostGtk::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const FloatRect& clipRect)
</span><span class="cx"> {
</span><span class="cx"> if (graphicsLayer == m_nonCompositedContentLayer.get()) {
</span><span class="lines">@@ -349,7 +327,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LayerTreeHostGtk::createPageOverlayLayer(PageOverlay* pageOverlay)
</del><ins>+void LayerTreeHostGtk::createPageOverlayLayer(WebCore::PageOverlay* pageOverlay)
</ins><span class="cx"> {
</span><span class="cx"> std::unique_ptr<GraphicsLayer> layer = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><span class="cx"> #ifndef NDEBUG
</span><span class="lines">@@ -366,7 +344,7 @@
</span><span class="cx"> m_pageOverlayLayers.add(pageOverlay, WTF::move(layer));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LayerTreeHostGtk::destroyPageOverlayLayer(PageOverlay* pageOverlay)
</del><ins>+void LayerTreeHostGtk::destroyPageOverlayLayer(WebCore::PageOverlay* pageOverlay)
</ins><span class="cx"> {
</span><span class="cx"> std::unique_ptr<GraphicsLayer> layer = m_pageOverlayLayers.take(pageOverlay);
</span><span class="cx"> ASSERT(layer);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h (174261 => 174262)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "TextureMapperLayer.h"
</span><span class="cx"> #include <WebCore/GLContext.h>
</span><span class="cx"> #include <WebCore/GraphicsLayerClient.h>
</span><ins>+#include <WebCore/PageOverlay.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/gobject/GMainLoopSource.h>
</span><span class="lines">@@ -72,17 +73,13 @@
</span><span class="cx"> virtual void setNonCompositedContentsNeedDisplayInRect(const WebCore::IntRect&) override;
</span><span class="cx"> virtual void scrollNonCompositedContents(const WebCore::IntRect& scrollRect) override;
</span><span class="cx">
</span><del>- virtual void didInstallPageOverlay(PageOverlay*) override;
- virtual void didUninstallPageOverlay(PageOverlay*) override;
- virtual void setPageOverlayNeedsDisplay(PageOverlay*, const WebCore::IntRect&) override;
-
</del><span class="cx"> // GraphicsLayerClient
</span><span class="cx"> virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& clipRect) override;
</span><span class="cx">
</span><span class="cx"> bool flushPendingLayerChanges();
</span><span class="cx">
</span><del>- void createPageOverlayLayer(PageOverlay*);
- void destroyPageOverlayLayer(PageOverlay*);
</del><ins>+ void createPageOverlayLayer(WebCore::PageOverlay*);
+ void destroyPageOverlayLayer(WebCore::PageOverlay*);
</ins><span class="cx">
</span><span class="cx"> enum CompositePurpose { ForResize, NotForResize };
</span><span class="cx"> void compositeLayersToContext(CompositePurpose = NotForResize);
</span><span class="lines">@@ -99,7 +96,7 @@
</span><span class="cx"> bool m_notifyAfterScheduledLayerFlush;
</span><span class="cx"> std::unique_ptr<WebCore::GraphicsLayer> m_rootLayer;
</span><span class="cx"> std::unique_ptr<WebCore::GraphicsLayer> m_nonCompositedContentLayer;
</span><del>- typedef HashMap<PageOverlay*, std::unique_ptr<WebCore::GraphicsLayer>> PageOverlayLayerMap;
</del><ins>+ typedef HashMap<WebCore::PageOverlay*, std::unique_ptr<WebCore::GraphicsLayer>> PageOverlayLayerMap;
</ins><span class="cx"> PageOverlayLayerMap m_pageOverlayLayers;
</span><span class="cx"> std::unique_ptr<WebCore::TextureMapper> m_textureMapper;
</span><span class="cx"> OwnPtr<WebCore::GLContext> m_context;
</span></span></pre>
</div>
</div>
</body>
</html>