Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (147191 => 147192)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-03-29 01:16:54 UTC (rev 147191)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-03-29 01:48:00 UTC (rev 147192)
@@ -1,3 +1,18 @@
+2013-03-28 James Robinson <jam...@chromium.org>
+
+ [chromium] Remove unused WebRegularExpression API
+ https://bugs.webkit.org/show_bug.cgi?id=113520
+
+ Reviewed by Kent Tamura.
+
+ Last reference to these files removed in r190880.
+
+ * WebKit.gyp:
+ * public/WebRegularExpression.h: Removed.
+ * public/WebTextCaseSensitivity.h: Removed.
+ * src/AssertMatchingEnums.cpp:
+ * src/WebRegularExpression.cpp: Removed.
+
2013-03-28 Alexandre Elias <ael...@chromium.org>
[chromium] Use widget.parent() for plugin WebMouseEvents
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (147191 => 147192)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2013-03-29 01:16:54 UTC (rev 147191)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2013-03-29 01:48:00 UTC (rev 147192)
@@ -229,7 +229,6 @@
'public/WebPopupType.h',
'public/WebPrerendererClient.h',
'public/WebRange.h',
- 'public/WebRegularExpression.h',
'public/WebRuntimeFeatures.h',
'public/WebScopedMicrotaskSuppression.h',
'public/WebScopedUserGesture.h',
@@ -263,7 +262,6 @@
'public/WebStorageQuotaError.h',
'public/WebSurroundingText.h',
'public/WebTextAffinity.h',
- 'public/WebTextCaseSensitivity.h',
'public/WebTextCheckingCompletion.h',
'public/WebTextCheckingResult.h',
'public/WebTextDirection.h',
@@ -541,7 +539,6 @@
'src/WebPopupMenuImpl.cpp',
'src/WebPopupMenuImpl.h',
'src/WebRange.cpp',
- 'src/WebRegularExpression.cpp',
'src/WebRuntimeFeatures.cpp',
'src/WebScopedMicrotaskSuppression.cpp',
'src/WebScopedUserGesture.cpp',
Deleted: trunk/Source/WebKit/chromium/public/WebRegularExpression.h (147191 => 147192)
--- trunk/Source/WebKit/chromium/public/WebRegularExpression.h 2013-03-29 01:16:54 UTC (rev 147191)
+++ trunk/Source/WebKit/chromium/public/WebRegularExpression.h 2013-03-29 01:48:00 UTC (rev 147192)
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2009 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 WebRegularExpression_h
-#define WebRegularExpression_h
-
-#include "../../../Platform/chromium/public/WebCommon.h"
-#include "../../../Platform/chromium/public/WebNonCopyable.h"
-#include "WebTextCaseSensitivity.h"
-
-namespace WebKit {
-
-class WebRegularExpressionPrivate;
-class WebString;
-
-class WebRegularExpression : public WebNonCopyable {
-public:
- WEBKIT_EXPORT WebRegularExpression(const WebString& pattern, WebTextCaseSensitivity);
- WEBKIT_EXPORT ~WebRegularExpression();
-
- WEBKIT_EXPORT int match(const WebString&, int startFrom = 0, int* matchLength = 0) const;
-
-private:
- WebRegularExpressionPrivate* m_private;
-};
-
-} // namespace WebKit
-
-#endif
Deleted: trunk/Source/WebKit/chromium/public/WebTextCaseSensitivity.h (147191 => 147192)
--- trunk/Source/WebKit/chromium/public/WebTextCaseSensitivity.h 2013-03-29 01:16:54 UTC (rev 147191)
+++ trunk/Source/WebKit/chromium/public/WebTextCaseSensitivity.h 2013-03-29 01:48:00 UTC (rev 147192)
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2009 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 WebTextCaseSensitivity_h
-#define WebTextCaseSensitivity_h
-
-namespace WebKit {
-
-// These constants specify the preferred case sensitivity.
-enum WebTextCaseSensitivity {
- WebTextCaseSensitive, // String matching is case-sensitive.
- WebTextCaseInsensitive, // String matching is case-insensitive.
-};
-
-} // namespace WebKit
-
-#endif
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (147191 => 147192)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-03-29 01:16:54 UTC (rev 147191)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-03-29 01:48:00 UTC (rev 147192)
@@ -114,7 +114,6 @@
#include "WebStorageQuotaError.h"
#include "WebStorageQuotaType.h"
#include "WebTextAffinity.h"
-#include "WebTextCaseSensitivity.h"
#include "WebTextCheckingResult.h"
#include "WebTextCheckingType.h"
#include "WebView.h"
@@ -476,9 +475,6 @@
COMPILE_ASSERT_MATCHING_ENUM(WebTextAffinityUpstream, UPSTREAM);
COMPILE_ASSERT_MATCHING_ENUM(WebTextAffinityDownstream, DOWNSTREAM);
-COMPILE_ASSERT_MATCHING_ENUM(WebTextCaseSensitive, TextCaseSensitive);
-COMPILE_ASSERT_MATCHING_ENUM(WebTextCaseInsensitive, TextCaseInsensitive);
-
COMPILE_ASSERT_MATCHING_ENUM(WebView::UserScriptInjectAtDocumentStart, InjectAtDocumentStart);
COMPILE_ASSERT_MATCHING_ENUM(WebView::UserScriptInjectAtDocumentEnd, InjectAtDocumentEnd);
COMPILE_ASSERT_MATCHING_ENUM(WebView::UserContentInjectInAllFrames, InjectInAllFrames);
Deleted: trunk/Source/WebKit/chromium/src/WebRegularExpression.cpp (147191 => 147192)
--- trunk/Source/WebKit/chromium/src/WebRegularExpression.cpp 2013-03-29 01:16:54 UTC (rev 147191)
+++ trunk/Source/WebKit/chromium/src/WebRegularExpression.cpp 2013-03-29 01:48:00 UTC (rev 147192)
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-#include "config.h"
-#include "WebRegularExpression.h"
-
-#include "RegularExpression.h"
-#include <public/WebString.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-class WebRegularExpressionPrivate : public RegularExpression {
-};
-
-WebRegularExpression::WebRegularExpression(const WebString& pattern,
- WebTextCaseSensitivity caseSensitivity)
-{
- TextCaseSensitivity sensitivity = static_cast<TextCaseSensitivity>(caseSensitivity);
- RegularExpression* re = new RegularExpression(pattern, sensitivity);
- m_private = static_cast<WebRegularExpressionPrivate*>(re);
-}
-
-WebRegularExpression::~WebRegularExpression()
-{
- delete m_private;
-}
-
-int WebRegularExpression::match(const WebString& str,
- int startFrom,
- int* matchLength) const
-{
- if (!m_private)
- return -1;
-
- return m_private->match(str, startFrom, matchLength);
-}
-
-} // namespace WebKit
