| OLD | NEW |
| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 // using inLayoutFlowThread() in the styleWillChange and styleDidChange will | 125 // using inLayoutFlowThread() in the styleWillChange and styleDidChange will |
| 126 // fail. | 126 // fail. |
| 127 new_layout_object->SetIsInsideFlowThread( | 127 new_layout_object->SetIsInsideFlowThread( |
| 128 parent_layout_object->IsInsideFlowThread()); | 128 parent_layout_object->IsInsideFlowThread()); |
| 129 | 129 |
| 130 LayoutObject* next_layout_object = this->NextLayoutObject(); | 130 LayoutObject* next_layout_object = this->NextLayoutObject(); |
| 131 node_->SetLayoutObject(new_layout_object); | 131 node_->SetLayoutObject(new_layout_object); |
| 132 new_layout_object->SetStyle( | 132 new_layout_object->SetStyle( |
| 133 &style); // setStyle() can depend on layoutObject() already being set. | 133 &style); // setStyle() can depend on layoutObject() already being set. |
| 134 | 134 |
| 135 if (Fullscreen::IsCurrentFullScreenElement(*node_)) { | 135 if (Fullscreen::IsFullscreenElement(*node_)) { |
| 136 new_layout_object = LayoutFullScreen::WrapLayoutObject( | 136 new_layout_object = LayoutFullScreen::WrapLayoutObject( |
| 137 new_layout_object, parent_layout_object, &node_->GetDocument()); | 137 new_layout_object, parent_layout_object, &node_->GetDocument()); |
| 138 if (!new_layout_object) | 138 if (!new_layout_object) |
| 139 return; | 139 return; |
| 140 } | 140 } |
| 141 | 141 |
| 142 // Note: Adding newLayoutObject instead of layoutObject(). layoutObject() may | 142 // Note: Adding newLayoutObject instead of layoutObject(). layoutObject() may |
| 143 // be a child of newLayoutObject. | 143 // be a child of newLayoutObject. |
| 144 parent_layout_object->AddChild(new_layout_object, next_layout_object); | 144 parent_layout_object->AddChild(new_layout_object, next_layout_object); |
| 145 } | 145 } |
| (...skipping 21 matching lines...) Expand all Loading... |
| 167 layout_object_parent_->IsInsideFlowThread()); | 167 layout_object_parent_->IsInsideFlowThread()); |
| 168 | 168 |
| 169 LayoutObject* next_layout_object = this->NextLayoutObject(); | 169 LayoutObject* next_layout_object = this->NextLayoutObject(); |
| 170 node_->SetLayoutObject(new_layout_object); | 170 node_->SetLayoutObject(new_layout_object); |
| 171 // Parent takes care of the animations, no need to call setAnimatableStyle. | 171 // Parent takes care of the animations, no need to call setAnimatableStyle. |
| 172 new_layout_object->SetStyle(&style); | 172 new_layout_object->SetStyle(&style); |
| 173 layout_object_parent_->AddChild(new_layout_object, next_layout_object); | 173 layout_object_parent_->AddChild(new_layout_object, next_layout_object); |
| 174 } | 174 } |
| 175 | 175 |
| 176 } // namespace blink | 176 } // namespace blink |
| OLD | NEW |