OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011 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 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
527 Frame* frame = frameView->frame(); | 527 Frame* frame = frameView->frame(); |
528 if (!frame) | 528 if (!frame) |
529 return 0; | 529 return 0; |
530 | 530 |
531 RenderView* renderView = frame->contentRenderer(); | 531 RenderView* renderView = frame->contentRenderer(); |
532 if (!renderView) | 532 if (!renderView) |
533 return 0; | 533 return 0; |
534 return renderView->compositor()->scrollLayer(); | 534 return renderView->compositor()->scrollLayer(); |
535 } | 535 } |
536 | 536 |
537 GraphicsLayer* ScrollingCoordinator::counterScrollingLayerForFrameView(FrameView
* frameView) | 537 GraphicsLayer* ScrollingCoordinator::counterScrollingLayerForFrameView(FrameView
*) |
538 { | 538 { |
539 Frame* frame = frameView->frame(); | 539 return 0; |
540 if (!frame) | |
541 return 0; | |
542 | |
543 RenderView* renderView = frame->contentRenderer(); | |
544 if (!renderView) | |
545 return 0; | |
546 return renderView->compositor()->fixedRootBackgroundLayer(); | |
547 } | 540 } |
548 | 541 |
549 void ScrollingCoordinator::frameViewRootLayerDidChange(FrameView* frameView) | 542 void ScrollingCoordinator::frameViewRootLayerDidChange(FrameView* frameView) |
550 { | 543 { |
551 ASSERT(isMainThread()); | 544 ASSERT(isMainThread()); |
552 ASSERT(m_page); | 545 ASSERT(m_page); |
553 | 546 |
554 if (!coordinatesScrollingForFrameView(frameView)) | 547 if (!coordinatesScrollingForFrameView(frameView)) |
555 return; | 548 return; |
556 | 549 |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
635 stringBuilder.resize(stringBuilder.length() - 2); | 628 stringBuilder.resize(stringBuilder.length() - 2); |
636 return stringBuilder.toString(); | 629 return stringBuilder.toString(); |
637 } | 630 } |
638 | 631 |
639 String ScrollingCoordinator::mainThreadScrollingReasonsAsText() const | 632 String ScrollingCoordinator::mainThreadScrollingReasonsAsText() const |
640 { | 633 { |
641 return mainThreadScrollingReasonsAsText(mainThreadScrollingReasons()); | 634 return mainThreadScrollingReasonsAsText(mainThreadScrollingReasons()); |
642 } | 635 } |
643 | 636 |
644 } // namespace WebCore | 637 } // namespace WebCore |
OLD | NEW |