ResizeObserver pt6: integration

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

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 15ae442e9a9fb3ac1d7ab4b34e0fade56b777386..1cf43209f41ebe7b803c488687dfd39682a53565 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -38,6 +38,7 @@
 #include "core/editing/FrameSelection.h"
 #include "core/editing/RenderedPosition.h"
 #include "core/editing/markers/DocumentMarkerController.h"
+#include "core/events/ErrorEvent.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameHost.h"
@@ -75,6 +76,7 @@
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
+#include "core/observer/ResizeObserverController.h"
 #include "core/page/AutoscrollController.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
@@ -2510,6 +2512,37 @@ void FrameView::scheduleVisualUpdateForPaintInvalidationIfNeeded()
     // Otherwise the paint invalidation will be handled in paint invalidation phase of this cycle.
 }
 
+void FrameView::notifyResizeObserver()
+{
+    // Controller exists only if ResizeObserver was created.
+    if (!m_frame->document()->resizeObserverController())

[eae, 2016/08/01 22:30:40]

Use frame().document() instead (as the method is guaranteed to return a frame)
or add an explicit check to see if set.

[atotic1, 2016/08/02 23:29:08]

Done.

+        return;
+
+    ResizeObserverController& resizeController = m_frame->document()->ensureResizeObserverController();
+
+    DCHECK(lifecycle().state() >= DocumentLifecycle::LayoutClean);
+
+    size_t minDepth = 0;
+    for (minDepth = resizeController.gatherObservations(0);
+        minDepth != ResizeObserverController::kDepthBottom;
+        minDepth = resizeController.gatherObservations(minDepth)) {
+        resizeController.deliverObservations();
+        if (lifecycle().state() < DocumentLifecycle::LayoutClean || layoutView()->needsLayout())
+            updateStyleAndLayoutIfNeededRecursive();
+    }
+
+    if (resizeController.skippedObservations()) {
+        resizeController.clearObservations();
+        ErrorEvent * error = ErrorEvent::create("ResizeObserver loop limit exceeded", SourceLocation::capture(m_frame->document()), nullptr);
+        m_frame->document()->reportException(error, NotSharableCrossOrigin);
+        // Ensure notifications will get delivered in next cycle.
+        if (FrameView* frameView = m_frame->view())
+            frameView->scheduleAnimation();
+    }
+
+    DCHECK(!layoutView()->needsLayout());
+}
+
 // TODO(leviw): We don't assert lifecycle information from documents in child PluginViews.
 void FrameView::updateLifecyclePhasesInternal(DocumentLifecycle::LifecycleState targetState)
 {
@@ -2541,6 +2574,8 @@ void FrameView::updateLifecyclePhasesInternal(DocumentLifecycle::LifecycleState
         return;
     }
 
+    notifyResizeObserver();
+
     if (LayoutViewItem view = layoutViewItem()) {
         forAllNonThrottledFrameViews([](FrameView& frameView) {
             frameView.checkDoesNotNeedLayout();