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

Side by Side Diff: Source/WebCore/rendering/RenderWidget.cpp

Issue 12545020: Revert 145087 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2000 Dirk Mueller (mueller@kde.org) 3 * Copyright (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 243
244 if (hasBoxDecorations() && (paintInfo.phase == PaintPhaseForeground || paint Info.phase == PaintPhaseSelection)) 244 if (hasBoxDecorations() && (paintInfo.phase == PaintPhaseForeground || paint Info.phase == PaintPhaseSelection))
245 paintBoxDecorations(paintInfo, adjustedPaintOffset); 245 paintBoxDecorations(paintInfo, adjustedPaintOffset);
246 246
247 if (paintInfo.phase == PaintPhaseMask) { 247 if (paintInfo.phase == PaintPhaseMask) {
248 paintMask(paintInfo, adjustedPaintOffset); 248 paintMask(paintInfo, adjustedPaintOffset);
249 return; 249 return;
250 } 250 }
251 251
252 if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSe lfOutline) && hasOutline()) 252 if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSe lfOutline) && hasOutline())
253 paintOutline(paintInfo, LayoutRect(adjustedPaintOffset, size())); 253 paintOutline(paintInfo.context, LayoutRect(adjustedPaintOffset, size())) ;
254 254
255 if (!m_frameView || paintInfo.phase != PaintPhaseForeground) 255 if (!m_frameView || paintInfo.phase != PaintPhaseForeground)
256 return; 256 return;
257 257
258 #if PLATFORM(MAC) 258 #if PLATFORM(MAC)
259 if (style()->highlight() != nullAtom && !paintInfo.context->paintingDisabled ()) 259 if (style()->highlight() != nullAtom && !paintInfo.context->paintingDisabled ())
260 paintCustomHighlight(paintOffset, style()->highlight(), true); 260 paintCustomHighlight(paintOffset, style()->highlight(), true);
261 #endif 261 #endif
262 262
263 if (style()->hasBorderRadius()) { 263 if (style()->hasBorderRadius()) {
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 CursorDirective RenderWidget::getCursor(const LayoutPoint& point, Cursor& cursor ) const 394 CursorDirective RenderWidget::getCursor(const LayoutPoint& point, Cursor& cursor ) const
395 { 395 {
396 if (widget() && widget()->isPluginViewBase()) { 396 if (widget() && widget()->isPluginViewBase()) {
397 // A plug-in is responsible for setting the cursor when the pointer is o ver it. 397 // A plug-in is responsible for setting the cursor when the pointer is o ver it.
398 return DoNotSetCursor; 398 return DoNotSetCursor;
399 } 399 }
400 return RenderReplaced::getCursor(point, cursor); 400 return RenderReplaced::getCursor(point, cursor);
401 } 401 }
402 402
403 } // namespace WebCore 403 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderTextControl.cpp ('k') | Source/WebCore/rendering/svg/RenderSVGContainer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698