Title: [131946] trunk
Revision
131946
Author
[email protected]
Date
2012-10-19 14:55:09 -0700 (Fri, 19 Oct 2012)

Log Message

Unreviewed, rolling out r131936.
http://trac.webkit.org/changeset/131936
https://bugs.webkit.org/show_bug.cgi?id=99717

Broke the clang build

.:

* Source/autotools/symbols.filter:

Source/WebCore:

* WebCore.exp.in:
* inspector/InspectorFrontendClient.h:
(InspectorFrontendClient):
* inspector/InspectorFrontendClientLocal.cpp:
(WebCore::InspectorFrontendClientLocal::requestAttachWindow):
(WebCore):
(WebCore::InspectorFrontendClientLocal::requestDetachWindow):
(WebCore::InspectorFrontendClientLocal::setAttachedWindow):
* inspector/InspectorFrontendClientLocal.h:
(InspectorFrontendClientLocal):
(WebCore::InspectorFrontendClientLocal::requestSetDockSide):
* inspector/InspectorFrontendHost.cpp:
(WebCore::InspectorFrontendHost::requestAttachWindow):
(WebCore):
(WebCore::InspectorFrontendHost::requestDetachWindow):
(WebCore::InspectorFrontendHost::requestSetDockSide):
* inspector/InspectorFrontendHost.h:
(InspectorFrontendHost):
* inspector/InspectorFrontendHost.idl:
* inspector/front-end/DockController.js:
(WebInspector.DockController):
(WebInspector.DockController.prototype.setDocked):
(WebInspector.DockController.prototype._innerSetDocked.set if):
(WebInspector.DockController.prototype._innerSetDocked):
(WebInspector.DockController.prototype._updateUI.get states):
(WebInspector.DockController.prototype._updateUI):
(WebInspector.DockController.prototype._toggleDockState):
* inspector/front-end/InspectorFrontendAPI.js:
(InspectorFrontendAPI.setAttachedWindow):
(InspectorFrontendAPI.setDockSide):
* inspector/front-end/InspectorFrontendHostStub.js:
(.WebInspector.InspectorFrontendHostStub.prototype.requestAttachWindow):
(.WebInspector.InspectorFrontendHostStub.prototype.requestDetachWindow):
(.WebInspector.InspectorFrontendHostStub.prototype.requestSetDockSide):
* inspector/front-end/externs.js:
(InspectorFrontendHostAPI.prototype.requestAttachWindow):
(InspectorFrontendHostAPI.prototype.requestDetachWindow):

Source/WebKit/chromium:

* public/WebDevToolsFrontendClient.h:
(WebKit::WebDevToolsFrontendClient::requestDockWindow):
(WebKit::WebDevToolsFrontendClient::requestUndockWindow):
* src/InspectorFrontendClientImpl.cpp:
(WebKit::InspectorFrontendClientImpl::requestAttachWindow):
(WebKit):
(WebKit::InspectorFrontendClientImpl::requestDetachWindow):
(WebKit::InspectorFrontendClientImpl::requestSetDockSide):
* src/InspectorFrontendClientImpl.h:
(InspectorFrontendClientImpl):

Source/WebKit2:

* win/WebKit2.def:
* win/WebKit2CFLite.def:

Modified Paths

Diff

Modified: trunk/ChangeLog (131945 => 131946)


--- trunk/ChangeLog	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/ChangeLog	2012-10-19 21:55:09 UTC (rev 131946)
@@ -1,3 +1,13 @@
+2012-10-19  Tony Chang  <[email protected]>
+
+        Unreviewed, rolling out r131936.
+        http://trac.webkit.org/changeset/131936
+        https://bugs.webkit.org/show_bug.cgi?id=99717
+
+        Broke the clang build
+
+        * Source/autotools/symbols.filter:
+
 2012-10-19  Dongwoo Joshua Im  <[email protected]>
 
         Rename ENABLE_CSS3_TEXT_DECORATION to ENABLE_CSS3_TEXT

Modified: trunk/Source/WebCore/ChangeLog (131945 => 131946)


