| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2012 Google Inc. All rights reserved. | 2  * Copyright (C) 2012 Google 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 are | 5  * modification, are permitted provided that the following conditions are | 
| 6  * met: | 6  * met: | 
| 7  * | 7  * | 
| 8  *     * Redistributions of source code must retain the above copyright | 8  *     * Redistributions of source code must retain the above copyright | 
| 9  * notice, this list of conditions and the following disclaimer. | 9  * notice, this list of conditions and the following disclaimer. | 
| 10  *     * Redistributions in binary form must reproduce the above | 10  *     * Redistributions in binary form must reproduce the above | 
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 53 HTMLShadowElement::~HTMLShadowElement() | 53 HTMLShadowElement::~HTMLShadowElement() | 
| 54 { | 54 { | 
| 55 } | 55 } | 
| 56 | 56 | 
| 57 ShadowRoot* HTMLShadowElement::olderShadowRoot() | 57 ShadowRoot* HTMLShadowElement::olderShadowRoot() | 
| 58 { | 58 { | 
| 59     ShadowRoot* containingRoot = containingShadowRoot(); | 59     ShadowRoot* containingRoot = containingShadowRoot(); | 
| 60     if (!containingRoot) | 60     if (!containingRoot) | 
| 61         return 0; | 61         return 0; | 
| 62 | 62 | 
| 63     document()->updateDistributionForNodeIfNeeded(this); | 63     document().updateDistributionForNodeIfNeeded(this); | 
| 64 | 64 | 
| 65     ShadowRoot* older = containingRoot->olderShadowRoot(); | 65     ShadowRoot* older = containingRoot->olderShadowRoot(); | 
| 66     if (!older || !older->shouldExposeToBindings() || older->insertionPoint() !=
     this) | 66     if (!older || !older->shouldExposeToBindings() || older->insertionPoint() !=
     this) | 
| 67         return 0; | 67         return 0; | 
| 68 | 68 | 
| 69     ASSERT(older->shouldExposeToBindings()); | 69     ASSERT(older->shouldExposeToBindings()); | 
| 70     return older; | 70     return older; | 
| 71 } | 71 } | 
| 72 | 72 | 
| 73 Node::InsertionNotificationRequest HTMLShadowElement::insertedInto(ContainerNode
    * insertionPoint) | 73 Node::InsertionNotificationRequest HTMLShadowElement::insertedInto(ContainerNode
    * insertionPoint) | 
| 74 { | 74 { | 
| 75     if (insertionPoint->inDocument()) { | 75     if (insertionPoint->inDocument()) { | 
| 76         // Warn if trying to reproject between user agent and author shadows. | 76         // Warn if trying to reproject between user agent and author shadows. | 
| 77         ShadowRoot* root = containingShadowRoot(); | 77         ShadowRoot* root = containingShadowRoot(); | 
| 78         if (root && root->olderShadowRoot() && root->type() != root->olderShadow
    Root()->type()) { | 78         if (root && root->olderShadowRoot() && root->type() != root->olderShadow
    Root()->type()) { | 
| 79             String message = String::format("<shadow> doesn't work for %s elemen
    t host.", root->host()->tagName().utf8().data()); | 79             String message = String::format("<shadow> doesn't work for %s elemen
    t host.", root->host()->tagName().utf8().data()); | 
| 80             document()->addConsoleMessage(RenderingMessageSource, WarningMessage
    Level, message); | 80             document().addConsoleMessage(RenderingMessageSource, WarningMessageL
    evel, message); | 
| 81         } | 81         } | 
| 82     } | 82     } | 
| 83     return InsertionPoint::insertedInto(insertionPoint); | 83     return InsertionPoint::insertedInto(insertionPoint); | 
| 84 } | 84 } | 
| 85 | 85 | 
| 86 } // namespace WebCore | 86 } // namespace WebCore | 
| 87 | 87 | 
| OLD | NEW | 
|---|