Title: [112601] branches/chromium/1084/Source/WebKit/chromium
- Revision
- 112601
- Author
- [email protected]
- Date
- 2012-03-29 16:19:05 -0700 (Thu, 29 Mar 2012)
Log Message
Merge 112363 - [chromium] Send wheel events to main thread even if we think nothing is scrollable
https://bugs.webkit.org/show_bug.cgi?id=82408
Patch by James Robinson <[email protected]> on 2012-03-27
Reviewed by Adrienne Walker.
* src/WebCompositorInputHandlerImpl.cpp:
(WebKit::WebCompositorInputHandlerImpl::handleInputEventInternal):
[email protected]
BUG=119984
Review URL: https://chromiumcodereview.appspot.com/9941001
Modified Paths
Diff
Modified: branches/chromium/1084/Source/WebKit/chromium/ChangeLog (112600 => 112601)
--- branches/chromium/1084/Source/WebKit/chromium/ChangeLog 2012-03-29 23:18:07 UTC (rev 112600)
+++ branches/chromium/1084/Source/WebKit/chromium/ChangeLog 2012-03-29 23:19:05 UTC (rev 112601)
@@ -1,5 +1,129 @@
+2012-03-27 James Robinson <[email protected]>
+
+ [chromium] Send wheel events to main thread even if we think nothing is scrollable
+ https://bugs.webkit.org/show_bug.cgi?id=82408
+
+ Reviewed by Adrienne Walker.
+
+ * src/WebCompositorInputHandlerImpl.cpp:
+ (WebKit::WebCompositorInputHandlerImpl::handleInputEventInternal):
+
+2012-03-27 Nat Duca <[email protected]>
+
+ [chromium] Route monotonic clock up from compositor
+ https://bugs.webkit.org/show_bug.cgi?id=82154
+
+ Reviewed by James Robinson.
+
+ * public/WebWidget.h:
+ (WebKit::WebWidget::animate):
+ * src/WebLayerTreeViewImpl.cpp:
+ (WebKit::WebLayerTreeViewImpl::updateAnimations):
+ * src/WebLayerTreeViewImpl.h:
+ (WebLayerTreeViewImpl):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::animate):
+ (WebKit::WebViewImpl::updateAnimations):
+ * src/WebViewImpl.h:
+ (WebViewImpl):
+ * tests/FakeCCLayerTreeHostClient.h:
+ (WebCore::FakeCCLayerTreeHostClient::updateAnimations):
+
+2012-03-27 James Robinson <[email protected]>
+
+ webkit_unit_tests crashing on chromium lion in CCLayerTreeHostTestCompositeAndReadbackWhileInvisible
+ https://bugs.webkit.org/show_bug.cgi?id=82382
+
+ Reviewed by Adrienne Walker.
+
+ Use UnsignedWithZeroKeyHashTraits trait for the HashSet<WebGLId> m_usedTextures in
+ CompositorFakeWebGraphicsContext3DWithTextureTracking. This set is used to track all textures that are bound in
+ a given context during a test. During ..CompositeAndReadback.. we bind texture id 0. By default, HashSet<T>
+ where T is an unsigned does not allow 0 as a value. WebGLId is typedef'd to unsigned.
+
+ * tests/CCLayerTreeHostTest.cpp:
+ (CompositorFakeWebGraphicsContext3DWithTextureTracking):
+
+2012-03-27 James Robinson <[email protected]>
+
+ webkit_unit_tests crashing on chromium lion in ScrollbarLayerChromiumTest.resolveScrollLayerPointer
+ https://bugs.webkit.org/show_bug.cgi?id=82381
+
+ Reviewed by Adrienne Walker.
+
+ Use the mock scrollbar theme for this unit test. The real ScrollbarThemeMac isn't compatible with the mocks this
+ test uses and the test isn't designed to cover the theming code, only code inside the compositor.
+
+ * tests/ScrollbarLayerChromiumTest.cpp:
+ (WebCore::TEST):
+
+2012-03-27 Dirk Pranke <[email protected]>
+
+ Unreviewed, rolling out r112339.
+ http://trac.webkit.org/changeset/112339
+ https://bugs.webkit.org/show_bug.cgi?id=82354
+
+ webkit_unit_tests crashing on chromium mac bots
+
+ * src/AssociatedURLLoader.cpp:
+ (AssociatedURLLoader::ClientAdapter):
+ * tests/AssociatedURLLoaderTest.cpp:
+ (WebKit::AssociatedURLLoaderTest::TearDown):
+ (WebKit):
+ (WebKit::TEST_F):
+
+2012-03-27 Kausalya Madhusudhanan <[email protected]>
+
+ [Coverity] Address some uninitialized constructor values.
+ https://bugs.webkit.org/show_bug.cgi?id=82376
+
+ Reviewed by James Robinson.
+
+ New tests are not required since I did not modify any code behavior. I just initialized the class member variables in the constructor.
+
+ * src/WebCompositorInputHandlerImpl.cpp:
+ (WebCore::PlatformGestureToCCGestureAdapter::PlatformGestureToCCGestureAdapter):
+
+2012-03-27 Dirk Pranke <[email protected]>
+
+ Roll chromium DEPS to r129300.
+
+ Unreviewed, deps change.
+
+ * DEPS:
+
+2012-03-27 Bill Budge <[email protected]>
+
+ AssociatedURLLoader does not support Cross Origin Redirects when using
+ Access Control.
+ https://bugs.webkit.org/show_bug.cgi?id=82354
+
+ AssociatedURLLoader's internal adapter now overrides didFailRedirectCheck,
+ which cancels the load, causing didFail to notify the client that the
+ load failed. AssociatedURLLoaderTest adds test cases for CORS requests
+ that receive redirects and pass or fail the redirect access check.
+
+ Reviewed by Adam Barth.
+
+ * src/AssociatedURLLoader.cpp:
+ (AssociatedURLLoader::ClientAdapter):
+ (WebKit::AssociatedURLLoader::ClientAdapter::didFailRedirectCheck):
+ (WebKit):
+ * tests/AssociatedURLLoaderTest.cpp:
+ (WebKit::TEST_F):
+
2012-03-27 Dana Jansens <[email protected]>
+ [chromium] Unknown transforms should be treated as non-axis aligned on main thread
+ https://bugs.webkit.org/show_bug.cgi?id=82370
+
+ Reviewed by Adrienne Walker.
+
+ * tests/CCLayerTreeHostCommonTest.cpp:
+ (WebKitTests::TEST):
+
+2012-03-27 Dana Jansens <[email protected]>
+
[chromium] Rename opaqueContentsRegion() to visibleContentOpaqueRegion()
https://bugs.webkit.org/show_bug.cgi?id=81689
Modified: branches/chromium/1084/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp (112600 => 112601)
--- branches/chromium/1084/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp 2012-03-29 23:18:07 UTC (rev 112600)
+++ branches/chromium/1084/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp 2012-03-29 23:19:05 UTC (rev 112601)
@@ -187,7 +187,9 @@
return DidHandle;
}
case CCInputHandlerClient::ScrollIgnored:
- return DropEvent;
+ // FIXME: This should be DropEvent, but in cases where we fail to properly sync scrollability it's safer to send the
+ // event to the main thread. Change back to DropEvent once we have synchronization bugs sorted out.
+ return DidNotHandle;
case CCInputHandlerClient::ScrollFailed:
return DidNotHandle;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
