[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 15:46:46 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0f729bd79a082c518fcfba6629990c7bf47b91ef
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 12 05:38:23 2010 +0000
2010-11-11 Kavita Kanetkar <kkanetkar at chromium.org>
Reviewed by Dumitru Daniliuc.
FileSystem: Fix a link error for non-chromium WebKit build
https://bugs.webkit.org/show_bug.cgi?id=49296
* WebCore.xcodeproj/project.pbxproj:
* inspector/InspectorFileSystemAgent.cpp:
(WebCore::InspectorFileSystemAgentCallbacks::didOpenFileSystem):
(WebCore::InspectorFileSystemAgentCallbacks::didReadDirectoryEntry):
(WebCore::InspectorFileSystemAgentCallbacks::didReadDirectoryEntries):
(WebCore::InspectorFileSystemAgentCallbacks::didCreateFileWriter):
(WebCore::InspectorFileSystemAgentCallbacks::didFail):
(WebCore::InspectorFileSystemAgent::revealFolderInOS):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71885 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f58b0dc..a6359a0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-11 Kavita Kanetkar <kkanetkar at chromium.org>
+
+ Reviewed by Dumitru Daniliuc.
+
+ FileSystem: Fix a link error for non-chromium WebKit build
+ https://bugs.webkit.org/show_bug.cgi?id=49296
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * inspector/InspectorFileSystemAgent.cpp:
+ (WebCore::InspectorFileSystemAgentCallbacks::didOpenFileSystem):
+ (WebCore::InspectorFileSystemAgentCallbacks::didReadDirectoryEntry):
+ (WebCore::InspectorFileSystemAgentCallbacks::didReadDirectoryEntries):
+ (WebCore::InspectorFileSystemAgentCallbacks::didCreateFileWriter):
+ (WebCore::InspectorFileSystemAgentCallbacks::didFail):
+ (WebCore::InspectorFileSystemAgent::revealFolderInOS):
+
2010-11-11 Nate Chapin <japhet at chromium.org>
Reviewed by Antti Koivisto.
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index e9d62e5..f2b5131 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -895,6 +895,8 @@
37F818FD0D657606005E1F05 /* WebCoreURLResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 37F818FB0D657606005E1F05 /* WebCoreURLResponse.h */; settings = {ATTRIBUTES = (Private, ); }; };
37F818FE0D657606005E1F05 /* WebCoreURLResponse.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37F818FC0D657606005E1F05 /* WebCoreURLResponse.mm */; };
37FD4298118368460093C029 /* TreeDepthLimit.h in Headers */ = {isa = PBXBuildFile; fileRef = 37FD4297118368460093C029 /* TreeDepthLimit.h */; };
+ 3888F6EE128C9889000CA8E0 /* InspectorFileSystemAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3888F6EC128C9889000CA8E0 /* InspectorFileSystemAgent.cpp */; };
+ 3888F6EF128C9889000CA8E0 /* InspectorFileSystemAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 3888F6ED128C9889000CA8E0 /* InspectorFileSystemAgent.h */; };
41002CCD0F66EDEF009E660D /* ScriptFunctionCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 41002CCB0F66EDEF009E660D /* ScriptFunctionCall.h */; };
41002CCE0F66EDEF009E660D /* ScriptFunctionCall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41002CCC0F66EDEF009E660D /* ScriptFunctionCall.cpp */; };
410B7E721045FAB000D8224F /* JSMessageEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 410B7E711045FAB000D8224F /* JSMessageEventCustom.cpp */; };
@@ -6988,6 +6990,8 @@
37F818FC0D657606005E1F05 /* WebCoreURLResponse.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreURLResponse.mm; sourceTree = "<group>"; };
37FC96DA1104ED71003E1FAD /* TrailingFloatsRootInlineBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrailingFloatsRootInlineBox.h; sourceTree = "<group>"; };
37FD4297118368460093C029 /* TreeDepthLimit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TreeDepthLimit.h; sourceTree = "<group>"; };
+ 3888F6EC128C9889000CA8E0 /* InspectorFileSystemAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFileSystemAgent.cpp; sourceTree = "<group>"; };
+ 3888F6ED128C9889000CA8E0 /* InspectorFileSystemAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFileSystemAgent.h; sourceTree = "<group>"; };
41002CCB0F66EDEF009E660D /* ScriptFunctionCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptFunctionCall.h; sourceTree = "<group>"; };
41002CCC0F66EDEF009E660D /* ScriptFunctionCall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptFunctionCall.cpp; sourceTree = "<group>"; };
410B7E711045FAB000D8224F /* JSMessageEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMessageEventCustom.cpp; sourceTree = "<group>"; };
@@ -12353,6 +12357,8 @@
7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */,
41F061730F5F00AC00A07EAC /* InspectorDOMStorageResource.cpp */,
41F061720F5F00AC00A07EAC /* InspectorDOMStorageResource.h */,
+ 3888F6EC128C9889000CA8E0 /* InspectorFileSystemAgent.cpp */,
+ 3888F6ED128C9889000CA8E0 /* InspectorFileSystemAgent.h */,
F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */,
F344C75711294FF600F26EEE /* InspectorFrontendClientLocal.cpp */,
F344C75211294D9D00F26EEE /* InspectorFrontendClientLocal.h */,
@@ -21362,6 +21368,7 @@
97DD4D870FDF4D6E00ECF9A4 /* XSSAuditor.h in Headers */,
499B3C59128C641E00E726C2 /* GraphicsLayerMac.h in Headers */,
08250939128BD4D800E2ED8E /* SVGAnimatedTransformList.h in Headers */,
+ 3888F6EF128C9889000CA8E0 /* InspectorFileSystemAgent.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -23932,6 +23939,7 @@
E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
97DD4D860FDF4D6E00ECF9A4 /* XSSAuditor.cpp in Sources */,
499B3C5A128C641E00E726C2 /* GraphicsLayerMac.mm in Sources */,
+ 3888F6EE128C9889000CA8E0 /* InspectorFileSystemAgent.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebCore/inspector/InspectorFileSystemAgent.cpp b/WebCore/inspector/InspectorFileSystemAgent.cpp
index 2192fd1..2a0df3c 100644
--- a/WebCore/inspector/InspectorFileSystemAgent.cpp
+++ b/WebCore/inspector/InspectorFileSystemAgent.cpp
@@ -42,6 +42,7 @@
#include "InspectorController.h"
#include "InspectorFrontend.h"
#include "LocalFileSystem.h"
+#include "NotImplemented.h"
#include "Page.h"
#include "RuntimeEnabledFeatures.h"
@@ -66,7 +67,7 @@ public:
ASSERT_NOT_REACHED();
}
- void didOpenFileSystem(const String& name, PassOwnPtr<AsyncFileSystem> fileSystem)
+ void didOpenFileSystem(const String&, PassOwnPtr<AsyncFileSystem> fileSystem)
{
// Agent will be alive even if InspectorController is destroyed until callback is run.
m_agent->didGetFileSystemPath(fileSystem->root(), m_type, m_origin);
@@ -77,22 +78,22 @@ public:
ASSERT_NOT_REACHED();
}
- void didReadDirectoryEntry(const String& name, bool isDirectory)
+ void didReadDirectoryEntry(const String&, bool)
{
ASSERT_NOT_REACHED();
}
- void didReadDirectoryEntries(bool hasMore)
+ void didReadDirectoryEntries(bool)
{
ASSERT_NOT_REACHED();
}
- void didCreateFileWriter(PassOwnPtr<AsyncFileWriter> writer, long long length)
+ void didCreateFileWriter(PassOwnPtr<AsyncFileWriter>, long long)
{
ASSERT_NOT_REACHED();
}
- void didFail(int code)
+ void didFail(int)
{
// FIXME: Is it useful to give back the code to Inspector UI?
m_agent->didGetFileSystemError(m_type, m_origin);
@@ -117,10 +118,18 @@ void InspectorFileSystemAgent::stop()
m_inspectorController = 0;
}
+#if PLATFORM(CHROMIUM)
void InspectorFileSystemAgent::revealFolderInOS(const String& path)
{
+ // FIXME: Remove guard when revealFolderInOS is implemented for non-chromium platforms.
WebCore::revealFolderInOS(path);
}
+#else
+void InspectorFileSystemAgent::revealFolderInOS(const String&)
+{
+ notImplemented();
+}
+#endif
void InspectorFileSystemAgent::getFileSystemPathAsync(unsigned int type, const String& origin)
{
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list