| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Apple Inc. All rights reserved. | 3 * Copyright (C) 2013 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 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 1672 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1683 exceptionState.throwDOMException(InvalidAccessError, renderer ? "The pro
vided element's renderer is not a box." : "The provided element has no renderer.
"); | 1683 exceptionState.throwDOMException(InvalidAccessError, renderer ? "The pro
vided element's renderer is not a box." : "The provided element has no renderer.
"); |
| 1684 return 0; | 1684 return 0; |
| 1685 } | 1685 } |
| 1686 | 1686 |
| 1687 RenderLayer* layer = toRenderBox(renderer)->layer(); | 1687 RenderLayer* layer = toRenderBox(renderer)->layer(); |
| 1688 if (!layer) { | 1688 if (!layer) { |
| 1689 exceptionState.throwDOMException(InvalidAccessError, "No render layer ca
n be obtained from the provided element."); | 1689 exceptionState.throwDOMException(InvalidAccessError, "No render layer ca
n be obtained from the provided element."); |
| 1690 return 0; | 1690 return 0; |
| 1691 } | 1691 } |
| 1692 | 1692 |
| 1693 return layer->isUnclippedDescendant(); | 1693 // We used to compute isUnclippedDescendant only when acceleratedCompositing
ForOverflowScrollEnabled, |
| 1694 // but now we compute it all the time. |
| 1695 // FIXME: Remove this if statement and rebaseline the tests that make this a
ssumption. |
| 1696 if (!layer->compositor()->acceleratedCompositingForOverflowScrollEnabled()) |
| 1697 return false; |
| 1698 |
| 1699 return layer->ancestorDependentProperties().isUnclippedDescendant; |
| 1694 } | 1700 } |
| 1695 | 1701 |
| 1696 String Internals::layerTreeAsText(Document* document, unsigned flags, ExceptionS
tate& exceptionState) const | 1702 String Internals::layerTreeAsText(Document* document, unsigned flags, ExceptionS
tate& exceptionState) const |
| 1697 { | 1703 { |
| 1698 if (!document || !document->frame()) { | 1704 if (!document || !document->frame()) { |
| 1699 exceptionState.throwDOMException(InvalidAccessError, document ? "The doc
ument's frame cannot be retrieved." : "The document provided is invalid."); | 1705 exceptionState.throwDOMException(InvalidAccessError, document ? "The doc
ument's frame cannot be retrieved." : "The document provided is invalid."); |
| 1700 return String(); | 1706 return String(); |
| 1701 } | 1707 } |
| 1702 | 1708 |
| 1703 document->view()->updateLayoutAndStyleForPainting(); | 1709 document->view()->updateLayoutAndStyleForPainting(); |
| (...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2363 } else if (type == "none") { | 2369 } else if (type == "none") { |
| 2364 webtype = blink::ConnectionTypeNone; | 2370 webtype = blink::ConnectionTypeNone; |
| 2365 } else { | 2371 } else { |
| 2366 exceptionState.throwDOMException(NotFoundError, ExceptionMessages::faile
dToEnumerate("connection type", type)); | 2372 exceptionState.throwDOMException(NotFoundError, ExceptionMessages::faile
dToEnumerate("connection type", type)); |
| 2367 return; | 2373 return; |
| 2368 } | 2374 } |
| 2369 networkStateNotifier().setWebConnectionTypeForTest(webtype); | 2375 networkStateNotifier().setWebConnectionTypeForTest(webtype); |
| 2370 } | 2376 } |
| 2371 | 2377 |
| 2372 } // namespace WebCore | 2378 } // namespace WebCore |
| OLD | NEW |