Title: [88852] branches/chromium/742
- Revision
- 88852
- Author
- [email protected]
- Date
- 2011-06-14 14:24:02 -0700 (Tue, 14 Jun 2011)
Log Message
Merge 88288 - 2011-06-07 Vangelis Kokkevis <[email protected]>
Reviewed by James Robinson.
Add a test to verify that RTL pages that trigger the compositor
render correctly.
https://bugs.webkit.org/show_bug.cgi?id=62246
* compositing/geometry/rtl-composited-expected.png: Added.
* compositing/geometry/rtl-composited-expected.txt: Added.
* compositing/geometry/rtl-composited.html: Added.
2011-06-07 Vangelis Kokkevis <[email protected]>
Reviewed by James Robinson.
Disable compositing for RTL pages in the RenderLayerCompositor rather
than later on in the WebViewImpl.
https://bugs.webkit.org/show_bug.cgi?id=62246
* src/ChromeClientImpl.cpp:
(WebKit::ChromeClientImpl::allowedCompositingTriggers):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::layout):
(WebKit::WebViewImpl::setRootGraphicsLayer):
[email protected]
Review URL: http://codereview.chromium.org/7163005
Modified Paths
Added Paths
Diff
Copied: branches/chromium/742/LayoutTests/compositing/geometry/rtl-composited-expected.png (from rev 88288, trunk/LayoutTests/compositing/geometry/rtl-composited-expected.png)
(Binary files differ)
Copied: branches/chromium/742/LayoutTests/compositing/geometry/rtl-composited-expected.txt (from rev 88288, trunk/LayoutTests/compositing/geometry/rtl-composited-expected.txt) (0 => 88852)
--- branches/chromium/742/LayoutTests/compositing/geometry/rtl-composited-expected.txt (rev 0)
+++ branches/chromium/742/LayoutTests/compositing/geometry/rtl-composited-expected.txt 2011-06-14 21:24:02 UTC (rev 88852)
@@ -0,0 +1 @@
+
Copied: branches/chromium/742/LayoutTests/compositing/geometry/rtl-composited.html (from rev 88288, trunk/LayoutTests/compositing/geometry/rtl-composited.html) (0 => 88852)
--- branches/chromium/742/LayoutTests/compositing/geometry/rtl-composited.html (rev 0)
+++ branches/chromium/742/LayoutTests/compositing/geometry/rtl-composited.html 2011-06-14 21:24:02 UTC (rev 88852)
@@ -0,0 +1,32 @@
+<!DOCTYPE>
+<html>
+<head>
+ <title>RTL page with composited elements</title>
+
+<style type="text/css" media="screen">
+body {
+ direction: rtl;
+}
+#wrapper {
+ position: relative;
+ background: green;
+ width: 200px;
+ height: 200px;
+ z-index: 5;
+}
+.accelerated {
+ -webkit-transform: translate3d(0,0,0);
+}
+</style>
+<script type="text/_javascript_" charset="utf-8">
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText(true);
+</script>
+</head>
+<body>
+<body>
+<!-- There should be a green box at the top right corner of the window -->
+ <div id="wrapper"></div>
+ <div class="accelerated"></div>
+</body>
+</html>
\ No newline at end of file
Modified: branches/chromium/742/Source/WebKit/chromium/src/ChromeClientImpl.cpp (88851 => 88852)
--- branches/chromium/742/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2011-06-14 20:51:11 UTC (rev 88851)
+++ branches/chromium/742/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2011-06-14 21:24:02 UTC (rev 88852)
@@ -839,7 +839,8 @@
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;
Modified: branches/chromium/742/Source/WebKit/chromium/src/WebViewImpl.cpp (88851 => 88852)
--- branches/chromium/742/Source/WebKit/chromium/src/WebViewImpl.cpp 2011-06-14 20:51:11 UTC (rev 88851)
+++ branches/chromium/742/Source/WebKit/chromium/src/WebViewImpl.cpp 2011-06-14 21:24:02 UTC (rev 88852)
@@ -1006,11 +1006,6 @@
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 @@
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);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
