Changeset 85720 in webkit
- Timestamp:
- May 3, 2011 11:25:27 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r85719 r85720 1 2011-05-03 Justin Novosad <junov@chromium.org> 2 3 Reviewed by Kenneth Russell. 4 5 [Chromium] Make accelerated 2d canvas enabled by default with skia 6 https://bugs.webkit.org/show_bug.cgi?id=59929 7 8 No new tests. Covered by existing layout tests 9 10 * html/canvas/CanvasRenderingContext2D.cpp: 11 (WebCore::CanvasRenderingContext2D::CanvasRenderingContext2D): 12 Initialized for accelerated canvas if either the accelerated2dCanvas 13 or the legacyAccelerated2dCanvas flags are enabled 14 * page/Page.cpp: 15 (WebCore::Page::sharedGraphicsContext3D): 16 This is where the code goes to implement the functionality for the 17 legacy vs current acceleration paths for the 2D canvas. Currently, 18 this is a no-op, and always select the legacy path. This is temporary 19 until we are ready to sort the GPU layout tests (rebasline vs. bug) 20 * page/Settings.cpp: Added new flage for legacyAccelerated2dCanvas 21 (WebCore::Settings::Settings): 22 (WebCore::Settings::setLegacyAccelerated2dCanvasEnabled): 23 * page/Settings.h: 24 (WebCore::Settings::legacyAccelerated2dCanvasEnabled): 25 1 26 2011-04-29 Jer Noble <jer.noble@apple.com> 2 27 -
trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
r85661 r85720 132 132 if (!p) 133 133 return; 134 if (! p->settings()->accelerated2dCanvasEnabled())134 if (!(p->settings()->accelerated2dCanvasEnabled() || p->settings()->legacyAccelerated2dCanvasEnabled())) 135 135 return; 136 136 if (GraphicsContext* c = drawingContext()) { -
trunk/Source/WebCore/page/Page.cpp
r85603 r85720 750 750 if (!m_sharedGraphicsContext3D) 751 751 #if USE(SKIA) 752 m_sharedGraphicsContext3D = SharedGraphicsContext3D::create(chrome(), settings()->acceleratedDrawingEnabled() ? SharedGraphicsContext3D::UseSkiaGPU : 0); 752 // Temporary code to postpone massive test rebaselining 753 m_sharedGraphicsContext3D = SharedGraphicsContext3D::create(chrome(), 0 /*settings()->legacyAccelerated2dCanvasEnabled() ? 0 : SharedGraphicsContext3D::UseSkiaGPU*/); 753 754 #else 754 755 m_sharedGraphicsContext3D = SharedGraphicsContext3D::create(chrome(), 0); -
trunk/Source/WebCore/page/Settings.cpp
r85620 r85720 164 164 , m_webAudioEnabled(false) 165 165 , m_acceleratedCanvas2dEnabled(false) 166 , m_legacyAcceleratedCanvas2dEnabled(false) 166 167 , m_loadDeferringEnabled(true) 167 168 , m_tiledBackingStoreEnabled(false) … … 723 724 } 724 725 726 void Settings::setLegacyAccelerated2dCanvasEnabled(bool enabled) 727 { 728 m_legacyAcceleratedCanvas2dEnabled = enabled; 729 } 730 725 731 void Settings::setLoadDeferringEnabled(bool enabled) 726 732 { -
trunk/Source/WebCore/page/Settings.h
r85378 r85720 341 341 void setAccelerated2dCanvasEnabled(bool); 342 342 bool accelerated2dCanvasEnabled() const { return m_acceleratedCanvas2dEnabled; } 343 344 void setLegacyAccelerated2dCanvasEnabled(bool); 345 bool legacyAccelerated2dCanvasEnabled() const { return m_legacyAcceleratedCanvas2dEnabled; } 343 346 344 347 void setLoadDeferringEnabled(bool); … … 492 495 bool m_webAudioEnabled : 1; 493 496 bool m_acceleratedCanvas2dEnabled : 1; 497 bool m_legacyAcceleratedCanvas2dEnabled : 1; 494 498 bool m_loadDeferringEnabled : 1; 495 499 bool m_tiledBackingStoreEnabled : 1; -
trunk/Source/WebKit/chromium/ChangeLog
r85717 r85720 1 2011-05-03 Justin Novosad <junov@chromium.org> 2 3 Reviewed by Kenneth Russell. 4 5 [Chromium] Make accelerated 2d canvas enabled by default with skia 6 https://bugs.webkit.org/show_bug.cgi?id=59929 7 Added new flag for enabling the legacy accelerated 2d canvas 8 The flag is not yet functional with this change. 9 10 * public/WebSettings.h: 11 * src/WebSettingsImpl.cpp: 12 (WebKit::WebSettingsImpl::setLegacyAccelerated2dCanvasEnabled): 13 * src/WebSettingsImpl.h: 14 1 15 2011-05-03 Alpha Lam <hclam@chromium.org> 2 16 -
trunk/Source/WebKit/chromium/public/WebSettings.h
r85378 r85720 111 111 virtual void setAcceleratedCompositingForAnimationEnabled(bool) = 0; 112 112 virtual void setAccelerated2dCanvasEnabled(bool) = 0; 113 virtual void setLegacyAccelerated2dCanvasEnabled(bool) = 0; 113 114 virtual void setAcceleratedDrawingEnabled(bool) = 0; 114 115 virtual void setMemoryInfoEnabled(bool) = 0; -
trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp
r85378 r85720 354 354 } 355 355 356 void WebSettingsImpl::setLegacyAccelerated2dCanvasEnabled(bool enabled) 357 { 358 m_settings->setLegacyAccelerated2dCanvasEnabled(enabled); 359 } 360 356 361 void WebSettingsImpl::setMemoryInfoEnabled(bool enabled) 357 362 { -
trunk/Source/WebKit/chromium/src/WebSettingsImpl.h
r85378 r85720 104 104 virtual void setAcceleratedCompositingForAnimationEnabled(bool); 105 105 virtual void setAccelerated2dCanvasEnabled(bool); 106 virtual void setLegacyAccelerated2dCanvasEnabled(bool); 106 107 virtual void setAcceleratedDrawingEnabled(bool); 107 108 virtual void setMemoryInfoEnabled(bool);
Note: See TracChangeset
for help on using the changeset viewer.