OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 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 |
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 const FrameView::ScrollableAreaSet* scrollableAreas = m_renderView->frameVie
w()->scrollableAreas(); | 307 const FrameView::ScrollableAreaSet* scrollableAreas = m_renderView->frameVie
w()->scrollableAreas(); |
308 if (!scrollableAreas) | 308 if (!scrollableAreas) |
309 return; | 309 return; |
310 | 310 |
311 for (FrameView::ScrollableAreaSet::iterator it = scrollableAreas->begin(); i
t != scrollableAreas->end(); ++it) | 311 for (FrameView::ScrollableAreaSet::iterator it = scrollableAreas->begin(); i
t != scrollableAreas->end(); ++it) |
312 (*it)->updateNeedsCompositedScrolling(); | 312 (*it)->updateNeedsCompositedScrolling(); |
313 } | 313 } |
314 | 314 |
315 static RenderVideo* findFullscreenVideoRenderer(Document& document) | 315 static RenderVideo* findFullscreenVideoRenderer(Document& document) |
316 { | 316 { |
317 Element* fullscreenElement = FullscreenElementStack::currentFullScreenElemen
tFrom(document); | 317 Element* fullscreenElement = FullscreenElementStack::fullscreenElementFrom(d
ocument); |
318 while (fullscreenElement && fullscreenElement->isFrameOwnerElement()) { | 318 while (fullscreenElement && fullscreenElement->isFrameOwnerElement()) { |
319 Document* contentDocument = toHTMLFrameOwnerElement(fullscreenElement)->
contentDocument(); | 319 Document* contentDocument = toHTMLFrameOwnerElement(fullscreenElement)->
contentDocument(); |
320 if (!contentDocument) | 320 if (!contentDocument) |
321 return 0; | 321 return 0; |
322 fullscreenElement = FullscreenElementStack::currentFullScreenElementFrom
(*contentDocument); | 322 fullscreenElement = FullscreenElementStack::fullscreenElementFrom(*conte
ntDocument); |
323 } | 323 } |
324 if (!fullscreenElement || !fullscreenElement->hasTagName(videoTag)) | 324 if (!fullscreenElement || !fullscreenElement->hasTagName(videoTag)) |
325 return 0; | 325 return 0; |
326 RenderObject* renderer = fullscreenElement->renderer(); | 326 RenderObject* renderer = fullscreenElement->renderer(); |
327 if (!renderer) | 327 if (!renderer) |
328 return 0; | 328 return 0; |
329 return toRenderVideo(renderer); | 329 return toRenderVideo(renderer); |
330 } | 330 } |
331 | 331 |
332 void RenderLayerCompositor::finishCompositingUpdateForFrameTree(LocalFrame* fram
e) | 332 void RenderLayerCompositor::finishCompositingUpdateForFrameTree(LocalFrame* fram
e) |
(...skipping 1901 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2234 } else if (graphicsLayer == m_scrollLayer.get()) { | 2234 } else if (graphicsLayer == m_scrollLayer.get()) { |
2235 name = "LocalFrame Scrolling Layer"; | 2235 name = "LocalFrame Scrolling Layer"; |
2236 } else { | 2236 } else { |
2237 ASSERT_NOT_REACHED(); | 2237 ASSERT_NOT_REACHED(); |
2238 } | 2238 } |
2239 | 2239 |
2240 return name; | 2240 return name; |
2241 } | 2241 } |
2242 | 2242 |
2243 } // namespace WebCore | 2243 } // namespace WebCore |
OLD | NEW |