<!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>[167002] 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/167002">167002</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-08 23:25:37 -0700 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix EFL Build errors since <a href="http://trac.webkit.org/projects/webkit/changeset/166975">r166975</a>.
https://bugs.webkit.org/show_bug.cgi?id=131421
Patch by Hyowon Kim <hw1008.kim@samsung.com> on 2014-04-08
Reviewed by Gyuyoung Kim.
This patch is just for fixing EFL build errors.
The page overlay functionality is not working yet.
* CMakeLists.txt:
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:
(WebKit::CoordinatedDrawingArea::display):
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
(WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):
(WebKit::CoordinatedLayerTreeHost::paintLayerContents):
* WebProcess/WebPage/PageOverlayController.cpp:
* WebProcess/WebPage/TapHighlightController.cpp:
(WebKit::TapHighlightController::hideHighlight):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreacpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagePageOverlayControllercpp">trunk/Source/WebKit2/WebProcess/WebPage/PageOverlayController.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageTapHighlightControllercpp">trunk/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (167001 => 167002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2014-04-09 06:18:00 UTC (rev 167001)
+++ trunk/Source/WebKit2/CMakeLists.txt 2014-04-09 06:25:37 UTC (rev 167002)
</span><span class="lines">@@ -543,6 +543,7 @@
</span><span class="cx"> WebProcess/WebPage/LayerTreeHost.cpp
</span><span class="cx"> WebProcess/WebPage/PageBanner.cpp
</span><span class="cx"> WebProcess/WebPage/PageOverlay.cpp
</span><ins>+ WebProcess/WebPage/PageOverlayController.cpp
</ins><span class="cx"> WebProcess/WebPage/TapHighlightController.cpp
</span><span class="cx"> WebProcess/WebPage/WebBackForwardListProxy.cpp
</span><span class="cx"> WebProcess/WebPage/WebContextMenu.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167001 => 167002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-09 06:18:00 UTC (rev 167001)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-09 06:25:37 UTC (rev 167002)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-04-08 Hyowon Kim <hw1008.kim@samsung.com>
+
+ Fix EFL Build errors since r166975.
+ https://bugs.webkit.org/show_bug.cgi?id=131421
+
+ Reviewed by Gyuyoung Kim.
+
+ This patch is just for fixing EFL build errors.
+ The page overlay functionality is not working yet.
+
+ * CMakeLists.txt:
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:
+ (WebKit::CoordinatedDrawingArea::display):
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+ (WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):
+ (WebKit::CoordinatedLayerTreeHost::paintLayerContents):
+ * WebProcess/WebPage/PageOverlayController.cpp:
+ * WebProcess/WebPage/TapHighlightController.cpp:
+ (WebKit::TapHighlightController::hideHighlight):
+
</ins><span class="cx"> 2014-04-08 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Turn MSE on by default
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp (167001 => 167002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp 2014-04-09 06:18:00 UTC (rev 167001)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp 2014-04-09 06:25:37 UTC (rev 167002)
</span><span class="lines">@@ -607,14 +607,6 @@
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < rects.size(); ++i) {
</span><span class="cx"> m_webPage->drawRect(*graphicsContext, rects[i]);
</span><del>-
- if (m_webPage->hasPageOverlay()) {
- PageOverlayList& pageOverlays = m_webPage->pageOverlays();
- PageOverlayList::iterator end = pageOverlays.end();
- for (PageOverlayList::iterator it = pageOverlays.begin(); it != end; ++it)
- m_webPage->drawPageOverlay(it->get(), *graphicsContext, rects[i]);
- }
-
</del><span class="cx"> updateInfo.updateRects.append(rects[i]);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (167001 => 167002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2014-04-09 06:18:00 UTC (rev 167001)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2014-04-09 06:25:37 UTC (rev 167002)
</span><span class="lines">@@ -73,9 +73,6 @@
</span><span class="cx">
</span><span class="cx"> CoordinatedSurface::setFactory(createCoordinatedSurface);
</span><span class="cx">
</span><del>- if (webPage->hasPageOverlay())
- createPageOverlayLayer();
-
</del><span class="cx"> scheduleLayerFlush();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -265,12 +262,6 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHost::paintLayerContents(const GraphicsLayer* graphicsLayer, GraphicsContext& graphicsContext, const IntRect& clipRect)
</span><span class="cx"> {
</span><del>- if (graphicsLayer == m_pageOverlayLayer.get()) {
- // Overlays contain transparent contents and won't clear the context as part of their rendering, so we do it here.
- graphicsContext.clearRect(clipRect);
- m_webPage->drawPageOverlay(m_pageOverlay.get(), graphicsContext, clipRect);
- return;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHost::commitSceneState(const WebCore::CoordinatedGraphicsState& state)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagePageOverlayControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/PageOverlayController.cpp (167001 => 167002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/PageOverlayController.cpp 2014-04-09 06:18:00 UTC (rev 167001)
+++ trunk/Source/WebKit2/WebProcess/WebPage/PageOverlayController.cpp 2014-04-09 06:25:37 UTC (rev 167002)
</span><span class="lines">@@ -23,18 +23,18 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import "config.h"
-#import "PageOverlayController.h"
</del><ins>+#include "config.h"
+#include "PageOverlayController.h"
</ins><span class="cx">
</span><del>-#import "DrawingArea.h"
-#import "PageOverlay.h"
-#import "WebPage.h"
-#import <WebCore/FrameView.h>
-#import <WebCore/GraphicsContext.h>
-#import <WebCore/GraphicsLayer.h>
-#import <WebCore/ScrollingCoordinator.h>
-#import <WebCore/Settings.h>
-#import <WebCore/TiledBacking.h>
</del><ins>+#include "DrawingArea.h"
+#include "PageOverlay.h"
+#include "WebPage.h"
+#include <WebCore/FrameView.h>
+#include <WebCore/GraphicsContext.h>
+#include <WebCore/GraphicsLayer.h>
+#include <WebCore/ScrollingCoordinator.h>
+#include <WebCore/Settings.h>
+#include <WebCore/TiledBacking.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageTapHighlightControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp (167001 => 167002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp 2014-04-09 06:18:00 UTC (rev 167001)
+++ trunk/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp 2014-04-09 06:25:37 UTC (rev 167002)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> void TapHighlightController::hideHighlight()
</span><span class="cx"> {
</span><span class="cx"> if (m_overlay)
</span><del>- m_webPage->uninstallPageOverlay(m_overlay, /* fadeout */ true);
</del><ins>+ m_webPage->uninstallPageOverlay(m_overlay, PageOverlay::FadeMode::Fade);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TapHighlightController::pageOverlayDestroyed(PageOverlay*)
</span></span></pre>
</div>
</div>
</body>
</html>