| 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 727 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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; |
| 748 // FIXME: acceleratedCompositingForFixedPositionEnabled should be renamed ac
celeratedCompositingForViewportConstrainedPositionEnabled(). |
| 749 // Or the sticky and fixed position elements should be behind different flag
s. |
| 750 if (settings.acceleratedCompositingForFixedPositionEnabled()) |
| 751 flags |= WebCore::ViewportConstrainedPositionedTrigger; |
| 748 | 752 |
| 749 return flags; | 753 return flags; |
| 750 } | 754 } |
| 751 | 755 |
| 752 void ChromeClientImpl::enterFullScreenForElement(Element* element) | 756 void ChromeClientImpl::enterFullScreenForElement(Element* element) |
| 753 { | 757 { |
| 754 m_webView->enterFullScreenForElement(element); | 758 m_webView->enterFullScreenForElement(element); |
| 755 } | 759 } |
| 756 | 760 |
| 757 void ChromeClientImpl::exitFullScreenForElement(Element* element) | 761 void ChromeClientImpl::exitFullScreenForElement(Element* element) |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 962 { | 966 { |
| 963 return static_cast<NavigatorContentUtilsClient::CustomHandlersState>(m_webVi
ew->client()->isProtocolHandlerRegistered(scheme, baseURL, url)); | 967 return static_cast<NavigatorContentUtilsClient::CustomHandlersState>(m_webVi
ew->client()->isProtocolHandlerRegistered(scheme, baseURL, url)); |
| 964 } | 968 } |
| 965 | 969 |
| 966 void NavigatorContentUtilsClientImpl::unregisterProtocolHandler(const String& sc
heme, const WebCore::KURL& baseURL, const WebCore::KURL& url) | 970 void NavigatorContentUtilsClientImpl::unregisterProtocolHandler(const String& sc
heme, const WebCore::KURL& baseURL, const WebCore::KURL& url) |
| 967 { | 971 { |
| 968 m_webView->client()->unregisterProtocolHandler(scheme, baseURL, url); | 972 m_webView->client()->unregisterProtocolHandler(scheme, baseURL, url); |
| 969 } | 973 } |
| 970 | 974 |
| 971 } // namespace blink | 975 } // namespace blink |
| OLD | NEW |