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

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

Issue 195713002: Fix crash on ASSERT when in subtree layout and LayoutState is not initialized (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 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
« no previous file with comments | « no previous file | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 Copyright (C) 1997 Martin Jones (mjones@kde.org) 2 Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 (C) 1998 Waldo Bastian (bastian@kde.org) 3 (C) 1998 Waldo Bastian (bastian@kde.org)
4 (C) 1998, 1999 Torben Weis (weis@kde.org) 4 (C) 1998, 1999 Torben Weis (weis@kde.org)
5 (C) 1999 Lars Knoll (knoll@kde.org) 5 (C) 1999 Lars Knoll (knoll@kde.org)
6 (C) 1999 Antti Koivisto (koivisto@kde.org) 6 (C) 1999 Antti Koivisto (koivisto@kde.org)
7 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 7 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
8 8
9 This library is free software; you can redistribute it and/or 9 This library is free software; you can redistribute it and/or
10 modify it under the terms of the GNU Library General Public 10 modify it under the terms of the GNU Library General Public
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 // DEPRECATED: Use viewportConstrainedVisibleContentRect() instead. 297 // DEPRECATED: Use viewportConstrainedVisibleContentRect() instead.
298 IntSize scrollOffsetForFixedPosition() const; 298 IntSize scrollOffsetForFixedPosition() const;
299 299
300 PartialLayoutState& partialLayout() { return m_partialLayout; } 300 PartialLayoutState& partialLayout() { return m_partialLayout; }
301 301
302 // Override scrollbar notifications to update the AXObject cache. 302 // Override scrollbar notifications to update the AXObject cache.
303 virtual void didAddScrollbar(Scrollbar*, ScrollbarOrientation) OVERRIDE; 303 virtual void didAddScrollbar(Scrollbar*, ScrollbarOrientation) OVERRIDE;
304 virtual void willRemoveScrollbar(Scrollbar*, ScrollbarOrientation) OVERRIDE; 304 virtual void willRemoveScrollbar(Scrollbar*, ScrollbarOrientation) OVERRIDE;
305 305
306 virtual bool shouldAttemptToScrollUsingFastPath() const OVERRIDE; 306 virtual bool shouldAttemptToScrollUsingFastPath() const OVERRIDE;
307 // FIXME: This should probably be renamed as the 'inSubtreeLayout' parameter
308 // passed around the FrameView layout methods can be true while this returns
309 // false.
307 bool isSubtreeLayout() const { return !!m_layoutSubtreeRoot; } 310 bool isSubtreeLayout() const { return !!m_layoutSubtreeRoot; }
308 311
309 protected: 312 protected:
310 virtual bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRec t& rectToScroll, const IntRect& clipRect) OVERRIDE; 313 virtual bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRec t& rectToScroll, const IntRect& clipRect) OVERRIDE;
311 virtual void scrollContentsSlowPath(const IntRect& updateRect) OVERRIDE; 314 virtual void scrollContentsSlowPath(const IntRect& updateRect) OVERRIDE;
312 315
313 virtual bool isVerticalDocument() const OVERRIDE; 316 virtual bool isVerticalDocument() const OVERRIDE;
314 virtual bool isFlippedDocument() const OVERRIDE; 317 virtual bool isFlippedDocument() const OVERRIDE;
315 318
316 private: 319 private:
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 m_view->setCanRepaintDuringPerformLayout(m_originalValue); 550 m_view->setCanRepaintDuringPerformLayout(m_originalValue);
548 } 551 }
549 private: 552 private:
550 FrameView* m_view; 553 FrameView* m_view;
551 bool m_originalValue; 554 bool m_originalValue;
552 }; 555 };
553 556
554 } // namespace WebCore 557 } // namespace WebCore
555 558
556 #endif // FrameView_h 559 #endif // FrameView_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698