Title: [186950] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 186950
- Author
- [email protected]
- Date
- 2015-07-16 23:15:40 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186924. rdar://problem/21669802
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (186949 => 186950)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 06:15:38 UTC (rev 186949)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 06:15:40 UTC (rev 186950)
@@ -1,5 +1,25 @@
2015-07-16 Matthew Hanson <[email protected]>
+ Merge r186924. rdar://problem/21669802
+
+ 2015-07-16 Matt Baker <[email protected]>
+
+ [Mac] Web Inspector toolbar can be covered by the Safari tab bar when docked to the right
+ https://bugs.webkit.org/show_bug.cgi?id=146994
+
+ Reviewed by Timothy Hatcher.
+
+ WebInspectorProxy contained logic which ignored the next frame change notification from the inspected view,
+ whenever it updated the frames of both the Inspector view and inspected view. This patch removes that logic,
+ as it prevented the Inspector's frame from being adjusted after changes to the browser's top content inset.
+
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (-[WKWebInspectorProxyObjCAdapter ignoreNextInspectedViewFrameDidChange]): Deleted.
+ (-[WKWebInspectorProxyObjCAdapter inspectedViewFrameDidChange:]): Deleted.
+ (WebKit::WebInspectorProxy::inspectedViewFrameDidChange): Deleted.
+
+2015-07-16 Matthew Hanson <[email protected]>
+
Merge r186919. rdar://problem/21834578
2015-07-16 Joseph Pecoraro <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (186949 => 186950)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2015-07-17 06:15:38 UTC (rev 186949)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2015-07-17 06:15:40 UTC (rev 186950)
@@ -151,18 +151,8 @@
static_cast<WebInspectorProxy*>(_inspectorProxy)->windowFullScreenDidChange();
}
-- (void)ignoreNextInspectedViewFrameDidChange
-{
- _ignoreNextInspectedViewFrameDidChange = YES;
-}
-
- (void)inspectedViewFrameDidChange:(NSNotification *)notification
{
- if (_ignoreNextInspectedViewFrameDidChange) {
- _ignoreNextInspectedViewFrameDidChange = NO;
- return;
- }
-
// Resizing the views while inside this notification can lead to bad results when entering
// or exiting full screen. To avoid that we need to perform the work after a delay. We only
// depend on this for enforcing the height constraints, so a small delay isn't terrible. Most
@@ -730,8 +720,6 @@
if (NSEqualRects([m_inspectorView frame], inspectorFrame) && NSEqualRects([inspectedView frame], inspectedViewFrame))
return;
- [m_inspectorProxyObjCAdapter ignoreNextInspectedViewFrameDidChange];
-
// Disable screen updates to make sure the layers for both views resize in sync.
[[m_inspectorView window] disableScreenUpdatesUntilFlush];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
