Seperate DOMVisualViewport from Blink's VisualViewport class

third_party/WebKit/Source/core/frame/DOMVisualViewport.cpp

Index: third_party/WebKit/Source/core/frame/DOMVisualViewport.cpp
diff --git a/third_party/WebKit/Source/core/frame/DOMVisualViewport.cpp b/third_party/WebKit/Source/core/frame/DOMVisualViewport.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d2d332a5313d70822c225cab78f9b4a56ca900e4
--- /dev/null
+++ b/third_party/WebKit/Source/core/frame/DOMVisualViewport.cpp
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2016 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 copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "core/frame/DOMVisualViewport.h"
+
+#include "core/dom/Document.h"
+#include "core/dom/Element.h"
+#include "core/frame/FrameHost.h"
+#include "core/frame/LocalFrame.h"
+#include "core/frame/VisualViewport.h"
+#include "core/page/Page.h"
+
+namespace blink {
+
+DOMVisualViewport::DOMVisualViewport(LocalDOMWindow* window)
+    : m_window(window) {}
+
+DEFINE_TRACE(DOMVisualViewport)
+{
+    visitor->trace(m_window);
+}
+
+bool DOMVisualViewport::isMainFrame() const
+{
+    LocalFrame* frame = m_window->frame();
+    if (!frame)
+        return false;
+    return frame->isMainFrame();
+}
+
+double DOMVisualViewport::scrollLeft()
+{
+    if (!isMainFrame())
+        return 0;
+
+    if (FrameHost* host = m_window->frame()->host())
+        return host->visualViewport().scrollLeft();
+
+    return 0;
+}
+
+double DOMVisualViewport::scrollTop()
+{
+    if (!isMainFrame())
+        return 0;
+
+    if (FrameHost* host = m_window->frame()->host())
+        return host->visualViewport().scrollTop();
+
+    return 0;
+}
+
+void DOMVisualViewport::setScrollLeft(double x)
+{
+    if (!isMainFrame())
+        return;
+
+    if (FrameHost* host = m_window->frame()->host())
+        host->visualViewport().setScrollLeft(x);
+}
+
+void DOMVisualViewport::setScrollTop(double y)
+{
+    if (!isMainFrame())
+        return;
+
+    if (FrameHost* host = m_window->frame()->host())
+        host->visualViewport().setScrollTop(y);
+}
+
+double DOMVisualViewport::clientWidth()
+{
+    if (!isMainFrame())
+        return m_window->document()->documentElement()->clientWidth();

[bokan, 2016/06/16 07:22:43]

This is wrong, it should be the window's FrameView's
visibleContentRect(ExcludeScrollbars). See LocalDOMWindow::innerWidth (but we
have to exclude scrollbars)

[ymalik, 2016/06/20 15:52:56]

Done.

+
+    if (FrameHost* host = m_window->frame()->host())
+        return host->visualViewport().clientWidth();
+
+    return 0;
+}
+
+double DOMVisualViewport::clientHeight()
+{
+    if (!isMainFrame())
+        return m_window->document()->documentElement()->clientHeight();
+
+    if (FrameHost* host = m_window->frame()->host())
+        return host->visualViewport().clientHeight();
+
+    return 0;
+}
+
+double DOMVisualViewport::pageScale()
+{
+    if (!isMainFrame())
+        return 1;
+
+    if (FrameHost* host = m_window->frame()->host())
+        return host->visualViewport().pageScale();
+
+    return 1;
+}
+
+} // namespace blink