Have Document::markers() return a reference

Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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 4080 matching lines @@
 
     element->focus();
     document->execCommand("InsertText", false, "_wellcome_.");
 
     const int allTextBeginOffset = 0;
     const int allTextLength = 11;
     frame->selectRange(WebRange::fromDocumentRange(frame, allTextBeginOffset, allTextLength));
     RefPtr<Range> selectionRange = frame->frame()->selection().toNormalizedRange();
 
     EXPECT_EQ(1, spellcheck.numberOfTimesChecked());
-    EXPECT_EQ(1U, document->markers()->markersInRange(selectionRange.get(), DocumentMarker::Spelling).size());
+    EXPECT_EQ(1U, document->markers().markersInRange(selectionRange.get(), DocumentMarker::Spelling).size());
 
     frame->replaceMisspelledRange("welcome");
     EXPECT_EQ("_welcome_.", frame->contentAsText(std::numeric_limits<size_t>::max()).utf8());
 }
 
 TEST_F(WebFrameTest, RemoveSpellingMarkers)
 {
     registerMockedHttpURLLoad("spell.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
@@ skipping 11 matching lines @@
     element->focus();
     document->execCommand("InsertText", false, "_wellcome_.");
 
     frame->removeSpellingMarkers();
 
     const int allTextBeginOffset = 0;
     const int allTextLength = 11;
     frame->selectRange(WebRange::fromDocumentRange(frame, allTextBeginOffset, allTextLength));
     RefPtr<Range> selectionRange = frame->frame()->selection().toNormalizedRange();
 
-    EXPECT_EQ(0U, document->markers()->markersInRange(selectionRange.get(), DocumentMarker::Spelling).size());
+    EXPECT_EQ(0U, document->markers().markersInRange(selectionRange.get(), DocumentMarker::Spelling).size());
 }
 
 TEST_F(WebFrameTest, MarkerHashIdentifiers) {
     registerMockedHttpURLLoad("spell.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
 
     static const uint32_t kHash = 42;
     SpellCheckClient spellcheck(kHash);
     webViewHelper.webView()->setSpellCheckClient(&spellcheck);
@@ skipping 129 matching lines @@
     WebInputElement webInputElement = frame->document().getElementById("data").to<WebInputElement>();
     Document* document = frame->frame()->document();
     Element* element = document->getElementById("data");
 
     webViewHelper.webView()->settings()->setAsynchronousSpellCheckingEnabled(true);
     webViewHelper.webView()->settings()->setUnifiedTextCheckerEnabled(true);
     webViewHelper.webView()->settings()->setEditingBehavior(WebSettings::EditingBehaviorWin);
 
     element->focus();
     document->execCommand("InsertText", false, "welcome ");
-    document->markers()->addMarker(rangeOfContents(element->toNode()).get(), DocumentMarker::Spelling);
-    document->markers()->addMarker(rangeOfContents(element->toNode()).get(), DocumentMarker::Grammar);
-    document->markers()->addMarker(rangeOfContents(element->toNode()).get(), DocumentMarker::InvisibleSpellcheck);
-    EXPECT_EQ(3U, document->markers()->markers().size());
+    document->markers().addMarker(rangeOfContents(element->toNode()).get(), DocumentMarker::Spelling);
+    document->markers().addMarker(rangeOfContents(element->toNode()).get(), DocumentMarker::Grammar);
+    document->markers().addMarker(rangeOfContents(element->toNode()).get(), DocumentMarker::InvisibleSpellcheck);
+    EXPECT_EQ(3U, document->markers().markers().size());
 
     spellcheck.kickNoResults();
-    EXPECT_EQ(0U, document->markers()->markers().size());
+    EXPECT_EQ(0U, document->markers().markers().size());
 }
 
 TEST_F(WebFrameTest, SpellcheckResultsSavedInDocument)
 {
     registerMockedHttpURLLoad("spell.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
 
     StubbornSpellCheckClient spellcheck;
     webViewHelper.webView()->setSpellCheckClient(&spellcheck);
 
     WebFrameImpl* frame = toWebFrameImpl(webViewHelper.webView()->mainFrame());
     WebInputElement webInputElement = frame->document().getElementById("data").to<WebInputElement>();
     Document* document = frame->frame()->document();
     Element* element = document->getElementById("data");
 
     webViewHelper.webView()->settings()->setAsynchronousSpellCheckingEnabled(true);
     webViewHelper.webView()->settings()->setUnifiedTextCheckerEnabled(true);
     webViewHelper.webView()->settings()->setEditingBehavior(WebSettings::EditingBehaviorWin);
 
     element->focus();
     document->execCommand("InsertText", false, "wellcome ");
 
     spellcheck.kick();
-    ASSERT_EQ(1U, document->markers()->markers().size());
-    ASSERT_NE(static_cast<DocumentMarker*>(0), document->markers()->markers()[0]);
-    EXPECT_EQ(DocumentMarker::Spelling, document->markers()->markers()[0]->type());
+    ASSERT_EQ(1U, document->markers().markers().size());
+    ASSERT_NE(static_cast<DocumentMarker*>(0), document->markers().markers()[0]);
+    EXPECT_EQ(DocumentMarker::Spelling, document->markers().markers()[0]->type());
 
     document->execCommand("InsertText", false, "wellcome ");
 
     spellcheck.kickGrammar();
-    ASSERT_EQ(1U, document->markers()->markers().size());
-    ASSERT_NE(static_cast<DocumentMarker*>(0), document->markers()->markers()[0]);
-    EXPECT_EQ(DocumentMarker::Grammar, document->markers()->markers()[0]->type());
+    ASSERT_EQ(1U, document->markers().markers().size());
+    ASSERT_NE(static_cast<DocumentMarker*>(0), document->markers().markers()[0]);
+    EXPECT_EQ(DocumentMarker::Grammar, document->markers().markers()[0]->type());
 
     document->execCommand("InsertText", false, "wellcome ");
 
     spellcheck.kickInvisibleSpellcheck();
-    ASSERT_EQ(1U, document->markers()->markers().size());
-    ASSERT_NE(static_cast<DocumentMarker*>(0), document->markers()->markers()[0]);
-    EXPECT_EQ(DocumentMarker::InvisibleSpellcheck, document->markers()->markers()[0]->type());
+    ASSERT_EQ(1U, document->markers().markers().size());
+    ASSERT_NE(static_cast<DocumentMarker*>(0), document->markers().markers()[0]);
+    EXPECT_EQ(DocumentMarker::InvisibleSpellcheck, document->markers().markers()[0]->type());
 }
 
 class TestAccessInitialDocumentWebFrameClient : public WebFrameClient {
 public:
     TestAccessInitialDocumentWebFrameClient() : m_didAccessInitialDocument(false)
     {
     }
 
     virtual void didAccessInitialDocument(WebFrame* frame)
     {
@@ skipping 876 matching lines @@
     webViewHelper.initializeAndLoad("about:blank");
 
     WebCore::FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();
     frameView->setFrameRect(WebCore::IntRect(0, 0, 200, 200));
     EXPECT_EQ_RECT(WebCore::IntRect(0, 0, 200, 200), frameView->frameRect());
     frameView->setFrameRect(WebCore::IntRect(100, 100, 200, 200));
     EXPECT_EQ_RECT(WebCore::IntRect(100, 100, 200, 200), frameView->frameRect());
 }
 
 } // namespace