Diff
Modified: trunk/Source/WebCore/ChangeLog (109859 => 109860)
--- trunk/Source/WebCore/ChangeLog 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebCore/ChangeLog 2012-03-06 06:16:12 UTC (rev 109860)
@@ -1,5 +1,9 @@
2012-03-05 Joseph Pecoraro <[email protected]>
+ Unreviewed rollout of r109858 for restructuring.
+
+2012-03-05 Joseph Pecoraro <[email protected]>
+
<http://webkit.org/b/78575> Web Inspector: Hide dock button when not allowed to dock
There are times when an undocked inspector frontend is not allowed to
Modified: trunk/Source/WebCore/WebCore.exp.in (109859 => 109860)
--- trunk/Source/WebCore/WebCore.exp.in 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-03-06 06:16:12 UTC (rev 109860)
@@ -1743,7 +1743,6 @@
__ZN7WebCore28InspectorFrontendClientLocal19windowObjectClearedEv
__ZN7WebCore28InspectorFrontendClientLocal20sendMessageToBackendERKN3WTF6StringE
__ZN7WebCore28InspectorFrontendClientLocal21isProfilingJavaScriptEv
-__ZN7WebCore28InspectorFrontendClientLocal21setDockingUnavailableEb
__ZN7WebCore28InspectorFrontendClientLocal23stopProfilingJavaScriptEv
__ZN7WebCore28InspectorFrontendClientLocal24showMainResourceForFrameEPNS_5FrameE
__ZN7WebCore28InspectorFrontendClientLocal24startProfilingJavaScriptEv
Modified: trunk/Source/WebCore/inspector/InspectorClient.h (109859 => 109860)
--- trunk/Source/WebCore/inspector/InspectorClient.h 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebCore/inspector/InspectorClient.h 2012-03-06 06:16:12 UTC (rev 109860)
@@ -46,7 +46,6 @@
virtual void openInspectorFrontend(InspectorController*) = 0;
virtual void closeInspectorFrontend() = 0;
virtual void bringFrontendToFront() = 0;
- virtual void updateDockingAvailability() { }
virtual void highlight() = 0;
virtual void hideHighlight() = 0;
Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (109859 => 109860)
--- trunk/Source/WebCore/inspector/InspectorController.cpp 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2012-03-06 06:16:12 UTC (rev 109860)
@@ -361,13 +361,9 @@
m_debuggerAgent->resume(&error);
}
}
+
#endif
-void InspectorController::updateDockingAvailability()
-{
- m_inspectorClient->updateDockingAvailability();
-}
-
void InspectorController::setResourcesDataSizeLimitsFromInternals(int maximumResourcesContentSize, int maximumSingleResourceContentSize)
{
m_resourceAgent->setResourcesDataSizeLimitsFromInternals(maximumResourcesContentSize, maximumSingleResourceContentSize);
Modified: trunk/Source/WebCore/inspector/InspectorController.h (109859 => 109860)
--- trunk/Source/WebCore/inspector/InspectorController.h 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2012-03-06 06:16:12 UTC (rev 109860)
@@ -106,8 +106,6 @@
void resume();
#endif
- void updateDockingAvailability();
-
void setResourcesDataSizeLimitsFromInternals(int maximumResourcesContentSize, int maximumSingleResourceContentSize);
InspectorPageAgent* pageAgent() const { return m_pageAgent; }
Modified: trunk/Source/WebCore/inspector/InspectorFrontendClient.h (109859 => 109860)
--- trunk/Source/WebCore/inspector/InspectorFrontendClient.h 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClient.h 2012-03-06 06:16:12 UTC (rev 109860)
@@ -65,9 +65,6 @@
virtual void inspectedURLChanged(const String&) = 0;
virtual void sendMessageToBackend(const String&) = 0;
-
- virtual bool canAttachWindow() { return true; }
- virtual void setDockingUnavailable(bool) { }
};
} // namespace WebCore
Modified: trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp (109859 => 109860)
--- trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp 2012-03-06 06:16:12 UTC (rev 109860)
@@ -138,7 +138,6 @@
void InspectorFrontendClientLocal::frontendLoaded()
{
bringToFront();
- setDockingUnavailable(!canAttachWindow());
m_frontendLoaded = true;
for (Vector<String>::iterator it = m_evaluateOnLoad.begin(); it != m_evaluateOnLoad.end(); ++it)
evaluateOnLoad(*it);
@@ -169,11 +168,6 @@
return minimumAttachedHeight <= maximumAttachedHeight && !isInspectorPage;
}
-void InspectorFrontendClientLocal::setDockingUnavailable(bool unavailable)
-{
- evaluateOnLoad(String::format("[\"setDockingUnavailable\", %s]", unavailable ? "true" : "false"));
-}
-
void InspectorFrontendClientLocal::changeAttachedWindowHeight(unsigned height)
{
unsigned totalHeight = m_frontendPage->mainFrame()->view()->visibleHeight() + m_inspectorController->inspectedPage()->mainFrame()->view()->visibleHeight();
Modified: trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h (109859 => 109860)
--- trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h 2012-03-06 06:16:12 UTC (rev 109860)
@@ -76,8 +76,7 @@
virtual void sendMessageToBackend(const String& message);
- virtual bool canAttachWindow();
- virtual void setDockingUnavailable(bool);
+ bool canAttachWindow();
static unsigned constrainedAttachedWindowHeight(unsigned preferredHeight, unsigned totalWindowHeight);
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (109859 => 109860)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2012-03-06 06:16:12 UTC (rev 109860)
@@ -268,12 +268,6 @@
timelineAgent->didRemoveTimer(timerId);
}
-void InspectorInstrumentation::didResizeMainFrameImpl(Frame* frame)
-{
- if (Page* page = frame->page())
- page->inspectorController()->updateDockingAvailability();
-}
-
InspectorInstrumentationCookie InspectorInstrumentation::willCallFunctionImpl(InstrumentingAgents* instrumentingAgents, const String& scriptName, int scriptLine)
{
int timelineAgentId = 0;
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (109859 => 109860)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2012-03-06 06:16:12 UTC (rev 109860)
@@ -106,8 +106,6 @@
static void didInstallTimer(ScriptExecutionContext*, int timerId, int timeout, bool singleShot);
static void didRemoveTimer(ScriptExecutionContext*, int timerId);
- static void didResizeMainFrame(Frame*);
-
static InspectorInstrumentationCookie willCallFunction(ScriptExecutionContext*, const String& scriptName, int scriptLine);
static void didCallFunction(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willChangeXHRReadyState(ScriptExecutionContext*, XMLHttpRequest* request);
@@ -261,8 +259,6 @@
static void didInstallTimerImpl(InstrumentingAgents*, int timerId, int timeout, bool singleShot);
static void didRemoveTimerImpl(InstrumentingAgents*, int timerId);
- static void didResizeMainFrameImpl(Frame*);
-
static InspectorInstrumentationCookie willCallFunctionImpl(InstrumentingAgents*, const String& scriptName, int scriptLine);
static void didCallFunctionImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willChangeXHRReadyStateImpl(InstrumentingAgents*, XMLHttpRequest*);
@@ -582,14 +578,6 @@
#endif
}
-inline void InspectorInstrumentation::didResizeMainFrame(Frame* frame)
-{
-#if ENABLE(INSPECTOR)
- FAST_RETURN_IF_NO_FRONTENDS(void());
- didResizeMainFrameImpl(frame);
-#endif
-}
-
inline InspectorInstrumentationCookie InspectorInstrumentation::willCallFunction(ScriptExecutionContext* context, const String& scriptName, int scriptLine)
{
#if ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/inspector/front-end/InspectorFrontendAPI.js (109859 => 109860)
--- trunk/Source/WebCore/inspector/front-end/InspectorFrontendAPI.js 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebCore/inspector/front-end/InspectorFrontendAPI.js 2012-03-06 06:16:12 UTC (rev 109860)
@@ -95,11 +95,6 @@
WebInspector.inspectorView.setCurrentPanel(WebInspector.panels.resources);
},
- setDockingUnavailable: function(unavailable)
- {
- WebInspector.setDockingUnavailable(unavailable);
- },
-
dispatch: function(signature)
{
if (WebInspector.panels) {
Modified: trunk/Source/WebCore/inspector/front-end/inspector.js (109859 => 109860)
--- trunk/Source/WebCore/inspector/front-end/inspector.js 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js 2012-03-06 06:16:12 UTC (rev 109860)
@@ -73,7 +73,6 @@
this._dockToggleButton = new WebInspector.StatusBarButton(this._dockButtonTitle(), "dock-status-bar-item");
this._dockToggleButton.addEventListener("click", this._toggleAttach.bind(this), false);
this._dockToggleButton.toggled = !this.attached;
- WebInspector.updateDockToggleButtonVisibility();
this._settingsButton = new WebInspector.StatusBarButton(WebInspector.UIString("Settings"), "settings-status-bar-item");
this._settingsButton.addEventListener("click", this._toggleSettings.bind(this), false);
@@ -565,22 +564,8 @@
WebInspector.setAttachedWindow = function(attached)
{
this.attached = attached;
- WebInspector.updateDockToggleButtonVisibility();
}
-WebInspector.setDockingUnavailable = function(unavailable)
-{
- this._isDockingUnavailable = unavailable;
- WebInspector.updateDockToggleButtonVisibility();
-}
-
-WebInspector.updateDockToggleButtonVisibility = function()
-{
- if (!this._dockToggleButton)
- return;
- this._dockToggleButton.visible = this.attached ? true : !this._isDockingUnavailable;
-}
-
WebInspector.close = function(event)
{
if (this._isClosing)
Modified: trunk/Source/WebCore/page/FrameView.cpp (109859 => 109860)
--- trunk/Source/WebCore/page/FrameView.cpp 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebCore/page/FrameView.cpp 2012-03-06 06:16:12 UTC (rev 109860)
@@ -2331,13 +2331,8 @@
bool resized = !m_firstLayout && (currentSize != m_lastLayoutSize || currentZoomFactor != m_lastZoomFactor);
m_lastLayoutSize = currentSize;
m_lastZoomFactor = currentZoomFactor;
- if (resized) {
+ if (resized)
m_frame->eventHandler()->sendResizeEvent();
- if (Page* page = m_frame->page()) {
- if (page->mainFrame() == m_frame)
- InspectorInstrumentation::didResizeMainFrame(m_frame.get());
- }
- }
}
}
Modified: trunk/Source/WebKit/mac/ChangeLog (109859 => 109860)
--- trunk/Source/WebKit/mac/ChangeLog 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-03-06 06:16:12 UTC (rev 109860)
@@ -1,5 +1,9 @@
2012-03-05 Joseph Pecoraro <[email protected]>
+ Unreviewed rollout of r109858 for restructuring.
+
+2012-03-05 Joseph Pecoraro <[email protected]>
+
<http://webkit.org/b/78575> Web Inspector: Hide dock button when not allowed to dock
Reviewed by Timothy Hatcher.
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h (109859 => 109860)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h 2012-03-06 06:16:12 UTC (rev 109860)
@@ -62,7 +62,6 @@
virtual void openInspectorFrontend(WebCore::InspectorController*) OVERRIDE;
virtual void closeInspectorFrontend() OVERRIDE;
virtual void bringFrontendToFront() OVERRIDE;
- virtual void updateDockingAvailability() OVERRIDE;
virtual void highlight() OVERRIDE;
virtual void hideHighlight() OVERRIDE;
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (109859 => 109860)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2012-03-06 06:16:12 UTC (rev 109860)
@@ -111,11 +111,6 @@
m_frontendClient->bringToFront();
}
-void WebInspectorClient::updateDockingAvailability()
-{
- m_frontendClient->setDockingUnavailable(!m_frontendClient->canAttachWindow());
-}
-
void WebInspectorClient::highlight()
{
[m_highlighter.get() highlight];
Modified: trunk/Source/WebKit2/ChangeLog (109859 => 109860)
--- trunk/Source/WebKit2/ChangeLog 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-06 06:16:12 UTC (rev 109860)
@@ -1,5 +1,9 @@
2012-03-05 Joseph Pecoraro <[email protected]>
+ Unreviewed rollout of r109858 for restructuring.
+
+2012-03-05 Joseph Pecoraro <[email protected]>
+
<http://webkit.org/b/78575> Web Inspector: Hide dock button when not allowed to dock
Reviewed by Timothy Hatcher.
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp (109859 => 109860)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp 2012-03-06 06:16:12 UTC (rev 109860)
@@ -60,11 +60,6 @@
m_page->inspector()->bringToFront();
}
-void WebInspectorClient::updateDockingAvailability()
-{
- m_page->inspector()->updateDockingAvailability();
-}
-
void WebInspectorClient::highlight()
{
if (!m_highlightOverlay) {
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h (109859 => 109860)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h 2012-03-06 06:16:12 UTC (rev 109860)
@@ -55,7 +55,6 @@
virtual void openInspectorFrontend(WebCore::InspectorController*) OVERRIDE;
virtual void closeInspectorFrontend() OVERRIDE;
virtual void bringFrontendToFront() OVERRIDE;
- virtual void updateDockingAvailability() OVERRIDE;
virtual void highlight() OVERRIDE;
virtual void hideHighlight() OVERRIDE;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (109859 => 109860)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2012-03-06 06:16:12 UTC (rev 109860)
@@ -221,12 +221,6 @@
m_frontendClient->setTimelineProfilingEnabled(false);
}
-void WebInspector::updateDockingAvailability()
-{
- if (m_frontendClient)
- m_frontendClient->setDockingUnavailable(!m_frontendClient->canAttachWindow());
-}
-
} // namespace WebKit
#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h (109859 => 109860)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2012-03-06 06:11:52 UTC (rev 109859)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2012-03-06 06:16:12 UTC (rev 109860)
@@ -102,8 +102,6 @@
void startJavaScriptProfiling();
void stopJavaScriptProfiling();
- void updateDockingAvailability();
-
WebPage* m_page;
WebPage* m_inspectorPage;
WebInspectorFrontendClient* m_frontendClient;
