Changeset 136529 in webkit
- Timestamp:
- Dec 4, 2012 10:47:50 AM (11 years ago)
- Location:
- trunk/Source/WebKit/chromium
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r136516 r136529 1 2012-12-04 Eberhard Graether <egraether@google.com> 2 3 [chromium] fix showFPScounter and showPaintRects not toggleable after page change 4 https://bugs.webkit.org/show_bug.cgi?id=103937 5 6 Reviewed by Pavel Feldman. 7 8 This change avoids updating the WebSettings and uses fields for showFPSCounter and 9 showPaintRects in WebViewImpl instead, which hold the values between InspectorPageAgent::restore() 10 and WebViewImpl::setIsAcceleratedCompositingActive(). 11 12 * src/WebViewImpl.cpp: 13 (WebKit::WebViewImpl::WebViewImpl): 14 (WebKit::WebViewImpl::setShowFPSCounter): 15 (WebKit::WebViewImpl::setShowPaintRects): 16 (WebKit::WebViewImpl::setIsAcceleratedCompositingActive): 17 * src/WebViewImpl.h: 18 1 19 2012-12-04 Charlie Reis <creis@chromium.org> 2 20 -
trunk/Source/WebKit/chromium/src/WebViewImpl.cpp
r136466 r136529 455 455 , m_validationMessage(ValidationMessageClientImpl::create(*client)) 456 456 , m_suppressInvalidations(false) 457 , m_showFPSCounter(false) 458 , m_showPaintRects(false) 457 459 { 458 460 // WebKit/win/WebView.cpp does the same thing, except they call the … … 846 848 m_layerTreeView->setShowFPSCounter(show); 847 849 } 848 settingsImpl()->setShowFPSCounter(show);850 m_showFPSCounter = show; 849 851 } 850 852 … … 855 857 m_layerTreeView->setShowPaintRects(show); 856 858 } 857 settingsImpl()->setShowPaintRects(show);859 m_showPaintRects = show; 858 860 } 859 861 … … 4047 4049 loadFontAtlasIfNecessary(); 4048 4050 4049 if (settingsImpl()->showFPSCounter())4050 setShowFPSCounter(true);4051 m_layerTreeView->setShowFPSCounter(m_showFPSCounter); 4052 m_layerTreeView->setShowPaintRects(m_showPaintRects); 4051 4053 } else { 4052 4054 m_nonCompositedContentHost.clear(); -
trunk/Source/WebKit/chromium/src/WebViewImpl.h
r136032 r136529 884 884 885 885 bool m_suppressInvalidations; 886 887 bool m_showFPSCounter; 888 bool m_showPaintRects; 886 889 }; 887 890
Note: See TracChangeset
for help on using the changeset viewer.