[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
cmarrin at apple.com
cmarrin at apple.com
Wed Dec 22 15:31:55 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e6a2700101d918dbbf079d087ede07848f8f66ad
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 5 21:45:37 2010 +0000
2010-11-05 Chris Marrin <cmarrin at apple.com>
Reviewed by Simon Fraser.
Move resumeAnimations/suspendAnimations from Frame to AnimationController.
https://bugs.webkit.org/show_bug.cgi?id=49073
* src/WebAnimationControllerImpl.cpp:
(WebKit::WebAnimationControllerImpl::suspendAnimations):
(WebKit::WebAnimationControllerImpl::resumeAnimations):
2010-11-05 Chris Marrin <cmarrin at apple.com>
Reviewed by Simon Fraser.
Move resumeAnimations/suspendAnimations from Frame to AnimationController.
https://bugs.webkit.org/show_bug.cgi?id=49073
* WebCoreSupport/DumpRenderTreeSupportQt.cpp:
(DumpRenderTreeSupportQt::suspendAnimations):
(DumpRenderTreeSupportQt::resumeAnimations):
2010-11-05 Chris Marrin <cmarrin at apple.com>
Reviewed by Simon Fraser.
Move resumeAnimations/suspendAnimations from Frame to AnimationController.
https://bugs.webkit.org/show_bug.cgi?id=49073
* webkit/webkitwebframe.cpp:
(webkit_web_frame_suspend_animations):
(webkit_web_frame_resume_animations):
2010-11-05 Chris Marrin <cmarrin at apple.com>
Reviewed by Simon Fraser.
Move resumeAnimations/suspendAnimations from Frame to AnimationController.
https://bugs.webkit.org/show_bug.cgi?id=49073
* WebFrame.cpp:
(WebFrame::suspendAnimations):
(WebFrame::resumeAnimations):
2010-11-05 Chris Marrin <cmarrin at apple.com>
Reviewed by Simon Fraser.
Move resumeAnimations/suspendAnimations from Frame to AnimationController.
https://bugs.webkit.org/show_bug.cgi?id=49073
* WebView/WebFrame.mm:
(-[WebFrame _suspendAnimations]):
(-[WebFrame _resumeAnimations]):
2010-11-05 Chris Marrin <cmarrin at apple.com>
Reviewed by Simon Fraser.
Move resumeAnimations/suspendAnimations from Frame to AnimationController.
https://bugs.webkit.org/show_bug.cgi?id=49073
Changed the name of suspendAnimations/resumeAnimations to
suspendAnimationsInDocument/resumeAnimationsInDocument. These are no
longer exported, but have the same functionality as before. I then
added new suspendAnimations/resumeAnimations function which take
no params and suspend/resume on the frame owning the animation
controller and all its child frames. These are the functions that
are now exported. I then changed all the platform specific WebKit
code to use these functions.
* WebCore.exp.in:
* page/Frame.cpp:
* page/Frame.h:
* page/animation/AnimationController.cpp:
(WebCore::AnimationControllerPrivate::suspendAnimations):
(WebCore::AnimationControllerPrivate::resumeAnimations):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71451 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6e74f6f..4f2eb77 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2010-11-05 Chris Marrin <cmarrin at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ Move resumeAnimations/suspendAnimations from Frame to AnimationController.
+ https://bugs.webkit.org/show_bug.cgi?id=49073
+
+ Changed the name of suspendAnimations/resumeAnimations to
+ suspendAnimationsInDocument/resumeAnimationsInDocument. These are no
+ longer exported, but have the same functionality as before. I then
+ added new suspendAnimations/resumeAnimations function which take
+ no params and suspend/resume on the frame owning the animation
+ controller and all its child frames. These are the functions that
+ are now exported. I then changed all the platform specific WebKit
+ code to use these functions.
+
+ * WebCore.exp.in:
+ * page/Frame.cpp:
+ * page/Frame.h:
+ * page/animation/AnimationController.cpp:
+ (WebCore::AnimationControllerPrivate::suspendAnimations):
+ (WebCore::AnimationControllerPrivate::resumeAnimations):
+
2010-11-04 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in
index 0fc9a23..28af5f0 100644
--- a/WebCore/WebCore.exp.in
+++ b/WebCore/WebCore.exp.in
@@ -431,8 +431,8 @@ __ZN7WebCore18SearchPopupMenuMacC1EPNS_15PopupMenuClientE
__ZN7WebCore18isStartOfParagraphERKNS_15VisiblePositionENS_8Position27EditingBoundaryCrossingRuleE
__ZN7WebCore18pluginScriptObjectEPN3JSC9ExecStateEPNS_13JSHTMLElementE
__ZN7WebCore18proxyServersForURLERKNS_4KURLEPKNS_17NetworkingContextE
-__ZN7WebCore19AnimationController16resumeAnimationsEPNS_8DocumentE
-__ZN7WebCore19AnimationController17suspendAnimationsEPNS_8DocumentE
+__ZN7WebCore19AnimationController16resumeAnimationsEv
+__ZN7WebCore19AnimationController17suspendAnimationsEv
__ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_12RenderObjectERKN3WTF6StringEd
__ZN7WebCore19AnimationController21pauseTransitionAtTimeEPNS_12RenderObjectERKN3WTF6StringEd
__ZN7WebCore19BackForwardListImpl10removeItemEPNS_11HistoryItemE
@@ -634,10 +634,8 @@ __ZN7WebCore5Cache13getStatisticsEv
__ZN7WebCore5Cache13setCapacitiesEjjj
__ZN7WebCore5Frame10createViewERKNS_7IntSizeERKNS_5ColorEbS3_bNS_13ScrollbarModeEbS7_b
__ZN7WebCore5Frame14frameForWidgetEPKNS_6WidgetE
-__ZN7WebCore5Frame16resumeAnimationsEv
__ZN7WebCore5Frame17setPageZoomFactorEf
__ZN7WebCore5Frame17setTextZoomFactorEf
-__ZN7WebCore5Frame17suspendAnimationsEv
__ZN7WebCore5Frame23visiblePositionForPointERKNS_8IntPointE
__ZN7WebCore5Frame25matchLabelsAgainstElementEP7NSArrayPNS_7ElementE
__ZN7WebCore5Frame25setPageAndTextZoomFactorsEff
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 1e71a95..a40a88b 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -2033,7 +2033,7 @@ void Document::implicitClose()
// Resume the animations (or start them)
if (f)
- f->animation()->resumeAnimations(this);
+ f->animation()->resumeAnimationsForDocument(this);
ImageLoader::dispatchPendingBeforeLoadEvents();
ImageLoader::dispatchPendingLoadEvents();
diff --git a/WebCore/history/CachedFrame.cpp b/WebCore/history/CachedFrame.cpp
index a3ef401..f2ce27d 100644
--- a/WebCore/history/CachedFrame.cpp
+++ b/WebCore/history/CachedFrame.cpp
@@ -90,7 +90,7 @@ void CachedFrameBase::restore()
m_document->accessSVGExtensions()->unpauseAnimations();
#endif
- frame->animation()->resumeAnimations(m_document.get());
+ frame->animation()->resumeAnimationsForDocument(m_document.get());
frame->eventHandler()->setMousePressNode(m_mousePressNode.get());
m_document->resumeActiveDOMObjects();
diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index dbe69a3..7cc7469 100644
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -640,7 +640,7 @@ void Frame::clearTimers(FrameView *view, Document *document)
if (view) {
view->unscheduleRelayout();
if (view->frame()) {
- view->frame()->animation()->suspendAnimations(document);
+ view->frame()->animation()->suspendAnimationsForDocument(document);
view->frame()->eventHandler()->stopAutoscrollTimer();
}
}
@@ -989,22 +989,4 @@ void Frame::scalePage(float scale)
}
}
-void Frame::suspendAnimations()
-{
- animation()->suspendAnimations(document());
-
- // Handle subframes
- for (Frame* child = tree()->firstChild(); child; child = child->tree()->nextSibling())
- child->suspendAnimations();
-}
-
-void Frame::resumeAnimations()
-{
- animation()->resumeAnimations(document());
-
- // Handle subframes
- for (Frame* child = tree()->firstChild(); child; child = child->tree()->nextSibling())
- child->resumeAnimations();
-}
-
} // namespace WebCore
diff --git a/WebCore/page/Frame.h b/WebCore/page/Frame.h
index 0bbfeb5..832a3c2 100644
--- a/WebCore/page/Frame.h
+++ b/WebCore/page/Frame.h
@@ -99,9 +99,6 @@ namespace WebCore {
AnimationController* animation() const;
ScriptController* script();
- void suspendAnimations();
- void resumeAnimations();
-
RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame.
RenderPart* ownerRenderer() const; // Renderer for the element that contains this frame.
diff --git a/WebCore/page/animation/AnimationController.cpp b/WebCore/page/animation/AnimationController.cpp
index a68f467..e8e990c 100644
--- a/WebCore/page/animation/AnimationController.cpp
+++ b/WebCore/page/animation/AnimationController.cpp
@@ -227,7 +227,25 @@ bool AnimationControllerPrivate::isRunningAcceleratedAnimationOnRenderer(RenderO
return animation->isAnimatingProperty(property, true, isRunningNow);
}
-void AnimationControllerPrivate::suspendAnimations(Document* document)
+void AnimationControllerPrivate::suspendAnimations()
+{
+ suspendAnimationsForDocument(m_frame->document());
+
+ // Traverse subframes
+ for (Frame* child = m_frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
+ child->animation()->suspendAnimations();
+}
+
+void AnimationControllerPrivate::resumeAnimations()
+{
+ resumeAnimationsForDocument(m_frame->document());
+
+ // Traverse subframes
+ for (Frame* child = m_frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
+ child->animation()->resumeAnimations();
+}
+
+void AnimationControllerPrivate::suspendAnimationsForDocument(Document* document)
{
setBeginAnimationUpdateTime(cBeginAnimationUpdateTimeNotSet);
@@ -243,7 +261,7 @@ void AnimationControllerPrivate::suspendAnimations(Document* document)
updateAnimationTimer();
}
-void AnimationControllerPrivate::resumeAnimations(Document* document)
+void AnimationControllerPrivate::resumeAnimationsForDocument(Document* document)
{
setBeginAnimationUpdateTime(cBeginAnimationUpdateTimeNotSet);
@@ -551,14 +569,24 @@ bool AnimationController::isRunningAcceleratedAnimationOnRenderer(RenderObject*
return m_data->isRunningAcceleratedAnimationOnRenderer(renderer, property, isRunningNow);
}
-void AnimationController::suspendAnimations(Document* document)
+void AnimationController::suspendAnimations()
+{
+ m_data->suspendAnimations();
+}
+
+void AnimationController::resumeAnimations()
+{
+ m_data->resumeAnimations();
+}
+
+void AnimationController::suspendAnimationsForDocument(Document* document)
{
- m_data->suspendAnimations(document);
+ m_data->suspendAnimationsForDocument(document);
}
-void AnimationController::resumeAnimations(Document* document)
+void AnimationController::resumeAnimationsForDocument(Document* document)
{
- m_data->resumeAnimations(document);
+ m_data->resumeAnimationsForDocument(document);
}
void AnimationController::beginAnimationUpdate()
diff --git a/WebCore/page/animation/AnimationController.h b/WebCore/page/animation/AnimationController.h
index 4528dae..5279467 100644
--- a/WebCore/page/animation/AnimationController.h
+++ b/WebCore/page/animation/AnimationController.h
@@ -62,8 +62,11 @@ public:
bool isRunningAnimationOnRenderer(RenderObject*, CSSPropertyID, bool isRunningNow = true) const;
bool isRunningAcceleratedAnimationOnRenderer(RenderObject*, CSSPropertyID, bool isRunningNow = true) const;
- void suspendAnimations(Document*);
- void resumeAnimations(Document*);
+ void suspendAnimations();
+ void resumeAnimations();
+
+ void suspendAnimationsForDocument(Document*);
+ void resumeAnimationsForDocument(Document*);
void beginAnimationUpdate();
void endAnimationUpdate();
diff --git a/WebCore/page/animation/AnimationControllerPrivate.h b/WebCore/page/animation/AnimationControllerPrivate.h
index 3305e24..893c717 100644
--- a/WebCore/page/animation/AnimationControllerPrivate.h
+++ b/WebCore/page/animation/AnimationControllerPrivate.h
@@ -67,8 +67,11 @@ public:
bool hasAnimations() const { return !m_compositeAnimations.isEmpty(); }
- void suspendAnimations(Document*);
- void resumeAnimations(Document*);
+ void suspendAnimations();
+ void resumeAnimations();
+
+ void suspendAnimationsForDocument(Document*);
+ void resumeAnimationsForDocument(Document*);
bool isRunningAnimationOnRenderer(RenderObject*, CSSPropertyID, bool isRunningNow) const;
bool isRunningAcceleratedAnimationOnRenderer(RenderObject*, CSSPropertyID, bool isRunningNow) const;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6aa5648..2775be6 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-05 Chris Marrin <cmarrin at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ Move resumeAnimations/suspendAnimations from Frame to AnimationController.
+ https://bugs.webkit.org/show_bug.cgi?id=49073
+
+ * src/WebAnimationControllerImpl.cpp:
+ (WebKit::WebAnimationControllerImpl::suspendAnimations):
+ (WebKit::WebAnimationControllerImpl::resumeAnimations):
+
2010-11-04 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
diff --git a/WebKit/chromium/src/WebAnimationControllerImpl.cpp b/WebKit/chromium/src/WebAnimationControllerImpl.cpp
index 15df140..e6eb828 100644
--- a/WebKit/chromium/src/WebAnimationControllerImpl.cpp
+++ b/WebKit/chromium/src/WebAnimationControllerImpl.cpp
@@ -94,7 +94,7 @@ void WebAnimationControllerImpl::suspendAnimations() const
return;
if (!m_frameImpl->frame())
return;
- controller->suspendAnimations(m_frameImpl->frame()->document());
+ controller->suspendAnimations();
}
void WebAnimationControllerImpl::resumeAnimations() const
@@ -104,7 +104,7 @@ void WebAnimationControllerImpl::resumeAnimations() const
return;
if (!m_frameImpl->frame())
return;
- controller->resumeAnimations(m_frameImpl->frame()->document());
+ controller->resumeAnimations();
}
} // namespace WebKit
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index fc09afa..bb6dd84 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,5 +1,16 @@
2010-11-05 Chris Marrin <cmarrin at apple.com>
+ Reviewed by Simon Fraser.
+
+ Move resumeAnimations/suspendAnimations from Frame to AnimationController.
+ https://bugs.webkit.org/show_bug.cgi?id=49073
+
+ * webkit/webkitwebframe.cpp:
+ (webkit_web_frame_suspend_animations):
+ (webkit_web_frame_resume_animations):
+
+2010-11-05 Chris Marrin <cmarrin at apple.com>
+
Unreviewed.
Small fix to GTK build
diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp
index 93497cb..63a2413 100644
--- a/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -1059,7 +1059,7 @@ void webkit_web_frame_suspend_animations(WebKitWebFrame* frame)
if (!coreFrame)
return;
- coreFrame->suspendAnimations();
+ coreFrame->animation()->suspendAnimations();
}
void webkit_web_frame_resume_animations(WebKitWebFrame* frame)
@@ -1068,7 +1068,7 @@ void webkit_web_frame_resume_animations(WebKitWebFrame* frame)
if (!coreFrame)
return;
- coreFrame->resumeAnimations();
+ coreFrame->animation()->resumeAnimations();
}
gchar* webkit_web_frame_get_response_mime_type(WebKitWebFrame* frame)
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 73903b3..fee4c9b 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-05 Chris Marrin <cmarrin at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ Move resumeAnimations/suspendAnimations from Frame to AnimationController.
+ https://bugs.webkit.org/show_bug.cgi?id=49073
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame _suspendAnimations]):
+ (-[WebFrame _resumeAnimations]):
+
2010-11-04 Alexey Proskuryakov <ap at apple.com>
Reviewed by Darin Adler.
diff --git a/WebKit/mac/WebView/WebFrame.mm b/WebKit/mac/WebView/WebFrame.mm
index 78f7d6a..fb6d69c 100644
--- a/WebKit/mac/WebView/WebFrame.mm
+++ b/WebKit/mac/WebView/WebFrame.mm
@@ -1137,7 +1137,7 @@ static inline WebDataSource *dataSource(DocumentLoader* loader)
if (!frame)
return;
- frame->suspendAnimations();
+ frame->animation()->suspendAnimations();
}
- (void) _resumeAnimations
@@ -1146,7 +1146,7 @@ static inline WebDataSource *dataSource(DocumentLoader* loader)
if (!frame)
return;
- frame->resumeAnimations();
+ frame->animation()->resumeAnimations();
}
- (void)_replaceSelectionWithFragment:(DOMDocumentFragment *)fragment selectReplacement:(BOOL)selectReplacement smartReplace:(BOOL)smartReplace matchStyle:(BOOL)matchStyle
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 7456898..5a86eee 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -2611,9 +2611,9 @@ static PassOwnPtr<Vector<String> > toStringVector(NSArray* patterns)
Frame* frame = core([self mainFrame]);
if (suspended)
- frame->animation()->suspendAnimations(frame->document());
+ frame->animation()->suspendAnimations();
else
- frame->animation()->resumeAnimations(frame->document());
+ frame->animation()->resumeAnimations();
}
+ (void)_setDomainRelaxationForbidden:(BOOL)forbidden forURLScheme:(NSString *)scheme
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 0cad5ae..bc005d2 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-05 Chris Marrin <cmarrin at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ Move resumeAnimations/suspendAnimations from Frame to AnimationController.
+ https://bugs.webkit.org/show_bug.cgi?id=49073
+
+ * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+ (DumpRenderTreeSupportQt::suspendAnimations):
+ (DumpRenderTreeSupportQt::resumeAnimations):
+
2010-11-03 Antonio Gomes <tonikitoo at webkit.org>, Andre Pedralho <andre.pedralho at gmail.com>
Reviewed by Kenneth Rohde Christiansen and Antti Koivisto.
diff --git a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
index c474d21..f5fa06b 100644
--- a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
+++ b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
@@ -279,7 +279,7 @@ void DumpRenderTreeSupportQt::suspendAnimations(QWebFrame *frame)
if (!controller)
return;
- controller->suspendAnimations(coreFrame->document());
+ controller->suspendAnimations();
}
void DumpRenderTreeSupportQt::resumeAnimations(QWebFrame *frame)
@@ -292,7 +292,7 @@ void DumpRenderTreeSupportQt::resumeAnimations(QWebFrame *frame)
if (!controller)
return;
- controller->resumeAnimations(coreFrame->document());
+ controller->resumeAnimations();
}
void DumpRenderTreeSupportQt::clearFrameName(QWebFrame* frame)
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 5582e11..efa7b5c 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-05 Chris Marrin <cmarrin at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ Move resumeAnimations/suspendAnimations from Frame to AnimationController.
+ https://bugs.webkit.org/show_bug.cgi?id=49073
+
+ * WebFrame.cpp:
+ (WebFrame::suspendAnimations):
+ (WebFrame::resumeAnimations):
+
2010-11-05 Brian Weinstein <bweinstein at apple.com>
Reviewed by Anders Carlsson.
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index eb51df1..dcf38a4 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -1299,7 +1299,7 @@ HRESULT WebFrame::suspendAnimations()
if (!frame)
return E_FAIL;
- frame->suspendAnimations();
+ frame->animation()->suspendAnimations();
return S_OK;
}
@@ -1309,7 +1309,7 @@ HRESULT WebFrame::resumeAnimations()
if (!frame)
return E_FAIL;
- frame->resumeAnimations();
+ frame->animation()->resumeAnimations();
return S_OK;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list