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

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

Issue 408143007: Revert r169180 (https://codereview.chromium.org/150733002) in M36.1985 branch, due to layout proble… (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1985/
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « LayoutTests/TestExpectations ('k') | 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 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 void setInProgrammaticScroll(bool programmaticScroll) { m_inProgrammaticScro ll = programmaticScroll; } 294 void setInProgrammaticScroll(bool programmaticScroll) { m_inProgrammaticScro ll = programmaticScroll; }
295 295
296 void setHasSoftwareFilters(bool hasSoftwareFilters) { m_hasSoftwareFilters = hasSoftwareFilters; } 296 void setHasSoftwareFilters(bool hasSoftwareFilters) { m_hasSoftwareFilters = hasSoftwareFilters; }
297 bool hasSoftwareFilters() const { return m_hasSoftwareFilters; } 297 bool hasSoftwareFilters() const { return m_hasSoftwareFilters; }
298 298
299 virtual bool isActive() const OVERRIDE; 299 virtual bool isActive() const OVERRIDE;
300 300
301 // DEPRECATED: Use viewportConstrainedVisibleContentRect() instead. 301 // DEPRECATED: Use viewportConstrainedVisibleContentRect() instead.
302 IntSize scrollOffsetForFixedPosition() const; 302 IntSize scrollOffsetForFixedPosition() const;
303 303
304 virtual bool shouldPlaceVerticalScrollbarOnLeft() const OVERRIDE;
305
306 // Override scrollbar notifications to update the AXObject cache. 304 // Override scrollbar notifications to update the AXObject cache.
307 virtual void didAddScrollbar(Scrollbar*, ScrollbarOrientation) OVERRIDE; 305 virtual void didAddScrollbar(Scrollbar*, ScrollbarOrientation) OVERRIDE;
308 virtual void willRemoveScrollbar(Scrollbar*, ScrollbarOrientation) OVERRIDE; 306 virtual void willRemoveScrollbar(Scrollbar*, ScrollbarOrientation) OVERRIDE;
309 307
310 virtual bool shouldAttemptToScrollUsingFastPath() const OVERRIDE; 308 virtual bool shouldAttemptToScrollUsingFastPath() const OVERRIDE;
311 // FIXME: This should probably be renamed as the 'inSubtreeLayout' parameter 309 // FIXME: This should probably be renamed as the 'inSubtreeLayout' parameter
312 // passed around the FrameView layout methods can be true while this returns 310 // passed around the FrameView layout methods can be true while this returns
313 // false. 311 // false.
314 bool isSubtreeLayout() const { return !!m_layoutSubtreeRoot; } 312 bool isSubtreeLayout() const { return !!m_layoutSubtreeRoot; }
315 313
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 m_view->setCanRepaintDuringPerformLayout(m_originalValue); 560 m_view->setCanRepaintDuringPerformLayout(m_originalValue);
563 } 561 }
564 private: 562 private:
565 FrameView* m_view; 563 FrameView* m_view;
566 bool m_originalValue; 564 bool m_originalValue;
567 }; 565 };
568 566
569 } // namespace WebCore 567 } // namespace WebCore
570 568
571 #endif // FrameView_h 569 #endif // FrameView_h
OLDNEW
« no previous file with comments | « LayoutTests/TestExpectations ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698