Title: [202230] trunk/Source/WebKit2
- Revision
- 202230
- Author
- [email protected]
- Date
- 2016-06-20 10:13:02 -0700 (Mon, 20 Jun 2016)
Log Message
REGRESSION (r191499): Tab content "jumps" down when focusing tabs that load in the background
https://bugs.webkit.org/show_bug.cgi?id=158904
<rdar://problem/26025831>
Reviewed by Sam Weinig.
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::viewDidMoveToWindow):
During the large refactor that was r191499, we somehow ended up with two
different members for the same thing - one that got written, and one that
got read. We should only have one.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (202229 => 202230)
--- trunk/Source/WebKit2/ChangeLog 2016-06-20 17:10:00 UTC (rev 202229)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-20 17:13:02 UTC (rev 202230)
@@ -1,5 +1,20 @@
2016-06-20 Tim Horton <[email protected]>
+ REGRESSION (r191499): Tab content "jumps" down when focusing tabs that load in the background
+ https://bugs.webkit.org/show_bug.cgi?id=158904
+ <rdar://problem/26025831>
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/Cocoa/WebViewImpl.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::viewDidMoveToWindow):
+ During the large refactor that was r191499, we somehow ended up with two
+ different members for the same thing - one that got written, and one that
+ got read. We should only have one.
+
+2016-06-20 Tim Horton <[email protected]>
+
Try to fix the iOS build after r202142 and r202224.
* Shared/mac/RemoteLayerBackingStore.mm:
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (202229 => 202230)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2016-06-20 17:10:00 UTC (rev 202229)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2016-06-20 17:13:02 UTC (rev 202230)
@@ -545,7 +545,6 @@
bool m_clipsToVisibleRect { false };
bool m_needsViewFrameInWindowCoordinates;
bool m_didScheduleWindowAndViewFrameUpdate { false };
- bool m_isDeferringViewInWindowChanges { false };
bool m_windowOcclusionDetectionEnabled { true };
bool m_automaticallyAdjustsContentInsets { false };
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (202229 => 202230)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-06-20 17:10:00 UTC (rev 202229)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-06-20 17:13:02 UTC (rev 202230)
@@ -1191,7 +1191,7 @@
windowDidChangeScreen();
WebCore::ViewState::Flags viewStateChanges = WebCore::ViewState::WindowIsActive | WebCore::ViewState::IsVisible;
- if (m_isDeferringViewInWindowChanges)
+ if (m_shouldDeferViewInWindowChanges)
m_viewInWindowChangeWasDeferred = true;
else
viewStateChanges |= WebCore::ViewState::IsInWindow;
@@ -1220,7 +1220,7 @@
[m_view addGestureRecognizer:m_immediateActionGestureRecognizer.get()];
} else {
WebCore::ViewState::Flags viewStateChanges = WebCore::ViewState::WindowIsActive | WebCore::ViewState::IsVisible;
- if (m_isDeferringViewInWindowChanges)
+ if (m_shouldDeferViewInWindowChanges)
m_viewInWindowChangeWasDeferred = true;
else
viewStateChanges |= WebCore::ViewState::IsInWindow;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
