Source/WebCore/rendering/RenderTheme.h - Issue 12463019: Merge 144789

Side by Side Diff: Source/WebCore/rendering/RenderTheme.h

Issue 12463019: Merge 144789 (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:

« no previous file with comments | « LayoutTests/platform/chromium/TestExpectations ('k') | Source/WebCore/rendering/RenderTheme.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * This file is part of the theme implementation for form controls in WebCore.	2 * This file is part of the theme implementation for form controls in WebCore.

3 *	3 *

4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.	4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.

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 320 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
331 virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const Int Rect&) { return true; }	331 virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const Int Rect&) { return true; }

332 virtual bool paintMediaSeekBackButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }	332 virtual bool paintMediaSeekBackButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }

333 virtual bool paintMediaSeekForwardButton(RenderObject*, const PaintInfo&, co nst IntRect&) { return true; }	333 virtual bool paintMediaSeekForwardButton(RenderObject*, const PaintInfo&, co nst IntRect&) { return true; }

334 virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const In tRect&) { return true; }	334 virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const In tRect&) { return true; }

335 virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const In tRect&) { return true; }	335 virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const In tRect&) { return true; }

336 virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo& , const IntRect&) { return true; }	336 virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo& , const IntRect&) { return true; }

337 virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, co nst IntRect&) { return true; }	337 virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, co nst IntRect&) { return true; }

338 virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, co nst IntRect&) { return true; }	338 virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, co nst IntRect&) { return true; }

339 virtual bool paintMediaRewindButton(RenderObject*, const PaintInfo&, const I ntRect&) { return true; }	339 virtual bool paintMediaRewindButton(RenderObject*, const PaintInfo&, const I ntRect&) { return true; }

340 virtual bool paintMediaReturnToRealtimeButton(RenderObject*, const PaintInfo &, const IntRect&) { return true; }	340 virtual bool paintMediaReturnToRealtimeButton(RenderObject*, const PaintInfo &, const IntRect&) { return true; }

	341 virtual bool paintMediaToggleClosedCaptionsButton(RenderObject*, const Paint Info&, const IntRect&) { return true; }

341 virtual bool paintMediaControlsBackground(RenderObject*, const PaintInfo&, c onst IntRect&) { return true; }	342 virtual bool paintMediaControlsBackground(RenderObject*, const PaintInfo&, c onst IntRect&) { return true; }

342 virtual bool paintMediaCurrentTime(RenderObject*, const PaintInfo&, const In tRect&) { return true; }	343 virtual bool paintMediaCurrentTime(RenderObject*, const PaintInfo&, const In tRect&) { return true; }

343 virtual bool paintMediaTimeRemaining(RenderObject*, const PaintInfo&, const IntRect&) { return true; }	344 virtual bool paintMediaTimeRemaining(RenderObject*, const PaintInfo&, const IntRect&) { return true; }

344 virtual bool paintMediaFullScreenVolumeSliderTrack(RenderObject*, const Pain tInfo&, const IntRect&) { return true; }	345 virtual bool paintMediaFullScreenVolumeSliderTrack(RenderObject*, const Pain tInfo&, const IntRect&) { return true; }

345 virtual bool paintMediaFullScreenVolumeSliderThumb(RenderObject*, const Pain tInfo&, const IntRect&) { return true; }	346 virtual bool paintMediaFullScreenVolumeSliderThumb(RenderObject*, const Pain tInfo&, const IntRect&) { return true; }

346	347

347 public:	348 public:

348 // Methods for state querying	349 // Methods for state querying

349 ControlStates controlStatesForRenderer(const RenderObject* o) const;	350 ControlStates controlStatesForRenderer(const RenderObject* o) const;

350 bool isActive(const RenderObject*) const;	351 bool isActive(const RenderObject*) const;

(...skipping 26 matching lines...) Expand all Loading...
377 #endif	378 #endif

378	379

379 #if USE(NEW_THEME)	380 #if USE(NEW_THEME)

380 Theme* m_theme; // The platform-specific theme.	381 Theme* m_theme; // The platform-specific theme.

381 #endif	382 #endif

382 };	383 };

383	384

384 } // namespace WebCore	385 } // namespace WebCore

385	386

386 #endif // RenderTheme_h	387 #endif // RenderTheme_h

OLD	NEW