Title: [199395] trunk/Source/WebKit2
- Revision
- 199395
- Author
- [email protected]
- Date
- 2016-04-12 15:48:43 -0700 (Tue, 12 Apr 2016)
Log Message
Web Inspector: Dock controls are not available in toolbar if Web Inspector window leaves fullscreen
https://bugs.webkit.org/show_bug.cgi?id=156520
<rdar://problem/22101106>
Patch by Joseph Pecoraro <[email protected]> on 2016-04-12
Reviewed by Timothy Hatcher.
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::platformCanAttach):
Be more explicit about the attachment view check. Its intent
was to prevent allowing a 2nd level inspector from attaching
to a 1st level inspector. We can use a stronger check. Also,
remove deprecated pragmas by switching to new value.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (199394 => 199395)
--- trunk/Source/WebKit2/ChangeLog 2016-04-12 22:42:06 UTC (rev 199394)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-12 22:48:43 UTC (rev 199395)
@@ -1,5 +1,20 @@
2016-04-12 Joseph Pecoraro <[email protected]>
+ Web Inspector: Dock controls are not available in toolbar if Web Inspector window leaves fullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=156520
+ <rdar://problem/22101106>
+
+ Reviewed by Timothy Hatcher.
+
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::platformCanAttach):
+ Be more explicit about the attachment view check. Its intent
+ was to prevent allowing a 2nd level inspector from attaching
+ to a 1st level inspector. We can use a stronger check. Also,
+ remove deprecated pragmas by switching to new value.
+
+2016-04-12 Joseph Pecoraro <[email protected]>
+
Web Inspector: Keyboard shortcut for "Inspect Element" only works when Web Inspector is open.
https://bugs.webkit.org/show_bug.cgi?id=111193
<rdar://problem/13325889>
Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (199394 => 199395)
--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2016-04-12 22:42:06 UTC (rev 199394)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2016-04-12 22:48:43 UTC (rev 199395)
@@ -454,14 +454,11 @@
bool WebInspectorProxy::platformCanAttach(bool webProcessCanAttach)
{
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if ([m_inspectorWindow styleMask] & NSFullScreenWindowMask)
+ if ([m_inspectorWindow styleMask] & NSWindowStyleMaskFullScreen)
return false;
-#pragma clang diagnostic pop
NSView *inspectedView = inspectedPage()->inspectorAttachmentView();
- if ([inspectedView isKindOfClass:[WKView class]] || [inspectedView isKindOfClass:[WKWebView class]])
+ if ([inspectedView isKindOfClass:[WKWebInspectorWKWebView class]])
return webProcessCanAttach;
static const float minimumAttachedHeight = 250;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
