| Index: Source/web/WebFrameImpl.cpp
|
| diff --git a/Source/web/WebFrameImpl.cpp b/Source/web/WebFrameImpl.cpp
|
| index 5a53a30f4d295dcf33e9b43264495b136ca34d42..758a307ae608c8ba3de95645ee660fe02d4d5e71 100644
|
| --- a/Source/web/WebFrameImpl.cpp
|
| +++ b/Source/web/WebFrameImpl.cpp
|
| @@ -2085,6 +2085,7 @@ WebFrameImpl::WebFrameImpl(WebFrameClient* client)
|
| , m_findMatchRectsAreValid(false)
|
| , m_identifier(generateFrameIdentifier())
|
| , m_inSameDocumentHistoryLoad(false)
|
| + , m_inputEventsScaleFactorForEmulation(1)
|
| {
|
| WebKit::Platform::current()->incrementStatsCounter(webFrameActiveCount);
|
| frameCount++;
|
| @@ -2195,11 +2196,10 @@ void WebFrameImpl::createFrameView()
|
| if (webView->shouldAutoResize() && isMainFrame)
|
| frame()->view()->enableAutoSizeMode(true, webView->minAutoSize(), webView->maxAutoSize());
|
|
|
| + frame()->view()->setInputEventsScaleFactorForEmulation(m_inputEventsScaleFactorForEmulation);
|
| +
|
| if (isMainFrame)
|
| webView->suppressInvalidations(false);
|
| -
|
| - if (isMainFrame && webView->devToolsAgentPrivate())
|
| - webView->devToolsAgentPrivate()->mainFrameViewCreated(this);
|
| }
|
|
|
| WebFrameImpl* WebFrameImpl::fromFrame(Frame* frame)
|
| @@ -2314,6 +2314,13 @@ void WebFrameImpl::setCanHaveScrollbars(bool canHaveScrollbars)
|
| frame()->view()->setCanHaveScrollbars(canHaveScrollbars);
|
| }
|
|
|
| +void WebFrameImpl::setInputEventsScaleFactorForEmulation(float contentScaleFactor)
|
| +{
|
| + m_inputEventsScaleFactorForEmulation = contentScaleFactor;
|
| + if (frame()->view())
|
| + frame()->view()->setInputEventsScaleFactorForEmulation(m_inputEventsScaleFactorForEmulation);
|
| +}
|
| +
|
| void WebFrameImpl::invalidateArea(AreaToInvalidate area)
|
| {
|
| ASSERT(frame() && frame()->view());
|
|
|