Changeset 147482 in webkit
- Timestamp:
- Apr 2, 2013 12:06:39 PM (11 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/cf/ChangeLog
r132916 r147482 1 2013-04-02 Timothy Hatcher <timothy@apple.com> 2 3 Provide a user default that can be used to disable docking of the Web Inspector. 4 5 The user default is "WebKit Web Inspector Setting - inspectorAttachDisabled". 6 7 https://webkit.org/b/113779 8 rdar://problem/13446021 9 10 Reviewed by Joseph Pecoraro. 11 12 * WebCoreSupport/WebInspectorClientCF.cpp: 13 (WebInspectorClient::inspectorAttachDisabled): Added. 14 (WebInspectorClient::setInspectorAttachDisabled): Added. 15 1 16 2012-10-29 Anders Carlsson <andersca@apple.com> 2 17 -
trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
r132916 r147482 63 63 64 64 static const char* inspectorStartsAttachedSetting = "inspectorStartsAttached"; 65 static const char* inspectorAttachDisabledSetting = "inspectorAttachDisabled"; 65 66 66 67 static inline RetainPtr<CFStringRef> createKeyForPreferences(const String& key) … … 94 95 { 95 96 return doDispatchMessageOnFrontendPage(m_frontendPage, message); 97 } 98 99 bool WebInspectorClient::inspectorAttachDisabled() 100 { 101 String value; 102 populateSetting(inspectorAttachDisabledSetting, &value); 103 if (value.isEmpty()) 104 return false; 105 return value == "true"; 106 } 107 108 void WebInspectorClient::setInspectorAttachDisabled(bool disabled) 109 { 110 storeSetting(inspectorAttachDisabledSetting, disabled ? "true" : "false"); 96 111 } 97 112 -
trunk/Source/WebKit/mac/ChangeLog
r147476 r147482 1 2013-04-02 Timothy Hatcher <timothy@apple.com> 2 3 Provide a user default that can be used to disable docking of the Web Inspector. 4 5 The user default is "WebKit Web Inspector Setting - inspectorAttachDisabled". 6 7 https://webkit.org/b/113779 8 rdar://problem/13446021 9 10 Reviewed by Joseph Pecoraro. 11 12 * WebCoreSupport/WebInspectorClient.h: 13 (WebInspectorClient::inspectorAttachDisabled): Added. 14 (WebInspectorClient::setInspectorAttachDisabled): Added. 15 16 * WebCoreSupport/WebInspectorClient.mm: 17 (WebInspectorClient::didResizeMainFrame): 18 (-[WebInspectorWindowController window]): 19 (-[WebInspectorWindowController showWindow:]): 20 Check inspectorAttachDisabled() in places where we attach or update the dock button. 21 1 22 2013-04-02 Alexey Proskuryakov <ap@apple.com> 2 23 -
trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h
r147004 r147482 77 77 void setInspectorStartsAttached(bool); 78 78 79 bool inspectorAttachDisabled(); 80 void setInspectorAttachDisabled(bool); 81 79 82 void releaseFrontend(); 80 83 -
trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
r147004 r147482 163 163 { 164 164 if (m_frontendClient) 165 m_frontendClient->attachAvailabilityChanged(m_frontendClient->canAttachWindow() );165 m_frontendClient->attachAvailabilityChanged(m_frontendClient->canAttachWindow() && !inspectorAttachDisabled()); 166 166 } 167 167 … … 470 470 471 471 // Hide the dock button if we can't attach. 472 _dockButton.get().hidden = !_frontendClient->canAttachWindow() ;472 _dockButton.get().hidden = !_frontendClient->canAttachWindow() || _inspectorClient->inspectorAttachDisabled(); 473 473 474 474 [self setWindow:window]; … … 539 539 _visible = YES; 540 540 541 _shouldAttach = _inspectorClient->inspectorStartsAttached(); 542 543 if (_shouldAttach && !_frontendClient->canAttachWindow()) 544 _shouldAttach = NO; 541 _shouldAttach = _inspectorClient->inspectorStartsAttached() && _frontendClient->canAttachWindow() && !_inspectorClient->inspectorAttachDisabled(); 545 542 546 543 if (_shouldAttach) { -
trunk/Source/WebKit/win/ChangeLog
r147135 r147482 1 2013-04-02 Timothy Hatcher <timothy@apple.com> 2 3 Provide a user default that can be used to disable docking of the Web Inspector. 4 5 The user default is "WebKit Web Inspector Setting - inspectorAttachDisabled". 6 7 https://webkit.org/b/113779 8 rdar://problem/13446021 9 10 Reviewed by Joseph Pecoraro. 11 12 * WebCoreSupport/WebInspectorClient.h: 13 (WebInspectorClient::inspectorAttachDisabled): Added. 14 (WebInspectorClient::setInspectorAttachDisabled): Added. 15 1 16 2013-03-28 Matt Falkenhagen <falken@chromium.org> 2 17 -
trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h
r147004 r147482 70 70 bool inspectorStartsAttached(); 71 71 void setInspectorStartsAttached(bool); 72 73 bool inspectorAttachDisabled(); 74 void setInspectorAttachDisabled(bool); 72 75 73 76 void releaseFrontend();
Note: See TracChangeset
for help on using the changeset viewer.