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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTreeAsText.cpp

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2007 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 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 ts << " clip " << adjustedClipRect; 593 ts << " clip " << adjustedClipRect;
594 } 594 }
595 if (layer.isTransparent()) 595 if (layer.isTransparent())
596 ts << " transparent"; 596 ts << " transparent";
597 597
598 if (layer.layoutObject()->hasOverflowClip() || reportFrameScrollInfo) { 598 if (layer.layoutObject()->hasOverflowClip() || reportFrameScrollInfo) {
599 ScrollableArea* scrollableArea; 599 ScrollableArea* scrollableArea;
600 if (reportFrameScrollInfo) 600 if (reportFrameScrollInfo)
601 scrollableArea = toLayoutView(layer.layoutObject())->frameView(); 601 scrollableArea = toLayoutView(layer.layoutObject())->frameView();
602 else 602 else
603 scrollableArea = layer.scrollableArea(); 603 scrollableArea = layer.getScrollableArea();
604 604
605 DoublePoint adjustedScrollOffset = scrollableArea->scrollPositionDouble( ) + toDoubleSize(scrollableArea->scrollOrigin()); 605 DoublePoint adjustedScrollOffset = scrollableArea->scrollPositionDouble( ) + toDoubleSize(scrollableArea->scrollOrigin());
606 if (adjustedScrollOffset.x()) 606 if (adjustedScrollOffset.x())
607 ts << " scrollX " << adjustedScrollOffset.x(); 607 ts << " scrollX " << adjustedScrollOffset.x();
608 if (adjustedScrollOffset.y()) 608 if (adjustedScrollOffset.y())
609 ts << " scrollY " << adjustedScrollOffset.y(); 609 ts << " scrollY " << adjustedScrollOffset.y();
610 if (layer.layoutBox() && layer.layoutBox()->pixelSnappedClientWidth() != layer.layoutBox()->pixelSnappedScrollWidth()) 610 if (layer.layoutBox() && layer.layoutBox()->pixelSnappedClientWidth() != layer.layoutBox()->pixelSnappedScrollWidth())
611 ts << " scrollWidth " << layer.layoutBox()->pixelSnappedScrollWidth( ); 611 ts << " scrollWidth " << layer.layoutBox()->pixelSnappedScrollWidth( );
612 if (layer.layoutBox() && layer.layoutBox()->pixelSnappedClientHeight() ! = layer.layoutBox()->pixelSnappedScrollHeight()) 612 if (layer.layoutBox() && layer.layoutBox()->pixelSnappedClientHeight() ! = layer.layoutBox()->pixelSnappedScrollHeight())
613 ts << " scrollHeight " << layer.layoutBox()->pixelSnappedScrollHeigh t(); 613 ts << " scrollHeight " << layer.layoutBox()->pixelSnappedScrollHeigh t();
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 element->document().updateLayout(); 845 element->document().updateLayout();
846 846
847 LayoutObject* layoutObject = element->layoutObject(); 847 LayoutObject* layoutObject = element->layoutObject();
848 if (!layoutObject || !layoutObject->isListItem()) 848 if (!layoutObject || !layoutObject->isListItem())
849 return String(); 849 return String();
850 850
851 return toLayoutListItem(layoutObject)->markerText(); 851 return toLayoutListItem(layoutObject)->markerText();
852 } 852 }
853 853
854 } // namespace blink 854 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutThemeMac.mm ('k') | third_party/WebKit/Source/core/layout/ScrollAnchorTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698