--- trunk/Source/WebCore/ChangeLog	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebCore/ChangeLog	2012-10-19 21:55:09 UTC (rev 131946)
@@ -1,3 +1,49 @@
+2012-10-19  Tony Chang  <[email protected]>
+
+        Unreviewed, rolling out r131936.
+        http://trac.webkit.org/changeset/131936
+        https://bugs.webkit.org/show_bug.cgi?id=99717
+
+        Broke the clang build
+
+        * WebCore.exp.in:
+        * inspector/InspectorFrontendClient.h:
+        (InspectorFrontendClient):
+        * inspector/InspectorFrontendClientLocal.cpp:
+        (WebCore::InspectorFrontendClientLocal::requestAttachWindow):
+        (WebCore):
+        (WebCore::InspectorFrontendClientLocal::requestDetachWindow):
+        (WebCore::InspectorFrontendClientLocal::setAttachedWindow):
+        * inspector/InspectorFrontendClientLocal.h:
+        (InspectorFrontendClientLocal):
+        (WebCore::InspectorFrontendClientLocal::requestSetDockSide):
+        * inspector/InspectorFrontendHost.cpp:
+        (WebCore::InspectorFrontendHost::requestAttachWindow):
+        (WebCore):
+        (WebCore::InspectorFrontendHost::requestDetachWindow):
+        (WebCore::InspectorFrontendHost::requestSetDockSide):
+        * inspector/InspectorFrontendHost.h:
+        (InspectorFrontendHost):
+        * inspector/InspectorFrontendHost.idl:
+        * inspector/front-end/DockController.js:
+        (WebInspector.DockController):
+        (WebInspector.DockController.prototype.setDocked):
+        (WebInspector.DockController.prototype._innerSetDocked.set if):
+        (WebInspector.DockController.prototype._innerSetDocked):
+        (WebInspector.DockController.prototype._updateUI.get states):
+        (WebInspector.DockController.prototype._updateUI):
+        (WebInspector.DockController.prototype._toggleDockState):
+        * inspector/front-end/InspectorFrontendAPI.js:
+        (InspectorFrontendAPI.setAttachedWindow):
+        (InspectorFrontendAPI.setDockSide):
+        * inspector/front-end/InspectorFrontendHostStub.js:
+        (.WebInspector.InspectorFrontendHostStub.prototype.requestAttachWindow):
+        (.WebInspector.InspectorFrontendHostStub.prototype.requestDetachWindow):
+        (.WebInspector.InspectorFrontendHostStub.prototype.requestSetDockSide):
+        * inspector/front-end/externs.js:
+        (InspectorFrontendHostAPI.prototype.requestAttachWindow):
+        (InspectorFrontendHostAPI.prototype.requestDetachWindow):
+
 2012-10-09  Martin Robinson  <[email protected]>
 
         REGRESSION (r130699): 5 various fast/ tests started failing

Modified: trunk/Source/WebCore/WebCore.exp.in (131945 => 131946)


--- trunk/Source/WebCore/WebCore.exp.in	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebCore/WebCore.exp.in	2012-10-19 21:55:09 UTC (rev 131946)
@@ -2306,7 +2306,8 @@
 __ZN7WebCore28InspectorFrontendClientLocal15canAttachWindowEv
 __ZN7WebCore28InspectorFrontendClientLocal17setAttachedWindowEb
 __ZN7WebCore28InspectorFrontendClientLocal18isDebuggingEnabledEv
-__ZN7WebCore28InspectorFrontendClientLocal18requestSetDockSideENS_23InspectorFrontendClient8DockSideE
+__ZN7WebCore28InspectorFrontendClientLocal19requestAttachWindowEv
+__ZN7WebCore28InspectorFrontendClientLocal19requestDetachWindowEv
 __ZN7WebCore28InspectorFrontendClientLocal19setDebuggingEnabledEb
 __ZN7WebCore28InspectorFrontendClientLocal19windowObjectClearedEv
 __ZN7WebCore28InspectorFrontendClientLocal20sendMessageToBackendERKN3WTF6StringE

Modified: trunk/Source/WebCore/inspector/InspectorFrontendClient.h (131945 => 131946)


