diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 2 | ||||
| -rw-r--r-- | webkit/pending/NSResolver.h | 45 |
3 files changed, 2 insertions, 47 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@2975", + "/trunk/deps/third_party/WebKit@2977", "src/third_party/cygwin": "/trunk/deps/third_party/cygwin@1788", diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 74b102d..3c901a3 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -3414,7 +3414,7 @@ > </File> <File - RelativePath="..\..\pending\NSResolver.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\NSResolver.h" > </File> <File diff --git a/webkit/pending/NSResolver.h b/webkit/pending/NSResolver.h deleted file mode 100644 index 74a3b07..0000000 --- a/webkit/pending/NSResolver.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2008 Apple 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: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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 NSResolver_h -#define NSResolver_h - -#include <wtf/RefCounted.h> - -namespace WebCore { - - class ExceptionContext; - class String; - - class NSResolver : public RefCounted<NSResolver> { - public: - virtual ~NSResolver() { } - virtual String lookupNamespaceURI(ExceptionContext*, const String& prefix) = 0; - virtual void mark() { } - }; - -} // namespace WebCore - -#endif // NSResolver_h |