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

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: rebasing after r150849 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 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 } 504 }
504 505
505 RenderThemeChromiumSkia::DirectionFlippingScope::~DirectionFlippingScope() 506 RenderThemeChromiumSkia::DirectionFlippingScope::~DirectionFlippingScope()
506 { 507 {
507 if (!m_needsFlipping) 508 if (!m_needsFlipping)
508 return; 509 return;
509 m_paintInfo.context->restore(); 510 m_paintInfo.context->restore();
510 } 511 }
511 512
512 } // namespace WebCore 513 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderThemeChromiumMac.mm ('k') | Source/core/rendering/RenderThemeChromiumWin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698