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

Source/WebKit/chromium/src/ChromeClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * 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.
@@ skipping 821 matching lines @@
     m_webView->setRootGraphicsLayer(graphicsLayer ? graphicsLayer->platformLayer() : 0);
 }
 
 void ChromeClientImpl::scheduleCompositingLayerSync()
 {
     m_webView->setRootLayerNeedsDisplay();
 }
 
 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;
     Settings* settings = m_webView->page()->settings();
     if (settings->acceleratedCompositingFor3DTransformsEnabled())
         flags |= ThreeDTransformTrigger;
     if (settings->acceleratedCompositingForVideoEnabled())
         flags |= VideoTrigger;
     if (settings->acceleratedCompositingForPluginsEnabled())
         flags |= PluginTrigger;
@@ skipping 73 matching lines @@
 {
     return adoptRef(new SearchPopupMenuChromium(client));
 }
 
 void ChromeClientImpl::willRunModalDialogDuringPageDismissal(const DialogType& dialogType) const
 {
     PlatformBridge::histogramEnumeration("Renderer.ModalDialogsDuringPageDismissal", static_cast<int>(dialogType), static_cast<int>(NumDialogTypes));
 }
 
 } // namespace WebKit