Diff
Modified: trunk/Source/Platform/ChangeLog (136762 => 136763)
--- trunk/Source/Platform/ChangeLog 2012-12-05 22:16:44 UTC (rev 136762)
+++ trunk/Source/Platform/ChangeLog 2012-12-05 22:38:48 UTC (rev 136763)
@@ -1,3 +1,14 @@
+2012-12-05 Eberhard Graether <[email protected]>
+
+ [chromium] Remove WebLayerTreeView API to set font atlas
+ https://bugs.webkit.org/show_bug.cgi?id=102960
+
+ Reviewed by James Robinson.
+
+ Removes old font atlas creation from WebViewImpl.
+
+ * chromium/public/WebLayerTreeView.h:
+
2012-12-05 Stephen White <[email protected]>
Unreviewed, rolling out r136609.
Modified: trunk/Source/Platform/chromium/public/WebLayerTreeView.h (136762 => 136763)
--- trunk/Source/Platform/chromium/public/WebLayerTreeView.h 2012-12-05 22:16:44 UTC (rev 136762)
+++ trunk/Source/Platform/chromium/public/WebLayerTreeView.h 2012-12-05 22:38:48 UTC (rev 136763)
@@ -33,8 +33,6 @@
#include "WebPrivateOwnPtr.h"
#include "WebSize.h"
-class SkBitmap;
-
namespace WebKit {
class WebGraphicsContext3D;
class WebLayer;
@@ -185,10 +183,6 @@
// Toggles the paint rects in the HUD layer
virtual void setShowPaintRects(bool) { }
- // Provides a font atlas to use for debug visualizations. The atlas must be a bitmap containing glyph data, a table of
- // ASCII character values to a subrectangle of the atlas representing the corresponding glyph, and the glyph height.
- virtual void setFontAtlas(WebRect asciiToRectTable[128], const SkBitmap&, int fontHeight) { }
-
// Simulates a lost context. For testing only.
virtual void loseCompositorContext(int numTimes) = 0;
};
Modified: trunk/Source/WebKit/chromium/ChangeLog (136762 => 136763)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-05 22:16:44 UTC (rev 136762)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-05 22:38:48 UTC (rev 136763)
@@ -1,3 +1,19 @@
+2012-12-05 Eberhard Graether <[email protected]>
+
+ [chromium] Remove WebLayerTreeView API to set font atlas
+ https://bugs.webkit.org/show_bug.cgi?id=102960
+
+ Reviewed by James Robinson.
+
+ Removes old font atlas creation from WebViewImpl.
+
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::WebViewImpl):
+ (WebKit::WebViewImpl::setShowFPSCounter):
+ (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+ (WebKit):
+ * src/WebViewImpl.h:
+
2012-12-05 Stephen White <[email protected]>
Unreviewed, rolling out r136735.
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (136762 => 136763)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-12-05 22:16:44 UTC (rev 136762)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-12-05 22:38:48 UTC (rev 136763)
@@ -431,7 +431,6 @@
, m_compositorSurfaceReady(false)
, m_deviceScaleInCompositor(1)
, m_inputHandlerIdentifier(-1)
- , m_isFontAtlasLoaded(false)
#endif
#if ENABLE(INPUT_SPEECH)
, m_speechInputClient(SpeechInputClientImpl::create(client))
@@ -842,9 +841,6 @@
{
if (isAcceleratedCompositingActive()) {
TRACE_EVENT0("webkit", "WebViewImpl::setShowFPSCounter");
-#if USE(ACCELERATED_COMPOSITING)
- loadFontAtlasIfNecessary();
-#endif
m_layerTreeView->setShowFPSCounter(show);
}
m_showFPSCounter = show;
@@ -4038,13 +4034,8 @@
m_client->didActivateCompositor(m_inputHandlerIdentifier);
m_isAcceleratedCompositingActive = true;
m_compositorCreationFailed = false;
- m_isFontAtlasLoaded = false;
if (m_pageOverlays)
m_pageOverlays->update();
-
- if (layerTreeViewSettings.showPlatformLayerTree)
- loadFontAtlasIfNecessary();
-
m_layerTreeView->setShowFPSCounter(m_showFPSCounter);
m_layerTreeView->setShowPaintRects(m_showPaintRects);
} else {
@@ -4058,21 +4049,6 @@
page()->mainFrame()->view()->setClipsRepaints(!m_isAcceleratedCompositingActive);
}
-void WebViewImpl::loadFontAtlasIfNecessary()
-{
- ASSERT(m_layerTreeView);
-
- if (m_isFontAtlasLoaded)
- return;
-
- TRACE_EVENT0("webkit", "WebViewImpl::loadFontAtlas");
- WebRect asciiToRectTable[128];
- int fontHeight;
- SkBitmap bitmap = WebCore::CompositorHUDFontAtlas::generateFontAtlas(asciiToRectTable, fontHeight);
- m_layerTreeView->setFontAtlas(asciiToRectTable, bitmap, fontHeight);
- m_isFontAtlasLoaded = true;
-}
-
#endif
namespace {
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (136762 => 136763)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-12-05 22:16:44 UTC (rev 136762)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-12-05 22:38:48 UTC (rev 136763)
@@ -653,7 +653,6 @@
#if USE(ACCELERATED_COMPOSITING)
void setIsAcceleratedCompositingActive(bool);
- void loadFontAtlasIfNecessary();
void doComposite();
void doPixelReadbackToCanvas(WebCanvas*, const WebCore::IntRect&);
void reallocateRenderer();
@@ -848,7 +847,6 @@
bool m_compositorSurfaceReady;
float m_deviceScaleInCompositor;
int m_inputHandlerIdentifier;
- bool m_isFontAtlasLoaded;
#endif
static const WebInputEvent* m_currentInputEvent;
