Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (170283 => 170284)
--- 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)
@@ -48,7 +48,7 @@
m_layerTreeHost->invalidate();
}
-DrawingAreaImpl::DrawingAreaImpl(WebPage* webPage, const WebPageCreationParameters& parameters)
+DrawingAreaImpl::DrawingAreaImpl(WebPage& webPage, const WebPageCreationParameters& parameters)
: DrawingArea(DrawingAreaTypeImpl, webPage)
, m_backingStoreStateID(0)
, m_isPaintingEnabled(true)
@@ -63,7 +63,7 @@
, m_displayTimer(RunLoop::main(), this, &DrawingAreaImpl::displayTimerFired)
, m_exitCompositingTimer(RunLoop::main(), this, &DrawingAreaImpl::exitAcceleratedCompositingMode)
{
- if (webPage->corePage()->settings().acceleratedDrawingEnabled() || webPage->corePage()->settings().forceCompositingMode())
+ if (webPage.corePage()->settings().acceleratedDrawingEnabled() || webPage.corePage()->settings().forceCompositingMode())
m_alwaysUseCompositing = true;
if (m_alwaysUseCompositing)
@@ -81,7 +81,7 @@
return;
}
- setNeedsDisplayInRect(m_webPage->bounds());
+ setNeedsDisplayInRect(m_webPage.bounds());
}
void DrawingAreaImpl::setNeedsDisplayInRect(const IntRect& rect)
@@ -96,7 +96,7 @@
}
IntRect dirtyRect = rect;
- dirtyRect.intersect(m_webPage->bounds());
+ dirtyRect.intersect(m_webPage.bounds());
if (dirtyRect.isEmpty())
return;
@@ -189,7 +189,7 @@
{
setNeedsDisplay();
- m_webPage->layoutIfNeeded();
+ m_webPage.layoutIfNeeded();
if (m_layerTreeHost) {
// FIXME: We need to do the same work as the layerHostDidFlushLayers function here,
@@ -252,7 +252,7 @@
void DrawingAreaImpl::updatePreferences(const WebPreferencesStore& store)
{
- m_webPage->corePage()->settings().setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()));
+ m_webPage.corePage()->settings().setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()));
}
void DrawingAreaImpl::layerHostDidFlushLayers()
@@ -271,7 +271,7 @@
ASSERT(!m_compositingAccordingToProxyMessages);
if (!exitAcceleratedCompositingModePending()) {
- m_webPage->send(Messages::DrawingAreaProxy::EnterAcceleratedCompositingMode(m_backingStoreStateID, m_layerTreeHost->layerTreeContext()));
+ m_webPage.send(Messages::DrawingAreaProxy::EnterAcceleratedCompositingMode(m_backingStoreStateID, m_layerTreeHost->layerTreeContext()));
m_compositingAccordingToProxyMessages = true;
}
}
@@ -341,17 +341,17 @@
m_backingStoreStateID = stateID;
m_shouldSendDidUpdateBackingStoreState = true;
- m_webPage->setDeviceScaleFactor(deviceScaleFactor);
- m_webPage->setSize(size);
- m_webPage->layoutIfNeeded();
- m_webPage->scrollMainFrameIfNotAtMaxScrollPosition(scrollOffset);
+ m_webPage.setDeviceScaleFactor(deviceScaleFactor);
+ m_webPage.setSize(size);
+ m_webPage.layoutIfNeeded();
+ m_webPage.scrollMainFrameIfNotAtMaxScrollPosition(scrollOffset);
if (m_layerTreeHost) {
- m_layerTreeHost->sizeDidChange(m_webPage->size());
+ m_layerTreeHost->sizeDidChange(m_webPage.size());
} else
- m_dirtyRegion = m_webPage->bounds();
+ m_dirtyRegion = m_webPage.bounds();
} else {
- ASSERT(size == m_webPage->size());
+ ASSERT(size == m_webPage.size());
if (!m_shouldSendDidUpdateBackingStoreState) {
// We've already sent a DidUpdateBackingStoreState message for this state. We have nothing more to do.
m_inUpdateBackingStoreState = false;
@@ -393,8 +393,8 @@
LayerTreeContext layerTreeContext;
if (m_isPaintingSuspended || m_layerTreeHost) {
- updateInfo.viewSize = m_webPage->size();
- updateInfo.deviceScaleFactor = m_webPage->corePage()->deviceScaleFactor();
+ updateInfo.viewSize = m_webPage.size();
+ updateInfo.deviceScaleFactor = m_webPage.corePage()->deviceScaleFactor();
if (m_layerTreeHost) {
layerTreeContext = m_layerTreeHost->layerTreeContext();
@@ -408,7 +408,7 @@
}
}
- m_webPage->send(Messages::DrawingAreaProxy::DidUpdateBackingStoreState(m_backingStoreStateID, updateInfo, layerTreeContext));
+ m_webPage.send(Messages::DrawingAreaProxy::DidUpdateBackingStoreState(m_backingStoreStateID, updateInfo, layerTreeContext));
m_compositingAccordingToProxyMessages = !layerTreeContext.isEmpty();
}
@@ -460,7 +460,7 @@
ASSERT(!m_layerTreeHost);
- m_layerTreeHost = LayerTreeHost::create(m_webPage);
+ m_layerTreeHost = LayerTreeHost::create(&m_webPage);
if (!m_inUpdateBackingStoreState)
m_layerTreeHost->setShouldNotifyAfterNextScheduledLayerFlush(true);
@@ -488,7 +488,7 @@
m_layerTreeHost->invalidate();
m_layerTreeHost = nullptr;
- m_dirtyRegion = m_webPage->bounds();
+ m_dirtyRegion = m_webPage.bounds();
if (m_inUpdateBackingStoreState)
return;
@@ -500,20 +500,20 @@
UpdateInfo updateInfo;
if (m_isPaintingSuspended) {
- updateInfo.viewSize = m_webPage->size();
- updateInfo.deviceScaleFactor = m_webPage->corePage()->deviceScaleFactor();
+ updateInfo.viewSize = m_webPage.size();
+ updateInfo.deviceScaleFactor = m_webPage.corePage()->deviceScaleFactor();
} else
display(updateInfo);
// Send along a complete update of the page so we can paint the contents right after we exit the
// accelerated compositing mode, eliminiating flicker.
if (m_compositingAccordingToProxyMessages) {
- m_webPage->send(Messages::DrawingAreaProxy::ExitAcceleratedCompositingMode(m_backingStoreStateID, updateInfo));
+ m_webPage.send(Messages::DrawingAreaProxy::ExitAcceleratedCompositingMode(m_backingStoreStateID, updateInfo));
m_compositingAccordingToProxyMessages = false;
} else {
// If we left accelerated compositing mode before we sent an EnterAcceleratedCompositingMode message to the
// UI process, we still need to let it know about the new contents, so send an Update message.
- m_webPage->send(Messages::DrawingAreaProxy::Update(m_backingStoreStateID, updateInfo));
+ m_webPage.send(Messages::DrawingAreaProxy::Update(m_backingStoreStateID, updateInfo));
}
}
@@ -580,7 +580,7 @@
return;
}
- m_webPage->send(Messages::DrawingAreaProxy::Update(m_backingStoreStateID, updateInfo));
+ m_webPage.send(Messages::DrawingAreaProxy::Update(m_backingStoreStateID, updateInfo));
m_isWaitingForDidUpdate = true;
}
@@ -609,23 +609,23 @@
{
ASSERT(!m_isPaintingSuspended);
ASSERT(!m_layerTreeHost);
- ASSERT(!m_webPage->size().isEmpty());
+ ASSERT(!m_webPage.size().isEmpty());
- m_webPage->layoutIfNeeded();
+ m_webPage.layoutIfNeeded();
// The layout may have put the page into accelerated compositing mode. If the LayerTreeHost is
// in charge of displaying, we have nothing more to do.
if (m_layerTreeHost)
return;
- updateInfo.viewSize = m_webPage->size();
- updateInfo.deviceScaleFactor = m_webPage->corePage()->deviceScaleFactor();
+ updateInfo.viewSize = m_webPage.size();
+ updateInfo.deviceScaleFactor = m_webPage.corePage()->deviceScaleFactor();
IntRect bounds = m_dirtyRegion.bounds();
- ASSERT(m_webPage->bounds().contains(bounds));
+ ASSERT(m_webPage.bounds().contains(bounds));
IntSize bitmapSize = bounds.size();
- float deviceScaleFactor = m_webPage->corePage()->deviceScaleFactor();
+ float deviceScaleFactor = m_webPage.corePage()->deviceScaleFactor();
bitmapSize.scale(deviceScaleFactor);
RefPtr<ShareableBitmap> bitmap = ShareableBitmap::createShareable(bitmapSize, ShareableBitmap::SupportsAlpha);
if (!bitmap)
@@ -656,7 +656,7 @@
graphicsContext->translate(-bounds.x(), -bounds.y());
for (size_t i = 0; i < rects.size(); ++i) {
- m_webPage->drawRect(*graphicsContext, rects[i]);
+ m_webPage.drawRect(*graphicsContext, rects[i]);
// FIXME: Draw page olverlays. https://bugs.webkit.org/show_bug.cgi?id=131433.
