OLD | NEW |
---|---|
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 665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
676 layer->convertToLayerCoords(rootLayer, offsetFromRoot); | 676 layer->convertToLayerCoords(rootLayer, offsetFromRoot); |
677 bool shouldPaint = (behavior & LayoutAsTextShowAllLayers) | 677 bool shouldPaint = (behavior & LayoutAsTextShowAllLayers) |
678 ? true | 678 ? true |
679 : layer->intersectsDamageRect( | 679 : layer->intersectsDamageRect( |
680 layerBounds, damageRect.rect(), offsetFromRoot); | 680 layerBounds, damageRect.rect(), offsetFromRoot); |
681 | 681 |
682 if (layer->layoutObject()->isLayoutPart() && | 682 if (layer->layoutObject()->isLayoutPart() && |
683 toLayoutPart(layer->layoutObject())->isThrottledFrameView()) | 683 toLayoutPart(layer->layoutObject())->isThrottledFrameView()) |
684 shouldPaint = false; | 684 shouldPaint = false; |
685 | 685 |
686 if (RuntimeEnabledFeatures::rootLayerScrollingEnabled() && | |
687 !layer->isRootLayer()) { | |
688 ScrollableArea* scrollableArea = rootLayer->getScrollableArea(); | |
689 FloatPoint adjustedScrollOffset = | |
690 scrollableArea->scrollPosition() + scrollableArea->scrollOrigin(); | |
skobes
2016/10/13 18:06:27
Adding the scroll origin doesn't make sense, the s
| |
691 layerBounds.moveBy(roundedIntPoint(adjustedScrollOffset)); | |
692 } | |
693 | |
686 Vector<PaintLayerStackingNode*>* negList = | 694 Vector<PaintLayerStackingNode*>* negList = |
687 layer->stackingNode()->negZOrderList(); | 695 layer->stackingNode()->negZOrderList(); |
688 bool paintsBackgroundSeparately = negList && negList->size() > 0; | 696 bool paintsBackgroundSeparately = negList && negList->size() > 0; |
689 if (shouldPaint && paintsBackgroundSeparately) | 697 if (shouldPaint && paintsBackgroundSeparately) |
690 write(ts, *layer, layerBounds, damageRect.rect(), clipRectToApply.rect(), | 698 write(ts, *layer, layerBounds, damageRect.rect(), clipRectToApply.rect(), |
691 LayerPaintPhaseBackground, indent, behavior, markedLayer); | 699 LayerPaintPhaseBackground, indent, behavior, markedLayer); |
692 | 700 |
693 if (negList) { | 701 if (negList) { |
694 int currIndent = indent; | 702 int currIndent = indent; |
695 if (behavior & LayoutAsTextShowLayerNesting) { | 703 if (behavior & LayoutAsTextShowLayerNesting) { |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
878 element->document().updateStyleAndLayout(); | 886 element->document().updateStyleAndLayout(); |
879 | 887 |
880 LayoutObject* layoutObject = element->layoutObject(); | 888 LayoutObject* layoutObject = element->layoutObject(); |
881 if (!layoutObject || !layoutObject->isListItem()) | 889 if (!layoutObject || !layoutObject->isListItem()) |
882 return String(); | 890 return String(); |
883 | 891 |
884 return toLayoutListItem(layoutObject)->markerText(); | 892 return toLayoutListItem(layoutObject)->markerText(); |
885 } | 893 } |
886 | 894 |
887 } // namespace blink | 895 } // namespace blink |
OLD | NEW |