<!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>[162264] 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/162264">162264</a></dd>

<dt>Author</dt> <dd>bburg@apple.com</dd>

<dt>Date</dt> <dd>2014-01-18 11:15:33 -0800 (Sat, 18 Jan 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>Web Inspector: Page should use std::unique_ptr for InspectorController

https://bugs.webkit.org/show_bug.cgi?id=127068

Reviewed by Joseph Pecoraro.

Source/WebCore:

Make Page and WorkerGlobalScope keep a std::unique_ptr to InspectorController

and WorkerInspectorController. Store page references and return controller

references where possible.

Convert call sites to use an InspectorController reference.

Convert instantiations of InspectorFrontendClient to use std::unique_ptr.

Convert InspectorOverlay to keep Page references.

* WebCore.exp.in:

* bindings/js/JSDOMWindowBase.cpp:

(WebCore::JSDOMWindowBase::supportsProfiling):

(WebCore::JSDOMWindowBase::supportsRichSourceInfo):

* dom/Node.cpp:

(WebCore::Node::inspect):

* inspector/InspectorController.cpp:

(WebCore::InspectorController::InspectorController):

(WebCore::InspectorController::inspectedPageDestroyed):

(WebCore::InspectorController::setInspectorFrontendClient):

(WebCore::InspectorController::hasInspectorFrontendClient):

(WebCore::InspectorController::connectFrontend):

(WebCore::InspectorController::disconnectFrontend):

(WebCore::InspectorController::inspectedPage):

(WebCore::InspectorController::developerExtrasEnabled):

* inspector/InspectorController.h:

* inspector/InspectorFrontendClientLocal.cpp:

(WebCore::InspectorFrontendClientLocal::canAttachWindow):

(WebCore::InspectorFrontendClientLocal::changeAttachedWindowHeight):

(WebCore::InspectorFrontendClientLocal::changeAttachedWindowWidth):

(WebCore::InspectorFrontendClientLocal::openInNewTab):

(WebCore::InspectorFrontendClientLocal::restoreAttachedWindowHeight):

* inspector/InspectorOverlay.cpp:

(WebCore::InspectorOverlay::InspectorOverlay):

(WebCore::InspectorOverlay::getHighlight):

(WebCore::InspectorOverlay::highlightQuad):

(WebCore::InspectorOverlay::update):

(WebCore::InspectorOverlay::buildObjectForHighlightedNode):

(WebCore::InspectorOverlay::drawQuadHighlight):

(WebCore::InspectorOverlay::overlayPage):

(WebCore::InspectorOverlay::reset):

* inspector/InspectorOverlay.h:

* inspector/InstrumentingAgents.cpp:

(WebCore::instrumentationForPage): remove null checks.

(WebCore::instrumentationForWorkerGlobalScope): remove null checks.

* inspector/WorkerInspectorController.cpp:

(WebCore::WorkerInspectorController::WorkerInspectorController):

(WebCore::WorkerInspectorController::connectFrontend):

(WebCore::WorkerInspectorController::disconnectFrontend):

* inspector/WorkerInspectorController.h:

* loader/FrameLoader.cpp:

(WebCore::FrameLoader::continueLoadAfterNavigationPolicy):

(WebCore::FrameLoader::dispatchDidClearWindowObjectInWorld):

* page/ContextMenuController.cpp:

(WebCore::ContextMenuController::showContextMenu):

(WebCore::ContextMenuController::contextMenuItemSelected):

(WebCore::ContextMenuController::populate):

(WebCore::ContextMenuController::addInspectElementItem):

* page/FrameView.cpp:

(WebCore::FrameView::sendResizeEventIfNeeded):

* page/Page.cpp:

(WebCore::Page::Page):

* page/Page.h:

(WebCore::Page::inspectorController):

* page/PageDebuggable.cpp:

(WebCore::PageDebuggable::hasLocalDebugger):

(WebCore::PageDebuggable::parentProcessIdentifier):

(WebCore::PageDebuggable::connect):

(WebCore::PageDebuggable::disconnect):

(WebCore::PageDebuggable::dispatchMessageFromRemoteFrontend):

(WebCore::PageDebuggable::setIndicating):

* platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:

(WebCore::CompositingCoordinator::syncDisplayState):

* testing/Internals.cpp:

(WebCore::Internals::resetToConsistentState):

(WebCore::Internals::inspectorHighlightRects):

(WebCore::Internals::inspectorHighlightObject):

(WebCore::Internals::emitInspectorDidBeginFrame):

(WebCore::Internals::emitInspectorDidCancelFrame):

(WebCore::Internals::openDummyInspectorFrontend):

(WebCore::Internals::closeDummyInspectorFrontend):

(WebCore::Internals::setInspectorResourcesDataSizeLimits):

(WebCore::Internals::setJavaScriptProfilingEnabled):

* workers/WorkerGlobalScope.cpp:

(WebCore::WorkerGlobalScope::WorkerGlobalScope):

* workers/WorkerGlobalScope.h: remove clearInspector().

(WebCore::WorkerGlobalScope::workerInspectorController):

* workers/WorkerMessagingProxy.cpp:

(WebCore::connectToWorkerGlobalScopeInspectorTask):

(WebCore::disconnectFromWorkerGlobalScopeInspectorTask):

(WebCore::dispatchOnInspectorBackendTask):

* workers/WorkerThread.cpp:

(WebCore::WorkerThreadShutdownFinishTask::performTask):

Source/WebKit/efl: