Merge 88288 - 2011-06-07 Vangelis Kokkevis <vangelis@chromium.org>

Source/WebKit/chromium/src/WebViewImpl.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 988 matching lines @@
     if (webframe) {
         FrameView* view = webframe->frameView();
         if (view)
             view->serviceScriptedAnimations(convertSecondsToDOMTimeStamp(currentTime()));
     }
 #endif
 }
 
 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) {
         // In order for our child HWNDs (NativeWindowWidgets) to update properly,
         // they need to be told that we are updating the screen.  The problem is
         // that the native widgets need to recalculate their clip region and not
         // overlap any of our non-native widgets.  To force the resizing, call
         // setFrameRect().  This will be a quick operation for most frames, but
         // the NativeWindowWidgets will update a proper clipping region.
         FrameView* view = webframe->frameView();
@@ skipping 1272 matching lines @@
     if (!renderView)
         return false;
     RenderStyle* style = renderView->style();
     if (!style)
         return false;
     return (style->direction() == RTL);
 }
 
 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);
 
     IntRect damagedRect(0, 0, m_size.width, m_size.height);
     if (m_isAcceleratedCompositingActive)
         invalidateRootLayerRect(damagedRect);
     else
         m_client->didInvalidateRect(damagedRect);
 }
 
@@ skipping 176 matching lines @@
         m_temporaryOnscreenGraphicsContext3D = GraphicsContext3D::create(getCompositorContextAttributes(), m_page->chrome(), GraphicsContext3D::RenderDirectlyToHostWindow);
         if (m_temporaryOnscreenGraphicsContext3D)
             m_temporaryOnscreenGraphicsContext3D->reshape(std::max(1, m_size.width), std::max(1, m_size.height));
         return GraphicsContext3DInternal::extractWebGraphicsContext3D(m_temporaryOnscreenGraphicsContext3D.get());
     }
 #endif
     return 0;
 }
 
 } // namespace WebKit