Changeset 136763 in webkit
- Timestamp:
- Dec 5, 2012 2:38:48 PM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/Platform/ChangeLog
r136734 r136763 1 2012-12-05 Eberhard Graether <egraether@google.com> 2 3 [chromium] Remove WebLayerTreeView API to set font atlas 4 https://bugs.webkit.org/show_bug.cgi?id=102960 5 6 Reviewed by James Robinson. 7 8 Removes old font atlas creation from WebViewImpl. 9 10 * chromium/public/WebLayerTreeView.h: 11 1 12 2012-12-05 Stephen White <senorblanco@chromium.org> 2 13 -
trunk/Source/Platform/chromium/public/WebLayerTreeView.h
r135881 r136763 33 33 #include "WebPrivateOwnPtr.h" 34 34 #include "WebSize.h" 35 36 class SkBitmap;37 35 38 36 namespace WebKit { … … 186 184 virtual void setShowPaintRects(bool) { } 187 185 188 // Provides a font atlas to use for debug visualizations. The atlas must be a bitmap containing glyph data, a table of189 // ASCII character values to a subrectangle of the atlas representing the corresponding glyph, and the glyph height.190 virtual void setFontAtlas(WebRect asciiToRectTable[128], const SkBitmap&, int fontHeight) { }191 192 186 // Simulates a lost context. For testing only. 193 187 virtual void loseCompositorContext(int numTimes) = 0; -
trunk/Source/WebKit/chromium/ChangeLog
r136749 r136763 1 2012-12-05 Eberhard Graether <egraether@google.com> 2 3 [chromium] Remove WebLayerTreeView API to set font atlas 4 https://bugs.webkit.org/show_bug.cgi?id=102960 5 6 Reviewed by James Robinson. 7 8 Removes old font atlas creation from WebViewImpl. 9 10 * src/WebViewImpl.cpp: 11 (WebKit::WebViewImpl::WebViewImpl): 12 (WebKit::WebViewImpl::setShowFPSCounter): 13 (WebKit::WebViewImpl::setIsAcceleratedCompositingActive): 14 (WebKit): 15 * src/WebViewImpl.h: 16 1 17 2012-12-05 Stephen White <senorblanco@chromium.org> 2 18 -
trunk/Source/WebKit/chromium/src/WebViewImpl.cpp
r136625 r136763 432 432 , m_deviceScaleInCompositor(1) 433 433 , m_inputHandlerIdentifier(-1) 434 , m_isFontAtlasLoaded(false)435 434 #endif 436 435 #if ENABLE(INPUT_SPEECH) … … 843 842 if (isAcceleratedCompositingActive()) { 844 843 TRACE_EVENT0("webkit", "WebViewImpl::setShowFPSCounter"); 845 #if USE(ACCELERATED_COMPOSITING)846 loadFontAtlasIfNecessary();847 #endif848 844 m_layerTreeView->setShowFPSCounter(show); 849 845 } … … 4039 4035 m_isAcceleratedCompositingActive = true; 4040 4036 m_compositorCreationFailed = false; 4041 m_isFontAtlasLoaded = false;4042 4037 if (m_pageOverlays) 4043 4038 m_pageOverlays->update(); 4044 4045 if (layerTreeViewSettings.showPlatformLayerTree)4046 loadFontAtlasIfNecessary();4047 4048 4039 m_layerTreeView->setShowFPSCounter(m_showFPSCounter); 4049 4040 m_layerTreeView->setShowPaintRects(m_showPaintRects); … … 4057 4048 if (page()) 4058 4049 page()->mainFrame()->view()->setClipsRepaints(!m_isAcceleratedCompositingActive); 4059 }4060 4061 void WebViewImpl::loadFontAtlasIfNecessary()4062 {4063 ASSERT(m_layerTreeView);4064 4065 if (m_isFontAtlasLoaded)4066 return;4067 4068 TRACE_EVENT0("webkit", "WebViewImpl::loadFontAtlas");4069 WebRect asciiToRectTable[128];4070 int fontHeight;4071 SkBitmap bitmap = WebCore::CompositorHUDFontAtlas::generateFontAtlas(asciiToRectTable, fontHeight);4072 m_layerTreeView->setFontAtlas(asciiToRectTable, bitmap, fontHeight);4073 m_isFontAtlasLoaded = true;4074 4050 } 4075 4051 -
trunk/Source/WebKit/chromium/src/WebViewImpl.h
r136529 r136763 654 654 #if USE(ACCELERATED_COMPOSITING) 655 655 void setIsAcceleratedCompositingActive(bool); 656 void loadFontAtlasIfNecessary();657 656 void doComposite(); 658 657 void doPixelReadbackToCanvas(WebCanvas*, const WebCore::IntRect&); … … 849 848 float m_deviceScaleInCompositor; 850 849 int m_inputHandlerIdentifier; 851 bool m_isFontAtlasLoaded;852 850 #endif 853 851 static const WebInputEvent* m_currentInputEvent;
Note: See TracChangeset
for help on using the changeset viewer.