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

Side by Side Diff: Source/WebCore/page/FrameView.h

Issue 7811011: Revert 94131 - Merge 94107 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 3 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) 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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 279
280 virtual IntPoint currentMousePosition() const; 280 virtual IntPoint currentMousePosition() const;
281 281
282 // FIXME: Remove this method once plugin loading is decoupled from layout. 282 // FIXME: Remove this method once plugin loading is decoupled from layout.
283 void flushAnyPendingPostLayoutTasks(); 283 void flushAnyPendingPostLayoutTasks();
284 284
285 virtual bool shouldSuspendScrollAnimations() const; 285 virtual bool shouldSuspendScrollAnimations() const;
286 286
287 void setAnimatorsAreActive(); 287 void setAnimatorsAreActive();
288 288
289 void clearOwningRendererForCustomScrollbars(RenderBox*);
290
291 protected: 289 protected:
292 virtual bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRec t& rectToScroll, const IntRect& clipRect); 290 virtual bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRec t& rectToScroll, const IntRect& clipRect);
293 virtual void scrollContentsSlowPath(const IntRect& updateRect); 291 virtual void scrollContentsSlowPath(const IntRect& updateRect);
294 292
295 virtual bool isVerticalDocument() const; 293 virtual bool isVerticalDocument() const;
296 virtual bool isFlippedDocument() const; 294 virtual bool isFlippedDocument() const;
297 295
298 private: 296 private:
299 FrameView(Frame*); 297 FrameView(Frame*);
300 298
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 m_visuallyNonEmptyPixelCount += size.width() * size.height(); 474 m_visuallyNonEmptyPixelCount += size.width() * size.height();
477 // Use a threshold value to prevent very small amounts of visible content fr om triggering didFirstVisuallyNonEmptyLayout 475 // Use a threshold value to prevent very small amounts of visible content fr om triggering didFirstVisuallyNonEmptyLayout
478 static const unsigned visualPixelThreshold = 256 * 256; 476 static const unsigned visualPixelThreshold = 256 * 256;
479 if (m_visuallyNonEmptyPixelCount > visualPixelThreshold) 477 if (m_visuallyNonEmptyPixelCount > visualPixelThreshold)
480 setIsVisuallyNonEmpty(); 478 setIsVisuallyNonEmpty();
481 } 479 }
482 480
483 } // namespace WebCore 481 } // namespace WebCore
484 482
485 #endif // FrameView_h 483 #endif // FrameView_h
OLDNEW
« no previous file with comments | « Source/WebCore/manual-tests/custom-scrollbar-renderer-removed-crash.html ('k') | Source/WebCore/page/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698