summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp')
-rw-r--r--Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index 6f72f13fd..7792cf863 100644
--- a/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -39,7 +39,6 @@
#include "InspectorBackendDispatcher.h"
#include "InspectorController.h"
#include "InspectorFrontend.h"
-#include "InspectorInstrumentation.h"
#include "InspectorProtocolVersion.h"
#include "MemoryCache.h"
#include "Page.h"
@@ -232,10 +231,8 @@ public:
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());
+ frame->setPageAndTextZoomFactors(m_originalZoomFactor, m_webView->emulatedTextZoomFactor());
Document* doc = frame->document();
doc->styleResolverChanged(RecalcStyleImmediately);
doc->updateLayout();
@@ -270,8 +267,7 @@ private:
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();
+ double denominator = frameView->contentsWidth();
if (!denominator)
denominator = 1;
m_originalZoomFactor = static_cast<double>(scaledEmulatedSize.width) / denominator;