| 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 | 
| 11  *     documentation and/or other materials provided with the distribution. | 11  *     documentation and/or other materials provided with the distribution. | 
| 12  * | 12  * | 
| 13  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN
     Y | 13  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN
     Y | 
| 14  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 14  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 
| 15  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 15  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 
| 16  * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN
     Y | 16  * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN
     Y | 
| 17  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 17  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 
| 18  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 18  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 
| 19  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O
     N | 19  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O
     N | 
| 20  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 20  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
| 21  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 21  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 
| 22  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 23  */ | 23  */ | 
| 24 | 24 | 
| 25 #include "config.h" | 25 #include "config.h" | 
| 26 | 26 | 
| 27 #include "core/rendering/RenderFullScreen.h" | 27 #include "core/rendering/RenderFullScreen.h" | 
| 28 | 28 | 
| 29 #include "core/rendering/RenderLayer.h" |  | 
| 30 #include "core/rendering/RenderLayerCompositor.h" |  | 
| 31 | 29 | 
| 32 using namespace WebCore; | 30 using namespace WebCore; | 
| 33 | 31 | 
| 34 class RenderFullScreenPlaceholder FINAL : public RenderBlock { | 32 class RenderFullScreenPlaceholder FINAL : public RenderBlock { | 
| 35 public: | 33 public: | 
| 36     RenderFullScreenPlaceholder(RenderFullScreen* owner) | 34     RenderFullScreenPlaceholder(RenderFullScreen* owner) | 
| 37         : RenderBlock(0) | 35         : RenderBlock(0) | 
| 38         , m_owner(owner) | 36         , m_owner(owner) | 
| 39     { | 37     { | 
| 40         setDocumentForAnonymous(owner->document()); | 38         setDocumentForAnonymous(owner->document()); | 
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 178     if (!m_placeholder) { | 176     if (!m_placeholder) { | 
| 179         m_placeholder = new (document()->renderArena()) RenderFullScreenPlacehol
     der(this); | 177         m_placeholder = new (document()->renderArena()) RenderFullScreenPlacehol
     der(this); | 
| 180         m_placeholder->setStyle(style); | 178         m_placeholder->setStyle(style); | 
| 181         if (parent()) { | 179         if (parent()) { | 
| 182             parent()->addChild(m_placeholder, this); | 180             parent()->addChild(m_placeholder, this); | 
| 183             parent()->setNeedsLayoutAndPrefWidthsRecalc(); | 181             parent()->setNeedsLayoutAndPrefWidthsRecalc(); | 
| 184         } | 182         } | 
| 185     } else | 183     } else | 
| 186         m_placeholder->setStyle(style); | 184         m_placeholder->setStyle(style); | 
| 187 } | 185 } | 
| OLD | NEW | 
|---|