Diff
Modified: trunk/Source/WebCore/ChangeLog (118509 => 118510)
--- trunk/Source/WebCore/ChangeLog 2012-05-25 10:15:57 UTC (rev 118509)
+++ trunk/Source/WebCore/ChangeLog 2012-05-25 10:23:29 UTC (rev 118510)
@@ -1,3 +1,30 @@
+2012-05-25 Taiju Tsuiki <[email protected]>
+
+ Web Inspector: Drop InspectorFileSystemInstrumentation
+ https://bugs.webkit.org/show_bug.cgi?id=87460
+
+ Inspector does not need to track DOMFileSystem object now. So we can
+ drop InspectorFileSystemInstrumentation.
+
+ Reviewed by Vsevolod Vlasov.
+
+ * GNUmakefile.list.am:
+ * Modules/filesystem/DOMFileSystem.cpp:
+ (WebCore::DOMFileSystem::create):
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * inspector/InspectorFileSystemAgent.cpp:
+ (WebCore::InspectorFileSystemAgent::enable):
+ * inspector/InspectorFileSystemAgent.h:
+ (InspectorFileSystemAgent):
+ * inspector/InspectorFileSystemInstrumentation.h: Removed.
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore):
+ * inspector/InspectorInstrumentation.h:
+ (WebCore):
+ (InspectorInstrumentation):
+
2012-05-25 Ilya Tikhonovsky <[email protected]>
Web Inspector: HeapProfiler: speed-up _calculateClassesRetainedSize and _buildAggregates.
Modified: trunk/Source/WebCore/GNUmakefile.list.am (118509 => 118510)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-05-25 10:15:57 UTC (rev 118509)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-05-25 10:23:29 UTC (rev 118510)
@@ -2687,7 +2687,6 @@
Source/WebCore/inspector/InspectorDOMStorageResource.h \
Source/WebCore/inspector/InspectorFileSystemAgent.cpp \
Source/WebCore/inspector/InspectorFileSystemAgent.h \
- Source/WebCore/inspector/InspectorFileSystemInstrumentation.h \
Source/WebCore/inspector/InspectorFrontendChannel.h \
Source/WebCore/inspector/InspectorFrontendClient.h \
Source/WebCore/inspector/InspectorFrontendClientLocal.cpp \
Modified: trunk/Source/WebCore/Modules/filesystem/DOMFileSystem.cpp (118509 => 118510)
--- trunk/Source/WebCore/Modules/filesystem/DOMFileSystem.cpp 2012-05-25 10:15:57 UTC (rev 118509)
+++ trunk/Source/WebCore/Modules/filesystem/DOMFileSystem.cpp 2012-05-25 10:23:29 UTC (rev 118510)
@@ -45,7 +45,6 @@
#include "FileWriter.h"
#include "FileWriterBaseCallback.h"
#include "FileWriterCallback.h"
-#include "InspectorFileSystemInstrumentation.h"
#include "MetadataCallback.h"
#include "ScriptExecutionContext.h"
#include <wtf/OwnPtr.h>
@@ -57,7 +56,6 @@
{
RefPtr<DOMFileSystem> fileSystem(adoptRef(new DOMFileSystem(context, name, type, rootURL, asyncFileSystem)));
fileSystem->suspendIfNeeded();
- InspectorInstrumentation::didOpenFileSystem(fileSystem.get());
return fileSystem.release();
}
Modified: trunk/Source/WebCore/WebCore.gypi (118509 => 118510)
--- trunk/Source/WebCore/WebCore.gypi 2012-05-25 10:15:57 UTC (rev 118509)
+++ trunk/Source/WebCore/WebCore.gypi 2012-05-25 10:23:29 UTC (rev 118510)
@@ -2789,7 +2789,6 @@
'inspector/InspectorDebuggerAgent.h',
'inspector/InspectorFileSystemAgent.cpp',
'inspector/InspectorFileSystemAgent.h',
- 'inspector/InspectorFileSystemInstrumentation.h',
'inspector/InspectorFrontendChannel.h',
'inspector/InspectorFrontendClientLocal.cpp',
'inspector/InspectorFrontendHost.cpp',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (118509 => 118510)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-05-25 10:15:57 UTC (rev 118509)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-05-25 10:23:29 UTC (rev 118510)
@@ -73495,10 +73495,6 @@
>
</File>
<File
- RelativePath="..\inspector\InspectorFileSystemInstrumentation.h"
- >
- </File>
- <File
RelativePath="..\inspector\InspectorFrontendChannel.h"
>
</File>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (118509 => 118510)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-05-25 10:15:57 UTC (rev 118509)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-05-25 10:23:29 UTC (rev 118510)
@@ -344,7 +344,6 @@
15C770A6100D41CD005BA267 /* DOMValidityState.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C770A4100D41CD005BA267 /* DOMValidityState.h */; };
15D17D21147231EB005EBCA6 /* InspectorFileSystemAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15D17D1E147231EB005EBCA6 /* InspectorFileSystemAgent.cpp */; };
15D17D22147231EB005EBCA6 /* InspectorFileSystemAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 15D17D1F147231EB005EBCA6 /* InspectorFileSystemAgent.h */; };
- 15D17D23147231EB005EBCA6 /* InspectorFileSystemInstrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 15D17D20147231EB005EBCA6 /* InspectorFileSystemInstrumentation.h */; };
163E88F7118A39D200ED9231 /* SimpleFontDataCoreText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 163E88F5118A39D200ED9231 /* SimpleFontDataCoreText.cpp */; };
163E8B13118B3ADD00ED9231 /* SimpleFontDataATSUI.mm in Sources */ = {isa = PBXBuildFile; fileRef = 163E8B12118B3ADD00ED9231 /* SimpleFontDataATSUI.mm */; };
185BCF280F3279CE000EA262 /* ThreadTimers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 185BCF260F3279CE000EA262 /* ThreadTimers.cpp */; };
@@ -7252,7 +7251,6 @@
15C770A4100D41CD005BA267 /* DOMValidityState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMValidityState.h; sourceTree = "<group>"; };
15D17D1E147231EB005EBCA6 /* InspectorFileSystemAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFileSystemAgent.cpp; sourceTree = "<group>"; };
15D17D1F147231EB005EBCA6 /* InspectorFileSystemAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFileSystemAgent.h; sourceTree = "<group>"; };
- 15D17D20147231EB005EBCA6 /* InspectorFileSystemInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFileSystemInstrumentation.h; sourceTree = "<group>"; };
163E88F5118A39D200ED9231 /* SimpleFontDataCoreText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleFontDataCoreText.cpp; sourceTree = "<group>"; };
163E8B12118B3ADD00ED9231 /* SimpleFontDataATSUI.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SimpleFontDataATSUI.mm; sourceTree = "<group>"; };
185BCF260F3279CE000EA262 /* ThreadTimers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadTimers.cpp; sourceTree = "<group>"; };
@@ -14377,7 +14375,6 @@
41F061720F5F00AC00A07EAC /* InspectorDOMStorageResource.h */,
15D17D1E147231EB005EBCA6 /* InspectorFileSystemAgent.cpp */,
15D17D1F147231EB005EBCA6 /* InspectorFileSystemAgent.h */,
- 15D17D20147231EB005EBCA6 /* InspectorFileSystemInstrumentation.h */,
2277775F1345DEA9008EA455 /* InspectorFrontendChannel.h */,
F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */,
F344C75711294FF600F26EEE /* InspectorFrontendClientLocal.cpp */,
@@ -23208,7 +23205,6 @@
7A74ECBB101839A600BF939E /* InspectorDOMStorageAgent.h in Headers */,
41F061740F5F00AC00A07EAC /* InspectorDOMStorageResource.h in Headers */,
15D17D22147231EB005EBCA6 /* InspectorFileSystemAgent.h in Headers */,
- 15D17D23147231EB005EBCA6 /* InspectorFileSystemInstrumentation.h in Headers */,
578DA20E1520EB8C006141C1 /* InspectorFrontend.h in Headers */,
227777601345DEA9008EA455 /* InspectorFrontendChannel.h in Headers */,
F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */,
Modified: trunk/Source/WebCore/inspector/InspectorFileSystemAgent.cpp (118509 => 118510)
--- trunk/Source/WebCore/inspector/InspectorFileSystemAgent.cpp 2012-05-25 10:15:57 UTC (rev 118509)
+++ trunk/Source/WebCore/inspector/InspectorFileSystemAgent.cpp 2012-05-25 10:23:29 UTC (rev 118510)
@@ -55,30 +55,12 @@
m_instrumentingAgents->setInspectorFileSystemAgent(0);
}
-void InspectorFileSystemAgent::didOpenFileSystem(PassRefPtr<DOMFileSystem> fileSystem)
-{
- // TODO(tzik):
- // Store fileSystem and notify the frontend using fileSystemAdded event.
- // fileSystem should be associated with its name.
-}
-
-void InspectorFileSystemAgent::fileSystemInvalidated(PassRefPtr<DOMFileSystem> fileSystem)
-{
- // TODO(tzik):
- // Discard fileSystem if we have.
- // If there is no other fileSystem who has same name with fileSystem,
- // notify the frontend using fileSystemInvalidated event.
-}
-
void InspectorFileSystemAgent::enable(ErrorString*)
{
if (m_enabled)
return;
m_enabled = true;
m_state->setBoolean(FileSystemAgentState::fileSystemAgentEnabled, m_enabled);
-
- // TODO(tzik):
- // Pass all available FileSystem to the frontend, using fileSystemAdded event.
}
void InspectorFileSystemAgent::disable(ErrorString*)
Modified: trunk/Source/WebCore/inspector/InspectorFileSystemAgent.h (118509 => 118510)
--- trunk/Source/WebCore/inspector/InspectorFileSystemAgent.h 2012-05-25 10:15:57 UTC (rev 118509)
+++ trunk/Source/WebCore/inspector/InspectorFileSystemAgent.h 2012-05-25 10:23:29 UTC (rev 118510)
@@ -50,9 +50,6 @@
static PassOwnPtr<InspectorFileSystemAgent> create(InstrumentingAgents*, InspectorState*);
virtual ~InspectorFileSystemAgent();
- void didOpenFileSystem(PassRefPtr<DOMFileSystem>);
- void fileSystemInvalidated(PassRefPtr<DOMFileSystem>);
-
virtual void enable(ErrorString*);
virtual void disable(ErrorString*);
Deleted: trunk/Source/WebCore/inspector/InspectorFileSystemInstrumentation.h (118509 => 118510)
--- trunk/Source/WebCore/inspector/InspectorFileSystemInstrumentation.h 2012-05-25 10:15:57 UTC (rev 118509)
+++ trunk/Source/WebCore/inspector/InspectorFileSystemInstrumentation.h 2012-05-25 10:23:29 UTC (rev 118510)
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef InspectorFileSystemInstrumentation_h
-#define InspectorFileSystemInstrumentation_h
-
-#include "DOMFileSystem.h"
-#include "InspectorInstrumentation.h"
-#include <wtf/PassRefPtr.h>
-
-namespace WebCore {
-
-#if ENABLE(FILE_SYSTEM)
-inline void InspectorInstrumentation::didOpenFileSystem(PassRefPtr<DOMFileSystem> fileSystem)
-{
-#if ENABLE(INSPECTOR)
- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(fileSystem->scriptExecutionContext()))
- didOpenFileSystemImpl(instrumentingAgents, fileSystem);
-#endif // ENABLE(INSPECTOR)
-}
-#endif // ENABLE(FILE_SYSTEM)
-
-} // namespace WebCore
-
-#endif // InspectorFileSystemInstrumentation_h
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (118509 => 118510)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2012-05-25 10:15:57 UTC (rev 118509)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2012-05-25 10:23:29 UTC (rev 118510)
@@ -36,7 +36,6 @@
#include "CSSRule.h"
#include "CSSStyleRule.h"
-#include "DOMFileSystem.h"
#include "DOMWindow.h"
#include "Database.h"
#include "DocumentLoader.h"
@@ -53,7 +52,6 @@
#include "InspectorDOMAgent.h"
#include "InspectorDOMStorageAgent.h"
#include "InspectorDebuggerAgent.h"
-#include "InspectorFileSystemAgent.h"
#include "InspectorPageAgent.h"
#include "InspectorProfilerAgent.h"
#include "InspectorResourceAgent.h"
@@ -921,14 +919,6 @@
}
#endif
-#if ENABLE(FILE_SYSTEM)
-void InspectorInstrumentation::didOpenFileSystemImpl(InstrumentingAgents* instrumentingAgents, PassRefPtr<DOMFileSystem> fileSystem)
-{
- if (InspectorFileSystemAgent* fileSystemAgent = instrumentingAgents->inspectorFileSystemAgent())
- fileSystemAgent->didOpenFileSystem(fileSystem);
-}
-#endif // ENABLE(FILE_SYSTEM)
-
void InspectorInstrumentation::didUseDOMStorageImpl(InstrumentingAgents* instrumentingAgents, StorageArea* storageArea, bool isLocalStorage, Frame* frame)
{
InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent();
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (118509 => 118510)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2012-05-25 10:15:57 UTC (rev 118509)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2012-05-25 10:23:29 UTC (rev 118510)
@@ -50,7 +50,6 @@
class CSSRule;
class CharacterData;
-class DOMFileSystem;
class DOMWindow;
class DOMWrapperWorld;
class Database;
@@ -215,10 +214,6 @@
static void didOpenDatabase(ScriptExecutionContext*, PassRefPtr<Database>, const String& domain, const String& name, const String& version);
#endif
-#if ENABLE(FILE_SYSTEM)
- static void didOpenFileSystem(PassRefPtr<DOMFileSystem>);
-#endif
-
static void didUseDOMStorage(Page*, StorageArea*, bool isLocalStorage, Frame*);
static void didDispatchDOMStorageEvent(const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
@@ -375,10 +370,6 @@
static void didOpenDatabaseImpl(InstrumentingAgents*, PassRefPtr<Database>, const String& domain, const String& name, const String& version);
#endif
-#if ENABLE(FILE_SYSTEM)
- static void didOpenFileSystemImpl(InstrumentingAgents*, PassRefPtr<DOMFileSystem>);
-#endif
-
static void didUseDOMStorageImpl(InstrumentingAgents*, StorageArea*, bool isLocalStorage, Frame*);
static void didDispatchDOMStorageEventImpl(InstrumentingAgents*, const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