--- trunk/Source/WebCore/inspector/InspectorFrontendClient.h	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClient.h	2012-10-19 21:55:09 UTC (rev 131946)
@@ -41,12 +41,6 @@
 
 class InspectorFrontendClient {
 public:
-    enum DockSide {
-        UNDOCKED = 0,
-        DOCKED_TO_RIGHT,
-        DOCKED_TO_BOTTOM
-    };
-
     virtual ~InspectorFrontendClient() { }
 
     virtual void windowObjectCleared() = 0;
@@ -60,7 +54,9 @@
     virtual void bringToFront() = 0;
     virtual void closeWindow() = 0;
 
-    virtual void requestSetDockSide(DockSide) = 0;
+    virtual void requestAttachWindow() = 0;
+    virtual void requestDetachWindow() = 0;
+    virtual void requestSetDockSide(const String&) = 0;
     virtual void changeAttachedWindowHeight(unsigned) = 0;
     virtual void openInNewTab(const String& url) = 0;
     virtual bool canSave() = 0;

Modified: trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp (131945 => 131946)


--- trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp	2012-10-19 21:55:09 UTC (rev 131946)
@@ -148,17 +148,20 @@
     m_evaluateOnLoad.clear();
 }
 
-void InspectorFrontendClientLocal::requestSetDockSide(DockSide dockSide)
+void InspectorFrontendClientLocal::requestAttachWindow()
 {
-    if (dockSide == UNDOCKED) {
-        detachWindow();
-        setAttachedWindow(false);
-    } else if (canAttachWindow()) {
-        attachWindow();
-        setAttachedWindow(true);
-    }
+    if (!canAttachWindow())
+        return;
+    attachWindow();
+    setAttachedWindow(true);
 }
 
+void InspectorFrontendClientLocal::requestDetachWindow()
+{
+    detachWindow();
+    setAttachedWindow(false);
+}
+
 bool InspectorFrontendClientLocal::canAttachWindow()
 {
     // Don't allow the attach if the window would be too small to accommodate the minimum inspector height.
@@ -211,7 +214,7 @@
 
 void InspectorFrontendClientLocal::setAttachedWindow(bool attached)
 {
-    evaluateOnLoad(String::format("[\"setDockSide\", %s]", attached ? "bottom" : "undocked"));
+    evaluateOnLoad(String::format("[\"setAttachedWindow\", %s]", attached ? "true" : "false"));
 }
 
 void InspectorFrontendClientLocal::restoreAttachedWindowHeight()

Modified: trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h (131945 => 131946)


--- trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h	2012-10-19 21:55:09 UTC (rev 131946)
@@ -63,7 +63,9 @@
 
     virtual void moveWindowBy(float x, float y);
 
-    virtual void requestSetDockSide(DockSide);
+    virtual void requestAttachWindow();
+    virtual void requestDetachWindow();
+    virtual void requestSetDockSide(const String&) { }
     virtual void changeAttachedWindowHeight(unsigned);
     virtual void openInNewTab(const String& url);
     virtual bool canSave() { return false; }

Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp (131945 => 131946)


--- trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp	2012-10-19 21:55:09 UTC (rev 131946)
@@ -149,16 +149,22 @@
         m_client->frontendLoaded();
 }
 
+void InspectorFrontendHost::requestAttachWindow()
+{
+    if (m_client)
+        m_client->requestAttachWindow();
+}
+
+void InspectorFrontendHost::requestDetachWindow()
+{
+    if (m_client)
+        m_client->requestDetachWindow();
+}
+
 void InspectorFrontendHost::requestSetDockSide(const String& side)
 {
-    if (!m_client)
-        return;
-    if (side == "undocked")
-        m_client->requestSetDockSide(InspectorFrontendClient::UNDOCKED);
-    else if (side == "right")
-        m_client->requestSetDockSide(InspectorFrontendClient::DOCKED_TO_RIGHT);
-    else if (side == "bottom")
-        m_client->requestSetDockSide(InspectorFrontendClient::DOCKED_TO_BOTTOM);
+    if (m_client)
+        m_client->requestSetDockSide(side);
 }
 
 void InspectorFrontendHost::closeWindow()

Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.h (131945 => 131946)


