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

Unified Diff: Source/core/rendering/RenderLayerScrollableArea.cpp

Issue 517043003: Move Frame to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase past r181245 conflict Created 6 years, 3 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
Index: Source/core/rendering/RenderLayerScrollableArea.cpp
diff --git a/Source/core/rendering/RenderLayerScrollableArea.cpp b/Source/core/rendering/RenderLayerScrollableArea.cpp
index 20df23b7ae2f22478e4727bd197767d7039116d9..4dbc800d72243474588060e6cad12c2fbb36cacb 100644
--- a/Source/core/rendering/RenderLayerScrollableArea.cpp
+++ b/Source/core/rendering/RenderLayerScrollableArea.cpp
@@ -49,6 +49,7 @@
#include "core/dom/Node.h"
#include "core/dom/shadow/ShadowRoot.h"
#include "core/editing/FrameSelection.h"
+#include "core/frame/FrameProtector.h"
#include "core/frame/FrameView.h"
#include "core/frame/LocalFrame.h"
#include "core/html/HTMLFrameOwnerElement.h"
@@ -358,7 +359,8 @@ void RenderLayerScrollableArea::setScrollOffset(const IntPoint& newScrollOffset)
LocalFrame* frame = box().frame();
ASSERT(frame);
- RefPtr<FrameView> frameView = box().frameView();
+ FrameView* frameView = box().frameView();
+ FrameViewProtector protect(frameView);
TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ScrollLayer", "data", InspectorScrollLayerEvent::data(&box()));
// FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeline migrates to tracing.

Powered by Google App Engine
This is Rietveld 408576698