| OLD | NEW |
| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 #include "sky/engine/core/page/FocusController.h" | 45 #include "sky/engine/core/page/FocusController.h" |
| 46 #include "sky/engine/core/page/Page.h" | 46 #include "sky/engine/core/page/Page.h" |
| 47 #include "sky/engine/core/rendering/RenderLayer.h" | 47 #include "sky/engine/core/rendering/RenderLayer.h" |
| 48 #include "sky/engine/core/rendering/RenderView.h" | 48 #include "sky/engine/core/rendering/RenderView.h" |
| 49 #include "sky/engine/core/rendering/style/RenderStyle.h" | 49 #include "sky/engine/core/rendering/style/RenderStyle.h" |
| 50 #include "sky/engine/platform/ScriptForbiddenScope.h" | 50 #include "sky/engine/platform/ScriptForbiddenScope.h" |
| 51 #include "sky/engine/platform/TraceEvent.h" | 51 #include "sky/engine/platform/TraceEvent.h" |
| 52 #include "sky/engine/platform/fonts/FontCache.h" | 52 #include "sky/engine/platform/fonts/FontCache.h" |
| 53 #include "sky/engine/platform/geometry/FloatRect.h" | 53 #include "sky/engine/platform/geometry/FloatRect.h" |
| 54 #include "sky/engine/platform/graphics/GraphicsContext.h" | 54 #include "sky/engine/platform/graphics/GraphicsContext.h" |
| 55 #include "sky/engine/platform/graphics/GraphicsLayerDebugInfo.h" | |
| 56 #include "sky/engine/platform/scroll/ScrollAnimator.h" | 55 #include "sky/engine/platform/scroll/ScrollAnimator.h" |
| 57 #include "sky/engine/platform/scroll/Scrollbar.h" | 56 #include "sky/engine/platform/scroll/Scrollbar.h" |
| 58 #include "sky/engine/platform/text/TextStream.h" | 57 #include "sky/engine/platform/text/TextStream.h" |
| 59 #include "sky/engine/wtf/CurrentTime.h" | 58 #include "sky/engine/wtf/CurrentTime.h" |
| 60 #include "sky/engine/wtf/TemporaryChange.h" | 59 #include "sky/engine/wtf/TemporaryChange.h" |
| 61 | 60 |
| 62 namespace blink { | 61 namespace blink { |
| 63 | 62 |
| 64 double FrameView::s_currentFrameTimeStamp = 0.0; | 63 double FrameView::s_currentFrameTimeStamp = 0.0; |
| 65 bool FrameView::s_inPaintContents = false; | 64 bool FrameView::s_inPaintContents = false; |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 401 // FIXME: It should be not possible to remove the FrameView from the frame/p
age during layout | 400 // FIXME: It should be not possible to remove the FrameView from the frame/p
age during layout |
| 402 // however m_inPerformLayout is not set for most of this function, so none o
f our RELEASE_ASSERTS | 401 // however m_inPerformLayout is not set for most of this function, so none o
f our RELEASE_ASSERTS |
| 403 // in LocalFrame/Page will fire. One of the post-layout tasks is disconnecti
ng the LocalFrame from | 402 // in LocalFrame/Page will fire. One of the post-layout tasks is disconnecti
ng the LocalFrame from |
| 404 // the page in fast/frames/crash-remove-iframe-during-object-beforeload-2.ht
ml | 403 // the page in fast/frames/crash-remove-iframe-during-object-beforeload-2.ht
ml |
| 405 // necessitating this check here. | 404 // necessitating this check here. |
| 406 // ASSERT(frame()->page()); | 405 // ASSERT(frame()->page()); |
| 407 if (frame().page()) | 406 if (frame().page()) |
| 408 frame().page()->chrome().client().layoutUpdated(m_frame.get()); | 407 frame().page()->chrome().client().layoutUpdated(m_frame.get()); |
| 409 } | 408 } |
| 410 | 409 |
| 411 // The plan is to move to compositor-queried paint invalidation, in which case t
his | |
| 412 // method would setNeedsRedraw on the GraphicsLayers with invalidations and | |
| 413 // let the compositor pick which to actually draw. | |
| 414 // See http://crbug.com/306706 | |
| 415 void FrameView::invalidateTreeIfNeeded() | 410 void FrameView::invalidateTreeIfNeeded() |
| 416 { | 411 { |
| 417 ASSERT(renderView()); | 412 ASSERT(renderView()); |
| 418 RenderView& rootForPaintInvalidation = *renderView(); | 413 RenderView& rootForPaintInvalidation = *renderView(); |
| 419 ASSERT(!rootForPaintInvalidation.needsLayout()); | 414 ASSERT(!rootForPaintInvalidation.needsLayout()); |
| 420 | 415 |
| 421 TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", rootForPaintInval
idation.debugName().ascii().data()); | 416 TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", rootForPaintInval
idation.debugName().ascii().data()); |
| 422 | 417 |
| 423 PaintInvalidationState rootPaintInvalidationState(rootForPaintInvalidation); | 418 PaintInvalidationState rootPaintInvalidationState(rootForPaintInvalidation); |
| 424 | 419 |
| (...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1022 void FrameView::setLayoutSizeInternal(const IntSize& size) | 1017 void FrameView::setLayoutSizeInternal(const IntSize& size) |
| 1023 { | 1018 { |
| 1024 if (m_layoutSize == size) | 1019 if (m_layoutSize == size) |
| 1025 return; | 1020 return; |
| 1026 | 1021 |
| 1027 m_layoutSize = size; | 1022 m_layoutSize = size; |
| 1028 contentsResized(); | 1023 contentsResized(); |
| 1029 } | 1024 } |
| 1030 | 1025 |
| 1031 } // namespace blink | 1026 } // namespace blink |
| OLD | NEW |