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

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2505543002: Move FrameView timers to WebFrameScheduler. (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
9 * rights reserved. 9 * rights reserved.
10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 283
284 bool isLocalRoot = this->isLocalRoot(); 284 bool isLocalRoot = this->isLocalRoot();
285 285
286 if (isLocalRoot && view()) 286 if (isLocalRoot && view())
287 view()->setParentVisible(false); 287 view()->setParentVisible(false);
288 288
289 setView(nullptr); 289 setView(nullptr);
290 290
291 FrameView* frameView = nullptr; 291 FrameView* frameView = nullptr;
292 if (isLocalRoot) { 292 if (isLocalRoot) {
293 frameView = FrameView::create(this, viewportSize); 293 frameView = FrameView::create(*this, viewportSize);
294 294
295 // The layout size is set by WebViewImpl to support @viewport 295 // The layout size is set by WebViewImpl to support @viewport
296 frameView->setLayoutSizeFixedToFrameSize(false); 296 frameView->setLayoutSizeFixedToFrameSize(false);
297 } else { 297 } else {
298 frameView = FrameView::create(this); 298 frameView = FrameView::create(*this);
299 } 299 }
300 300
301 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode, 301 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode,
302 horizontalLock, verticalLock); 302 horizontalLock, verticalLock);
303 303
304 setView(frameView); 304 setView(frameView);
305 305
306 frameView->updateBackgroundRecursively(backgroundColor, transparent); 306 frameView->updateBackgroundRecursively(backgroundColor, transparent);
307 307
308 if (isLocalRoot) 308 if (isLocalRoot)
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 920 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
921 m_frame->client()->frameBlameContext()->Enter(); 921 m_frame->client()->frameBlameContext()->Enter();
922 } 922 }
923 923
924 ScopedFrameBlamer::~ScopedFrameBlamer() { 924 ScopedFrameBlamer::~ScopedFrameBlamer() {
925 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 925 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
926 m_frame->client()->frameBlameContext()->Leave(); 926 m_frame->client()->frameBlameContext()->Leave();
927 } 927 }
928 928
929 } // namespace blink 929 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTestHelper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698