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

Side by Side Diff: third_party/WebKit/Source/core/dom/LayoutTreeBuilder.cpp

Issue 2557943002: Sync requestFullscreen() and exitFullscreen() algorithms with the spec (Closed)
Patch Set: rebase Created 4 years 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
8 * (http://www.torchmobile.com/) 8 * (http://www.torchmobile.com/)
9 * Copyright (C) 2011 Google Inc. All rights reserved. 9 * Copyright (C) 2011 Google Inc. All rights reserved.
10 * 10 *
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 // using inLayoutFlowThread() in the styleWillChange and styleDidChange will 136 // using inLayoutFlowThread() in the styleWillChange and styleDidChange will
137 // fail. 137 // fail.
138 newLayoutObject->setIsInsideFlowThread( 138 newLayoutObject->setIsInsideFlowThread(
139 parentLayoutObject->isInsideFlowThread()); 139 parentLayoutObject->isInsideFlowThread());
140 140
141 LayoutObject* nextLayoutObject = this->nextLayoutObject(); 141 LayoutObject* nextLayoutObject = this->nextLayoutObject();
142 m_node->setLayoutObject(newLayoutObject); 142 m_node->setLayoutObject(newLayoutObject);
143 newLayoutObject->setStyle( 143 newLayoutObject->setStyle(
144 &style); // setStyle() can depend on layoutObject() already being set. 144 &style); // setStyle() can depend on layoutObject() already being set.
145 145
146 if (Fullscreen::isCurrentFullScreenElement(*m_node)) { 146 if (Fullscreen::isFullscreenElement(*m_node)) {
147 newLayoutObject = LayoutFullScreen::wrapLayoutObject( 147 newLayoutObject = LayoutFullScreen::wrapLayoutObject(
148 newLayoutObject, parentLayoutObject, &m_node->document()); 148 newLayoutObject, parentLayoutObject, &m_node->document());
149 if (!newLayoutObject) 149 if (!newLayoutObject)
150 return; 150 return;
151 } 151 }
152 152
153 // Note: Adding newLayoutObject instead of layoutObject(). layoutObject() may 153 // Note: Adding newLayoutObject instead of layoutObject(). layoutObject() may
154 // be a child of newLayoutObject. 154 // be a child of newLayoutObject.
155 parentLayoutObject->addChild(newLayoutObject, nextLayoutObject); 155 parentLayoutObject->addChild(newLayoutObject, nextLayoutObject);
156 } 156 }
(...skipping 17 matching lines...) Expand all
174 m_layoutObjectParent->isInsideFlowThread()); 174 m_layoutObjectParent->isInsideFlowThread());
175 175
176 LayoutObject* nextLayoutObject = this->nextLayoutObject(); 176 LayoutObject* nextLayoutObject = this->nextLayoutObject();
177 m_node->setLayoutObject(newLayoutObject); 177 m_node->setLayoutObject(newLayoutObject);
178 // Parent takes care of the animations, no need to call setAnimatableStyle. 178 // Parent takes care of the animations, no need to call setAnimatableStyle.
179 newLayoutObject->setStyle(&style); 179 newLayoutObject->setStyle(&style);
180 m_layoutObjectParent->addChild(newLayoutObject, nextLayoutObject); 180 m_layoutObjectParent->addChild(newLayoutObject, nextLayoutObject);
181 } 181 }
182 182
183 } // namespace blink 183 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Fullscreen.cpp ('k') | third_party/WebKit/Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698