Changeset 136763 in webkit


Ignore:
Timestamp:
Dec 5, 2012 2:38:48 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[chromium] Remove WebLayerTreeView API to set font atlas
https://bugs.webkit.org/show_bug.cgi?id=102960

Patch by Eberhard Graether <egraether@google.com> on 2012-12-05
Reviewed by James Robinson.

Removes old font atlas creation from WebViewImpl.

Source/Platform:

  • chromium/public/WebLayerTreeView.h:

Source/WebKit/chromium:

  • src/WebViewImpl.cpp:

(WebKit::WebViewImpl::WebViewImpl):
(WebKit::WebViewImpl::setShowFPSCounter):
(WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
(WebKit):

  • src/WebViewImpl.h:
Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/Platform/ChangeLog

    r136734 r136763  
     12012-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
    1122012-12-05  Stephen White  <senorblanco@chromium.org>
    213
  • trunk/Source/Platform/chromium/public/WebLayerTreeView.h

    r135881 r136763  
    3333#include "WebPrivateOwnPtr.h"
    3434#include "WebSize.h"
    35 
    36 class SkBitmap;
    3735
    3836namespace WebKit {
     
    186184    virtual void setShowPaintRects(bool) { }
    187185
    188     // Provides a font atlas to use for debug visualizations. The atlas must be a bitmap containing glyph data, a table of
    189     // 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 
    192186    // Simulates a lost context. For testing only.
    193187    virtual void loseCompositorContext(int numTimes) = 0;
  • trunk/Source/WebKit/chromium/ChangeLog

    r136749 r136763  
     12012-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
    1172012-12-05  Stephen White  <senorblanco@chromium.org>
    218
  • trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

    r136625 r136763  
    432432    , m_deviceScaleInCompositor(1)
    433433    , m_inputHandlerIdentifier(-1)
    434     , m_isFontAtlasLoaded(false)
    435434#endif
    436435#if ENABLE(INPUT_SPEECH)
     
    843842    if (isAcceleratedCompositingActive()) {
    844843        TRACE_EVENT0("webkit", "WebViewImpl::setShowFPSCounter");
    845 #if USE(ACCELERATED_COMPOSITING)
    846         loadFontAtlasIfNecessary();
    847 #endif
    848844        m_layerTreeView->setShowFPSCounter(show);
    849845    }
     
    40394035            m_isAcceleratedCompositingActive = true;
    40404036            m_compositorCreationFailed = false;
    4041             m_isFontAtlasLoaded = false;
    40424037            if (m_pageOverlays)
    40434038                m_pageOverlays->update();
    4044 
    4045             if (layerTreeViewSettings.showPlatformLayerTree)
    4046                 loadFontAtlasIfNecessary();
    4047 
    40484039            m_layerTreeView->setShowFPSCounter(m_showFPSCounter);
    40494040            m_layerTreeView->setShowPaintRects(m_showPaintRects);
     
    40574048    if (page())
    40584049        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;
    40744050}
    40754051
  • trunk/Source/WebKit/chromium/src/WebViewImpl.h

    r136529 r136763  
    654654#if USE(ACCELERATED_COMPOSITING)
    655655    void setIsAcceleratedCompositingActive(bool);
    656     void loadFontAtlasIfNecessary();
    657656    void doComposite();
    658657    void doPixelReadbackToCanvas(WebCanvas*, const WebCore::IntRect&);
     
    849848    float m_deviceScaleInCompositor;
    850849    int m_inputHandlerIdentifier;
    851     bool m_isFontAtlasLoaded;
    852850#endif
    853851    static const WebInputEvent* m_currentInputEvent;
Note: See TracChangeset for help on using the changeset viewer.