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

Side by Side Diff: Source/core/dom/Document.cpp

Issue 30813004: Revert r160071 "Web Animations: Implement AnimationClock and fix start time of animations" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 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/dom/Document.h ('k') | no next file » | 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 24 matching lines...) Expand all
35 #include "SVGNames.h" 35 #include "SVGNames.h"
36 #include "XMLNSNames.h" 36 #include "XMLNSNames.h"
37 #include "XMLNames.h" 37 #include "XMLNames.h"
38 #include "bindings/v8/CustomElementConstructorBuilder.h" 38 #include "bindings/v8/CustomElementConstructorBuilder.h"
39 #include "bindings/v8/Dictionary.h" 39 #include "bindings/v8/Dictionary.h"
40 #include "bindings/v8/ExceptionMessages.h" 40 #include "bindings/v8/ExceptionMessages.h"
41 #include "bindings/v8/ExceptionState.h" 41 #include "bindings/v8/ExceptionState.h"
42 #include "bindings/v8/ExceptionStatePlaceholder.h" 42 #include "bindings/v8/ExceptionStatePlaceholder.h"
43 #include "bindings/v8/ScriptController.h" 43 #include "bindings/v8/ScriptController.h"
44 #include "core/accessibility/AXObjectCache.h" 44 #include "core/accessibility/AXObjectCache.h"
45 #include "core/animation/AnimationClock.h"
46 #include "core/animation/DocumentTimeline.h" 45 #include "core/animation/DocumentTimeline.h"
47 #include "core/css/CSSDefaultStyleSheets.h" 46 #include "core/css/CSSDefaultStyleSheets.h"
48 #include "core/css/CSSFontSelector.h" 47 #include "core/css/CSSFontSelector.h"
49 #include "core/css/CSSStyleDeclaration.h" 48 #include "core/css/CSSStyleDeclaration.h"
50 #include "core/css/CSSStyleSheet.h" 49 #include "core/css/CSSStyleSheet.h"
51 #include "core/css/FontFaceSet.h" 50 #include "core/css/FontFaceSet.h"
52 #include "core/css/MediaQueryMatcher.h" 51 #include "core/css/MediaQueryMatcher.h"
53 #include "core/css/StylePropertySet.h" 52 #include "core/css/StylePropertySet.h"
54 #include "core/css/StyleSheetContents.h" 53 #include "core/css/StyleSheetContents.h"
55 #include "core/css/StyleSheetList.h" 54 #include "core/css/StyleSheetList.h"
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 , m_writeRecursionDepth(0) 452 , m_writeRecursionDepth(0)
454 , m_lastHandledUserGestureTimestamp(0) 453 , m_lastHandledUserGestureTimestamp(0)
455 , m_textAutosizer(TextAutosizer::create(this)) 454 , m_textAutosizer(TextAutosizer::create(this))
456 , m_registrationContext(initializer.registrationContext(this)) 455 , m_registrationContext(initializer.registrationContext(this))
457 , m_pendingTasksTimer(this, &Document::pendingTasksTimerFired) 456 , m_pendingTasksTimer(this, &Document::pendingTasksTimerFired)
458 , m_scheduledTasksAreSuspended(false) 457 , m_scheduledTasksAreSuspended(false)
459 , m_sharedObjectPoolClearTimer(this, &Document::sharedObjectPoolClearTimerFi red) 458 , m_sharedObjectPoolClearTimer(this, &Document::sharedObjectPoolClearTimerFi red)
460 #ifndef NDEBUG 459 #ifndef NDEBUG
461 , m_didDispatchViewportPropertiesChanged(false) 460 , m_didDispatchViewportPropertiesChanged(false)
462 #endif 461 #endif
463 , m_animationClock(AnimationClock::create())
464 , m_timeline(DocumentTimeline::create(this)) 462 , m_timeline(DocumentTimeline::create(this))
465 , m_templateDocumentHost(0) 463 , m_templateDocumentHost(0)
466 , m_fonts(0) 464 , m_fonts(0)
467 , m_didAssociateFormControlsTimer(this, &Document::didAssociateFormControlsT imerFired) 465 , m_didAssociateFormControlsTimer(this, &Document::didAssociateFormControlsT imerFired)
468 { 466 {
469 setClient(this); 467 setClient(this);
470 ScriptWrappable::init(this); 468 ScriptWrappable::init(this);
471 469
472 if (m_frame) { 470 if (m_frame) {
473 provideContextFeaturesToDocumentFrom(this, m_frame->page()); 471 provideContextFeaturesToDocumentFrom(this, m_frame->page());
(...skipping 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after
1757 void Document::updateStyleIfNeeded() 1755 void Document::updateStyleIfNeeded()
1758 { 1756 {
1759 ASSERT(isMainThread()); 1757 ASSERT(isMainThread());
1760 ASSERT(!view() || (!view()->isInLayout() && !view()->isPainting())); 1758 ASSERT(!view() || (!view()->isInLayout() && !view()->isPainting()));
1761 1759
1762 if (!needsStyleRecalc() && !childNeedsStyleRecalc() && !childNeedsDistributi onRecalc()) 1760 if (!needsStyleRecalc() && !childNeedsStyleRecalc() && !childNeedsDistributi onRecalc())
1763 return; 1761 return;
1764 1762
1765 AnimationUpdateBlock animationUpdateBlock(m_frame ? m_frame->animation() : 0 ); 1763 AnimationUpdateBlock animationUpdateBlock(m_frame ? m_frame->animation() : 0 );
1766 recalcStyle(NoChange); 1764 recalcStyle(NoChange);
1767 m_animationClock->unfreeze();
1768 } 1765 }
1769 1766
1770 void Document::updateStyleForNodeIfNeeded(Node* node) 1767 void Document::updateStyleForNodeIfNeeded(Node* node)
1771 { 1768 {
1772 if (!hasPendingForcedStyleRecalc() && !childNeedsStyleRecalc() && !needsStyl eRecalc()) 1769 if (!hasPendingForcedStyleRecalc() && !childNeedsStyleRecalc() && !needsStyl eRecalc())
1773 return; 1770 return;
1774 1771
1775 bool needsStyleRecalc = hasPendingForcedStyleRecalc(); 1772 bool needsStyleRecalc = hasPendingForcedStyleRecalc();
1776 for (Node* ancestor = node; ancestor && !needsStyleRecalc; ancestor = ancest or->parentOrShadowHostNode()) 1773 for (Node* ancestor = node; ancestor && !needsStyleRecalc; ancestor = ancest or->parentOrShadowHostNode())
1777 needsStyleRecalc = ancestor->needsStyleRecalc(); 1774 needsStyleRecalc = ancestor->needsStyleRecalc();
(...skipping 3578 matching lines...) Expand 10 before | Expand all | Expand 10 after
5356 void Document::modifiedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, Style ResolverUpdateMode updateMode) 5353 void Document::modifiedStyleSheet(StyleSheet* sheet, RecalcStyleTime when, Style ResolverUpdateMode updateMode)
5357 { 5354 {
5358 if (!isActive()) 5355 if (!isActive())
5359 return; 5356 return;
5360 5357
5361 styleEngine()->modifiedStyleSheet(sheet); 5358 styleEngine()->modifiedStyleSheet(sheet);
5362 styleResolverChanged(when, updateMode); 5359 styleResolverChanged(when, updateMode);
5363 } 5360 }
5364 5361
5365 } // namespace WebCore 5362 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698