[Pinch-to-zoom] Moved scale factor into PinchViewport

Source/web/InspectorClientImpl.cpp

 /*
  * Copyright (C) 2009 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 18 matching lines @@
  */
 
 #include "config.h"
 #include "InspectorClientImpl.h"
 
 #include "WebDevToolsAgentImpl.h"
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/frame/DOMWindow.h"
+#include "core/frame/LocalFrame.h"
+#include "core/frame/Settings.h"
 #include "core/page/Page.h"
-#include "core/frame/Settings.h"
 #include "platform/JSONValues.h"
 #include "platform/geometry/FloatRect.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLRequest.h"
 #include "wtf/Vector.h"
 
 using namespace WebCore;
 
 namespace blink {
@@ skipping 81 matching lines @@
     m_inspectedWebView->setContinuousPaintingEnabled(enabled);
 }
 
 void InspectorClientImpl::setShowScrollBottleneckRects(bool show)
 {
     m_inspectedWebView->setShowScrollBottleneckRects(show);
 }
 
 void InspectorClientImpl::requestPageScaleFactor(float scale, const IntPoint& origin)
 {
-    m_inspectedWebView->setPageScaleFactor(scale, origin);
+    m_inspectedWebView->setPageScaleFactor(scale);
+    m_inspectedWebView->setMainFrameScrollOffset(origin);
 }
 
 void InspectorClientImpl::getAllocatedObjects(HashSet<const void*>& set)
 {
     if (WebDevToolsAgentImpl* agent = devToolsAgent())
         agent->getAllocatedObjects(set);
 }
 
 void InspectorClientImpl::dumpUncountedAllocatedObjects(const HashMap<const void*, size_t>& map)
 {
@@ skipping 36 matching lines @@
     if (WebDevToolsAgentImpl* agent = devToolsAgent())
         agent->stopGPUEventsRecording();
 }
 
 WebDevToolsAgentImpl* InspectorClientImpl::devToolsAgent()
 {
     return static_cast<WebDevToolsAgentImpl*>(m_inspectedWebView->devToolsAgent());
 }
 
 } // namespace blink