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

Side by Side Diff: Source/core/rendering/RenderFrameSet.cpp

Issue 16357011: Remove support for -webkit-color-correction (which we've never supported on (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: resolve merge conflicts, obey brace style changes Created 7 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
OLDNEW
1 /** 1 /**
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Simon Hausmann <hausmann@kde.org> 3 * (C) 2000 Simon Hausmann <hausmann@kde.org>
4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. 5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 73
74 static Color borderFillColor() 74 static Color borderFillColor()
75 { 75 {
76 return Color(208, 208, 208); 76 return Color(208, 208, 208);
77 } 77 }
78 78
79 void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect & borderRect) 79 void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect & borderRect)
80 { 80 {
81 if (!paintInfo.rect.intersects(borderRect)) 81 if (!paintInfo.rect.intersects(borderRect))
82 return; 82 return;
83 83
84 // FIXME: We should do something clever when borders from distinct framesets meet at a join. 84 // FIXME: We should do something clever when borders from distinct framesets meet at a join.
85 85
86 // Fill first. 86 // Fill first.
87 GraphicsContext* context = paintInfo.context; 87 GraphicsContext* context = paintInfo.context;
88 ColorSpace colorSpace = style()->colorSpace(); 88 context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->visite dDependentColor(CSSPropertyBorderLeftColor) : borderFillColor());
89 context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->visite dDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace); 89
90
91 // Now stroke the edges but only if we have enough room to paint both edges with a little 90 // Now stroke the edges but only if we have enough room to paint both edges with a little
92 // bit of the fill color showing through. 91 // bit of the fill color showing through.
93 if (borderRect.width() >= 3) { 92 if (borderRect.width() >= 3) {
94 context->fillRect(IntRect(borderRect.location(), IntSize(1, height())), borderStartEdgeColor(), colorSpace); 93 context->fillRect(IntRect(borderRect.location(), IntSize(1, height())), borderStartEdgeColor());
95 context->fillRect(IntRect(IntPoint(borderRect.maxX() - 1, borderRect.y() ), IntSize(1, height())), borderEndEdgeColor(), colorSpace); 94 context->fillRect(IntRect(IntPoint(borderRect.maxX() - 1, borderRect.y() ), IntSize(1, height())), borderEndEdgeColor());
96 } 95 }
97 } 96 }
98 97
99 void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const IntRect& b orderRect) 98 void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const IntRect& b orderRect)
100 { 99 {
101 if (!paintInfo.rect.intersects(borderRect)) 100 if (!paintInfo.rect.intersects(borderRect))
102 return; 101 return;
103 102
104 // FIXME: We should do something clever when borders from distinct framesets meet at a join. 103 // FIXME: We should do something clever when borders from distinct framesets meet at a join.
105 104
106 // Fill first. 105 // Fill first.
107 GraphicsContext* context = paintInfo.context; 106 GraphicsContext* context = paintInfo.context;
108 ColorSpace colorSpace = style()->colorSpace(); 107 context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->visite dDependentColor(CSSPropertyBorderLeftColor) : borderFillColor());
109 context->fillRect(borderRect, frameSet()->hasBorderColor() ? style()->visite dDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
110 108
111 // Now stroke the edges but only if we have enough room to paint both edges with a little 109 // Now stroke the edges but only if we have enough room to paint both edges with a little
112 // bit of the fill color showing through. 110 // bit of the fill color showing through.
113 if (borderRect.height() >= 3) { 111 if (borderRect.height() >= 3) {
114 context->fillRect(IntRect(borderRect.location(), IntSize(width(), 1)), b orderStartEdgeColor(), colorSpace); 112 context->fillRect(IntRect(borderRect.location(), IntSize(width(), 1)), b orderStartEdgeColor());
115 context->fillRect(IntRect(IntPoint(borderRect.x(), borderRect.maxY() - 1 ), IntSize(width(), 1)), borderEndEdgeColor(), colorSpace); 113 context->fillRect(IntRect(IntPoint(borderRect.x(), borderRect.maxY() - 1 ), IntSize(width(), 1)), borderEndEdgeColor());
116 } 114 }
117 } 115 }
118 116
119 void RenderFrameSet::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 117 void RenderFrameSet::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
120 { 118 {
121 ANNOTATE_GRAPHICS_CONTEXT(paintInfo, this); 119 ANNOTATE_GRAPHICS_CONTEXT(paintInfo, this);
122 120
123 if (paintInfo.phase != PaintPhaseForeground) 121 if (paintInfo.phase != PaintPhaseForeground)
124 return; 122 return;
125 123
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 void RenderFrameSet::GridAxis::reportMemoryUsage(MemoryObjectInfo* memoryObjectI nfo) const 684 void RenderFrameSet::GridAxis::reportMemoryUsage(MemoryObjectInfo* memoryObjectI nfo) const
687 { 685 {
688 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ; 686 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
689 info.addMember(m_sizes, "sizes"); 687 info.addMember(m_sizes, "sizes");
690 info.addMember(m_deltas, "deltas"); 688 info.addMember(m_deltas, "deltas");
691 info.addMember(m_preventResize, "preventResize"); 689 info.addMember(m_preventResize, "preventResize");
692 info.addMember(m_allowBorder, "allowBorder"); 690 info.addMember(m_allowBorder, "allowBorder");
693 } 691 }
694 692
695 } // namespace WebCore 693 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderFileUploadControl.cpp ('k') | Source/core/rendering/RenderImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698