Title: [112606] branches/chromium/1084/Source/WebKit/chromium
- Revision
- 112606
- Author
- [email protected]
- Date
- 2012-03-29 16:38:05 -0700 (Thu, 29 Mar 2012)
Log Message
Merge 112417 - [chromium] Compositor visibility setting must be updated even if not actively compositing
https://bugs.webkit.org/show_bug.cgi?id=82406
Patch by James Robinson <[email protected]> on 2012-03-28
Reviewed by Adrienne Walker.
Propagate the visibility bit to the WebLayerTreeView even when compositing is inactive.
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::setVisibilityState):
[email protected]
BUG=120464, 119812
Review URL: https://chromiumcodereview.appspot.com/9951001
Modified Paths
Diff
Modified: branches/chromium/1084/Source/WebKit/chromium/ChangeLog (112605 => 112606)
--- branches/chromium/1084/Source/WebKit/chromium/ChangeLog 2012-03-29 23:37:19 UTC (rev 112605)
+++ branches/chromium/1084/Source/WebKit/chromium/ChangeLog 2012-03-29 23:38:05 UTC (rev 112606)
@@ -1,5 +1,73 @@
+2012-03-28 James Robinson <[email protected]>
+
+ [chromium] Compositor visibility setting must be updated even if not actively compositing
+ https://bugs.webkit.org/show_bug.cgi?id=82406
+
+ Reviewed by Adrienne Walker.
+
+ Propagate the visibility bit to the WebLayerTreeView even when compositing is inactive.
+
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::setVisibilityState):
+
+2012-03-28 Fady Samuel <[email protected]>
+
+ [Chromium] Enable Viewport define by default
+ https://bugs.webkit.org/show_bug.cgi?id=79514
+
+ Reviewed by Darin Fisher.
+
+ * features.gypi:
+
2012-03-27 James Robinson <[email protected]>
+ [chromium] Transfer wheel fling via WebCompositorInputHandlerClient
+ https://bugs.webkit.org/show_bug.cgi?id=81740
+
+ Reviewed by Adrienne Walker.
+
+ Adds a path for transfering an active wheel fling animation out to the embedder from the compositor and back in
+ to a WebViewImpl via the embedder. This is used when we start a wheel fling animation on the compositor thread
+ but then hit a condition that we can't handle from the compositor, such as registered wheel event listeners or a
+ scrollable area we can't handle.
+
+ New tests added to WebCompositorInputHandlerTest for the transfering logic.
+
+ * public/WebActiveWheelFlingParameters.h: Copied from Source/WebKit/chromium/public/WebCompositorInputHandlerClient.h.
+ (WebKit):
+ (WebActiveWheelFlingParameters):
+ (WebKit::WebActiveWheelFlingParameters::WebActiveWheelFlingParameters):
+ * public/WebCompositorInputHandlerClient.h:
+ (WebKit):
+ (WebCompositorInputHandlerClient):
+ (WebKit::WebCompositorInputHandlerClient::transferActiveWheelFlingAnimation):
+ * public/WebView.h:
+ (WebKit):
+ (WebView):
+ * src/WebCompositorInputHandlerImpl.cpp:
+ (WebKit::WebCompositorInputHandlerImpl::handleGestureFling):
+ (WebKit::WebCompositorInputHandlerImpl::animate):
+ (WebKit::WebCompositorInputHandlerImpl::cancelCurrentFling):
+ (WebKit::WebCompositorInputHandlerImpl::scrollBy):
+ * src/WebCompositorInputHandlerImpl.h:
+ (WebCore):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::transferActiveWheelFlingAnimation):
+ (WebKit):
+ * src/WebViewImpl.h:
+ (WebViewImpl):
+ * tests/WebCompositorInputHandlerImplTest.cpp:
+ (WebKit::MockWebCompositorInputHandlerClient::MockWebCompositorInputHandlerClient):
+ (MockWebCompositorInputHandlerClient):
+ (WebKit::TEST):
+ (WebKit::WebCompositorInputHandlerImplTest::WebCompositorInputHandlerImplTest):
+ (WebKit::WebCompositorInputHandlerImplTest::~WebCompositorInputHandlerImplTest):
+ (WebCompositorInputHandlerImplTest):
+ (WebKit::TEST_F):
+ (WebKit):
+
+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
Modified: branches/chromium/1084/Source/WebKit/chromium/src/WebViewImpl.cpp (112605 => 112606)
--- branches/chromium/1084/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-03-29 23:37:19 UTC (rev 112605)
+++ branches/chromium/1084/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-03-29 23:38:05 UTC (rev 112606)
@@ -3468,9 +3468,9 @@
#endif
#if USE(ACCELERATED_COMPOSITING)
- if (isAcceleratedCompositingActive()) {
+ if (!m_layerTreeView.isNull()) {
bool visible = visibilityState == WebPageVisibilityStateVisible;
- if (!visible)
+ if (!visible && isAcceleratedCompositingActive())
m_nonCompositedContentHost->protectVisibleTileTextures();
m_layerTreeView.setVisible(visible);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
