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

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

Issue 289163003: Fix build with gcc 4.8 and C++11 support enabled (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderTheme.cpp ('k') | Source/platform/ThemeTypes.h » ('j') | 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) 2007 Apple Inc. 2 * Copyright (C) 2007 Apple Inc.
3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
4 * Copyright (C) 2008 Collabora Ltd. 4 * Copyright (C) 2008 Collabora Ltd.
5 * Copyright (C) 2008, 2009 Google Inc. 5 * Copyright (C) 2008, 2009 Google Inc.
6 * Copyright (C) 2009 Kenneth Rohde Christiansen 6 * Copyright (C) 2009 Kenneth Rohde Christiansen
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 style->setWidth(Length(size.width(), Fixed)); 484 style->setWidth(Length(size.width(), Fixed));
485 style->setMinWidth(Length(size.width(), Fixed)); 485 style->setMinWidth(Length(size.width(), Fixed));
486 } 486 }
487 487
488 bool RenderThemeChromiumDefault::paintInnerSpinButton(RenderObject* o, const Pai ntInfo& i, const IntRect& rect) 488 bool RenderThemeChromiumDefault::paintInnerSpinButton(RenderObject* o, const Pai ntInfo& i, const IntRect& rect)
489 { 489 {
490 if (i.context->paintingDisabled()) 490 if (i.context->paintingDisabled())
491 return false; 491 return false;
492 blink::WebThemeEngine::ExtraParams extraParams; 492 blink::WebThemeEngine::ExtraParams extraParams;
493 blink::WebCanvas* canvas = i.context->canvas(); 493 blink::WebCanvas* canvas = i.context->canvas();
494 extraParams.innerSpin.spinUp = (controlStatesForRenderer(o) & SpinUpState); 494 extraParams.innerSpin.spinUp = (controlStatesForRenderer(o) & SpinUpControlS tate);
495 extraParams.innerSpin.readOnly = isReadOnlyControl(o); 495 extraParams.innerSpin.readOnly = isReadOnlyControl(o);
496 496
497 blink::Platform::current()->themeEngine()->paint(canvas, blink::WebThemeEngi ne::PartInnerSpinButton, getWebThemeState(this, o), blink::WebRect(rect), &extra Params); 497 blink::Platform::current()->themeEngine()->paint(canvas, blink::WebThemeEngi ne::PartInnerSpinButton, getWebThemeState(this, o), blink::WebRect(rect), &extra Params);
498 return false; 498 return false;
499 } 499 }
500 500
501 bool RenderThemeChromiumDefault::paintProgressBar(RenderObject* o, const PaintIn fo& i, const IntRect& rect) 501 bool RenderThemeChromiumDefault::paintProgressBar(RenderObject* o, const PaintIn fo& i, const IntRect& rect)
502 { 502 {
503 if (!o->isProgress()) 503 if (!o->isProgress())
504 return true; 504 return true;
(...skipping 26 matching lines...) Expand all
531 if (useMockTheme()) { 531 if (useMockTheme()) {
532 // The mock theme can't handle zoomed controls, so we fall back to the " fallback" theme. 532 // The mock theme can't handle zoomed controls, so we fall back to the " fallback" theme.
533 ControlPart part = style->appearance(); 533 ControlPart part = style->appearance();
534 if (part == CheckboxPart || part == RadioPart) 534 if (part == CheckboxPart || part == RadioPart)
535 return style->effectiveZoom() != 1; 535 return style->effectiveZoom() != 1;
536 } 536 }
537 return RenderTheme::shouldUseFallbackTheme(style); 537 return RenderTheme::shouldUseFallbackTheme(style);
538 } 538 }
539 539
540 } // namespace WebCore 540 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTheme.cpp ('k') | Source/platform/ThemeTypes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698