Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(878)

Side by Side Diff: Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp

Issue 1162623007: Removed redundant rect methods on FrameView (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/layout/LayoutView.cpp ('k') | Source/core/paint/BoxPainter.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 void DeprecatedPaintLayerCompositor::frameViewDidChangeLocation(const IntPoint& contentsOffset) 528 void DeprecatedPaintLayerCompositor::frameViewDidChangeLocation(const IntPoint& contentsOffset)
529 { 529 {
530 if (m_overflowControlsHostLayer) 530 if (m_overflowControlsHostLayer)
531 m_overflowControlsHostLayer->setPosition(contentsOffset); 531 m_overflowControlsHostLayer->setPosition(contentsOffset);
532 } 532 }
533 533
534 void DeprecatedPaintLayerCompositor::frameViewDidChangeSize() 534 void DeprecatedPaintLayerCompositor::frameViewDidChangeSize()
535 { 535 {
536 if (m_containerLayer) { 536 if (m_containerLayer) {
537 FrameView* frameView = m_layoutView.frameView(); 537 FrameView* frameView = m_layoutView.frameView();
538 m_containerLayer->setSize(frameView->unscaledVisibleContentSize()); 538 m_containerLayer->setSize(frameView->visibleContentSize());
539 m_overflowControlsHostLayer->setSize(frameView->unscaledVisibleContentSi ze(IncludeScrollbars)); 539 m_overflowControlsHostLayer->setSize(frameView->visibleContentSize(Inclu deScrollbars));
540 540
541 frameViewDidScroll(); 541 frameViewDidScroll();
542 updateOverflowControlsLayers(); 542 updateOverflowControlsLayers();
543 } 543 }
544 } 544 }
545 545
546 enum AcceleratedFixedRootBackgroundHistogramBuckets { 546 enum AcceleratedFixedRootBackgroundHistogramBuckets {
547 ScrolledMainFrameBucket = 0, 547 ScrolledMainFrameBucket = 0,
548 ScrolledMainFrameWithAcceleratedFixedRootBackground = 1, 548 ScrolledMainFrameWithAcceleratedFixedRootBackground = 1,
549 ScrolledMainFrameWithUnacceleratedFixedRootBackground = 2, 549 ScrolledMainFrameWithUnacceleratedFixedRootBackground = 2,
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 755
756 void DeprecatedPaintLayerCompositor::updateRootLayerPosition() 756 void DeprecatedPaintLayerCompositor::updateRootLayerPosition()
757 { 757 {
758 if (m_rootContentLayer) { 758 if (m_rootContentLayer) {
759 const IntRect& documentRect = m_layoutView.documentRect(); 759 const IntRect& documentRect = m_layoutView.documentRect();
760 m_rootContentLayer->setSize(documentRect.size()); 760 m_rootContentLayer->setSize(documentRect.size());
761 m_rootContentLayer->setPosition(documentRect.location()); 761 m_rootContentLayer->setPosition(documentRect.location());
762 } 762 }
763 if (m_containerLayer) { 763 if (m_containerLayer) {
764 FrameView* frameView = m_layoutView.frameView(); 764 FrameView* frameView = m_layoutView.frameView();
765 m_containerLayer->setSize(frameView->unscaledVisibleContentSize()); 765 m_containerLayer->setSize(frameView->visibleContentSize());
766 m_overflowControlsHostLayer->setSize(frameView->unscaledVisibleContentSi ze(IncludeScrollbars)); 766 m_overflowControlsHostLayer->setSize(frameView->visibleContentSize(Inclu deScrollbars));
767 } 767 }
768 } 768 }
769 769
770 void DeprecatedPaintLayerCompositor::updatePotentialCompositingReasonsFromStyle( DeprecatedPaintLayer* layer) 770 void DeprecatedPaintLayerCompositor::updatePotentialCompositingReasonsFromStyle( DeprecatedPaintLayer* layer)
771 { 771 {
772 layer->setPotentialCompositingReasonsFromStyle(m_compositingReasonFinder.pot entialCompositingReasonsFromStyle(layer->layoutObject())); 772 layer->setPotentialCompositingReasonsFromStyle(m_compositingReasonFinder.pot entialCompositingReasonsFromStyle(layer->layoutObject()));
773 } 773 }
774 774
775 void DeprecatedPaintLayerCompositor::updateDirectCompositingReasons(DeprecatedPa intLayer* layer) 775 void DeprecatedPaintLayerCompositor::updateDirectCompositingReasons(DeprecatedPa intLayer* layer)
776 { 776 {
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1206 } else if (graphicsLayer == m_scrollLayer.get()) { 1206 } else if (graphicsLayer == m_scrollLayer.get()) {
1207 name = "LocalFrame Scrolling Layer"; 1207 name = "LocalFrame Scrolling Layer";
1208 } else { 1208 } else {
1209 ASSERT_NOT_REACHED(); 1209 ASSERT_NOT_REACHED();
1210 } 1210 }
1211 1211
1212 return name; 1212 return name;
1213 } 1213 }
1214 1214
1215 } // namespace blink 1215 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutView.cpp ('k') | Source/core/paint/BoxPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698