| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2010 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 }; | 45 }; |
| 46 | 46 |
| 47 void RenderFullScreenPlaceholder::willBeDestroyed() | 47 void RenderFullScreenPlaceholder::willBeDestroyed() |
| 48 { | 48 { |
| 49 m_owner->setPlaceholder(0); | 49 m_owner->setPlaceholder(0); |
| 50 RenderBlock::willBeDestroyed(); | 50 RenderBlock::willBeDestroyed(); |
| 51 } | 51 } |
| 52 | 52 |
| 53 RenderFullScreen::RenderFullScreen() | 53 RenderFullScreen::RenderFullScreen() |
| 54 : RenderFlexibleBox(0) | 54 : RenderFlexibleBox(0) |
| 55 , m_placeholder(0) | 55 , m_placeholder(nullptr) |
| 56 { | 56 { |
| 57 setReplaced(false); | 57 setReplaced(false); |
| 58 } | 58 } |
| 59 | 59 |
| 60 RenderFullScreen* RenderFullScreen::createAnonymous(Document* document) | 60 RenderFullScreen* RenderFullScreen::createAnonymous(Document* document) |
| 61 { | 61 { |
| 62 RenderFullScreen* renderer = new RenderFullScreen(); | 62 RenderFullScreen* renderer = new RenderFullScreen(); |
| 63 renderer->setDocumentForAnonymous(document); | 63 renderer->setDocumentForAnonymous(document); |
| 64 return renderer; | 64 return renderer; |
| 65 } | 65 } |
| 66 | 66 |
| 67 void RenderFullScreen::trace(Visitor* visitor) |
| 68 { |
| 69 visitor->trace(m_placeholder); |
| 70 RenderFlexibleBox::trace(visitor); |
| 71 } |
| 72 |
| 67 void RenderFullScreen::willBeDestroyed() | 73 void RenderFullScreen::willBeDestroyed() |
| 68 { | 74 { |
| 69 if (m_placeholder) { | 75 if (m_placeholder) { |
| 70 remove(); | 76 remove(); |
| 71 if (!m_placeholder->beingDestroyed()) | 77 if (!m_placeholder->beingDestroyed()) |
| 72 m_placeholder->destroy(); | 78 m_placeholder->destroy(); |
| 73 ASSERT(!m_placeholder); | 79 ASSERT(!m_placeholder); |
| 74 } | 80 } |
| 75 | 81 |
| 76 // RenderObjects are unretained, so notify the document (which holds a point
er to a RenderFullScreen) | 82 // RenderObjects are unretained, so notify the document (which holds a point
er to a RenderFullScreen) |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 if (!m_placeholder) { | 193 if (!m_placeholder) { |
| 188 m_placeholder = new RenderFullScreenPlaceholder(this); | 194 m_placeholder = new RenderFullScreenPlaceholder(this); |
| 189 m_placeholder->setStyle(style); | 195 m_placeholder->setStyle(style); |
| 190 if (parent()) { | 196 if (parent()) { |
| 191 parent()->addChild(m_placeholder, this); | 197 parent()->addChild(m_placeholder, this); |
| 192 parent()->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(
); | 198 parent()->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(
); |
| 193 } | 199 } |
| 194 } else | 200 } else |
| 195 m_placeholder->setStyle(style); | 201 m_placeholder->setStyle(style); |
| 196 } | 202 } |
| OLD | NEW |