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

Side by Side Diff: Source/core/css/MediaValuesDynamic.h

Issue 335313003: MediaQueryEvaluator getting mediaType from MediaValues (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed a bug and added tests Created 6 years, 5 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MediaValuesDynamic_h 5 #ifndef MediaValuesDynamic_h
6 #define MediaValuesDynamic_h 6 #define MediaValuesDynamic_h
7 7
8 #include "core/css/MediaValues.h" 8 #include "core/css/MediaValues.h"
9 9
10 namespace WebCore { 10 namespace WebCore {
(...skipping 10 matching lines...) Expand all
21 21
22 virtual int viewportWidth() const OVERRIDE; 22 virtual int viewportWidth() const OVERRIDE;
23 virtual int viewportHeight() const OVERRIDE; 23 virtual int viewportHeight() const OVERRIDE;
24 virtual int deviceWidth() const OVERRIDE; 24 virtual int deviceWidth() const OVERRIDE;
25 virtual int deviceHeight() const OVERRIDE; 25 virtual int deviceHeight() const OVERRIDE;
26 virtual float devicePixelRatio() const OVERRIDE; 26 virtual float devicePixelRatio() const OVERRIDE;
27 virtual int colorBitsPerComponent() const OVERRIDE; 27 virtual int colorBitsPerComponent() const OVERRIDE;
28 virtual int monochromeBitsPerComponent() const OVERRIDE; 28 virtual int monochromeBitsPerComponent() const OVERRIDE;
29 virtual PointerDeviceType pointer() const OVERRIDE; 29 virtual PointerDeviceType pointer() const OVERRIDE;
30 virtual bool threeDEnabled() const OVERRIDE; 30 virtual bool threeDEnabled() const OVERRIDE;
31 virtual bool scanMediaType() const OVERRIDE;
32 virtual bool screenMediaType() const OVERRIDE;
33 virtual bool printMediaType() const OVERRIDE;
34 virtual bool strictMode() const OVERRIDE; 31 virtual bool strictMode() const OVERRIDE;
32 virtual const String mediaType() const OVERRIDE;
35 virtual Document* document() const OVERRIDE; 33 virtual Document* document() const OVERRIDE;
36 virtual bool hasValues() const OVERRIDE; 34 virtual bool hasValues() const OVERRIDE;
37 35
38 protected: 36 protected:
39 MediaValuesDynamic(LocalFrame*); 37 MediaValuesDynamic(LocalFrame*);
40 38
41 // This raw ptr is safe, as MediaValues would not outlive MediaQueryEvaluato r, and 39 // This raw ptr is safe, as MediaValues would not outlive MediaQueryEvaluato r, and
42 // MediaQueryEvaluator is reset on |Document::detach|. 40 // MediaQueryEvaluator is reset on |Document::detach|.
43 // FIXME: Oilpan: This raw ptr should be changed to a Member when LocalFrame is migrated to the heap. 41 // FIXME: Oilpan: This raw ptr should be changed to a Member when LocalFrame is migrated to the heap.
44 LocalFrame* m_frame; 42 LocalFrame* m_frame;
45 }; 43 };
46 44
47 } // namespace 45 } // namespace
48 46
49 #endif // MediaValuesDynamic_h 47 #endif // MediaValuesDynamic_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698