Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(652)

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2431473003: Intersection Observer support for OOPIF (Closed)
Patch Set: Fix merge conflict Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 3d83fd3c6c7a112f7e5cf02df7f2d22a42880efa..9b253f3dc1eb0b3b3e65164dbe2c89be2d1dd1e6 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -51,6 +51,8 @@
#include "core/frame/Location.h"
#include "core/frame/PageScaleConstraintsSet.h"
#include "core/frame/PerformanceMonitor.h"
+#include "core/frame/RemoteFrame.h"
+#include "core/frame/RemoteFrameView.h"
#include "core/frame/Settings.h"
#include "core/frame/VisualViewport.h"
#include "core/html/HTMLFrameElement.h"
@@ -4584,4 +4586,16 @@ int FrameView::initialViewportHeight() const {
return m_initialViewportSize.height();
}
+void FrameView::setViewportIntersectionFromParent(
+ const IntRect& viewportIntersection) {
+ m_remoteViewportIntersection = viewportIntersection;
+ updateAllLifecyclePhases();
+}
+
+IntRect FrameView::remoteViewportIntersection() {
+ IntRect intersection(m_remoteViewportIntersection);
+ intersection.move(scrollOffsetInt());
+ return intersection;
+}
+
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698