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

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

Issue 14859003: Remove the compile time flag for DATALIST Element. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: incorporate tkent's comments Created 7 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
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 * 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 } 74 }
75 75
76 RenderThemeChromiumSkia::~RenderThemeChromiumSkia() 76 RenderThemeChromiumSkia::~RenderThemeChromiumSkia()
77 { 77 {
78 } 78 }
79 79
80 // Use the Windows style sheets to match their metrics. 80 // Use the Windows style sheets to match their metrics.
81 String RenderThemeChromiumSkia::extraDefaultStyleSheet() 81 String RenderThemeChromiumSkia::extraDefaultStyleSheet()
82 { 82 {
83 return String(themeWinUserAgentStyleSheet, sizeof(themeWinUserAgentStyleShee t)) + 83 return RenderTheme::extraDefaultStyleSheet() +
84 String(themeChromiumSkiaUserAgentStyleSheet, sizeof(themeChromiumSkia UserAgentStyleSheet)) + 84 String(themeWinUserAgentStyleSheet, sizeof(themeWinUserAgentStyleSheet)) +
85 String(themeChromiumUserAgentStyleSheet, sizeof(themeChromiumUserAgen tStyleSheet)); 85 String(themeChromiumSkiaUserAgentStyleSheet, sizeof(themeChromiumSkiaUse rAgentStyleSheet)) +
86 String(themeChromiumUserAgentStyleSheet, sizeof(themeChromiumUserAgentSt yleSheet));
86 } 87 }
87 88
88 String RenderThemeChromiumSkia::extraQuirksStyleSheet() 89 String RenderThemeChromiumSkia::extraQuirksStyleSheet()
89 { 90 {
90 return String(themeWinQuirksUserAgentStyleSheet, sizeof(themeWinQuirksUserAg entStyleSheet)); 91 return String(themeWinQuirksUserAgentStyleSheet, sizeof(themeWinQuirksUserAg entStyleSheet));
91 } 92 }
92 93
93 String RenderThemeChromiumSkia::extraMediaControlsStyleSheet() 94 String RenderThemeChromiumSkia::extraMediaControlsStyleSheet()
94 { 95 {
95 return String(mediaControlsChromiumUserAgentStyleSheet, sizeof(mediaControls ChromiumUserAgentStyleSheet)); 96 return String(mediaControlsChromiumUserAgentStyleSheet, sizeof(mediaControls ChromiumUserAgentStyleSheet));
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 padding += menuListArrowPadding(); 454 padding += menuListArrowPadding();
454 455
455 return padding; 456 return padding;
456 } 457 }
457 458
458 bool RenderThemeChromiumSkia::shouldShowPlaceholderWhenFocused() const 459 bool RenderThemeChromiumSkia::shouldShowPlaceholderWhenFocused() const
459 { 460 {
460 return true; 461 return true;
461 } 462 }
462 463
463 #if ENABLE(DATALIST_ELEMENT)
464 LayoutUnit RenderThemeChromiumSkia::sliderTickSnappingThreshold() const 464 LayoutUnit RenderThemeChromiumSkia::sliderTickSnappingThreshold() const
465 { 465 {
466 return RenderThemeChromiumCommon::sliderTickSnappingThreshold(); 466 return RenderThemeChromiumCommon::sliderTickSnappingThreshold();
467 } 467 }
468 #endif
469 468
470 // 469 //
471 // Following values are come from default of GTK+ 470 // Following values are come from default of GTK+
472 // 471 //
473 static const int progressDeltaPixelsPerSecond = 100; 472 static const int progressDeltaPixelsPerSecond = 100;
474 static const int progressActivityBlocks = 5; 473 static const int progressActivityBlocks = 5;
475 static const int progressAnimationFrmaes = 10; 474 static const int progressAnimationFrmaes = 10;
476 static const double progressAnimationInterval = 0.125; 475 static const double progressAnimationInterval = 0.125;
477 476
478 IntRect RenderThemeChromiumSkia::determinateProgressValueRectFor(RenderProgress* renderProgress, const IntRect& rect) const 477 IntRect RenderThemeChromiumSkia::determinateProgressValueRectFor(RenderProgress* renderProgress, const IntRect& rect) const
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 } 521 }
523 522
524 RenderThemeChromiumSkia::DirectionFlippingScope::~DirectionFlippingScope() 523 RenderThemeChromiumSkia::DirectionFlippingScope::~DirectionFlippingScope()
525 { 524 {
526 if (!m_needsFlipping) 525 if (!m_needsFlipping)
527 return; 526 return;
528 m_paintInfo.context->restore(); 527 m_paintInfo.context->restore();
529 } 528 }
530 529
531 } // namespace WebCore 530 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698