Always use a textured window for the Web Inspector.
authortimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Nov 2012 06:46:47 +0000 (06:46 +0000)
committertimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Nov 2012 06:46:47 +0000 (06:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=101693

Reviewed by Joseph Pecoraro.

Source/WebKit/mac:

* WebCoreSupport/WebInspectorClient.mm:
(-[WebInspectorWindowController window]): Removed the conditional for a textured window.

Source/WebKit2:

* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::createInspectorWindow): Removed the conditional for a textured window.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@134015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm

index 2238c67..639d102 100644 (file)
@@ -1,3 +1,14 @@
+2012-11-08  Timothy Hatcher  <timothy@apple.com>
+
+        Always use a textured window for the Web Inspector.
+
+        https://bugs.webkit.org/show_bug.cgi?id=101693
+
+        Reviewed by Joseph Pecoraro.
+
+        * WebCoreSupport/WebInspectorClient.mm:
+        (-[WebInspectorWindowController window]): Removed the conditional for a textured window.
+
 2012-11-08  Roger Fong  <roger_fong@apple.com>
 
         Null check URL key entries into WebHistory hash table. 
index f432cd5..0b9041d 100644 (file)
@@ -336,22 +336,13 @@ void WebInspectorFrontendClient::updateWindowTitle() const
     if (window)
         return window;
 
-    bool useTexturedWindow = useWebKitWebInspector();
-
-    NSUInteger styleMask = (NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask);
-
-    if (useTexturedWindow)
-        styleMask |= NSTexturedBackgroundWindowMask;
-
+    NSUInteger styleMask = (NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSTexturedBackgroundWindowMask);
     window = [[NSWindow alloc] initWithContentRect:NSMakeRect(60.0, 200.0, 750.0, 650.0) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
     [window setDelegate:self];
     [window setMinSize:NSMakeSize(400.0, 400.0)];
-
-    if (useTexturedWindow) {
-        [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
-        [window setContentBorderThickness:55. forEdge:NSMaxYEdge];
-        WKNSWindowMakeBottomCornersSquare(window);
-    }
+    [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
+    [window setContentBorderThickness:55. forEdge:NSMaxYEdge];
+    WKNSWindowMakeBottomCornersSquare(window);
 
     [self setWindow:window];
     [window release];
index 6be7531..77ba398 100644 (file)
@@ -1,3 +1,14 @@
+2012-11-08  Timothy Hatcher  <timothy@apple.com>
+
+        Always use a textured window for the Web Inspector.
+
+        https://bugs.webkit.org/show_bug.cgi?id=101693
+
+        Reviewed by Joseph Pecoraro.
+
+        * UIProcess/mac/WebInspectorProxyMac.mm:
+        (WebKit::WebInspectorProxy::createInspectorWindow): Removed the conditional for a textured window.
+
 2012-11-08  Huang Dongsung  <luxtella@company100.net>
 
         Coordinated Graphics: Don't send the messages for releasing resources during purging.
index 0a2b9b0..39cc7be 100644 (file)
@@ -139,22 +139,14 @@ void WebInspectorProxy::createInspectorWindow()
 {
     ASSERT(!m_inspectorWindow);
 
-    bool useTexturedWindow = inspectorReallyUsesWebKitUserInterface(page()->pageGroup()->preferences());
-
-    NSUInteger styleMask = (NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask);
-    if (useTexturedWindow)
-        styleMask |= NSTexturedBackgroundWindowMask;
-
+    NSUInteger styleMask = (NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSTexturedBackgroundWindowMask);
     NSWindow *window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, initialWindowWidth, initialWindowHeight) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
     [window setDelegate:m_inspectorProxyObjCAdapter.get()];
     [window setMinSize:NSMakeSize(minimumWindowWidth, minimumWindowHeight)];
     [window setReleasedWhenClosed:NO];
-
-    if (useTexturedWindow) {
-        [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
-        [window setContentBorderThickness:windowContentBorderThickness forEdge:NSMaxYEdge];
-        WKNSWindowMakeBottomCornersSquare(window);
-    }
+    [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
+    [window setContentBorderThickness:windowContentBorderThickness forEdge:NSMaxYEdge];
+    WKNSWindowMakeBottomCornersSquare(window);
 
     NSView *contentView = [window contentView];
     [m_inspectorView.get() setFrame:[contentView bounds]];