Chromium Code Reviews| 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 713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 724 return 0; | 724 return 0; |
| 725 | 725 |
| 726 WebCore::CompositingTriggerFlags flags = 0; | 726 WebCore::CompositingTriggerFlags flags = 0; |
| 727 Settings& settings = m_webView->page()->settings(); | 727 Settings& settings = m_webView->page()->settings(); |
| 728 if (settings.acceleratedCompositingFor3DTransformsEnabled()) | 728 if (settings.acceleratedCompositingFor3DTransformsEnabled()) |
| 729 flags |= WebCore::ThreeDTransformTrigger; | 729 flags |= WebCore::ThreeDTransformTrigger; |
| 730 if (settings.acceleratedCompositingForVideoEnabled()) | 730 if (settings.acceleratedCompositingForVideoEnabled()) |
| 731 flags |= WebCore::VideoTrigger; | 731 flags |= WebCore::VideoTrigger; |
| 732 if (settings.acceleratedCompositingForPluginsEnabled()) | 732 if (settings.acceleratedCompositingForPluginsEnabled()) |
| 733 flags |= WebCore::PluginTrigger; | 733 flags |= WebCore::PluginTrigger; |
| 734 if (settings.acceleratedCompositingForCanvasEnabled()) | |
|
ojan
2014/04/11 02:10:24
Reordered these to match the order in Settings.in.
| |
| 735 flags |= WebCore::CanvasTrigger; | |
| 734 if (settings.acceleratedCompositingForAnimationEnabled()) | 736 if (settings.acceleratedCompositingForAnimationEnabled()) |
| 735 flags |= WebCore::AnimationTrigger; | 737 flags |= WebCore::AnimationTrigger; |
| 736 if (settings.acceleratedCompositingForCanvasEnabled()) | |
| 737 flags |= WebCore::CanvasTrigger; | |
| 738 if (settings.acceleratedCompositingForScrollableFramesEnabled()) | 738 if (settings.acceleratedCompositingForScrollableFramesEnabled()) |
| 739 flags |= WebCore::ScrollableInnerFrameTrigger; | 739 flags |= WebCore::ScrollableInnerFrameTrigger; |
| 740 if (settings.acceleratedCompositingForFiltersEnabled()) | 740 if (settings.acceleratedCompositingForFiltersEnabled()) |
| 741 flags |= WebCore::FilterTrigger; | 741 flags |= WebCore::FilterTrigger; |
| 742 if (settings.acceleratedCompositingForGpuRasterizationHintEnabled()) | 742 if (settings.acceleratedCompositingForGpuRasterizationHintEnabled()) |
| 743 flags |= WebCore::GPURasterizationTrigger; | 743 flags |= WebCore::GPURasterizationTrigger; |
| 744 if (settings.acceleratedCompositingForOverflowScrollEnabled()) | 744 if (settings.acceleratedCompositingForOverflowScrollEnabled()) |
| 745 flags |= WebCore::LegacyOverflowScrollTrigger; | 745 flags |= WebCore::LegacyOverflowScrollTrigger; |
| 746 if (settings.compositorDrivenAcceleratedScrollingEnabled()) | 746 if (settings.compositorDrivenAcceleratedScrollingEnabled()) |
| 747 flags |= WebCore::OverflowScrollTrigger; | 747 flags |= WebCore::OverflowScrollTrigger; |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 962 { | 962 { |
| 963 return static_cast<NavigatorContentUtilsClient::CustomHandlersState>(m_webVi ew->client()->isProtocolHandlerRegistered(scheme, baseURL, url)); | 963 return static_cast<NavigatorContentUtilsClient::CustomHandlersState>(m_webVi ew->client()->isProtocolHandlerRegistered(scheme, baseURL, url)); |
| 964 } | 964 } |
| 965 | 965 |
| 966 void NavigatorContentUtilsClientImpl::unregisterProtocolHandler(const String& sc heme, const WebCore::KURL& baseURL, const WebCore::KURL& url) | 966 void NavigatorContentUtilsClientImpl::unregisterProtocolHandler(const String& sc heme, const WebCore::KURL& baseURL, const WebCore::KURL& url) |
| 967 { | 967 { |
| 968 m_webView->client()->unregisterProtocolHandler(scheme, baseURL, url); | 968 m_webView->client()->unregisterProtocolHandler(scheme, baseURL, url); |
| 969 } | 969 } |
| 970 | 970 |
| 971 } // namespace blink | 971 } // namespace blink |
| OLD | NEW |