[DMC #24] Add SpellingMarker and GrammarMarker (subclasses of DocumentMarker)

third_party/WebKit/Source/core/editing/markers/DocumentMarker.cpp

 /*
  * 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
@@ skipping 16 matching lines @@
  * (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 "core/editing/markers/DocumentMarker.h"
 
 #include "platform/wtf/StdLibExtras.h"
 
 namespace blink {
 
-DocumentMarkerDetails::~DocumentMarkerDetails() {}
-
-class DocumentMarkerDescription final : public DocumentMarkerDetails {
- public:
-  static DocumentMarkerDescription* Create(const String&);
-
-  const String& Description() const { return description_; }
-  bool IsDescription() const override { return true; }
-
- private:
-  explicit DocumentMarkerDescription(const String& description)
-      : description_(description) {}
-
-  String description_;
-};
-
-DocumentMarkerDescription* DocumentMarkerDescription::Create(
-    const String& description) {
-  return new DocumentMarkerDescription(description);
-}
-
-inline DocumentMarkerDescription* ToDocumentMarkerDescription(
-    DocumentMarkerDetails* details) {
-  if (details && details->IsDescription())
-    return static_cast<DocumentMarkerDescription*>(details);
-  return 0;
-}
+DocumentMarker::~DocumentMarker() {}

[yosin_UTC9, 2017/05/29 05:13:48]

nit: s/{}/ = default;/

 
 DocumentMarker::DocumentMarker(MarkerType type,
                                unsigned start_offset,
                                unsigned end_offset)
-    : type_(type),
-      start_offset_(start_offset),
-      end_offset_(end_offset),
-      details_(nullptr) {}
-
-DocumentMarker::DocumentMarker(MarkerType type,
-                               unsigned start_offset,
-                               unsigned end_offset,
-                               const String& description)
-    : type_(type),
-      start_offset_(start_offset),
-      end_offset_(end_offset),
-      details_(description.IsEmpty()
-                   ? nullptr
-                   : DocumentMarkerDescription::Create(description)) {}
+    : type_(type), start_offset_(start_offset), end_offset_(end_offset) {}

[yosin_UTC9, 2017/05/29 05:13:48]

Let's add
DCHECK_LT(start_offset_, end_offset_)

 
 Optional<DocumentMarker::MarkerOffsets>
 DocumentMarker::ComputeOffsetsAfterShift(unsigned offset,
                                          unsigned old_length,
                                          unsigned new_length) const {
   MarkerOffsets result;
   result.start_offset = StartOffset();
   result.end_offset = EndOffset();
 
   // algorithm inspired by https://dom.spec.whatwg.org/#concept-cd-replace
@@ skipping 32 matching lines @@
     return WTF::nullopt;
 
   return result;
 }
 
 void DocumentMarker::ShiftOffsets(int delta) {
   start_offset_ += delta;
   end_offset_ += delta;
 }
 
-const String& DocumentMarker::Description() const {
-  if (DocumentMarkerDescription* details =
-          ToDocumentMarkerDescription(details_.Get()))
-    return details->Description();
-  return g_empty_string;
-}
-
-DEFINE_TRACE(DocumentMarker) {
-  visitor->Trace(details_);
-}
-
 }  // namespace blink