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

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/LocalFrame.h ('k') | third_party/WebKit/Source/core/frame/Location.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/LocalFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index 0af4a42a5d0efc3503cd12ac3a165ce81a025d3e..d2e29cedb671bcb377d4e019fd4a6aa3b606ce5a 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -140,8 +140,8 @@ public:
}
private:
- RawPtrWillBeMember<const LocalFrame> m_localFrame;
- RawPtrWillBeMember<Node> m_draggedNode;
+ Member<const LocalFrame> m_localFrame;
+ Member<Node> m_draggedNode;
FloatRect m_bounds;
float m_opacity;
OwnPtr<SkPictureBuilder> m_pictureBuilder;
@@ -165,14 +165,14 @@ inline float parentTextZoomFactor(LocalFrame* frame)
} // namespace
-PassRefPtrWillBeRawPtr<LocalFrame> LocalFrame::create(FrameLoaderClient* client, FrameHost* host, FrameOwner* owner)
+RawPtr<LocalFrame> LocalFrame::create(FrameLoaderClient* client, FrameHost* host, FrameOwner* owner)
{
- RefPtrWillBeRawPtr<LocalFrame> frame = adoptRefWillBeNoop(new LocalFrame(client, host, owner));
+ RawPtr<LocalFrame> frame = new LocalFrame(client, host, owner);
InspectorInstrumentation::frameAttachedToParent(frame.get());
return frame.release();
}
-void LocalFrame::setView(PassRefPtrWillBeRawPtr<FrameView> view)
+void LocalFrame::setView(RawPtr<FrameView> view)
{
ASSERT(!m_view || m_view != view);
ASSERT(!document() || !document()->isActive());
@@ -196,7 +196,7 @@ void LocalFrame::createView(const IntSize& viewportSize, const Color& background
setView(nullptr);
- RefPtrWillBeRawPtr<FrameView> frameView = nullptr;
+ RawPtr<FrameView> frameView = nullptr;
if (isLocalRoot) {
frameView = FrameView::create(this, viewportSize);
@@ -320,7 +320,7 @@ void LocalFrame::detach(FrameDetachType type)
PluginScriptForbiddenScope forbidPluginDestructorScripting;
// A lot of the following steps can result in the current frame being
// detached, so protect a reference to it.
- RefPtrWillBeRawPtr<LocalFrame> protect(this);
+ RawPtr<LocalFrame> protect(this);
m_loader.stopAllLoaders();
// Don't allow any new child frames to load in this frame: attaching a new
// child frame during or after detaching children results in an attached
@@ -411,7 +411,7 @@ void LocalFrame::willDetachFrameHost()
page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get());
}
-void LocalFrame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow)
+void LocalFrame::setDOMWindow(RawPtr<LocalDOMWindow> domWindow)
{
// Oilpan: setDOMWindow() cannot be used when finalizing. Which
// is acceptable as its actions are either not needed or handled
@@ -462,7 +462,7 @@ void LocalFrame::didChangeVisibilityState()
if (document())
document()->didChangeVisibilityState();
- WillBeHeapVector<RefPtrWillBeMember<LocalFrame>> childFrames;
+ HeapVector<Member<LocalFrame>> childFrames;
for (Frame* child = tree().firstChild(); child; child = child->tree().nextSibling()) {
if (child->isLocalFrame())
childFrames.append(toLocalFrame(child));
@@ -524,7 +524,7 @@ void LocalFrame::setPrinting(bool printing, const FloatSize& pageSize, const Flo
}
// Subframes of the one we're printing don't lay out to the page size.
- for (RefPtrWillBeRawPtr<Frame> child = tree().firstChild(); child; child = child->tree().nextSibling()) {
+ for (RawPtr<Frame> child = tree().firstChild(); child; child = child->tree().nextSibling()) {
if (child->isLocalFrame())
toLocalFrame(child.get())->setPrinting(printing, FloatSize(), FloatSize(), 0);
}
@@ -601,7 +601,7 @@ void LocalFrame::setPageAndTextZoomFactors(float pageZoomFactor, float textZoomF
m_pageZoomFactor = pageZoomFactor;
m_textZoomFactor = textZoomFactor;
- for (RefPtrWillBeRawPtr<Frame> child = tree().firstChild(); child; child = child->tree().nextSibling()) {
+ for (RawPtr<Frame> child = tree().firstChild(); child; child = child->tree().nextSibling()) {
if (child->isLocalFrame())
toLocalFrame(child.get())->setPageAndTextZoomFactors(m_pageZoomFactor, m_textZoomFactor);
}
@@ -613,7 +613,7 @@ void LocalFrame::setPageAndTextZoomFactors(float pageZoomFactor, float textZoomF
void LocalFrame::deviceScaleFactorChanged()
{
document()->mediaQueryAffectingValueChanged();
- for (RefPtrWillBeRawPtr<Frame> child = tree().firstChild(); child; child = child->tree().nextSibling()) {
+ for (RawPtr<Frame> child = tree().firstChild(); child; child = child->tree().nextSibling()) {
if (child->isLocalFrame())
toLocalFrame(child.get())->deviceScaleFactorChanged();
}
@@ -832,7 +832,7 @@ inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, FrameO
, m_editor(Editor::create(*this))
, m_spellChecker(SpellChecker::create(*this))
, m_selection(FrameSelection::create(this))
- , m_eventHandler(adoptPtrWillBeNoop(new EventHandler(this)))
+ , m_eventHandler(new EventHandler(this))
, m_console(FrameConsole::create(*this))
, m_inputMethodController(InputMethodController::create(*this))
, m_navigationDisableCount(0)
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.h ('k') | third_party/WebKit/Source/core/frame/Location.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698