| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 HTMLShadowElement::~HTMLShadowElement() | 54 HTMLShadowElement::~HTMLShadowElement() |
| 55 { | 55 { |
| 56 } | 56 } |
| 57 | 57 |
| 58 ShadowRoot* HTMLShadowElement::olderShadowRoot() | 58 ShadowRoot* HTMLShadowElement::olderShadowRoot() |
| 59 { | 59 { |
| 60 ShadowRoot* containingRoot = containingShadowRoot(); | 60 ShadowRoot* containingRoot = containingShadowRoot(); |
| 61 if (!containingRoot) | 61 if (!containingRoot) |
| 62 return 0; | 62 return 0; |
| 63 | 63 |
| 64 ContentDistributor::ensureDistribution(containingRoot); | 64 containingRoot->host()->ensureDistribution(); |
| 65 | 65 |
| 66 ShadowRoot* older = containingRoot->olderShadowRoot(); | 66 ShadowRoot* older = containingRoot->olderShadowRoot(); |
| 67 if (!older || older->type() != ShadowRoot::AuthorShadowRoot || ScopeContentD
istribution::assignedTo(older) != this) | 67 if (!older || older->type() != ShadowRoot::AuthorShadowRoot || ScopeContentD
istribution::assignedTo(older) != this) |
| 68 return 0; | 68 return 0; |
| 69 | 69 |
| 70 return older; | 70 return older; |
| 71 } | 71 } |
| 72 | 72 |
| 73 } // namespace WebCore | 73 } // namespace WebCore |
| 74 | 74 |
| OLD | NEW |