Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All Rights Reserved. | 2 * Copyright (C) 2011 Google Inc. All Rights Reserved. |
| 3 * Copyright (C) 2012 Apple Inc. All rights reserved. | 3 * Copyright (C) 2012 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 490 for (ShadowRoot* root = element->youngestShadowRoot(); root; root = root ->olderShadowRoot()) | 490 for (ShadowRoot* root = element->youngestShadowRoot(); root; root = root ->olderShadowRoot()) |
| 491 root->setNeedsStyleRecalcForViewportUnits(); | 491 root->setNeedsStyleRecalcForViewportUnits(); |
| 492 RenderStyle* style = element->renderStyle(); | 492 RenderStyle* style = element->renderStyle(); |
| 493 if (style && style->hasViewportUnits()) | 493 if (style && style->hasViewportUnits()) |
| 494 element->setNeedsStyleRecalc(LocalStyleChange); | 494 element->setNeedsStyleRecalc(LocalStyleChange); |
| 495 } | 495 } |
| 496 } | 496 } |
| 497 | 497 |
| 498 KURL TreeScope::completeURL(const String& url) const | 498 KURL TreeScope::completeURL(const String& url) const |
| 499 { | 499 { |
| 500 return document().completeURLWithOverride(url, baseURL()); | 500 return document().completeURLWithOverride(url, m_baseURL.isEmpty() ? documen t().baseURL() : m_baseURL); |
|
esprehn
2014/01/14 00:22:12
Hmm, shouldn't the baseURL getter on ShadowRoot do
adamk
2014/01/14 00:34:03
Very good points. I've added the logic to baseURL
| |
| 501 } | 501 } |
| 502 | 502 |
| 503 } // namespace WebCore | 503 } // namespace WebCore |
| OLD | NEW |