Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /** | 1 /** |
| 2 * Copyright (C) 2003, 2006 Apple Computer, Inc. | 2 * Copyright (C) 2003, 2006 Apple Computer, Inc. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 // Select the correct color for painting the text. | 60 // Select the correct color for painting the text. |
| 61 Color foreground = paintInfo.forceBlackText() ? Color::black : renderer( )->selectionForegroundColor(); | 61 Color foreground = paintInfo.forceBlackText() ? Color::black : renderer( )->selectionForegroundColor(); |
| 62 if (foreground != styleTextColor) | 62 if (foreground != styleTextColor) |
| 63 context->setFillColor(foreground); | 63 context->setFillColor(foreground); |
| 64 } | 64 } |
| 65 | 65 |
| 66 // Text shadows are disabled when printing. http://crbug.com/258321 | 66 // Text shadows are disabled when printing. http://crbug.com/258321 |
| 67 const ShadowList* shadowList = context->printing() ? 0 : style->textShadow() ; | 67 const ShadowList* shadowList = context->printing() ? 0 : style->textShadow() ; |
| 68 bool hasShadow = shadowList; | 68 bool hasShadow = shadowList; |
| 69 if (hasShadow) { | 69 if (hasShadow) { |
| 70 DrawLooper drawLooper; | 70 DrawLooper::Builder drawLooperBuilder; |
| 71 for (size_t i = shadowList->shadows().size(); i--; ) { | 71 for (size_t i = shadowList->shadows().size(); i--; ) { |
| 72 const ShadowData& shadow = shadowList->shadows()[i]; | 72 const ShadowData& shadow = shadowList->shadows()[i]; |
| 73 float shadowX = isHorizontal() ? shadow.x() : shadow.y(); | 73 float shadowX = isHorizontal() ? shadow.x() : shadow.y(); |
| 74 float shadowY = isHorizontal() ? shadow.y() : -shadow.x(); | 74 float shadowY = isHorizontal() ? shadow.y() : -shadow.x(); |
| 75 FloatSize offset(shadowX, shadowY); | 75 FloatSize offset(shadowX, shadowY); |
| 76 drawLooper.addShadow(offset, shadow.blur(), shadow.color(), | 76 drawLooperBuilder.addShadow(offset, shadow.blur(), shadow.color(), |
| 77 DrawLooper::ShadowRespectsTransforms, DrawLooper::ShadowIgnoresA lpha); | 77 DrawLooper::ShadowRespectsTransforms, DrawLooper::ShadowIgnoresA lpha); |
| 78 } | 78 } |
| 79 drawLooper.addUnmodifiedContent(); | 79 drawLooperBuilder.addUnmodifiedContent(); |
| 80 context->setDrawLooper(drawLooper); | 80 context->setDrawLooper(*drawLooperBuilder.detachDrawLooper().get()); |
|
jbroman
2014/02/24 17:47:44
This seems awkward. If nothing else, you can deref
| |
| 81 } | 81 } |
| 82 | 82 |
| 83 TextRun textRun = RenderBlockFlow::constructTextRun(renderer(), font, m_str, style, TextRun::AllowTrailingExpansion); | 83 TextRun textRun = RenderBlockFlow::constructTextRun(renderer(), font, m_str, style, TextRun::AllowTrailingExpansion); |
| 84 TextRunPaintInfo textRunPaintInfo(textRun); | 84 TextRunPaintInfo textRunPaintInfo(textRun); |
| 85 textRunPaintInfo.bounds = boxRect; | 85 textRunPaintInfo.bounds = boxRect; |
| 86 context->drawText(font, textRunPaintInfo, textOrigin); | 86 context->drawText(font, textRunPaintInfo, textOrigin); |
| 87 | 87 |
| 88 // Restore the regular fill color. | 88 // Restore the regular fill color. |
| 89 if (styleTextColor != context->fillColor()) | 89 if (styleTextColor != context->fillColor()) |
| 90 context->setFillColor(styleTextColor); | 90 context->setFillColor(styleTextColor); |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 178 if (visibleToHitTestRequest(request) && boundsRect.intersects(HitTestLocatio n::rectForPoint(locationInContainer.point(), 0, 0, 0, 0))) { | 178 if (visibleToHitTestRequest(request) && boundsRect.intersects(HitTestLocatio n::rectForPoint(locationInContainer.point(), 0, 0, 0, 0))) { |
| 179 renderer()->updateHitTestResult(result, locationInContainer.point() - to LayoutSize(adjustedLocation)); | 179 renderer()->updateHitTestResult(result, locationInContainer.point() - to LayoutSize(adjustedLocation)); |
| 180 if (!result.addNodeToRectBasedTestResult(renderer()->node(), request, lo cationInContainer, boundsRect)) | 180 if (!result.addNodeToRectBasedTestResult(renderer()->node(), request, lo cationInContainer, boundsRect)) |
| 181 return true; | 181 return true; |
| 182 } | 182 } |
| 183 | 183 |
| 184 return false; | 184 return false; |
| 185 } | 185 } |
| 186 | 186 |
| 187 } // namespace WebCore | 187 } // namespace WebCore |
| OLD | NEW |