Changeset 128245 in webkit
- Timestamp:
- Sep 11, 2012 5:00:18 PM (12 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r128236 r128245 1 2012-09-11 Anders Carlsson <andersca@apple.com> 2 3 Accelerated compositing should always be forced when using the tiled drawing area 4 https://bugs.webkit.org/show_bug.cgi?id=96449 5 6 Reviewed by Andy Estes. 7 8 There's code in WebPage::updatePreferences that will turn off accelerated compositing unless accelerated drawing is enabled. 9 This should only be done in the non-tiled model, so move the code to DrawingAreaImpl::updatePreferences. 10 11 * WebProcess/WebPage/DrawingArea.h: 12 (WebKit::DrawingArea::updatePreferences): 13 This now takes a WebPreferencesStore. 14 15 * WebProcess/WebPage/DrawingAreaImpl.cpp: 16 (WebKit::DrawingAreaImpl::updatePreferences): 17 Move code here from WebPage::updatePreferences. 18 19 * WebProcess/WebPage/WebPage.cpp: 20 (WebKit::WebPage::updatePreferences): 21 Pass the WebPreferencesStore to DrawingArea::updatePreferences. 22 23 * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h: 24 * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm: 25 (WebKit::TiledCoreAnimationDrawingArea::TiledCoreAnimationDrawingArea): 26 Remove call to updatePreferences, it's going to be called by the WebPage object later. 27 28 (WebKit::TiledCoreAnimationDrawingArea::updatePreferences): 29 This now takes a WebPreferencesStore. 30 1 31 2012-09-11 Brady Eidson <beidson@apple.com> 2 32 -
trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h
r124701 r128245 50 50 class WebPage; 51 51 struct WebPageCreationParameters; 52 struct WebPreferencesStore; 52 53 53 54 #if PLATFORM(WIN) … … 84 85 85 86 virtual void setPaintingEnabled(bool) { } 86 virtual void updatePreferences( ) { }87 virtual void updatePreferences(const WebPreferencesStore&) { } 87 88 88 89 #if USE(ACCELERATED_COMPOSITING) -
trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
r125034 r128245 260 260 } 261 261 262 void DrawingAreaImpl::updatePreferences(const WebPreferencesStore& store) 263 { 264 // <rdar://problem/10697417>: It is necessary to force compositing when accelerate drawing 265 // is enabled on Mac so that scrollbars are always in their own layers. 266 #if PLATFORM(MAC) 267 if (m_webPage->corePage()->settings()->acceleratedDrawingEnabled()) 268 m_webPage->corePage()->settings()->setForceCompositingMode(LayerTreeHost::supportsAcceleratedCompositing()); 269 else 270 #endif 271 m_webPage->corePage()->settings()->setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()) && LayerTreeHost::supportsAcceleratedCompositing()); 272 } 273 262 274 void DrawingAreaImpl::layerHostDidFlushLayers() 263 275 { -
trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h
r125034 r128245 67 67 68 68 virtual void setPaintingEnabled(bool); 69 virtual void updatePreferences(const WebPreferencesStore&) OVERRIDE; 69 70 70 71 virtual void setRootCompositingLayer(WebCore::GraphicsLayer*); -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r128134 r128245 2082 2082 settings->setInteractiveFormValidationEnabled(store.getBoolValueForKey(WebPreferencesKey::interactiveFormValidationEnabledKey())); 2083 2083 2084 // <rdar://problem/10697417>: It is necessary to force compositing when accelerate drawing2085 // is enabled on Mac so that scrollbars are always in their own layers.2086 #if PLATFORM(MAC)2087 if (settings->acceleratedDrawingEnabled())2088 settings->setForceCompositingMode(LayerTreeHost::supportsAcceleratedCompositing());2089 else2090 #endif2091 settings->setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()) && LayerTreeHost::supportsAcceleratedCompositing());2092 2093 2084 #if ENABLE(SQL_DATABASE) 2094 2085 AbstractDatabase::setIsAvailable(store.getBoolValueForKey(WebPreferencesKey::databasesEnabledKey())); … … 2135 2126 2136 2127 if (m_drawingArea) 2137 m_drawingArea->updatePreferences( );2128 m_drawingArea->updatePreferences(store); 2138 2129 } 2139 2130 -
trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h
r120021 r128245 65 65 virtual void didUninstallPageOverlay() OVERRIDE; 66 66 virtual void setPageOverlayNeedsDisplay(const WebCore::IntRect&) OVERRIDE; 67 virtual void updatePreferences( ) OVERRIDE;67 virtual void updatePreferences(const WebPreferencesStore&) OVERRIDE; 68 68 69 69 virtual void dispatchAfterEnsuringUpdatedScrollPosition(const Function<void ()>&) OVERRIDE; -
trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
r128132 r128245 72 72 , m_isPaintingSuspended(!parameters.isVisible) 73 73 { 74 Page* page = webPage->corePage();75 76 // FIXME: It's weird that we're mucking around with the settings here.74 Page* page = m_webPage->corePage(); 75 76 page->settings()->setScrollingCoordinatorEnabled(true); 77 77 page->settings()->setForceCompositingMode(true); 78 page->settings()->setScrollingCoordinatorEnabled(true);79 78 80 79 WebProcess::shared().eventDispatcher().addScrollingTreeForPage(webPage); … … 93 92 layerTreeContext.contextID = m_layerHostingContext->contextID(); 94 93 m_webPage->send(Messages::DrawingAreaProxy::EnterAcceleratedCompositingMode(0, layerTreeContext)); 95 96 updatePreferences();97 94 } 98 95 … … 207 204 } 208 205 209 void TiledCoreAnimationDrawingArea::updatePreferences( )206 void TiledCoreAnimationDrawingArea::updatePreferences(const WebPreferencesStore&) 210 207 { 211 208 bool showDebugBorders = m_webPage->corePage()->settings()->showDebugBorders();
Note: See TracChangeset
for help on using the changeset viewer.