<!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>[170284] 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/170284">170284</a></dd>
<dt>Author</dt> <dd>yoon@igalia.com</dd>
<dt>Date</dt> <dd>2014-06-23 00:27:05 -0700 (Mon, 23 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, GTK build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/170274">r170274</a>.
* WebProcess/WebPage/DrawingAreaImpl.cpp:
Drawing::m_webPage changed to reference.
(WebKit::DrawingAreaImpl::DrawingAreaImpl):
(WebKit::DrawingAreaImpl::setNeedsDisplay):
(WebKit::DrawingAreaImpl::setNeedsDisplayInRect):
(WebKit::DrawingAreaImpl::forceRepaint):
(WebKit::DrawingAreaImpl::updatePreferences):
(WebKit::DrawingAreaImpl::layerHostDidFlushLayers):
(WebKit::DrawingAreaImpl::updateBackingStoreState):
(WebKit::DrawingAreaImpl::sendDidUpdateBackingStoreState):
(WebKit::DrawingAreaImpl::enterAcceleratedCompositingMode):
(WebKit::DrawingAreaImpl::exitAcceleratedCompositingMode):
(WebKit::DrawingAreaImpl::display):
* WebProcess/WebPage/DrawingAreaImpl.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170283 => 170284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-23 07:10:45 UTC (rev 170283)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-23 07:27:05 UTC (rev 170284)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-06-23 Gwang Yoon Hwang <yoon@igalia.com>
+
+ Unreviewed, GTK build fix after r170274.
+
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ Drawing::m_webPage changed to reference.
+
+ (WebKit::DrawingAreaImpl::DrawingAreaImpl):
+ (WebKit::DrawingAreaImpl::setNeedsDisplay):
+ (WebKit::DrawingAreaImpl::setNeedsDisplayInRect):
+ (WebKit::DrawingAreaImpl::forceRepaint):
+ (WebKit::DrawingAreaImpl::updatePreferences):
+ (WebKit::DrawingAreaImpl::layerHostDidFlushLayers):
+ (WebKit::DrawingAreaImpl::updateBackingStoreState):
+ (WebKit::DrawingAreaImpl::sendDidUpdateBackingStoreState):
+ (WebKit::DrawingAreaImpl::enterAcceleratedCompositingMode):
+ (WebKit::DrawingAreaImpl::exitAcceleratedCompositingMode):
+ (WebKit::DrawingAreaImpl::display):
+ * WebProcess/WebPage/DrawingAreaImpl.h:
+
</ins><span class="cx"> 2014-06-22 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r170163): It made everything crash on EFL
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreaImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (170283 => 170284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2014-06-23 07:10:45 UTC (rev 170283)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2014-06-23 07:27:05 UTC (rev 170284)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> m_layerTreeHost->invalidate();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DrawingAreaImpl::DrawingAreaImpl(WebPage* webPage, const WebPageCreationParameters& parameters)
</del><ins>+DrawingAreaImpl::DrawingAreaImpl(WebPage& webPage, const WebPageCreationParameters& parameters)
</ins><span class="cx"> : DrawingArea(DrawingAreaTypeImpl, webPage)
</span><span class="cx"> , m_backingStoreStateID(0)
</span><span class="cx"> , m_isPaintingEnabled(true)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> , m_displayTimer(RunLoop::main(), this, &DrawingAreaImpl::displayTimerFired)
</span><span class="cx"> , m_exitCompositingTimer(RunLoop::main(), this, &DrawingAreaImpl::exitAcceleratedCompositingMode)
</span><span class="cx"> {
</span><del>- if (webPage->corePage()->settings().acceleratedDrawingEnabled() || webPage->corePage()->settings().forceCompositingMode())
</del><ins>+ if (webPage.corePage()->settings().acceleratedDrawingEnabled() || webPage.corePage()->settings().forceCompositingMode())
</ins><span class="cx"> m_alwaysUseCompositing = true;
</span><span class="cx">
</span><span class="cx"> if (m_alwaysUseCompositing)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- setNeedsDisplayInRect(m_webPage->bounds());
</del><ins>+ setNeedsDisplayInRect(m_webPage.bounds());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DrawingAreaImpl::setNeedsDisplayInRect(const IntRect& rect)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect dirtyRect = rect;
</span><del>- dirtyRect.intersect(m_webPage->bounds());
</del><ins>+ dirtyRect.intersect(m_webPage.bounds());
</ins><span class="cx">
</span><span class="cx"> if (dirtyRect.isEmpty())
</span><span class="cx"> return;
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> {
</span><span class="cx"> setNeedsDisplay();
</span><span class="cx">
</span><del>- m_webPage->layoutIfNeeded();
</del><ins>+ m_webPage.layoutIfNeeded();
</ins><span class="cx">
</span><span class="cx"> if (m_layerTreeHost) {
</span><span class="cx"> // FIXME: We need to do the same work as the layerHostDidFlushLayers function here,
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx">
</span><span class="cx"> void DrawingAreaImpl::updatePreferences(const WebPreferencesStore& store)
</span><span class="cx"> {
</span><del>- m_webPage->corePage()->settings().setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()));
</del><ins>+ m_webPage.corePage()->settings().setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DrawingAreaImpl::layerHostDidFlushLayers()
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_compositingAccordingToProxyMessages);
</span><span class="cx"> if (!exitAcceleratedCompositingModePending()) {
</span><del>- m_webPage->send(Messages::DrawingAreaProxy::EnterAcceleratedCompositingMode(m_backingStoreStateID, m_layerTreeHost->layerTreeContext()));
</del><ins>+ m_webPage.send(Messages::DrawingAreaProxy::EnterAcceleratedCompositingMode(m_backingStoreStateID, m_layerTreeHost->layerTreeContext()));
</ins><span class="cx"> m_compositingAccordingToProxyMessages = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -341,17 +341,17 @@
</span><span class="cx"> m_backingStoreStateID = stateID;
</span><span class="cx"> m_shouldSendDidUpdateBackingStoreState = true;
</span><span class="cx">
</span><del>- m_webPage->setDeviceScaleFactor(deviceScaleFactor);
- m_webPage->setSize(size);
- m_webPage->layoutIfNeeded();
- m_webPage->scrollMainFrameIfNotAtMaxScrollPosition(scrollOffset);
</del><ins>+ m_webPage.setDeviceScaleFactor(deviceScaleFactor);
+ m_webPage.setSize(size);
+ m_webPage.layoutIfNeeded();
+ m_webPage.scrollMainFrameIfNotAtMaxScrollPosition(scrollOffset);
</ins><span class="cx">
</span><span class="cx"> if (m_layerTreeHost) {
</span><del>- m_layerTreeHost->sizeDidChange(m_webPage->size());
</del><ins>+ m_layerTreeHost->sizeDidChange(m_webPage.size());
</ins><span class="cx"> } else
</span><del>- m_dirtyRegion = m_webPage->bounds();
</del><ins>+ m_dirtyRegion = m_webPage.bounds();
</ins><span class="cx"> } else {
</span><del>- ASSERT(size == m_webPage->size());
</del><ins>+ ASSERT(size == m_webPage.size());
</ins><span class="cx"> if (!m_shouldSendDidUpdateBackingStoreState) {
</span><span class="cx"> // We've already sent a DidUpdateBackingStoreState message for this state. We have nothing more to do.
</span><span class="cx"> m_inUpdateBackingStoreState = false;
</span><span class="lines">@@ -393,8 +393,8 @@
</span><span class="cx"> LayerTreeContext layerTreeContext;
</span><span class="cx">
</span><span class="cx"> if (m_isPaintingSuspended || m_layerTreeHost) {
</span><del>- updateInfo.viewSize = m_webPage->size();
- updateInfo.deviceScaleFactor = m_webPage->corePage()->deviceScaleFactor();
</del><ins>+ updateInfo.viewSize = m_webPage.size();
+ updateInfo.deviceScaleFactor = m_webPage.corePage()->deviceScaleFactor();
</ins><span class="cx">
</span><span class="cx"> if (m_layerTreeHost) {
</span><span class="cx"> layerTreeContext = m_layerTreeHost->layerTreeContext();
</span><span class="lines">@@ -408,7 +408,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_webPage->send(Messages::DrawingAreaProxy::DidUpdateBackingStoreState(m_backingStoreStateID, updateInfo, layerTreeContext));
</del><ins>+ m_webPage.send(Messages::DrawingAreaProxy::DidUpdateBackingStoreState(m_backingStoreStateID, updateInfo, layerTreeContext));
</ins><span class="cx"> m_compositingAccordingToProxyMessages = !layerTreeContext.isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -460,7 +460,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_layerTreeHost);
</span><span class="cx">
</span><del>- m_layerTreeHost = LayerTreeHost::create(m_webPage);
</del><ins>+ m_layerTreeHost = LayerTreeHost::create(&m_webPage);
</ins><span class="cx"> if (!m_inUpdateBackingStoreState)
</span><span class="cx"> m_layerTreeHost->setShouldNotifyAfterNextScheduledLayerFlush(true);
</span><span class="cx">
</span><span class="lines">@@ -488,7 +488,7 @@
</span><span class="cx">
</span><span class="cx"> m_layerTreeHost->invalidate();
</span><span class="cx"> m_layerTreeHost = nullptr;
</span><del>- m_dirtyRegion = m_webPage->bounds();
</del><ins>+ m_dirtyRegion = m_webPage.bounds();
</ins><span class="cx">
</span><span class="cx"> if (m_inUpdateBackingStoreState)
</span><span class="cx"> return;
</span><span class="lines">@@ -500,20 +500,20 @@
</span><span class="cx">
</span><span class="cx"> UpdateInfo updateInfo;
</span><span class="cx"> if (m_isPaintingSuspended) {
</span><del>- updateInfo.viewSize = m_webPage->size();
- updateInfo.deviceScaleFactor = m_webPage->corePage()->deviceScaleFactor();
</del><ins>+ updateInfo.viewSize = m_webPage.size();
+ updateInfo.deviceScaleFactor = m_webPage.corePage()->deviceScaleFactor();
</ins><span class="cx"> } else
</span><span class="cx"> display(updateInfo);
</span><span class="cx">
</span><span class="cx"> // Send along a complete update of the page so we can paint the contents right after we exit the
</span><span class="cx"> // accelerated compositing mode, eliminiating flicker.
</span><span class="cx"> if (m_compositingAccordingToProxyMessages) {
</span><del>- m_webPage->send(Messages::DrawingAreaProxy::ExitAcceleratedCompositingMode(m_backingStoreStateID, updateInfo));
</del><ins>+ m_webPage.send(Messages::DrawingAreaProxy::ExitAcceleratedCompositingMode(m_backingStoreStateID, updateInfo));
</ins><span class="cx"> m_compositingAccordingToProxyMessages = false;
</span><span class="cx"> } else {
</span><span class="cx"> // If we left accelerated compositing mode before we sent an EnterAcceleratedCompositingMode message to the
</span><span class="cx"> // UI process, we still need to let it know about the new contents, so send an Update message.
</span><del>- m_webPage->send(Messages::DrawingAreaProxy::Update(m_backingStoreStateID, updateInfo));
</del><ins>+ m_webPage.send(Messages::DrawingAreaProxy::Update(m_backingStoreStateID, updateInfo));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -580,7 +580,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_webPage->send(Messages::DrawingAreaProxy::Update(m_backingStoreStateID, updateInfo));
</del><ins>+ m_webPage.send(Messages::DrawingAreaProxy::Update(m_backingStoreStateID, updateInfo));
</ins><span class="cx"> m_isWaitingForDidUpdate = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -609,23 +609,23 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_isPaintingSuspended);
</span><span class="cx"> ASSERT(!m_layerTreeHost);
</span><del>- ASSERT(!m_webPage->size().isEmpty());
</del><ins>+ ASSERT(!m_webPage.size().isEmpty());
</ins><span class="cx">
</span><del>- m_webPage->layoutIfNeeded();
</del><ins>+ m_webPage.layoutIfNeeded();
</ins><span class="cx">
</span><span class="cx"> // The layout may have put the page into accelerated compositing mode. If the LayerTreeHost is
</span><span class="cx"> // in charge of displaying, we have nothing more to do.
</span><span class="cx"> if (m_layerTreeHost)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- updateInfo.viewSize = m_webPage->size();
- updateInfo.deviceScaleFactor = m_webPage->corePage()->deviceScaleFactor();
</del><ins>+ updateInfo.viewSize = m_webPage.size();
+ updateInfo.deviceScaleFactor = m_webPage.corePage()->deviceScaleFactor();
</ins><span class="cx">
</span><span class="cx"> IntRect bounds = m_dirtyRegion.bounds();
</span><del>- ASSERT(m_webPage->bounds().contains(bounds));
</del><ins>+ ASSERT(m_webPage.bounds().contains(bounds));
</ins><span class="cx">
</span><span class="cx"> IntSize bitmapSize = bounds.size();
</span><del>- float deviceScaleFactor = m_webPage->corePage()->deviceScaleFactor();
</del><ins>+ float deviceScaleFactor = m_webPage.corePage()->deviceScaleFactor();
</ins><span class="cx"> bitmapSize.scale(deviceScaleFactor);
</span><span class="cx"> RefPtr<ShareableBitmap> bitmap = ShareableBitmap::createShareable(bitmapSize, ShareableBitmap::SupportsAlpha);
</span><span class="cx"> if (!bitmap)
</span><span class="lines">@@ -656,7 +656,7 @@
</span><span class="cx"> graphicsContext->translate(-bounds.x(), -bounds.y());
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < rects.size(); ++i) {
</span><del>- m_webPage->drawRect(*graphicsContext, rects[i]);
</del><ins>+ m_webPage.drawRect(*graphicsContext, rects[i]);
</ins><span class="cx">
</span><span class="cx"> // FIXME: Draw page olverlays. https://bugs.webkit.org/show_bug.cgi?id=131433.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreaImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h (170283 => 170284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2014-06-23 07:10:45 UTC (rev 170283)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2014-06-23 07:27:05 UTC (rev 170284)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> class DrawingAreaImpl : public DrawingArea {
</span><span class="cx"> public:
</span><del>- DrawingAreaImpl(WebPage*, const WebPageCreationParameters&);
</del><ins>+ DrawingAreaImpl(WebPage&, const WebPageCreationParameters&);
</ins><span class="cx"> virtual ~DrawingAreaImpl();
</span><span class="cx">
</span><span class="cx"> void layerHostDidFlushLayers();
</span></span></pre>
</div>
</div>
</body>
</html>