Seperate DOMVisualViewport from Blink's VisualViewport class

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

 /*
- * Copyright (C) 2013 Google Inc. All rights reserved.
+ * 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.
  *     * Neither the name of Google Inc. nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "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.
  */
 
-#ifndef WorkerPerformance_h
-#define WorkerPerformance_h
+#ifndef DOMVisualViewport_h
+#define DOMVisualViewport_h
 
 #include "bindings/core/v8/ScriptWrappable.h"
-#include "core/dom/ContextLifecycleObserver.h"
-#include "core/timing/PerformanceBase.h"
+#include "core/frame/LocalDOMWindow.h"

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

You should be able to forward declare this.

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

Done.

 #include "platform/heap/Handle.h"
-#include "wtf/Forward.h"
 
 namespace blink {
 
-class ExecutionContext;
-class MemoryInfo;
-class WorkerGlobalScope;
-
-class WorkerPerformance final : public PerformanceBase, public ContextLifecycleObserver {
+class DOMVisualViewport final
+    : public GarbageCollected<DOMVisualViewport>
+    , public ScriptWrappable
+    , public GarbageCollectedMixin {

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

You don't need the Mixin class.

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

You're right!

     DEFINE_WRAPPERTYPEINFO();
-    USING_GARBAGE_COLLECTED_MIXIN(WorkerPerformance);
+    USING_GARBAGE_COLLECTED_MIXIN(DOMVisualViewport);

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

Don't need this

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

Done.

 public:
-    static WorkerPerformance* create(WorkerGlobalScope* context)
+    static DOMVisualViewport* create(LocalDOMWindow* window)
     {
-        return new WorkerPerformance(context);
+        return new DOMVisualViewport(window);
     }
 
-    ExecutionContext* getExecutionContext() const override;
-
-    MemoryInfo* memory();
-
     DECLARE_VIRTUAL_TRACE();
 
+    double scrollLeft();
+    double scrollTop();
+    void setScrollLeft(double x);
+    void setScrollTop(double y);
+    double clientWidth();
+    double clientHeight();
+    double pageScale();
+
 private:
-    explicit WorkerPerformance(WorkerGlobalScope*);
+    explicit DOMVisualViewport(LocalDOMWindow*);
+
+    bool isMainFrame() const;
+    Member<LocalDOMWindow> m_window;
 };
 
 } // namespace blink
 
-#endif // WorkerPerformance_h
+#endif // DOMVisualViewport_h