Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)

1 files changed, 238 insertions, 5 deletions

diff --git a/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index 52eb37400..d39ff8af9 100644
--- a/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -32,6 +32,8 @@
 #include "WebDevToolsAgentImpl.h"
 
 #include "ExceptionCode.h"
+#include "Frame.h"
+#include "FrameView.h"
 #include "GraphicsContext.h"
 #include "InjectedScriptHost.h"
 #include "InspectorBackendDispatcher.h"
@@ -45,6 +47,7 @@
 #include "PageScriptDebugServer.h"
 #include "painting/GraphicsContextBuilder.h"
 #include "PlatformString.h"
+#include "RenderView.h"
 #include "ResourceError.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
@@ -63,10 +66,19 @@
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
 #include <wtf/CurrentTime.h>
+#include <wtf/MathExtras.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/OwnPtr.h>
 
 using namespace WebCore;
+using namespace std;
+
+namespace OverlayZOrders {
+static const int viewportGutter = 97;
+
+// Use 99 as a big z-order number so that highlight is above other overlays.
+static const int highlight = 99;
+}
 
 namespace WebKit {
 
@@ -173,6 +185,190 @@ private:
     OwnPtr<WebDevToolsAgent::MessageDescriptor> m_descriptor;
 };
 
+class DeviceMetricsSupport : public WebPageOverlay {
+public:
+    DeviceMetricsSupport(WebViewImpl* webView)
+        : m_webView(webView)
+        , m_fitWindow(false)
+        , m_originalZoomFactor(0)
+    {
+        m_webView->addPageOverlay(this, OverlayZOrders::viewportGutter);
+    }
+
+    ~DeviceMetricsSupport()
+    {
+        restore();
+        m_webView->removePageOverlay(this);
+    }
+
+    void setDeviceMetrics(int width, int height, float textZoomFactor, bool fitWindow)
+    {
+        WebCore::FrameView* view = frameView();
+        if (!view)
+            return;
+
+        m_emulatedFrameSize = WebSize(width, height);
+        m_fitWindow = fitWindow;
+        m_originalZoomFactor = 0;
+        m_webView->setEmulatedTextZoomFactor(textZoomFactor);
+        applySizeOverrideInternal(view, FitWindowAllowed);
+        autoZoomPageToFitWidth(view->frame());
+
+        m_webView->sendResizeEventAndRepaint();
+    }
+
+    void autoZoomPageToFitWidthOnNavigation(Frame* frame)
+    {
+        FrameView* frameView = frame->view();
+        applySizeOverrideInternal(frameView, FitWindowNotAllowed);
+        m_originalZoomFactor = 0;
+        applySizeOverrideInternal(frameView, FitWindowAllowed);
+        autoZoomPageToFitWidth(frame);
+    }
+
+    void autoZoomPageToFitWidth(Frame* frame)
+    {
+        if (!frame)
+            return;
+
+        frame->setTextZoomFactor(m_webView->emulatedTextZoomFactor());
+        WebSize scaledFrameSize = scaledEmulatedFrameSize(frame->view());
+        ensureOriginalZoomFactor(frame->view());
+        double sizeRatio = static_cast<double>(scaledFrameSize.width) / m_emulatedFrameSize.width;
+        frame->setPageAndTextZoomFactors(sizeRatio * m_originalZoomFactor, m_webView->emulatedTextZoomFactor());
+        Document* doc = frame->document();
+        doc->styleResolverChanged(RecalcStyleImmediately);
+        doc->updateLayout();
+    }
+
+    void webViewResized()
+    {
+        if (!m_fitWindow)
+            return;
+
+        applySizeOverrideIfNecessary();
+        autoZoomPageToFitWidth(m_webView->mainFrameImpl()->frame());
+    }
+
+    void applySizeOverrideIfNecessary()
+    {
+        FrameView* view = frameView();
+        if (!view)
+            return;
+
+        applySizeOverrideInternal(view, FitWindowAllowed);
+    }
+
+private:
+    enum FitWindowFlag { FitWindowAllowed, FitWindowNotAllowed };
+
+    void ensureOriginalZoomFactor(FrameView* frameView)
+    {
+        if (m_originalZoomFactor)
+            return;
+
+        m_webView->setPageScaleFactor(1, WebPoint());
+        m_webView->setZoomLevel(false, 0);
+        WebSize scaledEmulatedSize = scaledEmulatedFrameSize(frameView);
+        Document* document = frameView->frame()->document();
+        double denominator = document->renderView() ? document->renderView()->viewWidth() : frameView->contentsWidth();
+        if (!denominator)
+            denominator = 1;
+        m_originalZoomFactor = static_cast<double>(scaledEmulatedSize.width) / denominator;
+    }
+
+    void restore()
+    {
+        WebCore::FrameView* view = frameView();
+        if (!view)
+            return;
+
+        m_webView->setZoomLevel(false, 0);
+        m_webView->setEmulatedTextZoomFactor(1);
+        view->setHorizontalScrollbarLock(false);
+        view->setVerticalScrollbarLock(false);
+        view->setScrollbarModes(ScrollbarAuto, ScrollbarAuto, false, false);
+        view->resize(IntSize(m_webView->size()));
+        m_webView->sendResizeEventAndRepaint();
+    }
+
+    WebSize scaledEmulatedFrameSize(FrameView* frameView)
+    {
+        if (!m_fitWindow)
+            return m_emulatedFrameSize;
+
+        WebSize scrollbarDimensions = forcedScrollbarDimensions(frameView);
+
+        int overrideWidth = m_emulatedFrameSize.width;
+        int overrideHeight = m_emulatedFrameSize.height;
+
+        WebSize webViewSize = m_webView->size();
+        int availableViewWidth = max(webViewSize.width - scrollbarDimensions.width, 1);
+        int availableViewHeight = max(webViewSize.height - scrollbarDimensions.height, 1);
+
+        double widthRatio = static_cast<double>(overrideWidth) / availableViewWidth;
+        double heightRatio = static_cast<double>(overrideHeight) / availableViewHeight;
+        double dimensionRatio = max(widthRatio, heightRatio);
+        overrideWidth = static_cast<int>(ceil(static_cast<double>(overrideWidth) / dimensionRatio));
+        overrideHeight = static_cast<int>(ceil(static_cast<double>(overrideHeight) / dimensionRatio));
+
+        return WebSize(overrideWidth, overrideHeight);
+    }
+
+    WebSize forcedScrollbarDimensions(FrameView* frameView)
+    {
+        frameView->setScrollbarModes(ScrollbarAlwaysOn, ScrollbarAlwaysOn, true, true);
+
+        int verticalScrollbarWidth = 0;
+        int horizontalScrollbarHeight = 0;
+        if (Scrollbar* verticalBar = frameView->verticalScrollbar())
+            verticalScrollbarWidth = !verticalBar->isOverlayScrollbar() ? verticalBar->width() : 0;
+        if (Scrollbar* horizontalBar = frameView->horizontalScrollbar())
+            horizontalScrollbarHeight = !horizontalBar->isOverlayScrollbar() ? horizontalBar->height() : 0;
+        return WebSize(verticalScrollbarWidth, horizontalScrollbarHeight);
+    }
+
+    void applySizeOverrideInternal(FrameView* frameView, FitWindowFlag fitWindowFlag)
+    {
+        WebSize scrollbarDimensions = forcedScrollbarDimensions(frameView);
+
+        WebSize effectiveEmulatedSize = (fitWindowFlag == FitWindowAllowed) ? scaledEmulatedFrameSize(frameView) : m_emulatedFrameSize;
+        int overrideWidth = effectiveEmulatedSize.width + scrollbarDimensions.width;
+        int overrideHeight = effectiveEmulatedSize.height + scrollbarDimensions.height;
+
+        if (IntSize(overrideWidth, overrideHeight) != frameView->size())
+            frameView->resize(overrideWidth, overrideHeight);
+
+        Document* doc = frameView->frame()->document();
+        doc->styleResolverChanged(RecalcStyleImmediately);
+        doc->updateLayout();
+    }
+
+    virtual void paintPageOverlay(WebCanvas* canvas)
+    {
+        FrameView* frameView = this->frameView();
+        if (!frameView)
+            return;
+
+        GraphicsContextBuilder builder(canvas);
+        GraphicsContext& gc = builder.context();
+        gc.clipOut(IntRect(IntPoint(), frameView->size()));
+        gc.setFillColor(Color::darkGray, ColorSpaceDeviceRGB);
+        gc.drawRect(IntRect(IntPoint(), m_webView->size()));
+    }
+
+    WebCore::FrameView* frameView()
+    {
+        return m_webView->mainFrameImpl() ? m_webView->mainFrameImpl()->frameView() : 0;
+    }
+
+    WebViewImpl* m_webView;
+    WebSize m_emulatedFrameSize;
+    bool m_fitWindow;
+    double m_originalZoomFactor;
+};
+
+
 WebDevToolsAgentImpl::WebDevToolsAgentImpl(
     WebViewImpl* webViewImpl,
     WebDevToolsAgentClient* client)
