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

Side by Side Diff: third_party/WebKit/Source/core/page/FrameTree.cpp

Issue 2721503002: Rename all uses of EmptyFrameLoaderClient with EmptyLocalFrameClient. (Closed)
Patch Set: Change V8 headers to user includes and introduce a space between system and user headers. Headers w… Created 3 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
3 * Copyright (C) 2006 Apple Computer, Inc. 3 * Copyright (C) 2006 Apple Computer, Inc.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 109
110 DISABLE_CFI_PERF 110 DISABLE_CFI_PERF
111 Frame* FrameTree::parent() const { 111 Frame* FrameTree::parent() const {
112 if (!m_thisFrame->client()) 112 if (!m_thisFrame->client())
113 return nullptr; 113 return nullptr;
114 return m_thisFrame->client()->parent(); 114 return m_thisFrame->client()->parent();
115 } 115 }
116 116
117 Frame* FrameTree::top() const { 117 Frame* FrameTree::top() const {
118 // FIXME: top() should never return null, so here are some hacks to deal 118 // FIXME: top() should never return null, so here are some hacks to deal
119 // with EmptyFrameLoaderClient and cases where the frame is detached 119 // with EmptyLocalFrameClient and cases where the frame is detached
120 // already... 120 // already...
121 if (!m_thisFrame->client()) 121 if (!m_thisFrame->client())
122 return m_thisFrame; 122 return m_thisFrame;
123 Frame* candidate = m_thisFrame->client()->top(); 123 Frame* candidate = m_thisFrame->client()->top();
124 return candidate ? candidate : m_thisFrame.get(); 124 return candidate ? candidate : m_thisFrame.get();
125 } 125 }
126 126
127 Frame* FrameTree::nextSibling() const { 127 Frame* FrameTree::nextSibling() const {
128 if (!m_thisFrame->client()) 128 if (!m_thisFrame->client())
129 return nullptr; 129 return nullptr;
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 void showFrameTree(const blink::Frame* frame) { 538 void showFrameTree(const blink::Frame* frame) {
539 if (!frame) { 539 if (!frame) {
540 printf("Null input frame\n"); 540 printf("Null input frame\n");
541 return; 541 return;
542 } 542 }
543 543
544 printFrames(frame->tree().top(), frame, 0); 544 printFrames(frame->tree().top(), frame, 0);
545 } 545 }
546 546
547 #endif 547 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698