--- trunk/Source/WebCore/inspector/InspectorFrontendHost.h	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.h	2012-10-19 21:55:09 UTC (rev 131946)
@@ -57,6 +57,8 @@
     void disconnectClient();
 
     void loaded();
+    void requestAttachWindow();
+    void requestDetachWindow();
     void requestSetDockSide(const String&);
     void closeWindow();
     void bringToFront();

Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.idl (131945 => 131946)


--- trunk/Source/WebCore/inspector/InspectorFrontendHost.idl	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.idl	2012-10-19 21:55:09 UTC (rev 131946)
@@ -39,6 +39,8 @@
     void setZoomFactor(in float zoom);
     void inspectedURLChanged(in DOMString newURL);
 
+    void requestAttachWindow();
+    void requestDetachWindow();
     void requestSetDockSide(in DOMString side);
     void setAttachedWindowHeight(in unsigned long height);
     void moveWindowBy(in float x, in float y);

Modified: trunk/Source/WebCore/inspector/front-end/DockController.js (131945 => 131946)


--- trunk/Source/WebCore/inspector/front-end/DockController.js	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebCore/inspector/front-end/DockController.js	2012-10-19 21:55:09 UTC (rev 131946)
@@ -40,7 +40,8 @@
     if (Preferences.showDockToRight)
         this._dockToggleButton.makeLongClickEnabled(this._createDockOptions.bind(this));
 
-    this.setDockSide(WebInspector.queryParamsObject["dockSide"]);
+    this._dockSide = WebInspector.queryParamsObject["dockSide"];
+    this._innerSetDocked(WebInspector.queryParamsObject["docked"] === "true");
 }
 
 WebInspector.DockController.State = {
@@ -59,18 +60,33 @@
     },
 
     /**
-     * @param {string} dockSide
+     * @param {boolean} docked
      */
-    setDockSide: function(dockSide)
+    setDocked: function(docked)
     {
-        if (this._dockSide)
-            WebInspector.settings.lastDockState.set(this._dockSide);
+        var isDocked = this._state !== WebInspector.DockController.State.Undocked;
+        if (docked !== isDocked)
+            this._innerSetDocked(docked);
+    },
 
-        this._dockSide = dockSide;
-        if (dockSide === WebInspector.DockController.State.Undocked) 
+    /**
+     * @param {boolean} docked
+     */
+    _innerSetDocked: function(docked)
+    {
+        if (this._state)
+            WebInspector.settings.lastDockState.set(this._state);
+
+        if (!docked) {
+            this._state = WebInspector.DockController.State.Undocked;
             WebInspector.userMetrics.WindowDocked.record();
-        else
+        } else if (this._dockSide === "right") {
+            this._state = WebInspector.DockController.State.DockedToRight;
             WebInspector.userMetrics.WindowUndocked.record();
+        } else {
+            this._state = WebInspector.DockController.State.DockedToBottom;
+            WebInspector.userMetrics.WindowUndocked.record();
+        }
         this._updateUI();
     },
 
