Index: third_party/WebKit/Source/web/WebViewImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp |
index 76fa9d1908fa0c4ac497386d16303e86cb8bbd11..1a22148cba607edced1e58d6a6ce4b2c1f772b5a 100644 |
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp |
@@ -1728,7 +1728,7 @@ void WebViewImpl::enablePopupMouseWheelEventListener() |
// scrolled to a new position. This is part of a larger set of issues with |
// popups. |
// See https://crbug.com/566130 |
- if (!mainFrameImpl() || !mainFrameImpl()->frame()->isLocalFrame()) |
+ if (!mainFrameImpl()) |
return; |
DCHECK(!m_popupMouseWheelEventListener); |
Document* document = mainFrameImpl()->frame()->document(); |
@@ -1743,7 +1743,7 @@ void WebViewImpl::disablePopupMouseWheelEventListener() |
{ |
// TODO(kenrb): Concerns the same as in enablePopupMouseWheelEventListener. |
// See https://crbug.com/566130 |
- if (!mainFrameImpl() || !mainFrameImpl()->frame()->isLocalFrame()) |
+ if (!mainFrameImpl()) |
return; |
DCHECK(m_popupMouseWheelEventListener); |
Document* document = mainFrameImpl()->frame()->document(); |
@@ -1875,7 +1875,6 @@ void WebViewImpl::resizeViewWhileAnchored( |
FrameView* view, float topControlsHeight, bool topControlsShrinkLayout) |
{ |
DCHECK(mainFrameImpl()); |
- DCHECK(mainFrameImpl()->frame()->isLocalFrame()); |
topControls().setHeight(topControlsHeight, topControlsShrinkLayout); |
@@ -2844,7 +2843,7 @@ void WebViewImpl::didChangeWindowResizerRect() |
void WebViewImpl::reportFixedRasterScaleUseCounters(bool hasBlurryContent, bool hasPotentialPerformanceRegression) |
{ |
- if (!mainFrameImpl() || !mainFrameImpl()->frame()->isLocalFrame()) |
+ if (!mainFrameImpl()) |
return; |
Document* document = mainFrameImpl()->frame()->document(); |
if (hasBlurryContent) |