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

Side by Side Diff: third_party/WebKit/Source/core/paint/MediaControlsPainter.cpp

Issue 2341423002: Don't include LayoutBlock.h from MediaControlElementTypes.h (Closed)
Patch Set: Created 4 years, 3 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) 2009 Apple Inc. 2 * Copyright (C) 2009 Apple Inc.
3 * Copyright (C) 2009 Google Inc. 3 * Copyright (C) 2009 Google Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 13 matching lines...) Expand all
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "core/paint/MediaControlsPainter.h" 28 #include "core/paint/MediaControlsPainter.h"
29 29
30 #include "bindings/core/v8/ExceptionStatePlaceholder.h" 30 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
31 #include "core/html/HTMLMediaElement.h" 31 #include "core/html/HTMLMediaElement.h"
32 #include "core/html/TimeRanges.h" 32 #include "core/html/TimeRanges.h"
33 #include "core/html/shadow/MediaControlElementTypes.h" 33 #include "core/html/shadow/MediaControlElementTypes.h"
34 #include "core/layout/LayoutBox.h"
34 #include "core/paint/PaintInfo.h" 35 #include "core/paint/PaintInfo.h"
35 #include "core/style/ComputedStyle.h" 36 #include "core/style/ComputedStyle.h"
36 #include "platform/graphics/Gradient.h" 37 #include "platform/graphics/Gradient.h"
37 #include "platform/graphics/GraphicsContext.h" 38 #include "platform/graphics/GraphicsContext.h"
38 39
39 namespace blink { 40 namespace blink {
40 41
41 static const double kCurrentTimeBufferedDelta = 1.0; 42 static const double kCurrentTimeBufferedDelta = 1.0;
42 43
43 typedef WTF::HashMap<const char*, Image*> MediaControlImageMap; 44 typedef WTF::HashMap<const char*, Image*> MediaControlImageMap;
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 } 653 }
653 654
654 float zoomLevel = style.effectiveZoom(); 655 float zoomLevel = style.effectiveZoom();
655 if (thumbImage) { 656 if (thumbImage) {
656 style.setWidth(Length(static_cast<int>(width * zoomLevel), Fixed)); 657 style.setWidth(Length(static_cast<int>(width * zoomLevel), Fixed));
657 style.setHeight(Length(static_cast<int>(height * zoomLevel), Fixed)); 658 style.setHeight(Length(static_cast<int>(height * zoomLevel), Fixed));
658 } 659 }
659 } 660 }
660 661
661 } // namespace blink 662 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698