Title: [97040] trunk/Source
- Revision
- 97040
- Author
- [email protected]
- Date
- 2011-10-09 21:28:58 -0700 (Sun, 09 Oct 2011)
Log Message
Fix Lion, Leopard and Snow Leopard builds after changeset 97034 <http://trac.webkit.org/changeset/97034>
(https://bugs.webkit.org/show_bug.cgi?id=68035)
https://bugs.webkit.org/show_bug.cgi?id=69735
Patch by Luke Macpherson <[email protected]> on 2011-10-09
Reviewed by Daniel Bates.
Source/WebCore:
* testing/Internals.cpp:
Mark unused parameters to prevent compile errors when GESTURE_EVENTS and SMOOTH_SCROLLING are disabled.
(WebCore::Internals::setEnableScrollAnimator):
(WebCore::Internals::setZoomAnimatorTransform):
(WebCore::Internals::setZoomParameters):
Source/WebKit2:
* WebProcess/Plugins/PDF/BuiltInPDFView.h:
Add symbols that are now required by ScrollableArea.
(WebKit::BuiltInPDFView::zoomAnimatorTransformChanged):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (97039 => 97040)
--- trunk/Source/WebCore/ChangeLog 2011-10-10 04:05:27 UTC (rev 97039)
+++ trunk/Source/WebCore/ChangeLog 2011-10-10 04:28:58 UTC (rev 97040)
@@ -1,3 +1,17 @@
+2011-10-09 Luke Macpherson <[email protected]>
+
+ Fix Lion, Leopard and Snow Leopard builds after changeset 97034 <http://trac.webkit.org/changeset/97034>
+ (https://bugs.webkit.org/show_bug.cgi?id=68035)
+ https://bugs.webkit.org/show_bug.cgi?id=69735
+
+ Reviewed by Daniel Bates.
+
+ * testing/Internals.cpp:
+ Mark unused parameters to prevent compile errors when GESTURE_EVENTS and SMOOTH_SCROLLING are disabled.
+ (WebCore::Internals::setEnableScrollAnimator):
+ (WebCore::Internals::setZoomAnimatorTransform):
+ (WebCore::Internals::setZoomParameters):
+
2011-10-09 Kent Tamura <[email protected]>
Remove redundant code of HTMLSelectElement.
Modified: trunk/Source/WebCore/testing/Internals.cpp (97039 => 97040)
--- trunk/Source/WebCore/testing/Internals.cpp 2011-10-10 04:05:27 UTC (rev 97039)
+++ trunk/Source/WebCore/testing/Internals.cpp 2011-10-10 04:28:58 UTC (rev 97040)
@@ -254,6 +254,8 @@
#if ENABLE(SMOOTH_SCROLLING)
document->settings()->setEnableScrollAnimator(enabled);
+#else
+ UNUSED_PARAM(enabled);
#endif
}
@@ -267,6 +269,10 @@
#if ENABLE(GESTURE_EVENTS)
PlatformGestureEvent pge(PlatformGestureEvent::DoubleTapType, IntPoint(tx, ty), IntPoint(tx, ty), 0, scale, 0.f, 0, 0, 0, 0);
document->view()->frame()->eventHandler()->handleGestureEvent(pge);
+#else
+ UNUSED_PARAM(scale);
+ UNUSED_PARAM(tx);
+ UNUSED_PARAM(ty);
#endif
}
@@ -289,6 +295,10 @@
#if ENABLE(SMOOTH_SCROLLING)
document->view()->scrollAnimator()->setZoomParametersForTest(scale, x, y);
+#else
+ UNUSED_PARAM(scale);
+ UNUSED_PARAM(x);
+ UNUSED_PARAM(y);
#endif
}
Modified: trunk/Source/WebKit2/ChangeLog (97039 => 97040)
--- trunk/Source/WebKit2/ChangeLog 2011-10-10 04:05:27 UTC (rev 97039)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-10 04:28:58 UTC (rev 97040)
@@ -1,3 +1,15 @@
+2011-10-09 Luke Macpherson <[email protected]>
+
+ Fix Lion, Leopard and Snow Leopard builds after changeset 97034 <http://trac.webkit.org/changeset/97034>
+ (https://bugs.webkit.org/show_bug.cgi?id=68035)
+ https://bugs.webkit.org/show_bug.cgi?id=69735
+
+ Reviewed by Daniel Bates.
+
+ * WebProcess/Plugins/PDF/BuiltInPDFView.h:
+ Add symbols that are now required by ScrollableArea.
+ (WebKit::BuiltInPDFView::zoomAnimatorTransformChanged):
+
2011-10-08 Mark Hahnenberg <[email protected]>
Add static version of JSCell::getConstructData
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h (97039 => 97040)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h 2011-10-10 04:05:27 UTC (rev 97039)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h 2011-10-10 04:28:58 UTC (rev 97040)
@@ -85,6 +85,8 @@
virtual void manualStreamDidFinishLoading();
virtual void manualStreamDidFail(bool wasCancelled);
+ virtual void zoomAnimatorTransformChanged(double, double, double, ZoomAnimationState) { }
+
virtual bool handleMouseEvent(const WebMouseEvent&);
virtual bool handleWheelEvent(const WebWheelEvent&);
virtual bool handleMouseEnterEvent(const WebMouseEvent&);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