@@ -86,7 +102,7 @@
     _updateUI: function()
     {
         var body = document.body;
-        switch (this._dockSide) {
+        switch (this._state) {
         case WebInspector.DockController.State.DockedToBottom:
             body.removeStyleClass("undocked");
             body.removeStyleClass("dock-to-right");
@@ -113,17 +129,17 @@
         this._dockToggleButton.disabled = false;
 
         // Choose different last state based on the current one if missing or if is the same.
-        var sides = [WebInspector.DockController.State.DockedToBottom, WebInspector.DockController.State.Undocked, WebInspector.DockController.State.DockedToRight];
-        sides.remove(this._dockSide);
+        var states = [WebInspector.DockController.State.DockedToBottom, WebInspector.DockController.State.Undocked, WebInspector.DockController.State.DockedToRight];
+        states.remove(this._state);
         var lastState = WebInspector.settings.lastDockState.get();
 
-        sides.remove(lastState);
-        if (sides.length === 2) { // last state was not from the list of potential values
-            lastState = sides[0];
-            sides.remove(lastState);
+        states.remove(lastState);
+        if (states.length === 2) { // last state was not from the list of potential values
+            lastState = states[0];
+            states.remove(lastState);
         }
         this._decorateButtonForTargetState(this._dockToggleButton, lastState);
-        this._decorateButtonForTargetState(this._dockToggleButtonOption, sides[0]);
+        this._decorateButtonForTargetState(this._dockToggleButtonOption, states[0]);
     },
 
     /**
@@ -158,13 +174,22 @@
      */
     _toggleDockState: function(e)
     {
-        var action;
-        switch (e.target.state) {
-        case "bottom": action = "" break;
-        case "right": action = "" break;
-        case "undock": action = "" break;
+        var state = e.target.state;
+        switch (state) {
+        case "undock":
+            InspectorFrontendHost.requestDetachWindow();
+            WebInspector.userMetrics.WindowUndocked.record();
+            break;
+        case "right":
+        case "bottom":
+            this._dockSide = state;
+            InspectorFrontendHost.requestSetDockSide(this._dockSide);
+            if (this._state === WebInspector.DockController.State.Undocked)
+                InspectorFrontendHost.requestAttachWindow();
+            else
+                this._innerSetDocked(true);
+            break;
         }
-        InspectorFrontendHost.requestSetDockSide(action);
     },
 
     /**

Modified: trunk/Source/WebCore/inspector/front-end/InspectorFrontendAPI.js (131945 => 131946)


--- trunk/Source/WebCore/inspector/front-end/InspectorFrontendAPI.js	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebCore/inspector/front-end/InspectorFrontendAPI.js	2012-10-19 21:55:09 UTC (rev 131946)
@@ -74,15 +74,14 @@
             WebInspector.CPUProfileType.instance.stopRecordingProfile();
     },
 
-    setAttachedWindow: function(side)
+    setAttachedWindow: function(attached)
     {
-      
+        if (WebInspector.dockController)
+            WebInspector.dockController.setDocked(attached);
     },
 
-    setDockSide: function(side)
+    setDockSide: function(dockSide)
     {
-        if (WebInspector.dockController)
-            WebInspector.dockController.setDockSide(side);
     },
 
     showConsole: function()

Modified: trunk/Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js (131945 => 131946)


--- trunk/Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js	2012-10-19 21:55:09 UTC (rev 131946)
@@ -69,11 +69,20 @@
         this._windowVisible = false;
     },
 
-    requestSetDockSide: function(side)
+    requestAttachWindow: function()
     {
-        InspectorFrontendAPI.setDockSide(side);
+        InspectorFrontendAPI.setAttachedWindow(true);
     },
 
+    requestDetachWindow: function()
+    {
+        InspectorFrontendAPI.setAttachedWindow(false);
+    },
+
+    requestSetDockSide: function()
+    {
+    },
+
     setAttachedWindowHeight: function(height)
     {
     },

Modified: trunk/Source/WebCore/inspector/front-end/externs.js (131945 => 131946)


--- trunk/Source/WebCore/inspector/front-end/externs.js	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebCore/inspector/front-end/externs.js	2012-10-19 21:55:09 UTC (rev 131946)
@@ -123,6 +123,8 @@
 InspectorFrontendHostAPI.prototype.port = function() {}
 InspectorFrontendHostAPI.prototype.bringToFront = function() {}
 InspectorFrontendHostAPI.prototype.closeWindow = function() {}
+InspectorFrontendHostAPI.prototype.requestAttachWindow = function() {}
+InspectorFrontendHostAPI.prototype.requestDetachWindow = function() {}
 InspectorFrontendHostAPI.prototype.requestSetDockSide = function(dockSide) {}
 InspectorFrontendHostAPI.prototype.setAttachedWindowHeight = function(height) {}
 InspectorFrontendHostAPI.prototype.moveWindowBy = function(x, y) {}

Modified: trunk/Source/WebKit/chromium/ChangeLog (131945 => 131946)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-10-19 21:55:09 UTC (rev 131946)
@@ -1,3 +1,22 @@
+2012-10-19  Tony Chang  <[email protected]>
+
+        Unreviewed, rolling out r131936.
+        http://trac.webkit.org/changeset/131936
+        https://bugs.webkit.org/show_bug.cgi?id=99717
+
+        Broke the clang build
+
+        * public/WebDevToolsFrontendClient.h:
+        (WebKit::WebDevToolsFrontendClient::requestDockWindow):
+        (WebKit::WebDevToolsFrontendClient::requestUndockWindow):
+        * src/InspectorFrontendClientImpl.cpp:
+        (WebKit::InspectorFrontendClientImpl::requestAttachWindow):
+        (WebKit):
+        (WebKit::InspectorFrontendClientImpl::requestDetachWindow):
+        (WebKit::InspectorFrontendClientImpl::requestSetDockSide):
+        * src/InspectorFrontendClientImpl.h:
+        (InspectorFrontendClientImpl):
+
 2012-10-19  Alexandre Elias  <[email protected]>
 
         [chromium] API to pass impl thread via WebLayerTreeView

Modified: trunk/Source/WebKit/chromium/public/WebDevToolsFrontendClient.h (131945 => 131946)


--- trunk/Source/WebKit/chromium/public/WebDevToolsFrontendClient.h	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebKit/chromium/public/WebDevToolsFrontendClient.h	2012-10-19 21:55:09 UTC (rev 131946)
@@ -45,6 +45,8 @@
 
     virtual void activateWindow() { }
     virtual void closeWindow() { }
+    virtual void requestDockWindow() { }
+    virtual void requestUndockWindow() { }
     virtual void requestSetDockSide(const WebString& side) { }
     virtual void moveWindowBy(const WebFloatPoint&) { }
     virtual void openInNewTab(const WebString& side) { }

Modified: trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.cpp (131945 => 131946)


--- trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.cpp	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.cpp	2012-10-19 21:55:09 UTC (rev 131946)
@@ -103,17 +103,21 @@
     m_client->closeWindow();
 }
 
-void InspectorFrontendClientImpl::requestSetDockSide(DockSide side)
+void InspectorFrontendClientImpl::requestAttachWindow()
 {
-    String sideString = "undocked";
-    switch (side) {
-    case DOCKED_TO_RIGHT: sideString = "right"; break;
-    case DOCKED_TO_BOTTOM: sideString = "bottom"; break;
-    case UNDOCKED: sideString = "undocked"; break;
-    }
-    m_client->requestSetDockSide(sideString);
+    m_client->requestDockWindow();
 }
 
+void InspectorFrontendClientImpl::requestDetachWindow()
+{
+    m_client->requestUndockWindow();
+}
+
+void InspectorFrontendClientImpl::requestSetDockSide(const String& side)
+{
+    m_client->requestSetDockSide(side);
+}
+
 void InspectorFrontendClientImpl::changeAttachedWindowHeight(unsigned)
 {
     // Do nothing;

Modified: trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.h (131945 => 131946)


--- trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.h	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.h	2012-10-19 21:55:09 UTC (rev 131946)
@@ -62,7 +62,9 @@
     virtual void bringToFront();
     virtual void closeWindow();
 
-    virtual void requestSetDockSide(DockSide);
+    virtual void requestAttachWindow();
+    virtual void requestDetachWindow();
+    virtual void requestSetDockSide(const String&);
     virtual void changeAttachedWindowHeight(unsigned);
 
     virtual void openInNewTab(const String& url);

Modified: trunk/Source/WebKit2/ChangeLog (131945 => 131946)


--- trunk/Source/WebKit2/ChangeLog	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebKit2/ChangeLog	2012-10-19 21:55:09 UTC (rev 131946)
@@ -1,3 +1,14 @@
+2012-10-19  Tony Chang  <[email protected]>
+
+        Unreviewed, rolling out r131936.
+        http://trac.webkit.org/changeset/131936
+        https://bugs.webkit.org/show_bug.cgi?id=99717
+
+        Broke the clang build
+
+        * win/WebKit2.def:
+        * win/WebKit2CFLite.def:
+
 2012-10-19  Sheriff Bot  <[email protected]>
 
         Unreviewed, rolling out r131931.

Modified: trunk/Source/WebKit2/win/WebKit2.def (131945 => 131946)


--- trunk/Source/WebKit2/win/WebKit2.def	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebKit2/win/WebKit2.def	2012-10-19 21:55:09 UTC (rev 131946)
@@ -304,7 +304,8 @@
         ?moveWindowBy@InspectorFrontendClientLocal@WebCore@@UAEXMM@Z
         ?open@DOMWindow@WebCore@@QAE?AV?$PassRefPtr@VDOMWindow@WebCore@@@WTF@@ABVString@4@ABVAtomicString@4@0PAV12@2@Z
         ?openInNewTab@InspectorFrontendClientLocal@WebCore@@UAEXABVString@WTF@@@Z
-        ?requestSetDockSide@InspectorFrontendClientLocal@WebCore@@UAEXW4DockSide@InspectorFrontendClient@2@@Z
+        ?requestAttachWindow@InspectorFrontendClientLocal@WebCore@@UAEXXZ
+        ?requestDetachWindow@InspectorFrontendClientLocal@WebCore@@UAEXXZ
         ?sendMessageToBackend@InspectorFrontendClientLocal@WebCore@@UAEXABVString@WTF@@@Z
         ?setInspectorFrontendClient@InspectorController@WebCore@@QAEXV?$PassOwnPtr@VInspectorFrontendClient@WebCore@@@WTF@@@Z
         ?setProperty@Settings@InspectorFrontendClientLocal@WebCore@@UAEXABVString@WTF@@0@Z

Modified: trunk/Source/WebKit2/win/WebKit2CFLite.def (131945 => 131946)


--- trunk/Source/WebKit2/win/WebKit2CFLite.def	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/WebKit2/win/WebKit2CFLite.def	2012-10-19 21:55:09 UTC (rev 131946)
@@ -293,7 +293,8 @@
         ?moveWindowBy@InspectorFrontendClientLocal@WebCore@@UAEXMM@Z
         ?open@DOMWindow@WebCore@@QAE?AV?$PassRefPtr@VDOMWindow@WebCore@@@WTF@@ABVString@4@ABVAtomicString@4@0PAV12@2@Z
         ?openInNewTab@InspectorFrontendClientLocal@WebCore@@UAEXABVString@WTF@@@Z
-        ?requestSetDockSide@InspectorFrontendClientLocal@WebCore@@UAEXW4DockSide@InspectorFrontendClient@2@@Z
+        ?requestAttachWindow@InspectorFrontendClientLocal@WebCore@@UAEXXZ
+        ?requestDetachWindow@InspectorFrontendClientLocal@WebCore@@UAEXXZ
         ?sendMessageToBackend@InspectorFrontendClientLocal@WebCore@@UAEXABVString@WTF@@@Z
         ?setInspectorFrontendClient@InspectorController@WebCore@@QAEXV?$PassOwnPtr@VInspectorFrontendClient@WebCore@@@WTF@@@Z
         ?setProperty@Settings@InspectorFrontendClientLocal@WebCore@@UAEXABVString@WTF@@0@Z

Modified: trunk/Source/autotools/symbols.filter (131945 => 131946)


--- trunk/Source/autotools/symbols.filter	2012-10-19 21:36:00 UTC (rev 131945)
+++ trunk/Source/autotools/symbols.filter	2012-10-19 21:55:09 UTC (rev 131946)
@@ -99,7 +99,8 @@
 _ZN7WebCore28InspectorFrontendClientLocal12moveWindowByEff;
 _ZN7WebCore28InspectorFrontendClientLocal12openInNewTabERKN3WTF6StringE;
 _ZN7WebCore28InspectorFrontendClientLocal14frontendLoadedEv;
-_ZN7WebCore28InspectorFrontendClientLocal18requestSetDockSideENS_23InspectorFrontendClient8DockSideE;
+_ZN7WebCore28InspectorFrontendClientLocal19requestAttachWindowEv;
+_ZN7WebCore28InspectorFrontendClientLocal19requestDetachWindowEv;
 _ZN7WebCore28InspectorFrontendClientLocal19windowObjectClearedEv;
 _ZN7WebCore28InspectorFrontendClientLocal20sendMessageToBackendERKN3WTF6StringE;
 _ZN7WebCore28InspectorFrontendClientLocal26changeAttachedWindowHeightEj;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to