Diff
Modified: trunk/Source/WebCore/ChangeLog (107664 => 107665)
--- trunk/Source/WebCore/ChangeLog 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebCore/ChangeLog 2012-02-14 04:41:55 UTC (rev 107665)
@@ -1,3 +1,36 @@
+2012-02-13 W. James MacLean <[email protected]>
+
+ [chromium] Remove obsolete zoom animation pathway.
+ https://bugs.webkit.org/show_bug.cgi?id=78359
+
+ Reviewed by James Robinson.
+
+ Tests for existing pathways should not be broken. Tests for removed pathway removed previously.
+
+ This patch removes dead code from the previous incarnation of zoom animation for chromium.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleGestureEvent):
+ * page/FrameView.cpp:
+ * page/FrameView.h:
+ (FrameView):
+ * platform/ScrollAnimator.cpp:
+ (WebCore::ScrollAnimator::ScrollAnimator):
+ * platform/ScrollAnimator.h:
+ (ScrollAnimator):
+ * platform/ScrollAnimatorNone.cpp:
+ (WebCore::ScrollAnimatorNone::ScrollAnimatorNone):
+ (WebCore::ScrollAnimatorNone::animationTimerFired):
+ * platform/ScrollAnimatorNone.h:
+ (ScrollAnimatorNone):
+ * platform/ScrollableArea.cpp:
+ * platform/ScrollableArea.h:
+ * testing/InternalSettings.cpp:
+ * testing/InternalSettings.h:
+ (InternalSettings):
+ * testing/InternalSettings.idl:
+ * testing/Internals.cpp:
+
2012-02-13 Shinya Kawanaka <[email protected]>
[Regression] r107650 broke the windows build.
Modified: trunk/Source/WebCore/page/EventHandler.cpp (107664 => 107665)
--- trunk/Source/WebCore/page/EventHandler.cpp 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2012-02-14 04:41:55 UTC (rev 107665)
@@ -2362,6 +2362,7 @@
return true;
}
case PlatformEvent::GestureDoubleTap:
+ break;
case PlatformEvent::GestureScrollBegin:
case PlatformEvent::GestureScrollEnd: {
FrameView* view = m_frame->view();
Modified: trunk/Source/WebCore/page/FrameView.cpp (107664 => 107665)
--- trunk/Source/WebCore/page/FrameView.cpp 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebCore/page/FrameView.cpp 2012-02-14 04:41:55 UTC (rev 107665)
@@ -70,10 +70,7 @@
#if USE(ACCELERATED_COMPOSITING)
#include "RenderLayerCompositor.h"
-#if PLATFORM(CHROMIUM)
-#include "TraceEvent.h"
#endif
-#endif
#if ENABLE(SVG)
#include "RenderSVGRoot.h"
@@ -1229,26 +1226,6 @@
m_widgetUpdateSet->remove(object);
}
-void FrameView::zoomAnimatorTransformChanged(float scale, float x, float y, ZoomAnimationState state)
-{
- if (state == ZoomAnimationFinishing) {
- if (Page* page = m_frame->page())
- page->setPageScaleFactor(page->pageScaleFactor() * scale, IntPoint(scale * scrollX() - x, scale * scrollY() - y));
- scrollAnimator()->resetZoom();
- }
-
-#if USE(ACCELERATED_COMPOSITING)
- if (RenderView* root = rootRenderer(this)) {
- if (root->usesCompositing()) {
- root->compositor()->scheduleLayerFlush();
-#if PLATFORM(CHROMIUM)
- TRACE_EVENT("FrameView::zoomAnimatorTransformChanged", this, 0);
-#endif
- }
- }
-#endif
-}
-
void FrameView::setMediaType(const String& mediaType)
{
m_mediaType = mediaType;
Modified: trunk/Source/WebCore/page/FrameView.h (107664 => 107665)
--- trunk/Source/WebCore/page/FrameView.h 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebCore/page/FrameView.h 2012-02-14 04:41:55 UTC (rev 107665)
@@ -171,8 +171,6 @@
virtual bool shouldRubberBandInDirection(ScrollDirection) const;
virtual bool requestScrollPositionUpdate(const IntPoint&) OVERRIDE;
- virtual void zoomAnimatorTransformChanged(float, float, float, ZoomAnimationState);
-
String mediaType() const;
void setMediaType(const String&);
void adjustMediaTypeForPrinting(bool printing);
Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (107664 => 107665)
--- trunk/Source/WebCore/platform/ScrollAnimator.cpp 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp 2012-02-14 04:41:55 UTC (rev 107665)
@@ -52,9 +52,6 @@
: m_scrollableArea(scrollableArea)
, m_currentPosX(0)
, m_currentPosY(0)
- , m_currentZoomScale(1)
- , m_currentZoomTransX(0)
- , m_currentZoomTransY(0)
{
}
@@ -141,31 +138,4 @@
m_scrollableArea->setScrollOffsetFromAnimation(IntPoint(m_currentPosX, m_currentPosY));
}
-void ScrollAnimator::notifyZoomChanged(ZoomAnimationState state)
-{
- m_scrollableArea->zoomAnimatorTransformChanged(m_currentZoomScale, m_currentZoomTransX, m_currentZoomTransY,
- state == ZoomAnimationContinuing ? ScrollableArea::ZoomAnimationContinuing
- : ScrollableArea::ZoomAnimationFinishing);
-}
-
-FloatPoint ScrollAnimator::zoomTranslation() const
-{
- return FloatPoint(m_currentZoomTransX, m_currentZoomTransY);
-}
-
-void ScrollAnimator::resetZoom()
-{
- m_currentZoomScale = 1;
- m_currentZoomTransX = 0;
- m_currentZoomTransY = 0;
-}
-
-void ScrollAnimator::setZoomParametersForTest(float scale, float x, float y)
-{
- m_currentZoomScale = scale;
- m_currentZoomTransX = (1 - scale) * x;
- m_currentZoomTransY = (1 - scale) * y;
- notifyZoomChanged(ZoomAnimationContinuing); // Don't let page re-scale.
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/ScrollAnimator.h (107664 => 107665)
--- trunk/Source/WebCore/platform/ScrollAnimator.h 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebCore/platform/ScrollAnimator.h 2012-02-14 04:41:55 UTC (rev 107665)
@@ -47,8 +47,6 @@
class ScrollAnimator {
public:
- enum ZoomAnimationState { ZoomAnimationContinuing, ZoomAnimationFinishing };
-
static PassOwnPtr<ScrollAnimator> create(ScrollableArea*);
virtual ~ScrollAnimator();
@@ -91,11 +89,6 @@
virtual void didAddHorizontalScrollbar(Scrollbar*) { }
virtual void willRemoveHorizontalScrollbar(Scrollbar*) { }
- float zoomScale() const { return m_currentZoomScale; }
- FloatPoint zoomTranslation() const;
- virtual void resetZoom();
- virtual void setZoomParametersForTest(float, float, float);
-
virtual bool shouldScrollbarParticipateInHitTesting(Scrollbar*) { return true; }
virtual void notifyContentAreaScrolled() { }
@@ -104,15 +97,10 @@
ScrollAnimator(ScrollableArea*);
virtual void notifyPositionChanged();
- virtual void notifyZoomChanged(ZoomAnimationState);
ScrollableArea* m_scrollableArea;
float m_currentPosX; // We avoid using a FloatPoint in order to reduce
float m_currentPosY; // subclass code complexity.
-
- float m_currentZoomScale;
- float m_currentZoomTransX;
- float m_currentZoomTransY;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp (107664 => 107665)
--- trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2012-02-14 04:41:55 UTC (rev 107665)
@@ -371,36 +371,10 @@
m_visibleLength = visibleLength;
}
-ScrollAnimatorNone::ZoomData::ZoomData(WebCore::ScrollAnimatorNone* parent)
- : m_parent(parent)
- , m_isAnimating(false)
-{
-}
-
-bool ScrollAnimatorNone::ZoomData::animateZoom(double currentTime)
-{
- m_lastAnimationTime = currentTime;
- double deltaTime = currentTime - m_startTime;
-
- if (deltaTime > m_animationTime) {
- m_parent->m_currentZoomScale = m_desiredScale;
- m_parent->m_currentZoomTransX = m_desiredTransX;
- m_parent->m_currentZoomTransY = m_desiredTransY;
- return false;
- }
-
- double elapsedTimeFraction = deltaTime / m_animationTime;
- m_parent->m_currentZoomScale = elapsedTimeFraction * (m_desiredScale - m_startScale) + m_startScale;
- m_parent->m_currentZoomTransX = elapsedTimeFraction * m_desiredTransX;
- m_parent->m_currentZoomTransY = elapsedTimeFraction * m_desiredTransY;
- return true;
-}
-
ScrollAnimatorNone::ScrollAnimatorNone(ScrollableArea* scrollableArea)
: ScrollAnimator(scrollableArea)
, m_horizontalData(this, &m_currentPosX, scrollableArea->visibleWidth())
, m_verticalData(this, &m_currentPosY, scrollableArea->visibleHeight())
- , m_zoomData(this)
, m_animationTimer(this, &ScrollAnimatorNone::animationTimerFired)
{
}
@@ -470,63 +444,6 @@
notifyPositionChanged();
}
-#if ENABLE(GESTURE_EVENTS)
-void ScrollAnimatorNone::zoom(const PlatformGestureEvent& pge)
-{
- ASSERT(pge.type() == PlatformEvent::GestureDoubleTap);
- // FIXME: modify this so we can start even if the timer is active.
- if (!m_animationTimer.isActive()) {
- m_currentZoomScale = 1;
- m_currentZoomTransX = 0;
- m_currentZoomTransY = 0;
-
- double currentTime = WTF::monotonicallyIncreasingTime();
- float scale = pge.deltaX();
-
- m_zoomData.m_startTime = currentTime - kTickTime / 2;
- m_zoomData.m_startScale = m_currentZoomScale;
- m_zoomData.m_desiredScale = scale;
- // FIXME: Document then simplify the following equations.
- m_zoomData.m_desiredTransX = (1 - scale) * pge.globalPosition().x();
- m_zoomData.m_desiredTransY = (1 - scale) * pge.globalPosition().y();
-#if ENABLE(DOUBLE_TAP_CENTERS)
- if (pge.type() == PlatformEvent::GestureDoubleTap) {
- // Zoom to centre of display. Pinch-to-zoom may not want this behaviour.
- m_zoomData.m_desiredTransX += m_scrollableArea->visibleWidth() / 2 - pge.globalPosition().x();
- m_zoomData.m_desiredTransY += m_scrollableArea->visibleHeight() / 2 - pge.globalPosition().y();
- }
-#endif
- m_zoomData.m_lastAnimationTime = currentTime;
- m_zoomData.m_animationTime = kZoomTicks * kTickTime;
-
- bool isContinuing = m_zoomData.animateZoom(currentTime);
-
- double deltaToNextFrame = ceil((currentTime - m_startTime) * kFrameRate) / kFrameRate - (currentTime - m_startTime);
- double nextTimerInterval = max(kMinimumTimerInterval, deltaToNextFrame);
- if (isContinuing) {
- m_animationTimer.startOneShot(nextTimerInterval);
- m_zoomData.m_isAnimating = true;
- notifyZoomChanged(ZoomAnimationContinuing);
- } else
- notifyZoomChanged(ZoomAnimationFinishing);
- }
-}
-
-void ScrollAnimatorNone::handleGestureEvent(const PlatformGestureEvent& pge)
-{
- TRACE_EVENT("ScrollAnimatorNone::handleGestureEvent", this, 0);
- switch (pge.type()) {
- case PlatformEvent::GestureDoubleTap:
- zoom(pge);
- break;
-
- default:
- // TODO: add any other event types we should handle
- { }
- }
-}
-#endif
-
void ScrollAnimatorNone::willEndLiveResize()
{
updateVisibleLengths();
@@ -563,19 +480,6 @@
if (m_verticalData.m_startTime && m_verticalData.animateScroll(currentTime + deltaToNextFrame))
continueAnimation = true;
- if (m_zoomData.m_isAnimating) {
-#if PLATFORM(CHROMIUM)
- TRACE_EVENT("ScrollAnimatorNone::notifyZoomChanged", this, 0);
-#endif
- if (m_zoomData.m_startTime && m_zoomData.animateZoom(currentTime + deltaToNextFrame)) {
- continueAnimation = true;
- notifyZoomChanged(ZoomAnimationContinuing);
- } else {
- notifyZoomChanged(ZoomAnimationFinishing);
- m_zoomData.m_isAnimating = false;
- }
- }
-
if (continueAnimation) {
double nextTimerInterval = max(kMinimumTimerInterval, deltaToNextFrame);
timer->startOneShot(nextTimerInterval);
Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.h (107664 => 107665)
--- trunk/Source/WebCore/platform/ScrollAnimatorNone.h 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.h 2012-02-14 04:41:55 UTC (rev 107665)
@@ -50,11 +50,6 @@
virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, float multiplier);
virtual void scrollToOffsetWithoutAnimation(const FloatPoint&);
-#if ENABLE(GESTURE_EVENTS)
- virtual void zoom(const PlatformGestureEvent&);
- virtual void handleGestureEvent(const PlatformGestureEvent&);
-#endif
-
virtual void willEndLiveResize();
virtual void didAddVerticalScrollbar(Scrollbar*);
virtual void didAddHorizontalScrollbar(Scrollbar*);
@@ -131,35 +126,12 @@
int m_visibleLength;
};
- // While zooming, scale, posX and posY need to stay tightly coupled, so use a separate
- // data structure.
- struct ZoomData {
- ZoomData(ScrollAnimatorNone* parent);
- bool animateZoom(double currentTime);
-
- ScrollAnimatorNone* m_parent;
- bool m_isAnimating;
-
- double m_startTime;
-
- double m_animationTime;
- double m_lastAnimationTime;
-
- double m_startScale;
- double m_desiredScale;
- double m_desiredTransX;
- double m_desiredTransY;
- };
-
- friend struct ZoomData;
-
void animationTimerFired(Timer<ScrollAnimatorNone>*);
void stopAnimationTimerIfNeeded();
void updateVisibleLengths();
PerAxisData m_horizontalData;
PerAxisData m_verticalData;
- ZoomData m_zoomData;
double m_startTime;
Timer<ScrollAnimatorNone> m_animationTimer;
Modified: trunk/Source/WebCore/platform/ScrollableArea.cpp (107664 => 107665)
--- trunk/Source/WebCore/platform/ScrollableArea.cpp 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebCore/platform/ScrollableArea.cpp 2012-02-14 04:41:55 UTC (rev 107665)
@@ -153,11 +153,6 @@
scrollAnimator()->notifyContentAreaScrolled();
}
-void ScrollableArea::zoomAnimatorTransformChanged(float, float, float, ZoomAnimationState)
-{
- // Requires FrameView to override this.
-}
-
bool ScrollableArea::handleWheelEvent(const PlatformWheelEvent& wheelEvent)
{
return scrollAnimator()->handleWheelEvent(wheelEvent);
Modified: trunk/Source/WebCore/platform/ScrollableArea.h (107664 => 107665)
--- trunk/Source/WebCore/platform/ScrollableArea.h 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2012-02-14 04:41:55 UTC (rev 107665)
@@ -42,8 +42,6 @@
class ScrollableArea {
public:
- enum ZoomAnimationState { ZoomAnimationContinuing, ZoomAnimationFinishing };
-
bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1);
void scrollToOffsetWithoutAnimation(const FloatPoint&);
void scrollToOffsetWithoutAnimation(ScrollbarOrientation, float offset);
@@ -57,8 +55,6 @@
// expect it to happen sometime in the future.
virtual bool requestScrollPositionUpdate(const IntPoint&) { return false; }
- virtual void zoomAnimatorTransformChanged(float, float, float, ZoomAnimationState);
-
bool handleWheelEvent(const PlatformWheelEvent&);
#if ENABLE(GESTURE_EVENTS)
void handleGestureEvent(const PlatformGestureEvent&);
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (107664 => 107665)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2012-02-14 04:41:55 UTC (rev 107665)
@@ -36,14 +36,6 @@
#include "Page.h"
#include "Settings.h"
-#if ENABLE(GESTURE_EVENTS)
-#include "PlatformGestureEvent.h"
-#endif
-
-#if ENABLE(SMOOTH_SCROLLING)
-#include "ScrollAnimator.h"
-#endif
-
#if ENABLE(INPUT_COLOR)
#include "ColorChooser.h"
#endif
@@ -172,43 +164,6 @@
settings()->setAcceleratedDrawingEnabled(enabled);
}
-void InternalSettings::setEnableScrollAnimator(bool enabled, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
-#if ENABLE(SMOOTH_SCROLLING)
- settings()->setEnableScrollAnimator(enabled);
-#else
- UNUSED_PARAM(enabled);
-#endif
-}
-
-void InternalSettings::setZoomAnimatorTransform(float scale, float tx, float ty, ExceptionCode& ec)
-{
- InternalSettingsGuardForFrame();
-
-#if ENABLE(GESTURE_EVENTS)
- PlatformGestureEvent pge(PlatformEvent::GestureDoubleTap, IntPoint(tx, ty), IntPoint(tx, ty), 0, scale, 0.f, 0, 0, 0, 0);
- frame()->eventHandler()->handleGestureEvent(pge);
-#else
- UNUSED_PARAM(scale);
- UNUSED_PARAM(tx);
- UNUSED_PARAM(ty);
-#endif
-}
-
-void InternalSettings::setZoomParameters(float scale, float x, float y, ExceptionCode& ec)
-{
- InternalSettingsGuardForFrameView();
-
-#if ENABLE(SMOOTH_SCROLLING)
- frame()->view()->scrollAnimator()->setZoomParametersForTest(scale, x, y);
-#else
- UNUSED_PARAM(scale);
- UNUSED_PARAM(x);
- UNUSED_PARAM(y);
-#endif
-}
-
void InternalSettings::setMockScrollbarsEnabled(bool enabled, ExceptionCode& ec)
{
InternalSettingsGuardForSettings();
@@ -253,12 +208,6 @@
return settings()->unifiedTextCheckerEnabled();
}
-float InternalSettings::pageScaleFactor(ExceptionCode& ec)
-{
- InternalSettingsGuardForPageReturn(0);
- return page()->pageScaleFactor();
-}
-
void InternalSettings::setPageScaleFactor(float scaleFactor, int x, int y, ExceptionCode& ec)
{
InternalSettingsGuardForPage();
Modified: trunk/Source/WebCore/testing/InternalSettings.h (107664 => 107665)
--- trunk/Source/WebCore/testing/InternalSettings.h 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2012-02-14 04:41:55 UTC (rev 107665)
@@ -52,16 +52,12 @@
void setEnableCompositingForScrollableFrames(bool enabled, ExceptionCode&);
void setAcceleratedDrawingEnabled(bool enabled, ExceptionCode&);
void setAcceleratedFiltersEnabled(bool enabled, ExceptionCode&);
- void setEnableScrollAnimator(bool enabled, ExceptionCode&);
- void setZoomAnimatorTransform(float scale, float tx, float ty, ExceptionCode&);
- void setZoomParameters(float scale, float x, float y, ExceptionCode&);
void setMockScrollbarsEnabled(bool enabled, ExceptionCode&);
void setPasswordEchoEnabled(bool enabled, ExceptionCode&);
void setPasswordEchoDurationInSeconds(double durationInSeconds, ExceptionCode&);
void setFixedElementsLayoutRelativeToFrame(bool, ExceptionCode&);
void setUnifiedTextCheckingEnabled(bool, ExceptionCode&);
bool unifiedTextCheckingEnabled(ExceptionCode&);
- float pageScaleFactor(ExceptionCode&);
void setPageScaleFactor(float scaleFactor, int x, int y, ExceptionCode&);
void setPerTileDrawingEnabled(bool enabled, ExceptionCode&);
void setTouchEventEmulationEnabled(bool enabled, ExceptionCode&);
Modified: trunk/Source/WebCore/testing/InternalSettings.idl (107664 => 107665)
--- trunk/Source/WebCore/testing/InternalSettings.idl 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebCore/testing/InternalSettings.idl 2012-02-14 04:41:55 UTC (rev 107665)
@@ -33,16 +33,12 @@
void setEnableCompositingForScrollableFrames(in boolean enabled) raises(DOMException);
void setAcceleratedDrawingEnabled(in boolean enabled) raises(DOMException);
void setAcceleratedFiltersEnabled(in boolean enabled) raises(DOMException);
- void setEnableScrollAnimator(in boolean enabled) raises(DOMException);
- void setZoomAnimatorTransform(in float scale, in float tx, in float ty) raises(DOMException);
- void setZoomParameters(in float scale, in float x, in float y) raises(DOMException);
void setMockScrollbarsEnabled(in boolean enabled) raises(DOMException);
void setPasswordEchoEnabled(in boolean enabled) raises(DOMException);
void setPasswordEchoDurationInSeconds(in double durationInSeconds) raises(DOMException);
void setFixedElementsLayoutRelativeToFrame(in boolean enabled) raises(DOMException);
void setUnifiedTextCheckingEnabled(in boolean enabled) raises (DOMException);
boolean unifiedTextCheckingEnabled() raises (DOMException);
- float pageScaleFactor() raises(DOMException);
void setPageScaleFactor(in float scaleFactor, in long x, in long y) raises(DOMException);
void setTouchEventEmulationEnabled(in boolean enabled) raises(DOMException);
};
Modified: trunk/Source/WebCore/testing/Internals.cpp (107664 => 107665)
--- trunk/Source/WebCore/testing/Internals.cpp 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebCore/testing/Internals.cpp 2012-02-14 04:41:55 UTC (rev 107665)
@@ -53,14 +53,6 @@
#include "SpellChecker.h"
#include "TextIterator.h"
-#if ENABLE(GESTURE_EVENTS)
-#include "PlatformGestureEvent.h"
-#endif
-
-#if ENABLE(SMOOTH_SCROLLING)
-#include "ScrollAnimator.h"
-#endif
-
#if ENABLE(INPUT_COLOR)
#include "ColorChooser.h"
#endif
Modified: trunk/Source/WebKit/chromium/ChangeLog (107664 => 107665)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-02-14 04:41:55 UTC (rev 107665)
@@ -1,3 +1,14 @@
+2012-02-13 W. James MacLean <[email protected]>
+
+ [chromium] Remove obsolete zoom animation pathway.
+ https://bugs.webkit.org/show_bug.cgi?id=78359
+
+ Reviewed by James Robinson.
+
+ This patch removes dead code from the previous incarnation of zoom animation for chromium.
+
+ * src/WebViewImpl.cpp:
+
2012-02-13 Hayato Ito <[email protected]>
Make ShadowRoot.nodeType return DOCUMENT_FRAGMENT_NODE.
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (107664 => 107665)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-02-14 04:41:55 UTC (rev 107665)
@@ -99,7 +99,6 @@
#include "RenderWidget.h"
#include "ResourceHandle.h"
#include "SchemeRegistry.h"
-#include "ScrollAnimator.h"
#include "SecurityOrigin.h"
#include "SecurityPolicy.h"
#include "Settings.h"
Modified: trunk/Source/WebKit2/ChangeLog (107664 => 107665)
--- trunk/Source/WebKit2/ChangeLog 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebKit2/ChangeLog 2012-02-14 04:41:55 UTC (rev 107665)
@@ -1,3 +1,15 @@
+2012-02-13 W. James MacLean <[email protected]>
+
+ [chromium] Remove obsolete zoom animation pathway.
+ https://bugs.webkit.org/show_bug.cgi?id=78359
+
+ Reviewed by James Robinson.
+
+ This patch removes dead code from the previous incarnation of zoom animation for chromium.
+
+ WebProcess/Plugins/PDF/BuiltInPDFView.h:
+ (BuiltInPDFView):
+
2012-02-13 Enrica Casucci <[email protected]>
Refactor Mac platform implementation of the Pasteboard class to use Platform Strategies.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h (107664 => 107665)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h 2012-02-14 04:38:05 UTC (rev 107664)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h 2012-02-14 04:41:55 UTC (rev 107665)
@@ -140,7 +140,6 @@
virtual bool isOnActivePage() const;
virtual bool shouldSuspendScrollAnimations() const { return false; } // If we return true, ScrollAnimatorMac will keep cycling a timer forever, waiting for a good time to animate.
virtual void scrollbarStyleChanged(int newStyle, bool forceUpdate);
- virtual void zoomAnimatorTransformChanged(float, float, float, ZoomAnimationState) { }
// FIXME: Implement the other conversion functions; this one is enough to get scrollbar hit testing working.
virtual WebCore::IntPoint convertFromContainingViewToScrollbar(const WebCore::Scrollbar*, const WebCore::IntPoint& parentPoint) const;
