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

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

Issue 12252048: Merge 142788. Requested by Christian Biesinger <cbiesinger@chromium.org>. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 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
« no previous file with comments | « LayoutTests/fast/css/resize-object-crash-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 305
306 if (style()->hasBorderRadius()) 306 if (style()->hasBorderRadius())
307 paintInfo.context->restore(); 307 paintInfo.context->restore();
308 308
309 // Paint a partially transparent wash over selected widgets. 309 // Paint a partially transparent wash over selected widgets.
310 if (isSelected() && !document()->printing()) { 310 if (isSelected() && !document()->printing()) {
311 // FIXME: selectionRect() is in absolute, not painting coordinates. 311 // FIXME: selectionRect() is in absolute, not painting coordinates.
312 paintInfo.context->fillRect(pixelSnappedIntRect(selectionRect()), select ionBackgroundColor(), style()->colorSpace()); 312 paintInfo.context->fillRect(pixelSnappedIntRect(selectionRect()), select ionBackgroundColor(), style()->colorSpace());
313 } 313 }
314 314
315 if (style()->resize() != RESIZE_NONE) 315 if (hasLayer() && layer()->canResize())
316 layer()->paintResizer(paintInfo.context, roundedIntPoint(adjustedPaintOf fset), paintInfo.rect); 316 layer()->paintResizer(paintInfo.context, roundedIntPoint(adjustedPaintOf fset), paintInfo.rect);
317 } 317 }
318 318
319 void RenderWidget::setOverlapTestResult(bool isOverlapped) 319 void RenderWidget::setOverlapTestResult(bool isOverlapped)
320 { 320 {
321 ASSERT(m_widget); 321 ASSERT(m_widget);
322 ASSERT(m_widget->isFrameView()); 322 ASSERT(m_widget->isFrameView());
323 static_cast<FrameView*>(m_widget.get())->setIsOverlapped(isOverlapped); 323 static_cast<FrameView*>(m_widget.get())->setIsOverlapped(isOverlapped);
324 } 324 }
325 325
(...skipping 68 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 | « LayoutTests/fast/css/resize-object-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698