Remove some more zoom-related code.

sky/engine/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 132 matching lines @@
     m_spellCheckClient = spellCheckClient;
 }
 
 WebViewImpl::WebViewImpl(WebViewClient* client)
     : m_client(client)
     , m_spellCheckClient(0)
     , m_chromeClientImpl(this)
     , m_editorClientImpl(this)
     , m_spellCheckerClientImpl(this)
     , m_fixedLayoutSizeLock(false)
-    , m_zoomLevel(0)
-    , m_minimumZoomLevel(zoomFactorToZoomLevel(minTextSizeMultiplier))
-    , m_maximumZoomLevel(zoomFactorToZoomLevel(maxTextSizeMultiplier))
     , m_doingDragAndDrop(false)
     , m_ignoreInputEvents(false)
     , m_compositorDeviceScaleFactorOverride(0)
     , m_rootLayerScale(1)
     , m_suppressNextKeypressEvent(false)
     , m_imeAcceptEvents(true)
     , m_isTransparent(false)
     , m_tabsToLinks(false)
     , m_layerTreeView(0)
     , m_rootLayer(0)
     , m_rootGraphicsLayer(0)
     , m_rootTransformLayer(0)
     , m_graphicsLayerFactory(adoptPtr(new GraphicsLayerFactoryChromium(this)))
     , m_isAcceleratedCompositingActive(false)
     , m_layerTreeViewCommitsDeferred(false)
     , m_layerTreeViewClosed(false)
     , m_matchesHeuristicsForGpuRasterization(false)
     , m_recreatingGraphicsContext(false)
     , m_flingModifier(0)
     , m_flingSourceDevice(false)
     , m_showFPSCounter(false)
     , m_showPaintRects(false)
     , m_showDebugBorders(false)
     , m_continuousPaintingEnabled(false)
     , m_showScrollBottleneckRects(false)
     , m_baseBackgroundColor(Color::white)
     , m_backgroundColorOverride(Color::transparent)
-    , m_zoomFactorOverride(0)
     , m_userGestureObserved(false)
 {
     Page::PageClients pageClients;
     pageClients.chromeClient = &m_chromeClientImpl;
     pageClients.editorClient = &m_editorClientImpl;
     pageClients.spellCheckerClient = &m_spellCheckerClientImpl;
 
     m_page = adoptPtr(new Page(pageClients, m_client->services()));
     m_page->makeOrdinary();
 
@@ skipping 1521 matching lines @@
 void WebViewImpl::computeScaleAndScrollForFocusedNode(Node* focusedNode, float& newScale, IntPoint& newScroll, bool& needAnimation)
 {
     //FIXME(sky)
 }
 
 void WebViewImpl::advanceFocus(bool reverse)
 {
     page()->focusController().advanceFocus(reverse ? FocusTypeBackward : FocusTypeForward);
 }
 
-double WebViewImpl::zoomLevel()
-{
-    return m_zoomLevel;
-}
-
-double WebViewImpl::setZoomLevel(double zoomLevel)
-{
-    if (zoomLevel < m_minimumZoomLevel)
-        m_zoomLevel = m_minimumZoomLevel;
-    else if (zoomLevel > m_maximumZoomLevel)
-        m_zoomLevel = m_maximumZoomLevel;
-    else
-        m_zoomLevel = zoomLevel;
-
-    LocalFrame* frame = mainFrameImpl()->frame();
-    float zoomFactor = m_zoomFactorOverride ? m_zoomFactorOverride : static_cast<float>(zoomLevelToZoomFactor(m_zoomLevel));
-    frame->setPageZoomFactor(zoomFactor);
-
-    return m_zoomLevel;
-}
-
-void WebViewImpl::zoomLimitsChanged(double minimumZoomLevel,
-                                    double maximumZoomLevel)
-{
-    m_minimumZoomLevel = minimumZoomLevel;
-    m_maximumZoomLevel = maximumZoomLevel;
-    m_client->zoomLimitsChanged(m_minimumZoomLevel, m_maximumZoomLevel);
-}
-
-float WebViewImpl::textZoomFactor()
-{
-    return mainFrameImpl()->frame()->textZoomFactor();
-}
-
-float WebViewImpl::setTextZoomFactor(float textZoomFactor)
-{
-    LocalFrame* frame = mainFrameImpl()->frame();
-    frame->setTextZoomFactor(textZoomFactor);
-    return textZoomFactor;
-}
-
-double WebView::zoomLevelToZoomFactor(double zoomLevel)
-{
-    return pow(textSizeMultiplierRatio, zoomLevel);
-}
-
-double WebView::zoomFactorToZoomLevel(double factor)
-{
-    // Since factor = 1.2^level, level = log(factor) / log(1.2)
-    return log(factor) / log(textSizeMultiplierRatio);
-}
-
 IntPoint WebViewImpl::clampOffsetAtScale(const IntPoint& offset, float scale)
 {
     FrameView* view = mainFrameImpl()->frameView();
     if (!view)
         return offset;
 
     return view->clampOffsetAtScale(offset, scale);
 }
 
 void WebViewImpl::setMainFrameScrollOffset(const WebPoint& origin)
@@ skipping 46 matching lines @@
 }
 
 WebSize WebViewImpl::contentsPreferredMinimumSize()
 {
     Document* document = m_page->mainFrame()->document();
     if (!document || !document->renderView() || !document->documentElement())
         return WebSize();
 
     layout();
     FontCachePurgePreventer fontCachePurgePreventer; // Required by minPreferredLogicalWidth().
-    IntSize preferredMinimumSize(document->renderView()->minPreferredLogicalWidth(), document->documentElement()->scrollHeight());
-    preferredMinimumSize.scale(zoomLevelToZoomFactor(zoomLevel()));
-    return preferredMinimumSize;
+    return IntSize(document->renderView()->minPreferredLogicalWidth(), document->documentElement()->scrollHeight());
 }
 
 void WebViewImpl::resetScrollAndScaleState()
 {
     // FIXME(sky): Remove
 }
 
 void WebViewImpl::setFixedLayoutSize(const WebSize& layoutSize)
 {
     if (!page())
@@ skipping 234 matching lines @@
     ASSERT(m_ignoreInputEvents != newValue);
     m_ignoreInputEvents = newValue;
 }
 
 void WebViewImpl::setBackgroundColorOverride(WebColor color)
 {
     m_backgroundColorOverride = color;
     updateLayerTreeBackgroundColor();
 }
 
-void WebViewImpl::setZoomFactorOverride(float zoomFactor)
-{
-    m_zoomFactorOverride = zoomFactor;
-    setZoomLevel(zoomLevel());
-}
-
 void WebViewImpl::setOverlayLayer(GraphicsLayer* layer)
 {
     if (!m_rootGraphicsLayer)
         return;
 
     // FIXME(bokan): This path goes away after virtual viewport pinch is enabled everywhere.
     if (!m_rootTransformLayer)
         m_rootTransformLayer = m_page->mainFrame()->view()->renderView()->compositor()->ensureRootTransformLayer();
 
     if (m_rootTransformLayer) {
@@ skipping 241 matching lines @@
         m_layerTreeView->setVisible(visible);
     }
 }
 
 bool WebViewImpl::shouldDisableDesktopWorkarounds()
 {
     return true;
 }
 
 } // namespace blink