OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
839 m_webView->setRootGraphicsLayer(graphicsLayer ? graphicsLayer->platformLayer
() : 0); | 839 m_webView->setRootGraphicsLayer(graphicsLayer ? graphicsLayer->platformLayer
() : 0); |
840 } | 840 } |
841 | 841 |
842 void ChromeClientImpl::scheduleCompositingLayerSync() | 842 void ChromeClientImpl::scheduleCompositingLayerSync() |
843 { | 843 { |
844 m_webView->setRootLayerNeedsDisplay(); | 844 m_webView->setRootLayerNeedsDisplay(); |
845 } | 845 } |
846 | 846 |
847 ChromeClient::CompositingTriggerFlags ChromeClientImpl::allowedCompositingTrigge
rs() const | 847 ChromeClient::CompositingTriggerFlags ChromeClientImpl::allowedCompositingTrigge
rs() const |
848 { | 848 { |
849 if (!m_webView->allowsAcceleratedCompositing()) | 849 // FIXME: RTL style not supported by the compositor yet. |
| 850 if (!m_webView->allowsAcceleratedCompositing() || m_webView->pageHasRTLStyle
()) |
850 return 0; | 851 return 0; |
851 | 852 |
852 CompositingTriggerFlags flags = 0; | 853 CompositingTriggerFlags flags = 0; |
853 Settings* settings = m_webView->page()->settings(); | 854 Settings* settings = m_webView->page()->settings(); |
854 if (settings->acceleratedCompositingFor3DTransformsEnabled()) | 855 if (settings->acceleratedCompositingFor3DTransformsEnabled()) |
855 flags |= ThreeDTransformTrigger; | 856 flags |= ThreeDTransformTrigger; |
856 if (settings->acceleratedCompositingForVideoEnabled()) | 857 if (settings->acceleratedCompositingForVideoEnabled()) |
857 flags |= VideoTrigger; | 858 flags |= VideoTrigger; |
858 if (settings->acceleratedCompositingForPluginsEnabled()) | 859 if (settings->acceleratedCompositingForPluginsEnabled()) |
859 flags |= PluginTrigger; | 860 flags |= PluginTrigger; |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
933 { | 934 { |
934 return adoptRef(new SearchPopupMenuChromium(client)); | 935 return adoptRef(new SearchPopupMenuChromium(client)); |
935 } | 936 } |
936 | 937 |
937 void ChromeClientImpl::willRunModalDialogDuringPageDismissal(const DialogType& d
ialogType) const | 938 void ChromeClientImpl::willRunModalDialogDuringPageDismissal(const DialogType& d
ialogType) const |
938 { | 939 { |
939 PlatformBridge::histogramEnumeration("Renderer.ModalDialogsDuringPageDismiss
al", static_cast<int>(dialogType), static_cast<int>(NumDialogTypes)); | 940 PlatformBridge::histogramEnumeration("Renderer.ModalDialogsDuringPageDismiss
al", static_cast<int>(dialogType), static_cast<int>(NumDialogTypes)); |
940 } | 941 } |
941 | 942 |
942 } // namespace WebKit | 943 } // namespace WebKit |
OLD | NEW |