| 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 10 matching lines...) Expand all Loading... |
| 21 * You should have received a copy of the GNU Library General Public License | 21 * You should have received a copy of the GNU Library General Public License |
| 22 * along with this library; see the file COPYING.LIB. If not, write to | 22 * along with this library; see the file COPYING.LIB. If not, write to |
| 23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 24 * Boston, MA 02110-1301, USA. | 24 * Boston, MA 02110-1301, USA. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "sky/engine/config.h" | 27 #include "sky/engine/config.h" |
| 28 #include "sky/engine/core/frame/FrameView.h" | 28 #include "sky/engine/core/frame/FrameView.h" |
| 29 | 29 |
| 30 #include "gen/sky/platform/RuntimeEnabledFeatures.h" | 30 #include "gen/sky/platform/RuntimeEnabledFeatures.h" |
| 31 #include "sky/engine/core/animation/DocumentAnimations.h" |
| 31 #include "sky/engine/core/css/FontFaceSet.h" | 32 #include "sky/engine/core/css/FontFaceSet.h" |
| 32 #include "sky/engine/core/css/resolver/StyleResolver.h" | 33 #include "sky/engine/core/css/resolver/StyleResolver.h" |
| 33 #include "sky/engine/core/dom/DocumentMarkerController.h" | 34 #include "sky/engine/core/dom/DocumentMarkerController.h" |
| 34 #include "sky/engine/core/editing/FrameSelection.h" | 35 #include "sky/engine/core/editing/FrameSelection.h" |
| 35 #include "sky/engine/core/fetch/ResourceFetcher.h" | 36 #include "sky/engine/core/fetch/ResourceFetcher.h" |
| 36 #include "sky/engine/core/frame/FrameHost.h" | 37 #include "sky/engine/core/frame/FrameHost.h" |
| 37 #include "sky/engine/core/frame/LocalFrame.h" | 38 #include "sky/engine/core/frame/LocalFrame.h" |
| 38 #include "sky/engine/core/frame/Settings.h" | 39 #include "sky/engine/core/frame/Settings.h" |
| 39 #include "sky/engine/core/html/parser/TextResourceDecoder.h" | 40 #include "sky/engine/core/html/parser/TextResourceDecoder.h" |
| 40 #include "sky/engine/core/inspector/InspectorTraceEvents.h" | 41 #include "sky/engine/core/inspector/InspectorTraceEvents.h" |
| (...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 874 | 875 |
| 875 updateLayoutAndStyleIfNeededRecursive(); | 876 updateLayoutAndStyleIfNeededRecursive(); |
| 876 | 877 |
| 877 if (RenderView* view = renderView()) { | 878 if (RenderView* view = renderView()) { |
| 878 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "In
validateTreeAndUpdateIframes", TRACE_EVENT_SCOPE_PROCESS, "frame", m_frame.get()
); | 879 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "In
validateTreeAndUpdateIframes", TRACE_EVENT_SCOPE_PROCESS, "frame", m_frame.get()
); |
| 879 invalidateTreeIfNeeded(); | 880 invalidateTreeIfNeeded(); |
| 880 view->updateIFramesAfterLayout(); | 881 view->updateIFramesAfterLayout(); |
| 881 } | 882 } |
| 882 | 883 |
| 883 ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean); | 884 ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean); |
| 885 |
| 886 DocumentAnimations::startPendingAnimations(*m_frame->document()); |
| 884 } | 887 } |
| 885 | 888 |
| 886 void FrameView::updateLayoutAndStyleIfNeededRecursive() | 889 void FrameView::updateLayoutAndStyleIfNeededRecursive() |
| 887 { | 890 { |
| 888 // We have to crawl our entire tree looking for any FrameViews that need | 891 // We have to crawl our entire tree looking for any FrameViews that need |
| 889 // layout and make sure they are up to date. | 892 // layout and make sure they are up to date. |
| 890 // Mac actually tests for intersection with the dirty region and tries not t
o | 893 // Mac actually tests for intersection with the dirty region and tries not t
o |
| 891 // update layout for frames that are outside the dirty region. Not only doe
s this seem | 894 // update layout for frames that are outside the dirty region. Not only doe
s this seem |
| 892 // pointless (since those frames will have set a zero timer to layout anyway
), but | 895 // pointless (since those frames will have set a zero timer to layout anyway
), but |
| 893 // it is also incorrect, since if two frames overlap, the first could be exc
luded from the dirty | 896 // it is also incorrect, since if two frames overlap, the first could be exc
luded from the dirty |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1030 totalObjects = 0; | 1033 totalObjects = 0; |
| 1031 | 1034 |
| 1032 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { | 1035 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { |
| 1033 ++totalObjects; | 1036 ++totalObjects; |
| 1034 if (o->needsLayout()) | 1037 if (o->needsLayout()) |
| 1035 ++needsLayoutObjects; | 1038 ++needsLayoutObjects; |
| 1036 } | 1039 } |
| 1037 } | 1040 } |
| 1038 | 1041 |
| 1039 } // namespace blink | 1042 } // namespace blink |
| OLD | NEW |