Index: third_party/WebKit/Source/core/css/MediaValues.cpp |
diff --git a/third_party/WebKit/Source/core/css/MediaValues.cpp b/third_party/WebKit/Source/core/css/MediaValues.cpp |
index 5d6f585e92ea4bdcc3db2f190887a5f20f90cbe4..80a7ed7133b18628c5a4550fa304c5d8833c718d 100644 |
--- a/third_party/WebKit/Source/core/css/MediaValues.cpp |
+++ b/third_party/WebKit/Source/core/css/MediaValues.cpp |
@@ -31,12 +31,12 @@ MediaValues* MediaValues::createDynamicIfFrameExists(LocalFrame* frame) { |
} |
double MediaValues::calculateViewportWidth(LocalFrame* frame) { |
- ASSERT(frame && frame->view() && frame->document()); |
+ DCHECK(frame && frame->view() && frame->document()); |
tkent
2017/03/28 14:44:55
Split this into three.
nikhil.sahni
2017/03/30 12:17:58
Done.
|
return frame->view()->viewportSizeForMediaQueries().width(); |
} |
double MediaValues::calculateViewportHeight(LocalFrame* frame) { |
- ASSERT(frame && frame->view() && frame->document()); |
+ DCHECK(frame && frame->view() && frame->document()); |
tkent
2017/03/28 14:44:55
Split this into three.
nikhil.sahni
2017/03/30 12:17:57
Done.
|
return frame->view()->viewportSizeForMediaQueries().height(); |
} |
@@ -59,7 +59,7 @@ int MediaValues::calculateDeviceHeight(LocalFrame* frame) { |
} |
bool MediaValues::calculateStrictMode(LocalFrame* frame) { |
- ASSERT(frame && frame->document()); |
+ DCHECK(frame && frame->document()); |
tkent
2017/03/28 14:44:55
Split this into two.
nikhil.sahni
2017/03/30 12:17:58
Done.
|
return !frame->document()->inQuirksMode(); |
} |
@@ -68,7 +68,7 @@ float MediaValues::calculateDevicePixelRatio(LocalFrame* frame) { |
} |
int MediaValues::calculateColorBitsPerComponent(LocalFrame* frame) { |
- ASSERT(frame && frame->page() && frame->page()->mainFrame()); |
+ DCHECK(frame && frame->page() && frame->page()->mainFrame()); |
tkent
2017/03/28 14:44:55
Split this into three.
nikhil.sahni
2017/03/30 12:17:58
Done.
|
if (!frame->page()->mainFrame()->isLocalFrame() || |
frame->page()->chromeClient().screenInfo().isMonochrome) |
return 0; |
@@ -76,7 +76,7 @@ int MediaValues::calculateColorBitsPerComponent(LocalFrame* frame) { |
} |
int MediaValues::calculateMonochromeBitsPerComponent(LocalFrame* frame) { |
- ASSERT(frame && frame->page() && frame->page()->mainFrame()); |
+ DCHECK(frame && frame->page() && frame->page()->mainFrame()); |
tkent
2017/03/28 14:44:55
Split this into three.
nikhil.sahni
2017/03/30 12:17:58
Done.
|
if (!frame->page()->mainFrame()->isLocalFrame() || |
!frame->page()->chromeClient().screenInfo().isMonochrome) |
return 0; |
@@ -88,14 +88,14 @@ int MediaValues::calculateDefaultFontSize(LocalFrame* frame) { |
} |
const String MediaValues::calculateMediaType(LocalFrame* frame) { |
- ASSERT(frame); |
+ DCHECK(frame); |
if (!frame->view()) |
return emptyAtom; |
return frame->view()->mediaType(); |
} |
WebDisplayMode MediaValues::calculateDisplayMode(LocalFrame* frame) { |
- ASSERT(frame); |
+ DCHECK(frame); |
WebDisplayMode mode = frame->page()->settings().getDisplayModeOverride(); |
if (mode != WebDisplayModeUndefined) |
@@ -108,7 +108,7 @@ WebDisplayMode MediaValues::calculateDisplayMode(LocalFrame* frame) { |
} |
bool MediaValues::calculateThreeDEnabled(LocalFrame* frame) { |
- ASSERT(frame && !frame->contentLayoutItem().isNull() && |
+ DCHECK(frame && !frame->contentLayoutItem().isNull() && |
tkent
2017/03/28 14:44:55
Split this into three.
nikhil.sahni
2017/03/30 12:17:58
Done.
|
frame->contentLayoutItem().compositor()); |
bool threeDEnabled = false; |
if (LayoutViewItem view = frame->contentLayoutItem()) |
@@ -117,22 +117,22 @@ bool MediaValues::calculateThreeDEnabled(LocalFrame* frame) { |
} |
PointerType MediaValues::calculatePrimaryPointerType(LocalFrame* frame) { |
- ASSERT(frame && frame->settings()); |
+ DCHECK(frame && frame->settings()); |
tkent
2017/03/28 14:44:56
Split this into two.
nikhil.sahni
2017/03/30 12:17:58
Done.
|
return frame->settings()->getPrimaryPointerType(); |
} |
int MediaValues::calculateAvailablePointerTypes(LocalFrame* frame) { |
- ASSERT(frame && frame->settings()); |
+ DCHECK(frame && frame->settings()); |
tkent
2017/03/28 14:44:56
Split this into two.
nikhil.sahni
2017/03/30 12:17:58
Done.
|
return frame->settings()->getAvailablePointerTypes(); |
} |
HoverType MediaValues::calculatePrimaryHoverType(LocalFrame* frame) { |
- ASSERT(frame && frame->settings()); |
+ DCHECK(frame && frame->settings()); |
tkent
2017/03/28 14:44:55
Split this into two.
nikhil.sahni
2017/03/30 12:17:58
Done.
|
return frame->settings()->getPrimaryHoverType(); |
} |
int MediaValues::calculateAvailableHoverTypes(LocalFrame* frame) { |
- ASSERT(frame && frame->settings()); |
+ DCHECK(frame && frame->settings()); |
tkent
2017/03/28 14:44:56
Split this into two.
nikhil.sahni
2017/03/30 12:17:58
Done.
|
return frame->settings()->getAvailableHoverTypes(); |
} |
@@ -214,7 +214,7 @@ LocalFrame* MediaValues::frameFrom(Document& document) { |
Document* executingDocument = document.importsController() |
? document.importsController()->master() |
: &document; |
- ASSERT(executingDocument); |
+ DCHECK(executingDocument); |
return executingDocument->frame(); |
} |