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

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

Issue 1224893004: Turn FrameView's paintBehavior into a real global (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Improved change after the reviews. Still fails on Android. Created 5 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 | « Source/core/frame/FrameView.h ('k') | Source/core/frame/LocalFrame.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) 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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 m_updateWidgetsTimer.stop(); 204 m_updateWidgetsTimer.stop();
205 m_firstLayout = true; 205 m_firstLayout = true;
206 m_firstLayoutCallbackPending = false; 206 m_firstLayoutCallbackPending = false;
207 m_wasScrolledByUser = false; 207 m_wasScrolledByUser = false;
208 m_safeToPropagateScrollToParent = true; 208 m_safeToPropagateScrollToParent = true;
209 m_lastViewportSize = IntSize(); 209 m_lastViewportSize = IntSize();
210 m_lastZoomFactor = 1.0f; 210 m_lastZoomFactor = 1.0f;
211 m_isTrackingPaintInvalidations = false; 211 m_isTrackingPaintInvalidations = false;
212 m_trackedPaintInvalidationRects.clear(); 212 m_trackedPaintInvalidationRects.clear();
213 m_lastPaintTime = 0; 213 m_lastPaintTime = 0;
214 m_paintBehavior = PaintBehaviorNormal;
215 m_isPainting = false; 214 m_isPainting = false;
216 m_visuallyNonEmptyCharacterCount = 0; 215 m_visuallyNonEmptyCharacterCount = 0;
217 m_visuallyNonEmptyPixelCount = 0; 216 m_visuallyNonEmptyPixelCount = 0;
218 m_isVisuallyNonEmpty = false; 217 m_isVisuallyNonEmpty = false;
219 m_firstVisuallyNonEmptyLayoutCallbackPending = true; 218 m_firstVisuallyNonEmptyLayoutCallbackPending = true;
220 m_maintainScrollPositionAnchor = nullptr; 219 m_maintainScrollPositionAnchor = nullptr;
221 m_viewportConstrainedObjects.clear(); 220 m_viewportConstrainedObjects.clear();
222 m_layoutSubtreeRoots.clear(); 221 m_layoutSubtreeRoots.clear();
223 } 222 }
224 223
(...skipping 2224 matching lines...) Expand 10 before | Expand all | Expand 10 after
2449 { 2448 {
2450 return m_wasScrolledByUser; 2449 return m_wasScrolledByUser;
2451 } 2450 }
2452 2451
2453 void FrameView::setWasScrolledByUser(bool wasScrolledByUser) 2452 void FrameView::setWasScrolledByUser(bool wasScrolledByUser)
2454 { 2453 {
2455 m_maintainScrollPositionAnchor = nullptr; 2454 m_maintainScrollPositionAnchor = nullptr;
2456 m_wasScrolledByUser = wasScrolledByUser; 2455 m_wasScrolledByUser = wasScrolledByUser;
2457 } 2456 }
2458 2457
2459 void FrameView::setPaintBehavior(PaintBehavior behavior)
2460 {
2461 m_paintBehavior = behavior;
2462 }
2463
2464 PaintBehavior FrameView::paintBehavior() const
2465 {
2466 return m_paintBehavior;
2467 }
2468
2469 bool FrameView::isPainting() const 2458 bool FrameView::isPainting() const
2470 { 2459 {
2471 return m_isPainting; 2460 return m_isPainting;
2472 } 2461 }
2473 2462
2474 void FrameView::setNodeToDraw(Node* node) 2463 void FrameView::setNodeToDraw(Node* node)
2475 { 2464 {
2476 m_nodeToDraw = node; 2465 m_nodeToDraw = node;
2477 } 2466 }
2478 2467
(...skipping 1515 matching lines...) Expand 10 before | Expand all | Expand 10 after
3994 3983
3995 if (!graphicsLayer) 3984 if (!graphicsLayer)
3996 return; 3985 return;
3997 3986
3998 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect); 3987 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect);
3999 3988
4000 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect))); 3989 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect)));
4001 } 3990 }
4002 3991
4003 } // namespace blink 3992 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698