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

Side by Side Diff: Source/core/frame/FrameView.cpp

Issue 654253003: Error event shouldn't fire when image is updated on environment changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 1953 matching lines...) Expand 10 before | Expand all | Expand 10 after
1964 1964
1965 sendResizeEventIfNeeded(); 1965 sendResizeEventIfNeeded();
1966 } 1966 }
1967 1967
1968 bool FrameView::wasViewportResized() 1968 bool FrameView::wasViewportResized()
1969 { 1969 {
1970 ASSERT(m_frame); 1970 ASSERT(m_frame);
1971 RenderView* renderView = this->renderView(); 1971 RenderView* renderView = this->renderView();
1972 if (!renderView) 1972 if (!renderView)
1973 return false; 1973 return false;
1974 ASSERT(renderView->style());
Mike West 2014/10/17 14:12:40 Seems unrelated to this CL. Perhaps split it out f
1974 return (layoutSize(IncludeScrollbars) != m_lastViewportSize || renderView->s tyle()->zoom() != m_lastZoomFactor); 1975 return (layoutSize(IncludeScrollbars) != m_lastViewportSize || renderView->s tyle()->zoom() != m_lastZoomFactor);
1975 } 1976 }
1976 1977
1977 void FrameView::sendResizeEventIfNeeded() 1978 void FrameView::sendResizeEventIfNeeded()
1978 { 1979 {
1979 ASSERT(m_frame); 1980 ASSERT(m_frame);
1980 1981
1981 RenderView* renderView = this->renderView(); 1982 RenderView* renderView = this->renderView();
1982 if (!renderView || renderView->document().printing()) 1983 if (!renderView || renderView->document().printing())
1983 return; 1984 return;
(...skipping 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after
3036 IntSize visibleSize = expandedIntSize(visibleContentSizeF); 3037 IntSize visibleSize = expandedIntSize(visibleContentSizeF);
3037 3038
3038 IntPoint maximumOffset( 3039 IntPoint maximumOffset(
3039 contentsWidth() - visibleSize.width() - scrollOrigin().x(), 3040 contentsWidth() - visibleSize.width() - scrollOrigin().x(),
3040 contentsHeight() - visibleSize.height() - scrollOrigin().y()); 3041 contentsHeight() - visibleSize.height() - scrollOrigin().y());
3041 maximumOffset.clampNegativeToZero(); 3042 maximumOffset.clampNegativeToZero();
3042 return maximumOffset; 3043 return maximumOffset;
3043 } 3044 }
3044 3045
3045 } // namespace blink 3046 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698