<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173363] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173363">173363</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-09-06 13:52:28 -0700 (Sat, 06 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: convert DockSide to an enum class
https://bugs.webkit.org/show_bug.cgi?id=136601
Reviewed by Timothy Hatcher.
Source/WebCore:
* inspector/InspectorFrontendClient.h:
* inspector/InspectorFrontendClientLocal.cpp:
(WebCore::InspectorFrontendClientLocal::InspectorFrontendClientLocal):
(WebCore::InspectorFrontendClientLocal::requestSetDockSide):
(WebCore::InspectorFrontendClientLocal::canAttachWindow):
(WebCore::InspectorFrontendClientLocal::setAttachedWindow):
* inspector/InspectorFrontendHost.cpp:
(WebCore::InspectorFrontendHost::requestSetDockSide):
Source/WebKit/mac:
* WebCoreSupport/WebInspectorClient.mm:
(WebInspectorFrontendClient::frontendLoaded):
(-[WebInspectorWindowController attachWindow:]):
(-[WebInspectorWindowController attach]):
(-[WebInspectorWindowController detach]):
* WebInspector/WebInspectorFrontend.mm:
(-[WebInspectorFrontend attach]):
Source/WebKit/win:
* WebCoreSupport/WebInspectorClient.cpp:
(WebInspectorFrontendClient::frontendLoaded):
Source/WebKit2:
* WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp:
(WebKit::WebInspectorFrontendClient::attachWindow):
* WebProcess/WebPage/WebInspector.cpp:
(WebKit::WebInspector::attachedBottom):
(WebKit::WebInspector::attachedRight):
(WebKit::WebInspector::detached):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendClienth">trunk/Source/WebCore/inspector/InspectorFrontendClient.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendClientLocalcpp">trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHostcpp">trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebInspectorWebInspectorFrontendmm">trunk/Source/WebKit/mac/WebInspector/WebInspectorFrontend.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebInspectorClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebInspectorFrontendClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorcpp">trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173362 => 173363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-06 19:27:04 UTC (rev 173362)
+++ trunk/Source/WebCore/ChangeLog 2014-09-06 20:52:28 UTC (rev 173363)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-09-06 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: convert DockSide to an enum class
+ https://bugs.webkit.org/show_bug.cgi?id=136601
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorFrontendClient.h:
+ * inspector/InspectorFrontendClientLocal.cpp:
+ (WebCore::InspectorFrontendClientLocal::InspectorFrontendClientLocal):
+ (WebCore::InspectorFrontendClientLocal::requestSetDockSide):
+ (WebCore::InspectorFrontendClientLocal::canAttachWindow):
+ (WebCore::InspectorFrontendClientLocal::setAttachedWindow):
+ * inspector/InspectorFrontendHost.cpp:
+ (WebCore::InspectorFrontendHost::requestSetDockSide):
+
</ins><span class="cx"> 2014-09-06 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Serialize ResourceResponses using WebKit types
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendClient.h (173362 => 173363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendClient.h 2014-09-06 19:27:04 UTC (rev 173362)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClient.h 2014-09-06 20:52:28 UTC (rev 173363)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">
</span><span class="cx"> class InspectorFrontendClient {
</span><span class="cx"> public:
</span><del>- enum DockSide {
- UNDOCKED = 0,
- DOCKED_TO_RIGHT,
- DOCKED_TO_BOTTOM
</del><ins>+ enum class DockSide {
+ Undocked = 0,
+ Right,
+ Bottom,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> virtual ~InspectorFrontendClient() { }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendClientLocalcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp (173362 => 173363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp 2014-09-06 19:27:04 UTC (rev 173362)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp 2014-09-06 20:52:28 UTC (rev 173363)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> , m_frontendPage(frontendPage)
</span><span class="cx"> , m_settings(WTF::move(settings))
</span><span class="cx"> , m_frontendLoaded(false)
</span><del>- , m_dockSide(UNDOCKED)
</del><ins>+ , m_dockSide(DockSide::Undocked)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendPage->settings().setAllowFileAccessFromFileURLs(true);
</span><span class="cx"> m_dispatchTask = std::make_unique<InspectorBackendDispatchTask>(inspectorController);
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorFrontendClientLocal::requestSetDockSide(DockSide dockSide)
</span><span class="cx"> {
</span><del>- if (dockSide == UNDOCKED) {
</del><ins>+ if (dockSide == DockSide::Undocked) {
</ins><span class="cx"> detachWindow();
</span><span class="cx"> setAttachedWindow(dockSide);
</span><span class="cx"> } else if (canAttachWindow()) {
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // If we are already attached, allow attaching again to allow switching sides.
</span><del>- if (m_dockSide != UNDOCKED)
</del><ins>+ if (m_dockSide != DockSide::Undocked)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // Don't allow the attach if the window would be too small to accommodate the minimum inspector size.
</span><span class="lines">@@ -238,13 +238,13 @@
</span><span class="cx"> {
</span><span class="cx"> const char* side = "undocked";
</span><span class="cx"> switch (dockSide) {
</span><del>- case UNDOCKED:
</del><ins>+ case DockSide::Undocked:
</ins><span class="cx"> side = "undocked";
</span><span class="cx"> break;
</span><del>- case DOCKED_TO_RIGHT:
</del><ins>+ case DockSide::Right:
</ins><span class="cx"> side = "right";
</span><span class="cx"> break;
</span><del>- case DOCKED_TO_BOTTOM:
</del><ins>+ case DockSide::Bottom:
</ins><span class="cx"> side = "bottom";
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp (173362 => 173363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2014-09-06 19:27:04 UTC (rev 173362)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2014-09-06 20:52:28 UTC (rev 173363)
</span><span class="lines">@@ -156,11 +156,11 @@
</span><span class="cx"> if (!m_client)
</span><span class="cx"> return;
</span><span class="cx"> if (side == "undocked")
</span><del>- m_client->requestSetDockSide(InspectorFrontendClient::UNDOCKED);
</del><ins>+ m_client->requestSetDockSide(InspectorFrontendClient::DockSide::Undocked);
</ins><span class="cx"> else if (side == "right")
</span><del>- m_client->requestSetDockSide(InspectorFrontendClient::DOCKED_TO_RIGHT);
</del><ins>+ m_client->requestSetDockSide(InspectorFrontendClient::DockSide::Right);
</ins><span class="cx"> else if (side == "bottom")
</span><del>- m_client->requestSetDockSide(InspectorFrontendClient::DOCKED_TO_BOTTOM);
</del><ins>+ m_client->requestSetDockSide(InspectorFrontendClient::DockSide::Bottom);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorFrontendHost::closeWindow()
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (173362 => 173363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-09-06 19:27:04 UTC (rev 173362)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-09-06 20:52:28 UTC (rev 173363)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-09-06 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: convert DockSide to an enum class
+ https://bugs.webkit.org/show_bug.cgi?id=136601
+
+ Reviewed by Timothy Hatcher.
+
+ * WebCoreSupport/WebInspectorClient.mm:
+ (WebInspectorFrontendClient::frontendLoaded):
+ (-[WebInspectorWindowController attachWindow:]):
+ (-[WebInspectorWindowController attach]):
+ (-[WebInspectorWindowController detach]):
+ * WebInspector/WebInspectorFrontend.mm:
+ (-[WebInspectorFrontend attach]):
+
</ins><span class="cx"> 2014-09-05 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r173340 and r173342.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (173362 => 173363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2014-09-06 19:27:04 UTC (rev 173362)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2014-09-06 20:52:28 UTC (rev 173363)
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> @selector(webView:didClearInspectorWindowObject:forFrame:), [frame windowObject], frame);
</span><span class="cx">
</span><span class="cx"> bool attached = [m_windowController.get() attached];
</span><del>- setAttachedWindow(attached ? DOCKED_TO_BOTTOM : UNDOCKED);
</del><ins>+ setAttachedWindow(attached ? DockSide::Bottom : DockSide::Undocked);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebInspectorFrontendClient::localizedStringsURL()
</span><span class="lines">@@ -604,7 +604,7 @@
</span><span class="cx">
</span><span class="cx"> - (IBAction)attachWindow:(id)sender
</span><span class="cx"> {
</span><del>- _frontendClient->attachWindow(InspectorFrontendClient::DOCKED_TO_BOTTOM);
</del><ins>+ _frontendClient->attachWindow(InspectorFrontendClient::DockSide::Bottom);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)showWindow:(id)sender
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> _inspectorClient->setInspectorStartsAttached(true);
</span><del>- _frontendClient->setAttachedWindow(InspectorFrontendClient::DOCKED_TO_BOTTOM);
</del><ins>+ _frontendClient->setAttachedWindow(InspectorFrontendClient::DockSide::Bottom);
</ins><span class="cx">
</span><span class="cx"> [self close];
</span><span class="cx"> [self showWindow:nil];
</span><span class="lines">@@ -663,7 +663,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> _inspectorClient->setInspectorStartsAttached(false);
</span><del>- _frontendClient->setAttachedWindow(InspectorFrontendClient::UNDOCKED);
</del><ins>+ _frontendClient->setAttachedWindow(InspectorFrontendClient::DockSide::Undocked);
</ins><span class="cx">
</span><span class="cx"> [self close];
</span><span class="cx"> [self showWindow:nil];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebInspectorWebInspectorFrontendmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebInspector/WebInspectorFrontend.mm (173362 => 173363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebInspector/WebInspectorFrontend.mm 2014-09-06 19:27:04 UTC (rev 173362)
+++ trunk/Source/WebKit/mac/WebInspector/WebInspectorFrontend.mm 2014-09-06 20:52:28 UTC (rev 173363)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)attach
</span><span class="cx"> {
</span><del>- m_frontendClient->attachWindow(InspectorFrontendClient::DOCKED_TO_BOTTOM);
</del><ins>+ m_frontendClient->attachWindow(InspectorFrontendClient::DockSide::Bottom);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)detach
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (173362 => 173363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-09-06 19:27:04 UTC (rev 173362)
+++ trunk/Source/WebKit/win/ChangeLog 2014-09-06 20:52:28 UTC (rev 173363)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-09-06 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: convert DockSide to an enum class
+ https://bugs.webkit.org/show_bug.cgi?id=136601
+
+ Reviewed by Timothy Hatcher.
+
+ * WebCoreSupport/WebInspectorClient.cpp:
+ (WebInspectorFrontendClient::frontendLoaded):
+
</ins><span class="cx"> 2014-09-04 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix windows build.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebInspectorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp (173362 => 173363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2014-09-06 19:27:04 UTC (rev 173362)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2014-09-06 20:52:28 UTC (rev 173363)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> if (m_attached)
</span><span class="cx"> restoreAttachedWindowHeight();
</span><span class="cx">
</span><del>- setAttachedWindow(m_attached ? DOCKED_TO_BOTTOM : UNDOCKED);
</del><ins>+ setAttachedWindow(m_attached ? DockSide::Bottom : DockSide::Undocked);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebInspectorFrontendClient::localizedStringsURL()
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173362 => 173363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-06 19:27:04 UTC (rev 173362)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-06 20:52:28 UTC (rev 173363)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-09-06 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: convert DockSide to an enum class
+ https://bugs.webkit.org/show_bug.cgi?id=136601
+
+ Reviewed by Timothy Hatcher.
+
+ * WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp:
+ (WebKit::WebInspectorFrontendClient::attachWindow):
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::attachedBottom):
+ (WebKit::WebInspector::attachedRight):
+ (WebKit::WebInspector::detached):
+
</ins><span class="cx"> 2014-09-06 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Serialize ResourceResponses using WebKit types
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebInspectorFrontendClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp (173362 => 173363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp 2014-09-06 19:27:04 UTC (rev 173362)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp 2014-09-06 20:52:28 UTC (rev 173363)
</span><span class="lines">@@ -79,13 +79,13 @@
</span><span class="cx"> void WebInspectorFrontendClient::attachWindow(DockSide dockSide)
</span><span class="cx"> {
</span><span class="cx"> switch (dockSide) {
</span><del>- case InspectorFrontendClient::UNDOCKED:
</del><ins>+ case InspectorFrontendClient::DockSide::Undocked:
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><del>- case InspectorFrontendClient::DOCKED_TO_BOTTOM:
</del><ins>+ case InspectorFrontendClient::DockSide::Bottom:
</ins><span class="cx"> m_page->inspector()->attachBottom();
</span><span class="cx"> break;
</span><del>- case InspectorFrontendClient::DOCKED_TO_RIGHT:
</del><ins>+ case InspectorFrontendClient::DockSide::Right:
</ins><span class="cx"> m_page->inspector()->attachRight();
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (173362 => 173363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2014-09-06 19:27:04 UTC (rev 173362)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2014-09-06 20:52:28 UTC (rev 173363)
</span><span class="lines">@@ -216,19 +216,19 @@
</span><span class="cx"> void WebInspector::attachedBottom()
</span><span class="cx"> {
</span><span class="cx"> if (m_frontendClient)
</span><del>- m_frontendClient->setAttachedWindow(InspectorFrontendClient::DOCKED_TO_BOTTOM);
</del><ins>+ m_frontendClient->setAttachedWindow(InspectorFrontendClient::DockSide::Bottom);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspector::attachedRight()
</span><span class="cx"> {
</span><span class="cx"> if (m_frontendClient)
</span><del>- m_frontendClient->setAttachedWindow(InspectorFrontendClient::DOCKED_TO_RIGHT);
</del><ins>+ m_frontendClient->setAttachedWindow(InspectorFrontendClient::DockSide::Right);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspector::detached()
</span><span class="cx"> {
</span><span class="cx"> if (m_frontendClient)
</span><del>- m_frontendClient->setAttachedWindow(InspectorFrontendClient::UNDOCKED);
</del><ins>+ m_frontendClient->setAttachedWindow(InspectorFrontendClient::DockSide::Undocked);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebInspector::evaluateScriptForTest(const String& script)
</span></span></pre>
</div>
</div>
</body>
</html>