https://bugs.webkit.org/show_bug.cgi?id=164768
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-11-15
Reviewed by Brian Burg.
* inspector/DOMPatchSupport.cpp:
* inspector/InspectorApplicationCacheAgent.cpp:
* inspector/InspectorApplicationCacheAgent.h:
* inspector/InspectorCSSAgent.cpp:
* inspector/InspectorCSSAgent.h:
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
* inspector/InspectorDOMAgent.h:
* inspector/InspectorDOMDebuggerAgent.h:
* inspector/InspectorDOMStorageAgent.cpp:
* inspector/InspectorDOMStorageAgent.h:
* inspector/InspectorDatabaseAgent.cpp:
* inspector/InspectorDatabaseAgent.h:
* inspector/InspectorFrontendClientLocal.cpp:
(WebCore::InspectorFrontendClientLocal::frontendLoaded):
* inspector/InspectorIndexedDBAgent.cpp:
(WebCore::ClearObjectStoreListener::create): Deleted.
(WebCore::ClearObjectStoreListener::~ClearObjectStoreListener): Deleted.
(WebCore::ClearObjectStoreListener::ClearObjectStoreListener): Deleted.
(WebCore::ClearObjectStore::create): Deleted.
(WebCore::ClearObjectStore::ClearObjectStore): Deleted.
* inspector/InspectorLayerTreeAgent.cpp:
* inspector/InspectorLayerTreeAgent.h:
* inspector/InspectorNetworkAgent.h:
* inspector/InspectorPageAgent.cpp:
* inspector/InspectorPageAgent.h:
* inspector/InspectorReplayAgent.cpp:
* inspector/InspectorReplayAgent.h:
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::stopFromConsole):
* inspector/InspectorTimelineAgent.h:
* inspector/PageRuntimeAgent.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@208742
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2016-11-15 Joseph Pecoraro <pecoraro@apple.com>
+
+ Misc Inspector backend cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=164768
+
+ Reviewed by Brian Burg.
+
+ * inspector/DOMPatchSupport.cpp:
+ * inspector/InspectorApplicationCacheAgent.cpp:
+ * inspector/InspectorApplicationCacheAgent.h:
+ * inspector/InspectorCSSAgent.cpp:
+ * inspector/InspectorCSSAgent.h:
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
+ * inspector/InspectorDOMAgent.h:
+ * inspector/InspectorDOMDebuggerAgent.h:
+ * inspector/InspectorDOMStorageAgent.cpp:
+ * inspector/InspectorDOMStorageAgent.h:
+ * inspector/InspectorDatabaseAgent.cpp:
+ * inspector/InspectorDatabaseAgent.h:
+ * inspector/InspectorFrontendClientLocal.cpp:
+ (WebCore::InspectorFrontendClientLocal::frontendLoaded):
+ * inspector/InspectorIndexedDBAgent.cpp:
+ (WebCore::ClearObjectStoreListener::create): Deleted.
+ (WebCore::ClearObjectStoreListener::~ClearObjectStoreListener): Deleted.
+ (WebCore::ClearObjectStoreListener::ClearObjectStoreListener): Deleted.
+ (WebCore::ClearObjectStore::create): Deleted.
+ (WebCore::ClearObjectStore::ClearObjectStore): Deleted.
+ * inspector/InspectorLayerTreeAgent.cpp:
+ * inspector/InspectorLayerTreeAgent.h:
+ * inspector/InspectorNetworkAgent.h:
+ * inspector/InspectorPageAgent.cpp:
+ * inspector/InspectorPageAgent.h:
+ * inspector/InspectorReplayAgent.cpp:
+ * inspector/InspectorReplayAgent.h:
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::stopFromConsole):
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/PageRuntimeAgent.h:
+
2016-11-14 Myles C. Maxfield <mmaxfield@apple.com>
[WebGL] Migrate construction functions from pointers to references
#include "Node.h"
#include "XMLDocument.h"
#include "XMLDocumentParser.h"
-
#include <wtf/Deque.h>
#include <wtf/HashTraits.h>
#include <wtf/RefPtr.h>
#include "MainFrame.h"
#include "NetworkStateNotifier.h"
#include "Page.h"
-#include "ResourceResponse.h"
-#include <inspector/InspectorFrontendDispatchers.h>
#include <inspector/InspectorValues.h>
#include <wtf/text/StringBuilder.h>
class Frame;
class InspectorPageAgent;
class Page;
-class ResourceResponse;
typedef String ErrorString;
#include "FontCache.h"
#include "HTMLHeadElement.h"
#include "HTMLStyleElement.h"
-#include "InspectorDOMAgent.h"
#include "InspectorHistory.h"
#include "InspectorPageAgent.h"
#include "InstrumentingAgents.h"
void regionOversetChanged(WebKitNamedFlow*, int documentNodeId);
void reset();
- // InspectorInstrumentation callbacks.
+ // InspectorInstrumentation
void documentDetached(Document&);
void mediaQueryResultChanged();
void activeStyleSheetsUpdated(Document&);
#include "StyleSheetList.h"
#include "Text.h"
#include "TextNodeTraversal.h"
+#include "Timer.h"
#include "XPathResult.h"
#include "htmlediting.h"
#include "markup.h"
break;
}
- disabled = !axObject->isEnabled();
+ disabled = !axObject->isEnabled();
exists = true;
supportsExpanded = axObject->supportsExpanded();
#include "EventTarget.h"
#include "InspectorWebAgentBase.h"
-#include "Timer.h"
#include <inspector/InspectorBackendDispatchers.h>
#include <inspector/InspectorFrontendDispatchers.h>
#include <inspector/InspectorValues.h>
-#include <wtf/Deque.h>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/RefPtr.h>
namespace WebCore {
class AccessibilityObject;
-class ContainerNode;
class CharacterData;
class DOMEditor;
class Document;
class InspectorOverlay;
class InspectorPageAgent;
class HitTestResult;
-class HTMLElement;
-class NameNodeMap;
class Node;
class PseudoElement;
class RevalidateStyleAttributeTask;
void getEventListeners(Node*, Vector<EventListenerInfo>& listenersArray, bool includeAncestors);
- // InspectorInstrumentation callbacks.
+ // InspectorInstrumentation
void didInsertDOMNode(Node&);
void didRemoveDOMNode(Node&);
void willModifyDOMAttr(Element&, const AtomicString& oldValue, const AtomicString& newValue);
std::unique_ptr<RevalidateStyleAttributeTask> m_revalidateStyleAttrTask;
RefPtr<Node> m_nodeToFocus;
RefPtr<Node> m_mousedOverNode;
- bool m_searchingForNode { false };
std::unique_ptr<HighlightConfig> m_inspectModeHighlightConfig;
std::unique_ptr<InspectorHistory> m_history;
std::unique_ptr<DOMEditor> m_domEditor;
+ bool m_searchingForNode { false };
bool m_suppressAttributeModifiedEvent { false };
bool m_documentRequested { false };
};
void setDOMBreakpoint(ErrorString&, int nodeId, const String& type) override;
void removeDOMBreakpoint(ErrorString&, int nodeId, const String& type) override;
- // InspectorInstrumentation callbacks.
+ // InspectorInstrumentation
void willInsertDOMNode(Node& parent);
void didInvalidateStyleAttr(Node&);
void didInsertDOMNode(Node&);
#include "InspectorPageAgent.h"
#include "InstrumentingAgents.h"
#include "Page.h"
-#include "PageGroup.h"
#include "SecurityOrigin.h"
#include "SecurityOriginData.h"
#include "Storage.h"
#include "VoidCallback.h"
#include <inspector/InspectorFrontendDispatchers.h>
#include <inspector/InspectorValues.h>
-#include <wtf/Vector.h>
using namespace Inspector;
namespace Inspector {
class DOMStorageFrontendDispatcher;
-class InspectorArray;
}
namespace WebCore {
String storageId(Storage*);
RefPtr<Inspector::Protocol::DOMStorage::StorageId> storageId(SecurityOrigin*, bool isLocalStorage);
- // Called from InspectorInstrumentation
+ // InspectorInstrumentation
void didDispatchDOMStorageEvent(const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*);
private:
bool handleEvent(SQLTransaction*, SQLError* error) final
{
reportTransactionFailed(m_requestCallback.copyRef(), error);
- return true;
+ return true;
}
Ref<ExecuteSQLCallback> m_requestCallback;
#include <wtf/HashMap.h>
#include <wtf/text/WTFString.h>
-namespace Inspector {
-class InspectorArray;
-}
-
namespace WebCore {
class Database;
{
// Call setDockingUnavailable before bringToFront. If we display the inspector window via bringToFront first it causes
// the call to canAttachWindow to return the wrong result on Windows.
- // Calling bringToFront first causes the visibleHeight of the inspected page to always return 0 immediately after.
+ // Calling bringToFront first causes the visibleHeight of the inspected page to always return 0 immediately after.
// Thus if we call canAttachWindow first we can avoid this problem. This change does not cause any regressions on Mac.
setDockingUnavailable(!canAttachWindow());
bringToFront();
*/
#include "config.h"
+#include "InspectorIndexedDBAgent.h"
#if ENABLE(INDEXED_DATABASE)
-#include "InspectorIndexedDBAgent.h"
-
#include "DOMStringList.h"
#include "DOMWindow.h"
#include "DOMWindowIndexedDatabase.h"
return IDBKeyRange::create(WTFMove(idbLower), WTFMove(idbUpper), lowerOpen, upperOpen);
}
-class DataLoader;
-
-class OpenCursorCallback : public EventListener {
+class OpenCursorCallback final : public EventListener {
public:
static Ref<OpenCursorCallback> create(InjectedScript injectedScript, Ref<RequestDataCallback>&& requestCallback, int skipCount, unsigned pageSize)
{
unsigned m_pageSize;
};
-class DataLoader : public ExecutableWithDatabase {
+class DataLoader final : public ExecutableWithDatabase {
public:
static Ref<DataLoader> create(ScriptExecutionContext* context, Ref<RequestDataCallback>&& requestCallback, const InjectedScript& injectedScript, const String& objectStoreName, const String& indexName, RefPtr<IDBKeyRange>&& idbKeyRange, int skipCount, unsigned pageSize)
{
dataLoader->start(idbFactory, document->securityOrigin(), databaseName);
}
-class ClearObjectStoreListener : public EventListener {
+class ClearObjectStoreListener final : public EventListener {
WTF_MAKE_NONCOPYABLE(ClearObjectStoreListener);
public:
static Ref<ClearObjectStoreListener> create(Ref<ClearObjectStoreCallback> requestCallback)
Ref<ClearObjectStoreCallback> m_requestCallback;
};
-class ClearObjectStore : public ExecutableWithDatabase {
+class ClearObjectStore final : public ExecutableWithDatabase {
public:
static Ref<ClearObjectStore> create(ScriptExecutionContext* context, const String& objectStoreName, Ref<ClearObjectStoreCallback>&& requestCallback)
{
#include "InspectorLayerTreeAgent.h"
#include "InspectorDOMAgent.h"
-#include <inspector/InspectorFrontendDispatchers.h>
#include "InstrumentingAgents.h"
#include "IntRect.h"
#include "PseudoElement.h"
void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
void reset();
- // InspectorInstrumentation callbacks.
+ // InspectorInstrumentation
void layerTreeDidChange();
void renderLayerDestroyed(const RenderLayer&);
void pseudoElementDestroyed(PseudoElement&);
void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
- // InspectorInstrumentation callbacks.
+ // InspectorInstrumentation
void willRecalculateStyle();
void didRecalculateStyle();
void willSendRequest(unsigned long identifier, DocumentLoader&, ResourceRequest&, const ResourceResponse& redirectResponse);
#include "InspectorDOMAgent.h"
#include "InspectorNetworkAgent.h"
#include "InspectorOverlay.h"
-#include "InspectorTimelineAgent.h"
#include "InstrumentingAgents.h"
#include "MIMETypeRegistry.h"
#include "MainFrame.h"
#pragma once
#include "InspectorWebAgentBase.h"
-#include "IntSize.h"
#include "LayoutRect.h"
#include <inspector/InspectorBackendDispatchers.h>
#include <inspector/InspectorFrontendDispatchers.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
-class InspectorArray;
class InspectorObject;
}
class DOMWrapperWorld;
class DocumentLoader;
class Frame;
-class Frontend;
class InspectorClient;
class InspectorOverlay;
class MainFrame;
class Page;
class RenderObject;
class SharedBuffer;
-class TextResourceDecoder;
typedef String ErrorString;
static void resourceContent(ErrorString&, Frame*, const URL&, String* result, bool* base64Encoded);
static String sourceMapURLForResource(CachedResource*);
- static PassRefPtr<SharedBuffer> resourceData(Frame*, const URL&, String* textEncodingName);
static CachedResource* cachedResource(Frame*, const URL&);
static Inspector::Protocol::Page::ResourceType resourceTypeJson(ResourceType);
static ResourceType cachedResourceType(const CachedResource&);
void handleJavaScriptDialog(ErrorString&, bool accept, const String* promptText) override;
void archive(ErrorString&, String* data) override;
- // InspectorInstrumentation callbacks.
+ // InspectorInstrumentation
void didClearWindowObjectInWorld(Frame*, DOMWrapperWorld&);
void domContentEventFired();
void loadEventFired();
#include "ReplaySession.h"
#include "ReplaySessionSegment.h"
#include "SerializationMethods.h"
-#include "WebReplayInputs.h" // For EncodingTraits<InputQueue>.
+#include "WebReplayInputs.h"
#include <inspector/InspectorValues.h>
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
class DocumentLoader;
class Event;
class Frame;
-class InspectorPageAgent;
class Page;
class ReplaySession;
class ReplaySessionSegment;
void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
- // InspectorInstrumentation callbacks.
+ // InspectorInstrumentation
void frameNavigated(Frame&);
void frameDetached(Frame&);
void willDispatchEvent(const Event&, Frame*);
if (WebConsoleAgent* consoleAgent = m_instrumentingAgents.webConsoleAgent()) {
// FIXME: Send an enum to the frontend for localization?
String warning = title.isEmpty() ? ASCIILiteral("No profiles exist") : makeString("Profile \"", title, "\" does not exist");
- consoleAgent->addMessageToConsole(std::make_unique<ConsoleMessage>(MessageSource::ConsoleAPI, MessageType::ProfileEnd, MessageLevel::Warning, warning));
+ consoleAgent->addMessageToConsole(std::make_unique<ConsoleMessage>(MessageSource::ConsoleAPI, MessageType::ProfileEnd, MessageLevel::Warning, warning));
}
}
void startFromConsole(JSC::ExecState*, const String& title);
void stopFromConsole(JSC::ExecState*, const String& title);
- // InspectorInstrumentation callbacks.
+ // InspectorInstrumentation
void didInstallTimer(int timerId, std::chrono::milliseconds timeout, bool singleShot, Frame*);
void didRemoveTimer(int timerId, Frame*);
void willFireTimer(int timerId, Frame*);
class ExecState;
}
-namespace Inspector {
-class InjectedScriptManager;
-}
-
namespace WebCore {
class InspectorPageAgent;
void enable(ErrorString&) override;
void disable(ErrorString&) override;
- // InspectorInstrumentation callbacks.
+ // InspectorInstrumentation
void didCreateMainWorldContext(Frame&);
private: