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

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

Issue 2242773003: Revert of ResizeObserver pt6: integration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months 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
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.h ('k') | third_party/WebKit/Source/core/layout/LayoutBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ee6f99f6ae3a7ea976f7288d75437e82d43ca01e..002fc8d1ec0aae8670224e90f8ff3dbf3c913059 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -38,7 +38,6 @@
#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"
@@ -76,7 +75,6 @@
#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"
@@ -2511,36 +2509,6 @@
// Otherwise the paint invalidation will be handled in paint invalidation phase of this cycle.
}
-void FrameView::notifyResizeObservers()
-{
- // Controller exists only if ResizeObserver was created.
- if (!frame().document()->resizeObserverController())
- 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();
- frame().document()->updateStyleAndLayout();
- }
-
- 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)
{
@@ -2570,12 +2538,6 @@
if (targetState == DocumentLifecycle::LayoutClean) {
updateViewportIntersectionsForSubtree(targetState);
return;
- }
-
- if (targetState == DocumentLifecycle::PaintClean) {
- forAllNonThrottledFrameViews([](FrameView& frameView) {
- frameView.notifyResizeObservers();
- });
}
if (LayoutViewItem view = layoutViewItem()) {
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.h ('k') | third_party/WebKit/Source/core/layout/LayoutBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698