diff options
| author | Ben Murdoch <benm@google.com> | 2011-07-13 10:14:36 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-07-13 11:03:14 +0100 |
| commit | d0147a863b872ecaa451ab0dce2a348760e99e2c (patch) | |
| tree | b4819830b7ab03f384ed8ab83734ac0f46193263 /Source/WebKit/chromium/src | |
| parent | 65b45b34343dc5d5b9dbeda52e9de428e146c8f7 (diff) | |
| download | external_webkit-d0147a863b872ecaa451ab0dce2a348760e99e2c.zip external_webkit-d0147a863b872ecaa451ab0dce2a348760e99e2c.tar.gz external_webkit-d0147a863b872ecaa451ab0dce2a348760e99e2c.tar.bz2 | |
Merge WebKit at branches/chromium/742 r89068: Initial merge by Git.
Take us to top of Chrome 12 release branch (12.0.742.130)
Change-Id: I4408a97e343a118cf4a1bb9d71367bcc2c16ae48
Diffstat (limited to 'Source/WebKit/chromium/src')
| -rw-r--r-- | Source/WebKit/chromium/src/ChromeClientImpl.cpp | 3 | ||||
| -rw-r--r-- | Source/WebKit/chromium/src/WebViewImpl.cpp | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.cpp b/Source/WebKit/chromium/src/ChromeClientImpl.cpp index eee6934..fb41fbf 100644 --- a/Source/WebKit/chromium/src/ChromeClientImpl.cpp +++ b/Source/WebKit/chromium/src/ChromeClientImpl.cpp @@ -839,7 +839,8 @@ void ChromeClientImpl::scheduleCompositingLayerSync() ChromeClient::CompositingTriggerFlags ChromeClientImpl::allowedCompositingTriggers() const { - if (!m_webView->allowsAcceleratedCompositing()) + // FIXME: RTL style not supported by the compositor yet. + if (!m_webView->allowsAcceleratedCompositing() || m_webView->pageHasRTLStyle()) return 0; CompositingTriggerFlags flags = 0; diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp index 9447b18..896395d 100644 --- a/Source/WebKit/chromium/src/WebViewImpl.cpp +++ b/Source/WebKit/chromium/src/WebViewImpl.cpp @@ -1006,11 +1006,6 @@ void WebViewImpl::animate() void WebViewImpl::layout() { -#if USE(ACCELERATED_COMPOSITING) - // FIXME: RTL style not supported by the compositor yet. - if (isAcceleratedCompositingActive() && pageHasRTLStyle()) - setIsAcceleratedCompositingActive(false); -#endif WebFrameImpl* webframe = mainFrameImpl(); if (webframe) { @@ -2303,8 +2298,7 @@ bool WebViewImpl::pageHasRTLStyle() const void WebViewImpl::setRootGraphicsLayer(WebCore::PlatformLayer* layer) { - // FIXME: RTL style not supported by the compositor yet. - setIsAcceleratedCompositingActive(layer && !pageHasRTLStyle() ? true : false); + setIsAcceleratedCompositingActive(layer); if (m_layerRenderer) m_layerRenderer->setRootLayer(layer); |