Modified: trunk/Source/WebKit/chromium/ChangeLog (108022 => 108023)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-02-17 04:36:50 UTC (rev 108022)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-02-17 04:46:20 UTC (rev 108023)
@@ -1,3 +1,17 @@
+2012-02-16 MORITA Hajime <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=78065
+ [Chromium] Should eliminate WebTextCheckingResult legacy APIs
+
+ Reviewed by Kent Tamura.
+
+ Removed unused legacy members.
+
+ * public/WebTextCheckingResult.h:
+ (WebKit::WebTextCheckingResult::WebTextCheckingResult):
+ (WebTextCheckingResult):
+ * src/AssertMatchingEnums.cpp:
+
2012-02-16 Evan Martin <[email protected]>
[chromium] pull third_party/gold to fix linux build
Modified: trunk/Source/WebKit/chromium/public/WebTextCheckingResult.h (108022 => 108023)
--- trunk/Source/WebKit/chromium/public/WebTextCheckingResult.h 2012-02-17 04:36:50 UTC (rev 108022)
+++ trunk/Source/WebKit/chromium/public/WebTextCheckingResult.h 2012-02-17 04:46:20 UTC (rev 108023)
@@ -34,7 +34,6 @@
#include "WebTextCheckingType.h"
#include "platform/WebCommon.h"
#include "platform/WebString.h"
-#include "platform/WebVector.h"
namespace WebCore {
struct TextCheckingResult;
@@ -44,50 +43,19 @@
// A checked entry of text checking.
struct WebTextCheckingResult {
- // FIXME: Should be removed after we confirm Chromium does not use it.
- enum Error {
- ErrorSpelling = 1 << 0,
- ErrorGrammar = 1 << 1
- };
-
WebTextCheckingResult()
: type(WebTextCheckingTypeSpelling)
- , error(ErrorSpelling)
- , position(0)
, location(0)
, length(0)
{
}
- explicit WebTextCheckingResult(Error e, int p = 0, int l = 0)
- : type(WebTextCheckingTypeSpelling)
- , error(e)
- , position(p)
- , location(p)
- , length(l)
- {
- if (e & ErrorSpelling)
- type = WebTextCheckingTypeSpelling;
- else if (e & ErrorGrammar)
- type = WebTextCheckingTypeGrammar;
- else
- WEBKIT_ASSERT_NOT_REACHED();
- }
-
WebTextCheckingResult(WebTextCheckingType type, int location, int length, const WebString& replacement = WebString())
: type(type)
- , error(ErrorSpelling)
- , position(location)
, location(location)
, length(length)
, replacement(replacement)
{
- if (type & WebTextCheckingTypeSpelling)
- error = ErrorSpelling;
- else if (type & WebTextCheckingTypeGrammar)
- error = ErrorGrammar;
- else
- WEBKIT_ASSERT_NOT_REACHED();
}
#if WEBKIT_IMPLEMENTATION
@@ -95,8 +63,6 @@
#endif
WebTextCheckingType type;
- Error error; // FIXME: Should be removed after we confirm Chromium does not use it.
- int position; // FIXME: Should be removed after we confirm Chromium does not use it.
int location;
int length;
WebString replacement;
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (108022 => 108023)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-02-17 04:36:50 UTC (rev 108022)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-02-17 04:46:20 UTC (rev 108023)
@@ -454,9 +454,6 @@
COMPILE_ASSERT_MATCHING_ENUM(WebGeolocationError::ErrorPermissionDenied, GeolocationError::PermissionDenied);
COMPILE_ASSERT_MATCHING_ENUM(WebGeolocationError::ErrorPositionUnavailable, GeolocationError::PositionUnavailable);
-COMPILE_ASSERT_MATCHING_ENUM(WebTextCheckingResult::ErrorSpelling, DocumentMarker::Spelling);
-COMPILE_ASSERT_MATCHING_ENUM(WebTextCheckingResult::ErrorGrammar, DocumentMarker::Grammar);
-
COMPILE_ASSERT_MATCHING_ENUM(WebTextCheckingTypeSpelling, TextCheckingTypeSpelling);
COMPILE_ASSERT_MATCHING_ENUM(WebTextCheckingTypeGrammar, TextCheckingTypeGrammar);
COMPILE_ASSERT_MATCHING_ENUM(WebTextCheckingTypeLink, TextCheckingTypeLink);