@@ -224,13 +420,51 @@ void WebDevToolsAgentImpl::didNavigate()
     ClientMessageLoopAdapter::didNavigate();
 }
 
-void WebDevToolsAgentImpl::didClearWindowObject(WebFrameImpl* webframe)
+void WebDevToolsAgentImpl::didCreateScriptContext(WebFrameImpl* webframe, int worldId)
 {
-    WebCore::V8Proxy* proxy = WebCore::V8Proxy::retrieve(webframe->frame());
-    if (proxy && webframe->frame()->script()->canExecuteScripts(NotAboutToExecuteScript))
+    // Skip non main world contexts.
+    if (worldId)
+        return;
+    if (WebCore::V8Proxy* proxy = WebCore::V8Proxy::retrieve(webframe->frame()))
         proxy->setContextDebugId(m_hostId);
 }
 
+void WebDevToolsAgentImpl::mainFrameViewCreated(WebFrameImpl* webFrame)
+{
+    if (m_metricsSupport)
+        m_metricsSupport->applySizeOverrideIfNecessary();
+}
+
+bool WebDevToolsAgentImpl::metricsOverridden()
+{
+    return !!m_metricsSupport;
+}
+
+void WebDevToolsAgentImpl::webViewResized()
+{
+    if (m_metricsSupport)
+        m_metricsSupport->webViewResized();
+}
+
+void WebDevToolsAgentImpl::overrideDeviceMetrics(int width, int height, float fontScaleFactor, bool fitWindow)
+{
+    if (!width && !height) {
+        if (m_metricsSupport)
+            m_metricsSupport.clear();
+        return;
+    }
+
+    if (!m_metricsSupport)
+        m_metricsSupport = adoptPtr(new DeviceMetricsSupport(m_webViewImpl));
+    m_metricsSupport->setDeviceMetrics(width, height, fontScaleFactor, fitWindow);
+}
+
+void WebDevToolsAgentImpl::autoZoomPageToFitWidth()
+{
+    if (m_metricsSupport)
+        m_metricsSupport->autoZoomPageToFitWidthOnNavigation(m_webViewImpl->mainFrameImpl()->frame());
+}
+
 void WebDevToolsAgentImpl::dispatchOnInspectorBackend(const WebString& message)
 {
     inspectorController()->dispatchMessageFromFrontend(message);
@@ -282,8 +516,7 @@ void WebDevToolsAgentImpl::paintPageOverlay(WebCanvas* canvas)
 
 void WebDevToolsAgentImpl::highlight()
 {
-    // Use 99 as a big z-order number so that highlight is above other overlays.
-    m_webViewImpl->addPageOverlay(this, 99);
+    m_webViewImpl->addPageOverlay(this, OverlayZOrders::highlight);
 }
 
 void WebDevToolsAgentImpl::hideHighlight()