Rename enums/functions that collide in chromium style.

This fixes cases in:
core/editing/
core/events/
core/fetch/
core/fileapi/
core/frame/

TBR=esprehn, Nico, sievers, haraken
R=esprehn@chromium.org, pdr
BUG=582312

Review URL: https://codereview.chromium.org/1738623004

Cr-Commit-Position: refs/heads/master@{#377812}

91 files changed, 200 insertions, 200 deletions

diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index dc9f4e7..8486b3e 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -1055,7 +1055,7 @@ void ChromeContentRendererClient::GetNavigationErrorStrings(
 
   bool is_post = base::EqualsASCII(
       base::StringPiece16(failed_request.httpMethod()), "POST");
-  bool is_ignoring_cache = failed_request.cachePolicy() ==
+  bool is_ignoring_cache = failed_request.getCachePolicy() ==
                            blink::WebURLRequest::ReloadBypassingCache;
   if (error_html) {
     NetErrorHelper::Get(render_frame)
diff --git a/content/child/web_url_request_util.cc b/content/child/web_url_request_util.cc
index c08a637..32f3ab4 100644
--- a/content/child/web_url_request_util.cc
+++ b/content/child/web_url_request_util.cc
@@ -197,7 +197,7 @@ std::string GetWebURLRequestHeaders(const blink::WebURLRequest& request) {
 int GetLoadFlagsForWebURLRequest(const blink::WebURLRequest& request) {
   int load_flags = net::LOAD_NORMAL;
   GURL url = request.url();
-  switch (request.cachePolicy()) {
+  switch (request.getCachePolicy()) {
     case WebURLRequest::ReloadIgnoringCacheData:
       // Required by LayoutTests/http/tests/misc/refresh-headers.php
       load_flags |= net::LOAD_VALIDATE_CACHE;
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 7c33f4e..482aa49 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2962,7 +2962,7 @@ void RenderFrameImpl::didCreateDataSource(blink::WebLocalFrame* frame,
 
   if (content_initiated) {
     const WebURLRequest& request = datasource->request();
-    switch (request.cachePolicy()) {
+    switch (request.getCachePolicy()) {
       case WebURLRequest::UseProtocolCachePolicy:  // normal load.
         document_state->set_load_type(DocumentState::LINK_LOAD_NORMAL);
         break;
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
index 7d8cae7..6bcbf1c 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp
@@ -448,7 +448,7 @@ void SerializedScriptValueWriter::doWriteFile(const File& file)
         doWriteUint32(static_cast<uint8_t>(0));
     }
 
-    doWriteUint32(static_cast<uint8_t>((file.userVisibility() == File::IsUserVisible) ? 1 : 0));
+    doWriteUint32(static_cast<uint8_t>((file.getUserVisibility() == File::IsUserVisible) ? 1 : 0));
 }
 
 void SerializedScriptValueWriter::doWriteArrayBuffer(const DOMArrayBuffer& arrayBuffer)
diff --git a/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValueTest.cpp b/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValueTest.cpp
index db3e4c0..ab84251 100644
--- a/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValueTest.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValueTest.cpp
@@ -35,7 +35,7 @@ TEST_F(SerializedScriptValueTest, UserSelectedFile)
     filePath.append("/Source/bindings/core/v8/SerializedScriptValueTest.cpp");
     File* originalFile = File::create(filePath);
     ASSERT_TRUE(originalFile->hasBackingFile());
-    ASSERT_EQ(File::IsUserVisible, originalFile->userVisibility());
+    ASSERT_EQ(File::IsUserVisible, originalFile->getUserVisibility());
     ASSERT_EQ(filePath, originalFile->path());
 
     v8::Local<v8::Value> v8OriginalFile = toV8(originalFile, creationContext(), isolate());
@@ -46,7 +46,7 @@ TEST_F(SerializedScriptValueTest, UserSelectedFile)
     ASSERT_TRUE(V8File::hasInstance(v8File, isolate()));
     File* file = V8File::toImpl(v8::Local<v8::Object>::Cast(v8File));
     EXPECT_TRUE(file->hasBackingFile());
-    EXPECT_EQ(File::IsUserVisible, file->userVisibility());
+    EXPECT_EQ(File::IsUserVisible, file->getUserVisibility());
     EXPECT_EQ(filePath, file->path());
 }
 
@@ -55,7 +55,7 @@ TEST_F(SerializedScriptValueTest, FileConstructorFile)
     RefPtr<BlobDataHandle> blobDataHandle = BlobDataHandle::create();
     File* originalFile = File::create("hello.txt", 12345678.0, blobDataHandle);
     ASSERT_FALSE(originalFile->hasBackingFile());
-    ASSERT_EQ(File::IsNotUserVisible, originalFile->userVisibility());
+    ASSERT_EQ(File::IsNotUserVisible, originalFile->getUserVisibility());
     ASSERT_EQ("hello.txt", originalFile->name());
 
     v8::Local<v8::Value> v8OriginalFile = toV8(originalFile, creationContext(), isolate());
@@ -66,7 +66,7 @@ TEST_F(SerializedScriptValueTest, FileConstructorFile)
     ASSERT_TRUE(V8File::hasInstance(v8File, isolate()));
     File* file = V8File::toImpl(v8::Local<v8::Object>::Cast(v8File));
     EXPECT_FALSE(file->hasBackingFile());
-    EXPECT_EQ(File::IsNotUserVisible, file->userVisibility());
+    EXPECT_EQ(File::IsNotUserVisible, file->getUserVisibility());
     EXPECT_EQ("hello.txt", file->name());
 }
 
diff --git a/third_party/WebKit/Source/bindings/core/v8/custom/V8MessageEventCustom.cpp b/third_party/WebKit/Source/bindings/core/v8/custom/V8MessageEventCustom.cpp
index 884bca9..65f7cb0 100644
--- a/third_party/WebKit/Source/bindings/core/v8/custom/V8MessageEventCustom.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/custom/V8MessageEventCustom.cpp
@@ -54,7 +54,7 @@ void V8MessageEvent::dataAttributeGetterCustom(const v8::FunctionCallbackInfo<v8
     MessageEvent* event = V8MessageEvent::toImpl(info.Holder());
 
     v8::Local<v8::Value> result;
-    switch (event->dataType()) {
+    switch (event->getDataType()) {
     case MessageEvent::DataTypeScriptValue:
         result = event->dataAsScriptValue().v8ValueFor(scriptState);
         if (result.IsEmpty())
diff --git a/third_party/WebKit/Source/core/clipboard/DataObjectTest.cpp b/third_party/WebKit/Source/core/clipboard/DataObjectTest.cpp
index 7944eb3..5d13fad 100644
--- a/third_party/WebKit/Source/core/clipboard/DataObjectTest.cpp
+++ b/third_party/WebKit/Source/core/clipboard/DataObjectTest.cpp
@@ -36,7 +36,7 @@ TEST_F(DataObjectTest, addItemWithFilenameAndNoTitle)
     ASSERT_TRUE(blob->isFile());
     File* file = toFile(blob);
     EXPECT_TRUE(file->hasBackingFile());
-    EXPECT_EQ(File::IsUserVisible, file->userVisibility());
+    EXPECT_EQ(File::IsUserVisible, file->getUserVisibility());
     EXPECT_EQ(filePath, file->path());
 }
 
@@ -55,7 +55,7 @@ TEST_F(DataObjectTest, addItemWithFilenameAndTitle)
     ASSERT_TRUE(blob->isFile());
     File* file = toFile(blob);
     EXPECT_TRUE(file->hasBackingFile());
-    EXPECT_EQ(File::IsUserVisible, file->userVisibility());
+    EXPECT_EQ(File::IsUserVisible, file->getUserVisibility());
     EXPECT_EQ(filePath, file->path());
     EXPECT_EQ("name.cpp", file->name());
 }
diff --git a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
index 0860092..70f8c19 100644
--- a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
+++ b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
@@ -96,7 +96,7 @@ void RemoteFontFaceSource::fontLoaded(FontResource*)
     m_histograms.fontLoaded(m_isInterventionTriggered);
 
     m_font->ensureCustomFontData();
-    if (m_font->status() == Resource::DecodeError)
+    if (m_font->getStatus() == Resource::DecodeError)
         m_fontLoader->didFailToDecode(m_font.get());
 
     pruneTable();
diff --git a/third_party/WebKit/Source/core/dom/PendingScript.cpp b/third_party/WebKit/Source/core/dom/PendingScript.cpp
index 5058b05..5003d50 100644
--- a/third_party/WebKit/Source/core/dom/PendingScript.cpp
+++ b/third_party/WebKit/Source/core/dom/PendingScript.cpp
@@ -155,7 +155,7 @@ void PendingScript::notifyFinished(Resource* resource)
     //
     // See https://crbug.com/500701 for more information.
     if (m_element) {
-        ASSERT(resource->type() == Resource::Script);
+        ASSERT(resource->getType() == Resource::Script);
         ScriptResource* scriptResource = toScriptResource(resource);
         String integrityAttr = m_element->fastGetAttribute(HTMLNames::integrityAttr);
 
diff --git a/third_party/WebKit/Source/core/editing/CaretBase.h b/third_party/WebKit/Source/core/editing/CaretBase.h
index aa90ea2..48068fe 100644
--- a/third_party/WebKit/Source/core/editing/CaretBase.h
+++ b/third_party/WebKit/Source/core/editing/CaretBase.h
@@ -63,7 +63,7 @@ protected:
 
     void setCaretVisibility(CaretVisibility visibility) { m_caretVisibility = visibility; }
     bool caretIsVisible() const { return m_caretVisibility == Visible; }
-    CaretVisibility caretVisibility() const { return m_caretVisibility; }
+    CaretVisibility getCaretVisibility() const { return m_caretVisibility; }
 
     static LayoutBlock* caretLayoutObject(Node*);
     static void invalidateLocalCaretRect(Node*, const LayoutRect&);
diff --git a/third_party/WebKit/Source/core/editing/Editor.cpp b/third_party/WebKit/Source/core/editing/Editor.cpp
index 95e8f53..076c0311 100644
--- a/third_party/WebKit/Source/core/editing/Editor.cpp
+++ b/third_party/WebKit/Source/core/editing/Editor.cpp
@@ -556,7 +556,7 @@ bool Editor::shouldDeleteRange(const EphemeralRange& range) const
 
 void Editor::notifyComponentsOnChangedSelection(const VisibleSelection& oldSelection, FrameSelection::SetSelectionOptions options)
 {
-    client().respondToChangedSelection(m_frame, frame().selection().selectionType());
+    client().respondToChangedSelection(m_frame, frame().selection().getSelectionType());
     setStartNewKillRingSequence(true);
 }
 
@@ -599,7 +599,7 @@ Element* Editor::findEventTargetFromSelection() const
 
 void Editor::applyStyle(StylePropertySet* style, EditAction editingAction)
 {
-    switch (frame().selection().selectionType()) {
+    switch (frame().selection().getSelectionType()) {
     case NoSelection:
         // do nothing
         break;
@@ -1119,7 +1119,7 @@ void Editor::changeSelectionAfterCommand(const VisibleSelection& newSelection,
     // does not call EditorClient::respondToChangedSelection(), which, on the Mac, sends selection change notifications and
     // starts a new kill ring sequence, but we want to do these things (matches AppKit).
     if (selectionDidNotChangeDOMPosition)
-        client().respondToChangedSelection(m_frame, frame().selection().selectionType());
+        client().respondToChangedSelection(m_frame, frame().selection().getSelectionType());
 }
 
 IntRect Editor::firstRectForRange(const EphemeralRange& range) const
diff --git a/third_party/WebKit/Source/core/editing/FrameSelection.cpp b/third_party/WebKit/Source/core/editing/FrameSelection.cpp
index 4645c46..86e5c77 100644
--- a/third_party/WebKit/Source/core/editing/FrameSelection.cpp
+++ b/third_party/WebKit/Source/core/editing/FrameSelection.cpp
@@ -718,7 +718,7 @@ void FrameSelection::invalidateCaretRect()
     if (!m_caretBlinkTimer.isActive()
         && newNode == m_previousCaretNode
         && newRect == m_previousCaretRect
-        && caretVisibility() == m_previousCaretVisibility)
+        && getCaretVisibility() == m_previousCaretVisibility)
         return;
 
     LayoutView* view = m_frame->document()->layoutView();
@@ -728,7 +728,7 @@ void FrameSelection::invalidateCaretRect()
         invalidateLocalCaretRect(newNode, newRect);
     m_previousCaretNode = newNode;
     m_previousCaretRect = newRect;
-    m_previousCaretVisibility = caretVisibility();
+    m_previousCaretVisibility = getCaretVisibility();
 }
 
 void FrameSelection::paintCaret(GraphicsContext& context, const LayoutPoint& paintOffset)
@@ -1025,7 +1025,7 @@ void FrameSelection::updateAppearance()
 
 void FrameSelection::setCaretVisibility(CaretVisibility visibility)
 {
-    if (caretVisibility() == visibility)
+    if (getCaretVisibility() == visibility)
         return;
 
     CaretBase::setCaretVisibility(visibility);
@@ -1220,7 +1220,7 @@ void FrameSelection::revealSelection(const ScrollAlignment& alignment, RevealExt
 {
     LayoutRect rect;
 
-    switch (selectionType()) {
+    switch (getSelectionType()) {
     case NoSelection:
         return;
     case CaretSelection:
diff --git a/third_party/WebKit/Source/core/editing/FrameSelection.h b/third_party/WebKit/Source/core/editing/FrameSelection.h
index 3c822da..a1e7d83 100644
--- a/third_party/WebKit/Source/core/editing/FrameSelection.h
+++ b/third_party/WebKit/Source/core/editing/FrameSelection.h
@@ -127,7 +127,7 @@ public:
 
     bool contains(const LayoutPoint&);
 
-    SelectionType selectionType() const { return selection().selectionType(); }
+    SelectionType getSelectionType() const { return selection().getSelectionType(); }
 
     TextAffinity affinity() const { return selection().affinity(); }
 
diff --git a/third_party/WebKit/Source/core/editing/PendingSelection.cpp b/third_party/WebKit/Source/core/editing/PendingSelection.cpp
index 381c2de..d81b2f4 100644
--- a/third_party/WebKit/Source/core/editing/PendingSelection.cpp
+++ b/third_party/WebKit/Source/core/editing/PendingSelection.cpp
@@ -59,7 +59,7 @@ VisibleSelectionInFlatTree PendingSelection::calcVisibleSelection(const VisibleS
 {
     const PositionInFlatTree& start = originalSelection.start();
     const PositionInFlatTree& end = originalSelection.end();
-    SelectionType selectionType = originalSelection.selectionType();
+    SelectionType selectionType = originalSelection.getSelectionType();
     const TextAffinity affinity = originalSelection.affinity();
 
     bool paintBlockCursor = m_frameSelection->shouldShowBlockCursor() && selectionType == SelectionType::CaretSelection && !isLogicalEndOfLine(createVisiblePosition(end, affinity));
diff --git a/third_party/WebKit/Source/core/editing/SelectionController.cpp b/third_party/WebKit/Source/core/editing/SelectionController.cpp
index 5369bad..ad5f87e 100644
--- a/third_party/WebKit/Source/core/editing/SelectionController.cpp
+++ b/third_party/WebKit/Source/core/editing/SelectionController.cpp
@@ -610,9 +610,9 @@ bool SelectionController::mouseDownWasSingleClickInSelection() const
 
 void SelectionController::notifySelectionChanged()
 {
-    if (selection().selectionType() == SelectionType::RangeSelection)
+    if (selection().getSelectionType() == SelectionType::RangeSelection)
         m_selectionState = SelectionState::ExtendedSelection;
-    else if (selection().selectionType() == SelectionType::CaretSelection)
+    else if (selection().getSelectionType() == SelectionType::CaretSelection)
         m_selectionState = SelectionState::PlacedCaret;
     else
         m_selectionState = SelectionState::HaveNotStartedSelection;
diff --git a/third_party/WebKit/Source/core/editing/VisibleSelection.cpp b/third_party/WebKit/Source/core/editing/VisibleSelection.cpp
index d7d7114..010c6dc 100644
--- a/third_party/WebKit/Source/core/editing/VisibleSelection.cpp
+++ b/third_party/WebKit/Source/core/editing/VisibleSelection.cpp
@@ -547,7 +547,7 @@ void VisibleSelectionTemplate<Strategy>::validate(TextGranularity granularity)
     adjustSelectionToAvoidCrossingEditingBoundaries();
     updateSelectionType();
 
-    if (selectionType() == RangeSelection) {
+    if (getSelectionType() == RangeSelection) {
         // "Constrain" the selection to be the smallest equivalent range of
         // nodes. This is a somewhat arbitrary choice, but experience shows that
         // it is useful to make to make the selection "canonical" (if only for
diff --git a/third_party/WebKit/Source/core/editing/VisibleSelection.h b/third_party/WebKit/Source/core/editing/VisibleSelection.h
index 1916386..25608c3 100644
--- a/third_party/WebKit/Source/core/editing/VisibleSelection.h
+++ b/third_party/WebKit/Source/core/editing/VisibleSelection.h
@@ -79,7 +79,7 @@ public:
 
     static VisibleSelectionTemplate selectionFromContentsOfNode(Node*);
 
-    SelectionType selectionType() const { return m_selectionType; }
+    SelectionType getSelectionType() const { return m_selectionType; }
 
     void setAffinity(TextAffinity affinity) { m_affinity = affinity; }
     TextAffinity affinity() const { return m_affinity; }
@@ -102,10 +102,10 @@ public:
     bool operator==(const VisibleSelectionTemplate&) const;
     bool operator!=(const VisibleSelectionTemplate& other) const { return !operator==(other); }
 
-    bool isNone() const { return selectionType() == NoSelection; }
-    bool isCaret() const { return selectionType() == CaretSelection; }
-    bool isRange() const { return selectionType() == RangeSelection; }
-    bool isCaretOrRange() const { return selectionType() != NoSelection; }
+    bool isNone() const { return getSelectionType() == NoSelection; }
+    bool isCaret() const { return getSelectionType() == CaretSelection; }
+    bool isRange() const { return getSelectionType() == RangeSelection; }
+    bool isCaretOrRange() const { return getSelectionType() != NoSelection; }
     bool isNonOrphanedRange() const { return isRange() && !start().isOrphan() && !end().isOrphan(); }
     bool isNonOrphanedCaretOrRange() const { return isCaretOrRange() && !start().isOrphan() && !end().isOrphan(); }
 
diff --git a/third_party/WebKit/Source/core/editing/commands/TypingCommand.cpp b/third_party/WebKit/Source/core/editing/commands/TypingCommand.cpp
index a4ce811..b16aec04 100644
--- a/third_party/WebKit/Source/core/editing/commands/TypingCommand.cpp
+++ b/third_party/WebKit/Source/core/editing/commands/TypingCommand.cpp
@@ -445,7 +445,7 @@ void TypingCommand::deleteKeyPressed(TextGranularity granularity, bool killRing,
     VisibleSelection selectionToDelete;
     VisibleSelection selectionAfterUndo;
 
-    switch (endingSelection().selectionType()) {
+    switch (endingSelection().getSelectionType()) {
     case RangeSelection:
         selectionToDelete = endingSelection();
         selectionAfterUndo = selectionToDelete;
@@ -560,7 +560,7 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity, bool ki
     VisibleSelection selectionToDelete;
     VisibleSelection selectionAfterUndo;
 
-    switch (endingSelection().selectionType()) {
+    switch (endingSelection().getSelectionType()) {
     case RangeSelection:
         selectionToDelete = endingSelection();
         selectionAfterUndo = selectionToDelete;
diff --git a/third_party/WebKit/Source/core/events/EventListener.h b/third_party/WebKit/Source/core/events/EventListener.h
index d7b46a83..b2bb559 100644
--- a/third_party/WebKit/Source/core/events/EventListener.h
+++ b/third_party/WebKit/Source/core/events/EventListener.h
@@ -33,7 +33,7 @@ class ExecutionContext;
 
 class CORE_EXPORT EventListener : public RefCountedWillBeGarbageCollectedFinalized<EventListener> {
 public:
-    enum Type {
+    enum ListenerType {
         JSEventListenerType,
         ImageEventListenerType,
         CPPEventListenerType,
@@ -49,12 +49,12 @@ public:
     virtual bool belongsToTheCurrentWorld() const { return false; }
 
     bool isAttribute() const { return virtualisAttribute(); }
-    Type type() const { return m_type; }
+    ListenerType type() const { return m_type; }
 
     DEFINE_INLINE_VIRTUAL_TRACE() { }
 
 protected:
-    explicit EventListener(Type type)
+    explicit EventListener(ListenerType type)
             : m_type(type)
     {
     }
@@ -62,7 +62,7 @@ protected:
 private:
     virtual bool virtualisAttribute() const { return false; }
 
-    Type m_type;
+    ListenerType m_type;
 };
 
 } // namespace blink
diff --git a/third_party/WebKit/Source/core/events/MessageEvent.cpp b/third_party/WebKit/Source/core/events/MessageEvent.cpp
index f688635..5fef430 100644
--- a/third_party/WebKit/Source/core/events/MessageEvent.cpp
+++ b/third_party/WebKit/Source/core/events/MessageEvent.cpp
@@ -220,7 +220,7 @@ v8::Local<v8::Object> MessageEvent::associateWithWrapper(v8::Isolate* isolate, c
     // Ensures a wrapper is created for the data to return now so that V8 knows how
     // much memory is used via the wrapper. To keep the wrapper alive, it's set to
     // the wrapper of the MessageEvent as a hidden value.
-    switch (dataType()) {
+    switch (getDataType()) {
     case MessageEvent::DataTypeScriptValue:
     case MessageEvent::DataTypeSerializedScriptValue:
         break;
diff --git a/third_party/WebKit/Source/core/events/MessageEvent.h b/third_party/WebKit/Source/core/events/MessageEvent.h
index 36cb814..3c9ad75 100644
--- a/third_party/WebKit/Source/core/events/MessageEvent.h
+++ b/third_party/WebKit/Source/core/events/MessageEvent.h
@@ -94,7 +94,7 @@ public:
         DataTypeBlob,
         DataTypeArrayBuffer
     };
-    DataType dataType() const { return m_dataType; }
+    DataType getDataType() const { return m_dataType; }
     ScriptValue dataAsScriptValue() const { ASSERT(m_dataType == DataTypeScriptValue); return m_dataAsScriptValue; }
     SerializedScriptValue* dataAsSerializedScriptValue() const { ASSERT(m_dataType == DataTypeSerializedScriptValue); return m_dataAsSerializedScriptValue.get(); }
     String dataAsString() const { ASSERT(m_dataType == DataTypeString); return m_dataAsString; }
diff --git a/third_party/WebKit/Source/core/events/WheelEvent.cpp b/third_party/WebKit/Source/core/events/WheelEvent.cpp
index 3300b8d..56d46b6 100644
--- a/third_party/WebKit/Source/core/events/WheelEvent.cpp
+++ b/third_party/WebKit/Source/core/events/WheelEvent.cpp
@@ -41,7 +41,7 @@ PassRefPtrWillBeRawPtr<WheelEvent> WheelEvent::create(const PlatformWheelEvent&
         event.modifiers(),
         MouseEvent::platformModifiersToButtons(event.modifiers()), event.timestamp(),
         event.canScroll(), event.resendingPluginId(), event.hasPreciseScrollingDeltas(),
-        static_cast<Event::RailsMode>(event.railsMode())));
+        static_cast<Event::RailsMode>(event.getRailsMode())));
 }
 
 WheelEvent::WheelEvent()
diff --git a/third_party/WebKit/Source/core/events/WheelEvent.h b/third_party/WebKit/Source/core/events/WheelEvent.h
index 27ec42f..35fbecb 100644
--- a/third_party/WebKit/Source/core/events/WheelEvent.h
+++ b/third_party/WebKit/Source/core/events/WheelEvent.h
@@ -81,7 +81,7 @@ public:
     bool canScroll() const { return m_canScroll; }
     int resendingPluginId() const { return m_resendingPluginId; }
     bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
-    RailsMode railsMode() const { return m_railsMode; }
+    RailsMode getRailsMode() const { return m_railsMode; }
 
     const AtomicString& interfaceName() const override;
     bool isMouseEvent() const override;
diff --git a/third_party/WebKit/Source/core/fetch/DocumentResource.cpp b/third_party/WebKit/Source/core/fetch/DocumentResource.cpp
index d076e1a..191fa6e 100644
--- a/third_party/WebKit/Source/core/fetch/DocumentResource.cpp
+++ b/third_party/WebKit/Source/core/fetch/DocumentResource.cpp
@@ -80,7 +80,7 @@ void DocumentResource::checkNotify()
 
 bool DocumentResource::mimeTypeAllowed() const
 {
-    ASSERT(type() == SVGDocument);
+    ASSERT(getType() == SVGDocument);
     AtomicString mimeType = response().mimeType();
     if (response().isHTTP())
         mimeType = httpContentType();
@@ -92,7 +92,7 @@ bool DocumentResource::mimeTypeAllowed() const
 
 PassRefPtrWillBeRawPtr<Document> DocumentResource::createDocument(const KURL& url)
 {
-    switch (type()) {
+    switch (getType()) {
     case SVGDocument:
         return XMLDocument::createSVG(DocumentInit(url));
     default:
diff --git a/third_party/WebKit/Source/core/fetch/DocumentResource.h b/third_party/WebKit/Source/core/fetch/DocumentResource.h
index 6543379..56c7e83 100644
--- a/third_party/WebKit/Source/core/fetch/DocumentResource.h
+++ b/third_party/WebKit/Source/core/fetch/DocumentResource.h
@@ -67,14 +67,14 @@ private:
     OwnPtr<TextResourceDecoder> m_decoder;
 };
 
-DEFINE_TYPE_CASTS(DocumentResource, Resource, resource, resource->type() == Resource::SVGDocument, resource.type() == Resource::SVGDocument); \
+DEFINE_TYPE_CASTS(DocumentResource, Resource, resource, resource->getType() == Resource::SVGDocument, resource.getType() == Resource::SVGDocument); \
 inline DocumentResource* toDocumentResource(const RefPtrWillBeRawPtr<Resource>& ptr) { return toDocumentResource(ptr.get()); }
 
 class DocumentResourceClient : public ResourceClient {
 public:
     ~DocumentResourceClient() override {}
-    static bool isExpectedType(ResourceClient* client) { return client->resourceClientType() == DocumentType; }
-    ResourceClientType resourceClientType() const final { return DocumentType; }
+    static bool isExpectedType(ResourceClient* client) { return client->getResourceClientType() == DocumentType; }
+    ResourceClientType getResourceClientType() const final { return DocumentType; }
 };
 
 } // namespace blink
diff --git a/third_party/WebKit/Source/core/fetch/FetchContext.cpp b/third_party/WebKit/Source/core/fetch/FetchContext.cpp
index b69102e..df39185 100644
--- a/third_party/WebKit/Source/core/fetch/FetchContext.cpp
+++ b/third_party/WebKit/Source/core/fetch/FetchContext.cpp
@@ -51,7 +51,7 @@ void FetchContext::setFirstPartyForCookies(ResourceRequest&)
 {
 }
 
-CachePolicy FetchContext::cachePolicy() const
+CachePolicy FetchContext::getCachePolicy() const
 {
     return CachePolicyVerify;
 }
diff --git a/third_party/WebKit/Source/core/fetch/FetchContext.h b/third_party/WebKit/Source/core/fetch/FetchContext.h
index f522a47..6b67914 100644
--- a/third_party/WebKit/Source/core/fetch/FetchContext.h
+++ b/third_party/WebKit/Source/core/fetch/FetchContext.h
@@ -71,7 +71,7 @@ public:
 
     virtual void addAdditionalRequestHeaders(ResourceRequest&, FetchResourceType);
     virtual void setFirstPartyForCookies(ResourceRequest&);
-    virtual CachePolicy cachePolicy() const;
+    virtual CachePolicy getCachePolicy() const;
     virtual ResourceRequestCachePolicy resourceRequestCachePolicy(const ResourceRequest&, Resource::Type) const;
 
     virtual void dispatchDidChangeResourcePriority(unsigned long identifier, ResourceLoadPriority, int intraPriorityValue);
diff --git a/third_party/WebKit/Source/core/fetch/FetchRequest.h b/third_party/WebKit/Source/core/fetch/FetchRequest.h
index 4d3dba4..9f189b9 100644
--- a/third_party/WebKit/Source/core/fetch/FetchRequest.h
+++ b/third_party/WebKit/Source/core/fetch/FetchRequest.h
@@ -79,7 +79,7 @@ public:
     DeferOption defer() const { return m_defer; }
     void setDefer(DeferOption defer) { m_defer = defer; }
 
-    ResourceWidth resourceWidth() const { return m_resourceWidth; }
+    ResourceWidth getResourceWidth() const { return m_resourceWidth; }
     void setResourceWidth(ResourceWidth);
 
     ClientHintsPreferences& clientHintsPreferences() { return m_clientHintPreferences; }
@@ -92,7 +92,7 @@ public:
 
     void setContentSecurityCheck(ContentSecurityPolicyDisposition contentSecurityPolicyOption) { m_options.contentSecurityPolicyOption = contentSecurityPolicyOption; }
     void setCrossOriginAccessControl(SecurityOrigin*, CrossOriginAttributeValue);
-    OriginRestriction originRestriction() const { return m_originRestriction; }
+    OriginRestriction getOriginRestriction() const { return m_originRestriction; }
     void setOriginRestriction(OriginRestriction restriction) { m_originRestriction = restriction; }
     const IntegrityMetadataSet& integrityMetadata() const { return m_integrityMetadata; }
     void setIntegrityMetadata(const IntegrityMetadataSet& metadata) { m_integrityMetadata = metadata; }
diff --git a/third_party/WebKit/Source/core/fetch/FontResource.h b/third_party/WebKit/Source/core/fetch/FontResource.h
index e104dff..aa92d49 100644
--- a/third_party/WebKit/Source/core/fetch/FontResource.h
+++ b/third_party/WebKit/Source/core/fetch/FontResource.h
@@ -103,8 +103,8 @@ DEFINE_RESOURCE_TYPE_CASTS(Font);
 class FontResourceClient : public ResourceClient {
 public:
     ~FontResourceClient() override {}
-    static bool isExpectedType(ResourceClient* client) { return client->resourceClientType() == FontType; }
-    ResourceClientType resourceClientType() const final { return FontType; }
+    static bool isExpectedType(ResourceClient* client) { return client->getResourceClientType() == FontType; }
+    ResourceClientType getResourceClientType() const final { return FontType; }
     virtual void fontLoaded(FontResource*) {}
     virtual void didStartFontLoad(FontResource*) {}
     virtual void fontLoadShortLimitExceeded(FontResource*) {}
diff --git a/third_party/WebKit/Source/core/fetch/ImageResource.cpp b/third_party/WebKit/Source/core/fetch/ImageResource.cpp
index d0a45f2..99a4343 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResource.cpp
+++ b/third_party/WebKit/Source/core/fetch/ImageResource.cpp
@@ -47,7 +47,7 @@ PassRefPtrWillBeRawPtr<ImageResource> ImageResource::fetch(FetchRequest& request
         request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestContextImage);
     if (fetcher->context().pageDismissalEventBeingDispatched()) {
         KURL requestURL = request.resourceRequest().url();
-        if (requestURL.isValid() && fetcher->context().canRequest(Resource::Image, request.resourceRequest(), requestURL, request.options(), request.forPreload(), request.originRestriction()))
+        if (requestURL.isValid() && fetcher->context().canRequest(Resource::Image, request.resourceRequest(), requestURL, request.options(), request.forPreload(), request.getOriginRestriction()))
             fetcher->context().sendImagePing(requestURL);
         return nullptr;
     }
@@ -321,7 +321,7 @@ void ImageResource::updateImage(bool allDataReceived)
     // to decode.
     if (sizeAvailable || allDataReceived) {
         if (!m_image || m_image->isNull()) {
-            error(errorOccurred() ? status() : DecodeError);
+            error(errorOccurred() ? getStatus() : DecodeError);
             if (memoryCache()->contains(this))
                 memoryCache()->remove(this);
             return;
diff --git a/third_party/WebKit/Source/core/fetch/ImageResource.h b/third_party/WebKit/Source/core/fetch/ImageResource.h
index aeb64c3..c17849a 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResource.h
+++ b/third_party/WebKit/Source/core/fetch/ImageResource.h
@@ -110,7 +110,7 @@ public:
     bool shouldIgnoreHTTPStatusCodeErrors() const override { return true; }
 
     bool isImage() const override { return true; }
-    bool stillNeedsLoad() const override { return !errorOccurred() && status() == Unknown && !isLoading(); }
+    bool stillNeedsLoad() const override { return !errorOccurred() && getStatus() == Unknown && !isLoading(); }
 
     // ImageObserver
     void decodedSizeChanged(const blink::Image*, int delta) override;
diff --git a/third_party/WebKit/Source/core/fetch/ImageResourceClient.h b/third_party/WebKit/Source/core/fetch/ImageResourceClient.h
index 32fac1f..cc69a3d 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResourceClient.h
+++ b/third_party/WebKit/Source/core/fetch/ImageResourceClient.h
@@ -35,8 +35,8 @@ class IntRect;
 class CORE_EXPORT ImageResourceClient : public ResourceClient {
 public:
     ~ImageResourceClient() override {}
-    static bool isExpectedType(ResourceClient* client) { return client->resourceClientType() == ImageType; }
-    ResourceClientType resourceClientType() const final { return ImageType; }
+    static bool isExpectedType(ResourceClient* client) { return client->getResourceClientType() == ImageType; }
+    ResourceClientType getResourceClientType() const final { return ImageType; }
 
     // Called whenever a frame of an image changes, either because we got more data from the network or
     // because we are animating. If not null, the IntRect is the changed rect of the image.
diff --git a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
index f17cfc6..9a07d62 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
@@ -94,7 +94,7 @@ TEST(ImageResourceTest, MultipartImage)
     Platform::current()->unitTestSupport()->unregisterMockedURL(testURL);
 
     MockImageResourceClient client(cachedImage);
-    EXPECT_EQ(Resource::Pending, cachedImage->status());
+    EXPECT_EQ(Resource::Pending, cachedImage->getStatus());
 
     // Send the multipart response. No image or data buffer is created.
     // Note that the response must be routed through ResourceLoader to
@@ -151,16 +151,16 @@ TEST(ImageResourceTest, CancelOnDetach)
     memoryCache()->add(cachedImage.get());
 
     MockImageResourceClient client(cachedImage);
-    EXPECT_EQ(Resource::Pending, cachedImage->status());
+    EXPECT_EQ(Resource::Pending, cachedImage->getStatus());
 
     // The load should still be alive, but a timer should be started to cancel the load inside removeClient().
     client.removeAsClient();
-    EXPECT_EQ(Resource::Pending, cachedImage->status());
+    EXPECT_EQ(Resource::Pending, cachedImage->getStatus());
     EXPECT_NE(reinterpret_cast<Resource*>(0), memoryCache()->resourceForURL(testURL));
 
     // Trigger the cancel timer, ensure the load was cancelled and the resource was evicted from the cache.
     blink::testing::runPendingTasks();
-    EXPECT_EQ(Resource::LoadError, cachedImage->status());
+    EXPECT_EQ(Resource::LoadError, cachedImage->getStatus());
     EXPECT_EQ(reinterpret_cast<Resource*>(0), memoryCache()->resourceForURL(testURL));
 
     Platform::current()->unitTestSupport()->unregisterMockedURL(testURL);
diff --git a/third_party/WebKit/Source/core/fetch/MemoryCache.cpp b/third_party/WebKit/Source/core/fetch/MemoryCache.cpp
index c25122b..5353407 100644
--- a/third_party/WebKit/Source/core/fetch/MemoryCache.cpp
+++ b/third_party/WebKit/Source/core/fetch/MemoryCache.cpp
@@ -589,7 +589,7 @@ MemoryCache::Statistics MemoryCache::getStatistics()
     for (const auto& resourceMapIter : m_resourceMaps) {
         for (const auto& resourceIter : *resourceMapIter.value) {
             Resource* resource = resourceIter.value->m_resource.get();
-            switch (resource->type()) {
+            switch (resource->getType()) {
             case Resource::Image:
                 stats.images.addResource(resource);
                 break;
@@ -671,7 +671,7 @@ void MemoryCache::prune(Resource* justReleasedResource)
         // while a prune is pending.
         // Main Resources in the cache are only substitue data that was
         // precached and should not be evicted.
-        if (justReleasedResource->type() != Resource::MainResource) {
+        if (justReleasedResource->getType() != Resource::MainResource) {
             if (MemoryCacheEntry* entry = getEntryForResource(justReleasedResource))
                 evict(entry);
         }
diff --git a/third_party/WebKit/Source/core/fetch/RawResource.h b/third_party/WebKit/Source/core/fetch/RawResource.h
index 56ac47f..febd218 100644
--- a/third_party/WebKit/Source/core/fetch/RawResource.h
+++ b/third_party/WebKit/Source/core/fetch/RawResource.h
@@ -91,7 +91,7 @@ private:
 #if ENABLE(SECURITY_ASSERT)
 inline bool isRawResource(const Resource& resource)
 {
-    Resource::Type type = resource.type();
+    Resource::Type type = resource.getType();
     return type == Resource::MainResource || type == Resource::Raw || type == Resource::TextTrack || type == Resource::Media || type == Resource::Manifest || type == Resource::ImportResource;
 }
 #endif
@@ -104,8 +104,8 @@ inline PassRefPtrWillBeRawPtr<RawResource> toRawResource(const PassRefPtrWillBeR
 class CORE_EXPORT RawResourceClient : public ResourceClient {
 public:
     ~RawResourceClient() override {}
-    static bool isExpectedType(ResourceClient* client) { return client->resourceClientType() == RawResourceType; }
-    ResourceClientType resourceClientType() const final { return RawResourceType; }
+    static bool isExpectedType(ResourceClient* client) { return client->getResourceClientType() == RawResourceType; }
+    ResourceClientType getResourceClientType() const final { return RawResourceType; }
 
     virtual void dataSent(Resource*, unsigned long long /* bytesSent */, unsigned long long /* totalBytesToBeSent */) { }
     virtual void responseReceived(Resource*, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) { }
diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp
index 29b0e84..0035e20 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.cpp
+++ b/third_party/WebKit/Source/core/fetch/Resource.cpp
@@ -621,7 +621,7 @@ void Resource::addClient(ResourceClient* client)
     }
 
     // If we have existing data to send to the new client and the resource type supprts it, send it asynchronously.
-    if (!m_response.isNull() && !shouldSendCachedDataSynchronouslyForType(type()) && !m_needsSynchronousCacheHit) {
+    if (!m_response.isNull() && !shouldSendCachedDataSynchronouslyForType(getType()) && !m_needsSynchronousCacheHit) {
         m_clientsAwaitingCallback.add(client);
         ResourceCallback::callbackHandler()->schedule(this);
         return;
@@ -814,7 +814,7 @@ void Resource::onMemoryDump(WebMemoryDumpLevelOfDetail levelOfDetail, WebProcess
 
 String Resource::getMemoryDumpName() const
 {
-    return String::format("web_cache/%s_resources/%ld", resourceTypeToString(type(), options().initiatorInfo), m_identifier);
+    return String::format("web_cache/%s_resources/%ld", resourceTypeToString(getType(), options().initiatorInfo), m_identifier);
 }
 
 void Resource::revalidationSucceeded(const ResourceResponse& validatingResponse)
diff --git a/third_party/WebKit/Source/core/fetch/Resource.h b/third_party/WebKit/Source/core/fetch/Resource.h
index 8cdaa7d..2dd4369 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.h
+++ b/third_party/WebKit/Source/core/fetch/Resource.h
@@ -127,7 +127,7 @@ public:
     void setRevalidatingRequest(const ResourceRequest& request) { m_revalidatingRequest = request; }
 
     const KURL& url() const { return m_resourceRequest.url();}
-    Type type() const { return static_cast<Type>(m_type); }
+    Type getType() const { return static_cast<Type>(m_type); }
     const ResourceLoaderOptions& options() const { return m_options; }
     void setOptions(const ResourceLoaderOptions& options) { m_options = options; }
 
@@ -144,7 +144,7 @@ public:
         PreloadReferencedWhileLoading,
         PreloadReferencedWhileComplete
     };
-    PreloadResult preloadResult() const { return static_cast<PreloadResult>(m_preloadResult); }
+    PreloadResult getPreloadResult() const { return static_cast<PreloadResult>(m_preloadResult); }
 
     virtual void didAddClient(ResourceClient*);
     virtual void didRemoveClient(ResourceClient*) { }
@@ -152,7 +152,7 @@ public:
 
     unsigned count() const { return m_clients.size(); }
 
-    Status status() const { return static_cast<Status>(m_status); }
+    Status getStatus() const { return static_cast<Status>(m_status); }
     void setStatus(Status status) { m_status = status; }
 
     size_t size() const { return encodedSize() + decodedSize() + overheadSize(); }
@@ -216,10 +216,10 @@ public:
     bool errorOccurred() const { return m_status == LoadError || m_status == DecodeError; }
     bool loadFailedOrCanceled() { return !m_error.isNull(); }
 
-    DataBufferingPolicy dataBufferingPolicy() const { return m_options.dataBufferingPolicy; }
+    DataBufferingPolicy getDataBufferingPolicy() const { return m_options.dataBufferingPolicy; }
     void setDataBufferingPolicy(DataBufferingPolicy);
 
-    bool isUnusedPreload() const { return isPreloaded() && preloadResult() == PreloadNotReferenced; }
+    bool isUnusedPreload() const { return isPreloaded() && getPreloadResult() == PreloadNotReferenced; }
     bool isPreloaded() const { return m_preloadCount; }
     void increasePreloadCount() { ++m_preloadCount; }
     void decreasePreloadCount() { ASSERT(m_preloadCount); --m_preloadCount; }
@@ -400,7 +400,7 @@ protected:
 };
 
 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \
-    DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->type() == Resource::typeName, resource.type() == Resource::typeName); \
+    DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->getType() == Resource::typeName, resource.getType() == Resource::typeName); \
     inline typeName##Resource* to##typeName##Resource(const RefPtrWillBeRawPtr<Resource>& ptr) { return to##typeName##Resource(ptr.get()); }
 
 } // namespace blink
diff --git a/third_party/WebKit/Source/core/fetch/ResourceClient.h b/third_party/WebKit/Source/core/fetch/ResourceClient.h
index be914a5..41fe1bc 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceClient.h
+++ b/third_party/WebKit/Source/core/fetch/ResourceClient.h
@@ -49,7 +49,7 @@ public:
     virtual void notifyFinished(Resource*) { }
 
     static bool isExpectedType(ResourceClient*) { return true; }
-    virtual ResourceClientType resourceClientType() const { return BaseResourceType; }
+    virtual ResourceClientType getResourceClientType() const { return BaseResourceType; }
 
     virtual ResourcePriority computeResourcePriority() const { return ResourcePriority(); }
 
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
index 7325d3f..78209db 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -232,7 +232,7 @@ bool ResourceFetcher::canAccessResource(Resource* resource, SecurityOrigin* sour
 {
     // Redirects can change the response URL different from one of request.
     bool forPreload = resource->isUnusedPreload();
-    if (!context().canRequest(resource->type(), resource->resourceRequest(), url, resource->options(), forPreload, FetchRequest::UseDefaultOriginRestrictionForType))
+    if (!context().canRequest(resource->getType(), resource->resourceRequest(), url, resource->options(), forPreload, FetchRequest::UseDefaultOriginRestrictionForType))
         return false;
 
     if (!sourceOrigin)
@@ -245,7 +245,7 @@ bool ResourceFetcher::canAccessResource(Resource* resource, SecurityOrigin* sour
     if (!resource->passesAccessControlCheck(sourceOrigin, errorDescription)) {
         resource->setCORSFailed();
         if (!forPreload && (logErrorsDecision == ShouldLogAccessControlErrors)) {
-            String resourceType = Resource::resourceTypeToString(resource->type(), resource->options().initiatorInfo);
+            String resourceType = Resource::resourceTypeToString(resource->getType(), resource->options().initiatorInfo);
             context().addConsoleMessage(resourceType + " from origin '" + SecurityOrigin::create(url)->toString() + "' has been blocked from loading by Cross-Origin Resource Sharing policy: " + errorDescription);
         }
         return false;
@@ -275,7 +275,7 @@ static const int kMaxValidatedURLsSize = 10000;
 
 void ResourceFetcher::requestLoadStarted(Resource* resource, const FetchRequest& request, ResourceLoadStartType type, bool isStaticData)
 {
-    if (type == ResourceLoadingFromCache && resource->status() == Resource::Cached && !m_validatedURLs.contains(resource->url()))
+    if (type == ResourceLoadingFromCache && resource->getStatus() == Resource::Cached && !m_validatedURLs.contains(resource->url()))
         context().dispatchDidLoadResourceFromMemoryCache(resource, request.resourceRequest().frameType(), request.resourceRequest().requestContext());
 
     if (isStaticData)
@@ -283,7 +283,7 @@ void ResourceFetcher::requestLoadStarted(Resource* resource, const FetchRequest&
 
     if (type == ResourceLoadingFromCache && !resource->stillNeedsLoad() && !m_validatedURLs.contains(request.resourceRequest().url())) {
         // Resources loaded from memory cache should be reported the first time they're used.
-        OwnPtr<ResourceTimingInfo> info = ResourceTimingInfo::create(request.options().initiatorInfo.name, monotonicallyIncreasingTime(), resource->type() == Resource::MainResource);
+        OwnPtr<ResourceTimingInfo> info = ResourceTimingInfo::create(request.options().initiatorInfo.name, monotonicallyIncreasingTime(), resource->getType() == Resource::MainResource);
         populateResourceTiming(info.get(), resource, true);
         m_scheduledResourceTimingReports.append(info.release());
         if (!m_resourceTimingReportTimer.isActive())
@@ -384,7 +384,7 @@ PassRefPtrWillBeRawPtr<Resource> ResourceFetcher::requestResource(FetchRequest&
     if (!url.isValid())
         return nullptr;
 
-    if (!context().canRequest(factory.type(), request.resourceRequest(), url, request.options(), request.forPreload(), request.originRestriction()))
+    if (!context().canRequest(factory.type(), request.resourceRequest(), url, request.options(), request.forPreload(), request.getOriginRestriction()))
         return nullptr;
 
     if (!request.forPreload()) {
@@ -442,7 +442,7 @@ PassRefPtrWillBeRawPtr<Resource> ResourceFetcher::requestResource(FetchRequest&
 
     if (!resource)
         return nullptr;
-    if (resource->type() != factory.type()) {
+    if (resource->getType() != factory.type()) {
         ASSERT(request.forPreload());
         return nullptr;
     }
@@ -527,7 +527,7 @@ void ResourceFetcher::determineRequestContext(ResourceRequest& request, Resource
 
 void ResourceFetcher::initializeResourceRequest(ResourceRequest& request, Resource::Type type)
 {
-    if (request.cachePolicy() == UseProtocolCachePolicy)
+    if (request.getCachePolicy() == UseProtocolCachePolicy)
         request.setCachePolicy(context().resourceRequestCachePolicy(request, type));
     if (request.requestContext() == WebURLRequest::RequestContextUnspecified)
         determineRequestContext(request, type);
@@ -548,13 +548,13 @@ void ResourceFetcher::initializeRevalidation(const FetchRequest& request, Resour
 
     ResourceRequest revalidatingRequest(resource->resourceRequest());
     revalidatingRequest.clearHTTPReferrer();
-    initializeResourceRequest(revalidatingRequest, resource->type());
+    initializeResourceRequest(revalidatingRequest, resource->getType());
 
     const AtomicString& lastModified = resource->response().httpHeaderField(HTTPNames::Last_Modified);
     const AtomicString& eTag = resource->response().httpHeaderField(HTTPNames::ETag);
     if (!lastModified.isEmpty() || !eTag.isEmpty()) {
-        ASSERT(context().cachePolicy() != CachePolicyReload);
-        if (context().cachePolicy() == CachePolicyRevalidate)
+        ASSERT(context().getCachePolicy() != CachePolicyReload);
+        if (context().getCachePolicy() == CachePolicyRevalidate)
             revalidatingRequest.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=0");
     }
     if (!lastModified.isEmpty())
@@ -591,7 +591,7 @@ void ResourceFetcher::storeResourceTimingInitiatorInformation(Resource* resource
     if (resource->options().initiatorInfo.name == FetchInitiatorTypeNames::internal)
         return;
 
-    OwnPtr<ResourceTimingInfo> info = ResourceTimingInfo::create(resource->options().initiatorInfo.name, monotonicallyIncreasingTime(), resource->type() == Resource::MainResource);
+    OwnPtr<ResourceTimingInfo> info = ResourceTimingInfo::create(resource->options().initiatorInfo.name, monotonicallyIncreasingTime(), resource->getType() == Resource::MainResource);
 
     if (resource->isCacheValidator()) {
         const AtomicString& timingAllowOrigin = resource->response().httpHeaderField(HTTPNames::Timing_Allow_Origin);
@@ -599,7 +599,7 @@ void ResourceFetcher::storeResourceTimingInitiatorInformation(Resource* resource
             info->setOriginalTimingAllowOrigin(timingAllowOrigin);
     }
 
-    if (resource->type() != Resource::MainResource || context().updateTimingInfoForIFrameNavigation(info.get()))
+    if (resource->getType() != Resource::MainResource || context().updateTimingInfoForIFrameNavigation(info.get()))
         m_resourceTimingInfoMap.add(resource, info.release());
 }
 
@@ -642,7 +642,7 @@ ResourceFetcher::RevalidationPolicy ResourceFetcher::determineRevalidationPolicy
         return Use;
 
     // If the same URL has been loaded as a different type, we need to reload.
-    if (existingResource->type() != type) {
+    if (existingResource->getType() != type) {
         // FIXME: If existingResource is a Preload and the new type is LinkPrefetch
         // We really should discard the new prefetch since the preload has more
         // specific type information! crbug.com/379893
@@ -678,7 +678,7 @@ ResourceFetcher::RevalidationPolicy ResourceFetcher::determineRevalidationPolicy
     if (m_allowStaleResources)
         return Use;
 
-    if (request.cachePolicy() == ResourceRequestCachePolicy::ReloadBypassingCache)
+    if (request.getCachePolicy() == ResourceRequestCachePolicy::ReloadBypassingCache)
         return Reload;
 
     if (!fetchRequest.options().canReuseRequest(existingResource->options()))
@@ -689,7 +689,7 @@ ResourceFetcher::RevalidationPolicy ResourceFetcher::determineRevalidationPolicy
         return Use;
 
     // CachePolicyHistoryBuffer uses the cache no matter what.
-    CachePolicy cachePolicy = context().cachePolicy();
+    CachePolicy cachePolicy = context().getCachePolicy();
     if (cachePolicy == CachePolicyHistoryBuffer)
         return Use;
 
@@ -818,7 +818,7 @@ void ResourceFetcher::reloadImagesIfNotDeferred()
     // the resource probably won't be necesssary.
     for (const auto& documentResource : m_documentResources) {
         Resource* resource = documentResource.value.get();
-        if (resource && resource->type() == Resource::Image && resource->stillNeedsLoad() && !clientDefersImage(resource->url()))
+        if (resource && resource->getType() == Resource::Image && resource->stillNeedsLoad() && !clientDefersImage(resource->url()))
             const_cast<Resource*>(resource)->load(this, defaultResourceOptions());
     }
 }
@@ -878,7 +878,7 @@ void ResourceFetcher::clearPreloads(ClearPreloadsPolicy policy)
 
     for (auto resource : *m_preloads) {
         resource->decreasePreloadCount();
-        if (resource->preloadResult() == Resource::PreloadNotReferenced && (policy == ClearAllPreloads || !resource->isLinkPreload()))
+        if (resource->getPreloadResult() == Resource::PreloadNotReferenced && (policy == ClearAllPreloads || !resource->isLinkPreload()))
             memoryCache()->remove(resource.get());
     }
     m_preloads.clear();
@@ -895,7 +895,7 @@ ArchiveResource* ResourceFetcher::createArchive(Resource* resource)
 
 bool ResourceFetcher::scheduleArchiveLoad(Resource* resource, const ResourceRequest& request)
 {
-    if (resource->type() == Resource::MainResource && !context().isMainFrame())
+    if (resource->getType() == Resource::MainResource && !context().isMainFrame())
         m_archive = context().archive();
 
     if (!m_archive)
@@ -955,7 +955,7 @@ void ResourceFetcher::didReceiveResponse(const Resource* resource, const Resourc
     // https://w3c.github.io/webappsec-csp/#should-block-response
     if (response.wasFetchedViaServiceWorker()) {
         const KURL& originalURL = response.originalURLViaServiceWorker();
-        if (!originalURL.isEmpty() && !context().allowResponse(resource->type(), resource->resourceRequest(), originalURL, resource->options())) {
+        if (!originalURL.isEmpty() && !context().allowResponse(resource->getType(), resource->resourceRequest(), originalURL, resource->options())) {
             resource->loader()->cancel();
             bool isInternalRequest = resource->options().initiatorInfo.name == FetchInitiatorTypeNames::internal;
             context().dispatchDidFail(resource->identifier(), ResourceError(errorDomainBlinkInternal, 0, originalURL.string(), "Unsafe attempt to load URL " + originalURL.elidedString() + " fetched by a ServiceWorker."), isInternalRequest);
@@ -1052,7 +1052,7 @@ bool ResourceFetcher::isLoadedBy(ResourceFetcher* possibleOwner) const
 
 bool ResourceFetcher::canAccessRedirect(Resource* resource, ResourceRequest& newRequest, const ResourceResponse& redirectResponse, ResourceLoaderOptions& options)
 {
-    if (!context().canRequest(resource->type(), newRequest, newRequest.url(), options, resource->isUnusedPreload(), FetchRequest::UseDefaultOriginRestrictionForType))
+    if (!context().canRequest(resource->getType(), newRequest, newRequest.url(), options, resource->isUnusedPreload(), FetchRequest::UseDefaultOriginRestrictionForType))
         return false;
     if (options.corsEnabled == IsCORSEnabled) {
         SecurityOrigin* sourceOrigin = options.securityOrigin.get();
@@ -1067,7 +1067,7 @@ bool ResourceFetcher::canAccessRedirect(Resource* resource, ResourceRequest& new
             return false;
         }
     }
-    if (resource->type() == Resource::Image && shouldDeferImageLoad(newRequest.url()))
+    if (resource->getType() == Resource::Image && shouldDeferImageLoad(newRequest.url()))
         return false;
     return true;
 }
@@ -1120,24 +1120,24 @@ void ResourceFetcher::printPreloadStats()
     unsigned images = 0;
     unsigned imageMisses = 0;
     for (auto resource : *m_preloads) {
-        if (resource->preloadResult() == Resource::PreloadNotReferenced)
+        if (resource->getPreloadResult() == Resource::PreloadNotReferenced)
             printf("!! UNREFERENCED PRELOAD %s\n", resource->url().string().latin1().data());
-        else if (resource->preloadResult() == Resource::PreloadReferencedWhileComplete)
+        else if (resource->getPreloadResult() == Resource::PreloadReferencedWhileComplete)
             printf("HIT COMPLETE PRELOAD %s\n", resource->url().string().latin1().data());
-        else if (resource->preloadResult() == Resource::PreloadReferencedWhileLoading)
+        else if (resource->getPreloadResult() == Resource::PreloadReferencedWhileLoading)
             printf("HIT LOADING PRELOAD %s\n", resource->url().string().latin1().data());
 
-        if (resource->type() == Resource::Script) {
+        if (resource->getType() == Resource::Script) {
             scripts++;
-            if (resource->preloadResult() < Resource::PreloadReferencedWhileLoading)
+            if (resource->getPreloadResult() < Resource::PreloadReferencedWhileLoading)
                 scriptMisses++;
-        } else if (resource->type() == Resource::CSSStyleSheet) {
+        } else if (resource->getType() == Resource::CSSStyleSheet) {
             stylesheets++;
-            if (resource->preloadResult() < Resource::PreloadReferencedWhileLoading)
+            if (resource->getPreloadResult() < Resource::PreloadReferencedWhileLoading)
                 stylesheetMisses++;
         } else {
             images++;
-            if (resource->preloadResult() < Resource::PreloadReferencedWhileLoading)
+            if (resource->getPreloadResult() < Resource::PreloadReferencedWhileLoading)
                 imageMisses++;
         }
 
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp
index ffc0a0c..8731568 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp
@@ -61,7 +61,7 @@ public:
     bool shouldLoadNewResource(Resource::Type) const override { return true; }
 
     void setCachePolicy(CachePolicy policy) { m_policy = policy; }
-    CachePolicy cachePolicy() const override { return m_policy; }
+    CachePolicy getCachePolicy() const override { return m_policy; }
 
 private:
     ResourceFetcherTestMockFetchContext()
diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
index d53920a..2ff8e64 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
@@ -366,7 +366,7 @@ void ResourceLoader::didReceiveResponse(WebURLLoader*, const WebURLResponse& res
     if (response.toResourceResponse().isMultipart()) {
         // We only support multipart for images, though the image may be loaded
         // as a main resource that we end up displaying through an ImageDocument.
-        if (!m_resource->isImage() && m_resource->type() != Resource::MainResource) {
+        if (!m_resource->isImage() && m_resource->getType() != Resource::MainResource) {
             cancel();
             return;
         }
diff --git a/third_party/WebKit/Source/core/fetch/ScriptResource.h b/third_party/WebKit/Source/core/fetch/ScriptResource.h
index a9426b2..af2d619 100644
--- a/third_party/WebKit/Source/core/fetch/ScriptResource.h
+++ b/third_party/WebKit/Source/core/fetch/ScriptResource.h
@@ -46,8 +46,8 @@ class ScriptResource;
 class CORE_EXPORT ScriptResourceClient : public ResourceClient {
 public:
     ~ScriptResourceClient() override {}
-    static bool isExpectedType(ResourceClient* client) { return client->resourceClientType() == ScriptType; }
-    ResourceClientType resourceClientType() const final { return ScriptType; }
+    static bool isExpectedType(ResourceClient* client) { return client->getResourceClientType() == ScriptType; }
+    ResourceClientType getResourceClientType() const final { return ScriptType; }
 
     virtual void notifyAppendData(ScriptResource* resource) { }
 };
diff --git a/third_party/WebKit/Source/core/fetch/StyleSheetResourceClient.h b/third_party/WebKit/Source/core/fetch/StyleSheetResourceClient.h
index 36c1298..9656bd0 100644
--- a/third_party/WebKit/Source/core/fetch/StyleSheetResourceClient.h
+++ b/third_party/WebKit/Source/core/fetch/StyleSheetResourceClient.h
@@ -36,8 +36,8 @@ class CSSStyleSheetResource;
 class StyleSheetResourceClient : public ResourceClient {
 public:
     ~StyleSheetResourceClient() override {}
-    static bool isExpectedType(ResourceClient* client) { return client->resourceClientType() == StyleSheetType; }
-    ResourceClientType resourceClientType() const final { return StyleSheetType; }
+    static bool isExpectedType(ResourceClient* client) { return client->getResourceClientType() == StyleSheetType; }
+    ResourceClientType getResourceClientType() const final { return StyleSheetType; }
     virtual void setCSSStyleSheet(const String& /* href */, const KURL& /* baseURL */, const String& /* charset */, const CSSStyleSheetResource*) {}
     virtual void setXSLStyleSheet(const String& /* href */, const KURL& /* baseURL */, const String& /* sheet */) {}
 };
diff --git a/third_party/WebKit/Source/core/fileapi/File.h b/third_party/WebKit/Source/core/fileapi/File.h
index fedb56a..b893ebf 100644
--- a/third_party/WebKit/Source/core/fileapi/File.h
+++ b/third_party/WebKit/Source/core/fileapi/File.h
@@ -132,7 +132,7 @@ public:
     // http://www.w3.org/TR/FileAPI/#dfn-lastModifiedDate
     double lastModifiedDate() const;
 
-    UserVisibility userVisibility() const { return m_userVisibility; }
+    UserVisibility getUserVisibility() const { return m_userVisibility; }
 
     // Returns the relative path of this file in the context of a directory selection.
     const String& webkitRelativePath() const { return m_relativePath; }
diff --git a/third_party/WebKit/Source/core/fileapi/FileList.cpp b/third_party/WebKit/Source/core/fileapi/FileList.cpp
index 9af0890..6b18106 100644
--- a/third_party/WebKit/Source/core/fileapi/FileList.cpp
+++ b/third_party/WebKit/Source/core/fileapi/FileList.cpp
@@ -43,7 +43,7 @@ Vector<String> FileList::pathsForUserVisibleFiles() const
 {
     Vector<String> paths;
     for (unsigned i = 0; i < m_files.size(); ++i) {
-        if (m_files[i]->userVisibility() == File::IsUserVisible) {
+        if (m_files[i]->getUserVisibility() == File::IsUserVisible) {
             if (m_files[i]->hasBackingFile())
                 paths.append(m_files[i]->path());
             else
diff --git a/third_party/WebKit/Source/core/fileapi/FileReader.h b/third_party/WebKit/Source/core/fileapi/FileReader.h
index 0506748..0fef178 100644
--- a/third_party/WebKit/Source/core/fileapi/FileReader.h
+++ b/third_party/WebKit/Source/core/fileapi/FileReader.h
@@ -73,7 +73,7 @@ public:
 
     void doAbort();
 
-    ReadyState readyState() const { return m_state; }
+    ReadyState getReadyState() const { return m_state; }
     FileError* error() { return m_error; }
     void result(StringOrArrayBuffer& resultAttribute) const;
 
diff --git a/third_party/WebKit/Source/core/fileapi/FileReader.idl b/third_party/WebKit/Source/core/fileapi/FileReader.idl
index 9e9c30c..c299840 100644
--- a/third_party/WebKit/Source/core/fileapi/FileReader.idl
+++ b/third_party/WebKit/Source/core/fileapi/FileReader.idl
@@ -53,7 +53,7 @@
     const unsigned short LOADING = 1;
     const unsigned short DONE = 2;
 
-    readonly attribute unsigned short readyState;
+    [ImplementedAs=getReadyState] readonly attribute unsigned short readyState;
 
     // File or Blob data
     readonly attribute (DOMString or ArrayBuffer)? result;
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 05c65b4..e94fd54 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -1672,7 +1672,7 @@ bool FrameView::computeCompositedSelection(LocalFrame& frame, CompositedSelectio
     if (!selection.end.layer)
         return false;
 
-    selection.type = visibleSelection.selectionType();
+    selection.type = visibleSelection.getSelectionType();
     selection.isEditable = visibleSelection.isContentEditable();
     if (selection.isEditable) {
         if (HTMLTextFormControlElement* enclosingTextFormControlElement = enclosingTextFormControl(visibleSelection.rootEditableElement()))
diff --git a/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h b/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h
index 3c6b295..9c8ba87 100644
--- a/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h
+++ b/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h
@@ -67,8 +67,8 @@ public:
     bool allowDynamic() const;
 
     const String& evalDisabledErrorMessage() const { return m_evalDisabledErrorMessage; }
-    ReflectedXSSDisposition reflectedXSSDisposition() const { return m_reflectedXSSDisposition; }
-    ReferrerPolicy referrerPolicy() const { return m_referrerPolicy; }
+    ReflectedXSSDisposition getReflectedXSSDisposition() const { return m_reflectedXSSDisposition; }
+    ReferrerPolicy getReferrerPolicy() const { return m_referrerPolicy; }
     bool didSetReferrerPolicy() const { return m_didSetReferrerPolicy; }
     bool isReportOnly() const { return m_reportOnly; }
     const Vector<String>& reportEndpoints() const { return m_reportEndpoints; }
diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
index 23085be..88e59b9 100644
--- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
+++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
@@ -279,7 +279,7 @@ void ContentSecurityPolicy::addPolicyFromHeaderValue(const String& header, Conte
         // When a referrer policy has already been set, the most recent
         // one takes precedence.
         if (type != ContentSecurityPolicyHeaderTypeReport && policy->didSetReferrerPolicy())
-            m_referrerPolicy = policy->referrerPolicy();
+            m_referrerPolicy = policy->getReferrerPolicy();
 
         if (!policy->allowEval(0, SuppressReport) && m_disableEvalErrorMessage.isNull())
             m_disableEvalErrorMessage = policy->evalDisabledErrorMessage();
@@ -631,12 +631,12 @@ bool ContentSecurityPolicy::isActive() const
     return !m_policies.isEmpty();
 }
 
-ReflectedXSSDisposition ContentSecurityPolicy::reflectedXSSDisposition() const
+ReflectedXSSDisposition ContentSecurityPolicy::getReflectedXSSDisposition() const
 {
     ReflectedXSSDisposition disposition = ReflectedXSSUnset;
     for (const auto& policy : m_policies) {
-        if (policy->reflectedXSSDisposition() > disposition)
-            disposition = std::max(disposition, policy->reflectedXSSDisposition());
+        if (policy->getReflectedXSSDisposition() > disposition)
+            disposition = std::max(disposition, policy->getReflectedXSSDisposition());
     }
     return disposition;
 }
diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h
index 766d396..8c4e502 100644
--- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h
+++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h
@@ -203,7 +203,7 @@ public:
     void usesScriptHashAlgorithms(uint8_t ContentSecurityPolicyHashAlgorithm);
     void usesStyleHashAlgorithms(uint8_t ContentSecurityPolicyHashAlgorithm);
 
-    ReflectedXSSDisposition reflectedXSSDisposition() const;
+    ReflectedXSSDisposition getReflectedXSSDisposition() const;
 
     bool didSetReferrerPolicy() const;
 
diff --git a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp
index ae623aa..3c8690b 100644
--- a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp
@@ -252,7 +252,7 @@ void HTMLImageElement::setBestFitURLAndDPRFromImageCandidate(const ImageCandidat
         m_imageDevicePixelRatio = 1.0 / candidateDensity;
 
     bool intrinsicSizingViewportDependant = false;
-    if (candidate.resourceWidth() > 0) {
+    if (candidate.getResourceWidth() > 0) {
         intrinsicSizingViewportDependant = true;
         UseCounter::count(document(), UseCounter::SrcsetWDescriptor);
     } else if (!candidate.srcOrigin()) {
@@ -671,7 +671,7 @@ static bool sourceSizeValue(Element& element, Document& currentDocument, float&
     return exists;
 }
 
-FetchRequest::ResourceWidth HTMLImageElement::resourceWidth()
+FetchRequest::ResourceWidth HTMLImageElement::getResourceWidth()
 {
     FetchRequest::ResourceWidth resourceWidth;
     Element* element = m_source.get();
diff --git a/third_party/WebKit/Source/core/html/HTMLImageElement.h b/third_party/WebKit/Source/core/html/HTMLImageElement.h
index 446f400..31e4957 100644
--- a/third_party/WebKit/Source/core/html/HTMLImageElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLImageElement.h
@@ -110,7 +110,7 @@ public:
     void setUseFallbackContent();
     void setIsFallbackImage() { m_isFallbackImage = true; }
 
-    FetchRequest::ResourceWidth resourceWidth();
+    FetchRequest::ResourceWidth getResourceWidth();
     float sourceSize(Element&);
 
     void forceReload() const;
diff --git a/third_party/WebKit/Source/core/html/HTMLImageElementTest.cpp b/third_party/WebKit/Source/core/html/HTMLImageElementTest.cpp
index 9768137..99ae9dd 100644
--- a/third_party/WebKit/Source/core/html/HTMLImageElementTest.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLImageElementTest.cpp
@@ -28,9 +28,9 @@ TEST_F(HTMLImageElementTest, width)
     RefPtrWillBeRawPtr<HTMLImageElement> image = HTMLImageElement::create(m_dummyPageHolder->document(), nullptr, /* createdByParser */ false);
     image->setAttribute(HTMLNames::widthAttr, "400");
     // TODO(yoav): `width` does not impact resourceWidth until we resolve https://github.com/ResponsiveImagesCG/picture-element/issues/268
-    EXPECT_EQ(500, image->resourceWidth().width);
+    EXPECT_EQ(500, image->getResourceWidth().width);
     image->setAttribute(HTMLNames::sizesAttr, "100vw");
-    EXPECT_EQ(500, image->resourceWidth().width);
+    EXPECT_EQ(500, image->getResourceWidth().width);
 }
 
 TEST_F(HTMLImageElementTest, sourceSize)
diff --git a/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp b/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
index 85c4755..91bbbc5 100644
--- a/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
@@ -368,7 +368,7 @@ void HTMLObjectElement::renderFallbackContent()
         return;
 
     // Before we give up and use fallback content, check to see if this is a MIME type issue.
-    if (m_imageLoader && m_imageLoader->image() && m_imageLoader->image()->status() != Resource::LoadError) {
+    if (m_imageLoader && m_imageLoader->image() && m_imageLoader->image()->getStatus() != Resource::LoadError) {
         m_serviceType = m_imageLoader->image()->response().mimeType();
         if (!isImageType()) {
             // If we don't think we have an image type anymore, then clear the image from the loader.
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLPreloadScannerTest.cpp b/third_party/WebKit/Source/core/html/parser/HTMLPreloadScannerTest.cpp
index 03a37c1..3409dbc 100644
--- a/third_party/WebKit/Source/core/html/parser/HTMLPreloadScannerTest.cpp
+++ b/third_party/WebKit/Source/core/html/parser/HTMLPreloadScannerTest.cpp
@@ -65,7 +65,7 @@ public:
     void preloadRequestVerification(Resource::Type type, const char* url, const char* baseURL, int width, ReferrerPolicy referrerPolicy)
     {
         preloadRequestVerification(type, url, baseURL, width, ClientHintsPreferences());
-        EXPECT_EQ(referrerPolicy, m_preloadRequest->referrerPolicy());
+        EXPECT_EQ(referrerPolicy, m_preloadRequest->getReferrerPolicy());
     }
 
     void preconnectRequestVerification(const String& host, CrossOriginAttributeValue crossOrigin)
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.cpp b/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.cpp
index 7b540e4..f90e555 100644
--- a/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.cpp
+++ b/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.cpp
@@ -370,8 +370,8 @@ static ImageCandidate pickBestImageCandidate(float deviceScaleFactor, float sour
 
     // http://picture.responsiveimages.org/#normalize-source-densities
     for (ImageCandidate& image : imageCandidates) {
-        if (image.resourceWidth() > 0) {
-            image.setDensity((float)image.resourceWidth() / sourceSize);
+        if (image.getResourceWidth() > 0) {
+            image.setDensity((float)image.getResourceWidth() / sourceSize);
             ignoreSrc = true;
         } else if (image.density() < 0) {
             image.setDensity(defaultDensityValue);
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.h b/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.h
index e12447f..16492ee 100644
--- a/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.h
+++ b/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.h
@@ -57,7 +57,7 @@ public:
     bool hasHeight() const { return m_resourceHeight >= 0; }
 
     float density() const { ASSERT(hasDensity()); return m_density; }
-    unsigned resourceWidth() const { ASSERT(hasWidth()); return m_resourceWidth; }
+    unsigned getResourceWidth() const { ASSERT(hasWidth()); return m_resourceWidth; }
     unsigned resourceHeight() const { ASSERT(hasHeight()); return m_resourceHeight; }
 
     void setResourceWidth(int width) { ASSERT(width >= 0); m_resourceWidth = (unsigned)width; }
@@ -88,7 +88,7 @@ public:
     ImageCandidate(const String& source, unsigned start, unsigned length, const DescriptorParsingResult& result, OriginAttribute originAttribute)
         : m_string(source.createView(start, length))
         , m_density(result.hasDensity()?result.density():UninitializedDescriptor)
-        , m_resourceWidth(result.hasWidth()?result.resourceWidth():UninitializedDescriptor)
+        , m_resourceWidth(result.hasWidth()?result.getResourceWidth():UninitializedDescriptor)
         , m_originAttribute(originAttribute)
     {
     }
@@ -113,7 +113,7 @@ public:
         return m_density;
     }
 
-    int resourceWidth() const
+    int getResourceWidth() const
     {
         return m_resourceWidth;
     }
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParserTest.cpp b/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParserTest.cpp
index 86586ea..5829e7b 100644
--- a/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParserTest.cpp
+++ b/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParserTest.cpp
@@ -23,7 +23,7 @@ TEST(ImageCandidateTest, Basic)
 {
     ImageCandidate candidate;
     ASSERT_EQ(candidate.density(), 1);
-    ASSERT_EQ(candidate.resourceWidth(), -1);
+    ASSERT_EQ(candidate.getResourceWidth(), -1);
     ASSERT_EQ(candidate.srcOrigin(), false);
 
 }
@@ -120,7 +120,7 @@ TEST(HTMLSrcsetParserTest, Basic)
         TestCase test = testCases[i];
         ImageCandidate candidate = bestFitSourceForImageAttributes(test.deviceScaleFactor, test.effectiveSize, test.srcInput, test.srcsetInput);
         ASSERT_EQ(test.outputDensity, candidate.density());
-        ASSERT_EQ(test.outputResourceWidth, candidate.resourceWidth());
+        ASSERT_EQ(test.outputResourceWidth, candidate.getResourceWidth());
         ASSERT_STREQ(test.outputURL, candidate.toString().ascii().data());
     }
 }
diff --git a/third_party/WebKit/Source/core/html/parser/PreloadRequest.h b/third_party/WebKit/Source/core/html/parser/PreloadRequest.h
index 994298c..cb0932d 100644
--- a/third_party/WebKit/Source/core/html/parser/PreloadRequest.h
+++ b/third_party/WebKit/Source/core/html/parser/PreloadRequest.h
@@ -51,7 +51,7 @@ public:
     const KURL& baseURL() const { return m_baseURL; }
     bool isPreconnect() const { return m_requestType == RequestTypePreconnect; }
     const ClientHintsPreferences& preferences() const { return m_clientHintsPreferences; }
-    ReferrerPolicy referrerPolicy() const { return m_referrerPolicy; }
+    ReferrerPolicy getReferrerPolicy() const { return m_referrerPolicy; }
     void setIntegrityMetadata(const IntegrityMetadataSet& metadataSet)
     {
         m_integrityMetadata = metadataSet;
diff --git a/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp b/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp
index d0cac91..158eca5 100644
--- a/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp
+++ b/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp
@@ -353,7 +353,7 @@ void XSSAuditor::init(Document* document, XSSAuditorDelegate* auditorDelegate)
         if (xssProtectionHeader == ReflectedXSSInvalid)
             document->addConsoleMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, "Error parsing header X-XSS-Protection: " + headerValue + ": "  + errorDetails + " at character position " + String::format("%u", errorPosition) + ". The default protections will be applied."));
 
-        ReflectedXSSDisposition cspHeader = document->contentSecurityPolicy()->reflectedXSSDisposition();
+        ReflectedXSSDisposition cspHeader = document->contentSecurityPolicy()->getReflectedXSSDisposition();
         m_didSendValidCSPHeader = cspHeader != ReflectedXSSUnset && cspHeader != ReflectedXSSInvalid;
 
         m_xssProtection = combineXSSProtectionHeaderAndCSP(xssProtectionHeader, cspHeader);
diff --git a/third_party/WebKit/Source/core/input/EventHandler.cpp b/third_party/WebKit/Source/core/input/EventHandler.cpp
index 81e9c47..a5b46c7 100644
--- a/third_party/WebKit/Source/core/input/EventHandler.cpp
+++ b/third_party/WebKit/Source/core/input/EventHandler.cpp
@@ -1732,8 +1732,8 @@ namespace {
 
 ScrollResult scrollAreaWithWheelEvent(const PlatformWheelEvent& event, ScrollableArea& scrollableArea)
 {
-    float deltaX = event.railsMode() != PlatformEvent::RailsModeVertical ? event.deltaX() : 0;
-    float deltaY = event.railsMode() != PlatformEvent::RailsModeHorizontal ? event.deltaY() : 0;
+    float deltaX = event.getRailsMode() != PlatformEvent::RailsModeVertical ? event.deltaX() : 0;
+    float deltaY = event.getRailsMode() != PlatformEvent::RailsModeHorizontal ? event.deltaY() : 0;
 
     ScrollGranularity granularity =
         event.granularity() == ScrollByPixelWheelEvent ? ScrollByPixel : ScrollByPage;
@@ -1851,11 +1851,11 @@ void EventHandler::defaultWheelEventHandler(Node* startNode, WheelEvent* wheelEv
     // a MacBook pro is an example of a 2-dimensional mouse wheel event (where both deltaX and deltaY can be set).
 
     // FIXME: enable scroll customization in this case. See crbug.com/410974.
-    if (wheelEvent->railsMode() != Event::RailsModeVertical
+    if (wheelEvent->getRailsMode() != Event::RailsModeVertical
         && scroll(ScrollRightIgnoringWritingMode, granularity, startNode, &stopNode, wheelEvent->deltaX()).didScroll)
         wheelEvent->setDefaultHandled();
 
-    if (wheelEvent->railsMode() != Event::RailsModeHorizontal
+    if (wheelEvent->getRailsMode() != Event::RailsModeHorizontal
         && scroll(ScrollDownIgnoringWritingMode, granularity, startNode, &stopNode, wheelEvent->deltaY()).didScroll)
         wheelEvent->setDefaultHandled();
 
diff --git a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
index 7e83f2a..ac7ff0b 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
@@ -129,7 +129,7 @@ static bool prepareResourceBuffer(Resource* cachedResource, bool* hasZeroSize)
     if (!cachedResource)
         return false;
 
-    if (cachedResource->dataBufferingPolicy() == DoNotBufferData)
+    if (cachedResource->getDataBufferingPolicy() == DoNotBufferData)
         return false;
 
     // Zero-sized resources don't have data at all -- so fake the empty buffer, instead of indicating error by returning 0.
@@ -154,7 +154,7 @@ static bool prepareResourceBuffer(Resource* cachedResource, bool* hasZeroSize)
 
 static bool hasTextContent(Resource* cachedResource)
 {
-    Resource::Type type = cachedResource->type();
+    Resource::Type type = cachedResource->getType();
     return type == Resource::CSSStyleSheet || type == Resource::XSLStyleSheet || type == Resource::Script || type == Resource::Raw || type == Resource::ImportResource || type == Resource::MainResource;
 }
 
@@ -211,7 +211,7 @@ bool InspectorPageAgent::cachedResourceContent(Resource* cachedResource, String*
     }
 
     if (cachedResource) {
-        switch (cachedResource->type()) {
+        switch (cachedResource->getType()) {
         case Resource::CSSStyleSheet:
             *result = toCSSStyleSheetResource(cachedResource)->sheetText();
             return true;
@@ -313,7 +313,7 @@ String InspectorPageAgent::resourceTypeJson(InspectorPageAgent::ResourceType res
 
 InspectorPageAgent::ResourceType InspectorPageAgent::cachedResourceType(const Resource& cachedResource)
 {
-    switch (cachedResource.type()) {
+    switch (cachedResource.getType()) {
     case Resource::Image:
         return InspectorPageAgent::ImageResource;
     case Resource::Font:
@@ -438,7 +438,7 @@ static void cachedResourcesForDocument(Document* document, WillBeHeapVector<RawP
         if (!cachedResource)
             continue;
 
-        switch (cachedResource->type()) {
+        switch (cachedResource->getType()) {
         case Resource::Image:
             // Skip images that were not auto loaded (images disabled in the user agent).
             if (toImageResource(cachedResource)->stillNeedsLoad())
@@ -737,7 +737,7 @@ PassOwnPtr<protocol::Page::FrameResourceTree> InspectorPageAgent::buildObjectFor
             .setMimeType(cachedResource->response().mimeType()).build();
         if (cachedResource->wasCanceled())
             resourceObject->setCanceled(true);
-        else if (cachedResource->status() == Resource::LoadError)
+        else if (cachedResource->getStatus() == Resource::LoadError)
             resourceObject->setFailed(true);
         subresources->addItem(resourceObject.release());
     }
diff --git a/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp
index d26d586..3134651 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp
@@ -584,7 +584,7 @@ void InspectorResourceAgent::didReceiveData(LocalFrame*, unsigned long identifie
 
     if (data) {
         NetworkResourcesData::ResourceData const* resourceData = m_resourcesData->data(requestId);
-        if (resourceData && (!resourceData->cachedResource() || resourceData->cachedResource()->dataBufferingPolicy() == DoNotBufferData || isErrorStatusCode(resourceData->httpStatusCode())))
+        if (resourceData && (!resourceData->cachedResource() || resourceData->cachedResource()->getDataBufferingPolicy() == DoNotBufferData || isErrorStatusCode(resourceData->httpStatusCode())))
             m_resourcesData->maybeAddResourceData(requestId, data, dataLength);
     }
 
diff --git a/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp b/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp
index 5ff9960..54fe833 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp
@@ -31,7 +31,7 @@ public:
 
     void waitForResource(Resource* resource)
     {
-        if (resource->type() == Resource::Raw)
+        if (resource->getType() == Resource::Raw)
             resource->addClient(static_cast<RawResourceClient*>(this));
         else
             resource->addClient(static_cast<StyleSheetResourceClient*>(this));
@@ -58,7 +58,7 @@ void InspectorResourceContentLoader::ResourceClient::resourceFinished(Resource*
     if (m_loader)
         m_loader->resourceFinished(this);
 
-    if (resource->type() == Resource::Raw)
+    if (resource->getType() == Resource::Raw)
         resource->removeClient(static_cast<RawResourceClient*>(this));
     else
         resource->removeClient(static_cast<StyleSheetResourceClient*>(this));
@@ -75,7 +75,7 @@ void InspectorResourceContentLoader::ResourceClient::setCSSStyleSheet(const Stri
 
 void InspectorResourceContentLoader::ResourceClient::notifyFinished(Resource* resource)
 {
-    if (resource->type() == Resource::CSSStyleSheet)
+    if (resource->getType() == Resource::CSSStyleSheet)
         return;
     resourceFinished(resource);
 }
diff --git a/third_party/WebKit/Source/core/layout/LayoutThemeMac.mm b/third_party/WebKit/Source/core/layout/LayoutThemeMac.mm
index 5a53040..a9fea2f 100644
--- a/third_party/WebKit/Source/core/layout/LayoutThemeMac.mm
+++ b/third_party/WebKit/Source/core/layout/LayoutThemeMac.mm
@@ -1086,7 +1086,7 @@ String LayoutThemeMac::fileListNameForWidth(Locale& locale, const FileList* file
         strToTruncate = locale.queryString(WebLocalizedString::FileButtonNoFileSelectedLabel);
     } else if (fileList->length() == 1) {
         File* file = fileList->item(0);
-        if (file->userVisibility() == File::IsUserVisible)
+        if (file->getUserVisibility() == File::IsUserVisible)
             strToTruncate = [[NSFileManager defaultManager] displayNameAtPath:(fileList->item(0)->path())];
         else
             strToTruncate = file->name();
diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
index d76d6e3..8868bda 100644
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
@@ -433,7 +433,7 @@ void DocumentLoader::responseReceived(Resource* resource, const ResourceResponse
 
     m_response = response;
 
-    if (isArchiveMIMEType(m_response.mimeType()) && m_mainResource->dataBufferingPolicy() != BufferData)
+    if (isArchiveMIMEType(m_response.mimeType()) && m_mainResource->getDataBufferingPolicy() != BufferData)
         m_mainResource->setDataBufferingPolicy(BufferData);
 
     if (!shouldContinueForResponse()) {
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
index 06aef60..cb00daf 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
@@ -131,7 +131,7 @@ void FrameFetchContext::setFirstPartyForCookies(ResourceRequest& request)
         request.setFirstPartyForCookies(toLocalFrame(frame()->tree().top())->document()->firstPartyForCookies());
 }
 
-CachePolicy FrameFetchContext::cachePolicy() const
+CachePolicy FrameFetchContext::getCachePolicy() const
 {
     if (m_document && m_document->loadEventFinished())
         return CachePolicyVerify;
@@ -142,7 +142,7 @@ CachePolicy FrameFetchContext::cachePolicy() const
 
     Frame* parentFrame = frame()->tree().parent();
     if (parentFrame && parentFrame->isLocalFrame()) {
-        CachePolicy parentCachePolicy = toLocalFrame(parentFrame)->document()->fetcher()->context().cachePolicy();
+        CachePolicy parentCachePolicy = toLocalFrame(parentFrame)->document()->fetcher()->context().getCachePolicy();
         if (parentCachePolicy != CachePolicyVerify)
             return parentCachePolicy;
     }
@@ -150,7 +150,7 @@ CachePolicy FrameFetchContext::cachePolicy() const
     if (loadType == FrameLoadTypeReload)
         return CachePolicyRevalidate;
 
-    if (m_documentLoader && m_documentLoader->request().cachePolicy() == ReturnCacheDataElseLoad)
+    if (m_documentLoader && m_documentLoader->request().getCachePolicy() == ReturnCacheDataElseLoad)
         return CachePolicyHistoryBuffer;
     return CachePolicyVerify;
 
@@ -216,13 +216,13 @@ ResourceRequestCachePolicy FrameFetchContext::resourceRequestCachePolicy(const R
     if (m_documentLoader && m_document && !m_document->loadEventFinished()) {
         // For POST requests, we mutate the main resource's cache policy to avoid form resubmission.
         // This policy should not be inherited by subresources.
-        ResourceRequestCachePolicy mainResourceCachePolicy = m_documentLoader->request().cachePolicy();
+        ResourceRequestCachePolicy mainResourceCachePolicy = m_documentLoader->request().getCachePolicy();
         if (m_documentLoader->request().httpMethod() == "POST") {
             if (mainResourceCachePolicy == ReturnCacheDataDontLoad)
                 return ReturnCacheDataElseLoad;
             return UseProtocolCachePolicy;
         }
-        return memoryCachePolicyToResourceRequestCachePolicy(cachePolicy());
+        return memoryCachePolicyToResourceRequestCachePolicy(getCachePolicy());
     }
     return UseProtocolCachePolicy;
 }
@@ -690,7 +690,7 @@ void FrameFetchContext::addClientHintsIfNecessary(FetchRequest& fetchRequest)
         fetchRequest.mutableResourceRequest().addHTTPHeaderField("DPR", AtomicString(String::number(m_document->devicePixelRatio())));
 
     if (shouldSendResourceWidth) {
-        FetchRequest::ResourceWidth resourceWidth = fetchRequest.resourceWidth();
+        FetchRequest::ResourceWidth resourceWidth = fetchRequest.getResourceWidth();
         if (resourceWidth.isSet) {
             float physicalWidth = resourceWidth.width * m_document->devicePixelRatio();
             fetchRequest.mutableResourceRequest().addHTTPHeaderField("Width", AtomicString(String::number(ceil(physicalWidth))));
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.h b/third_party/WebKit/Source/core/loader/FrameFetchContext.h
index 4410b91..f88ebd9 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.h
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.h
@@ -69,7 +69,7 @@ public:
 
     void addAdditionalRequestHeaders(ResourceRequest&, FetchResourceType) override;
     void setFirstPartyForCookies(ResourceRequest&) override;
-    CachePolicy cachePolicy() const override;
+    CachePolicy getCachePolicy() const override;
     ResourceRequestCachePolicy resourceRequestCachePolicy(const ResourceRequest&, Resource::Type) const override;
     void dispatchDidChangeResourcePriority(unsigned long identifier, ResourceLoadPriority, int intraPriorityValue) override;
     void dispatchWillSendRequest(unsigned long identifier, ResourceRequest&, const ResourceResponse& redirectResponse, const FetchInitiatorInfo& = FetchInitiatorInfo()) override;
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 9b54797..bb530a2 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -757,9 +757,9 @@ FrameLoadType FrameLoader::determineFrameLoadType(const FrameLoadRequest& reques
         return FrameLoadTypeStandard;
     if (m_provisionalDocumentLoader && request.substituteData().failingURL() == m_provisionalDocumentLoader->url() && m_loadType == FrameLoadTypeBackForward)
         return FrameLoadTypeBackForward;
-    if (request.resourceRequest().cachePolicy() == ReloadIgnoringCacheData)
+    if (request.resourceRequest().getCachePolicy() == ReloadIgnoringCacheData)
         return FrameLoadTypeReload;
-    if (request.resourceRequest().cachePolicy() == ReloadBypassingCache)
+    if (request.resourceRequest().getCachePolicy() == ReloadBypassingCache)
         return FrameLoadTypeReloadFromOrigin;
     // From the HTML5 spec for location.assign():
     //  "If the browsing context's session history contains only one Document,
diff --git a/third_party/WebKit/Source/core/loader/ImageLoader.cpp b/third_party/WebKit/Source/core/loader/ImageLoader.cpp
index c3b611d..8252793 100644
--- a/third_party/WebKit/Source/core/loader/ImageLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/ImageLoader.cpp
@@ -246,7 +246,7 @@ static void configureRequest(FetchRequest& request, ImageLoader::BypassMainWorld
         request.setCrossOriginAccessControl(element.document().securityOrigin(), crossOrigin);
 
     if (clientHintsPreferences.shouldSendResourceWidth() && isHTMLImageElement(element))
-        request.setResourceWidth(toHTMLImageElement(element).resourceWidth());
+        request.setResourceWidth(toHTMLImageElement(element).getResourceWidth());
 }
 
 inline void ImageLoader::dispatchErrorEvent()
diff --git a/third_party/WebKit/Source/core/loader/LinkLoader.cpp b/third_party/WebKit/Source/core/loader/LinkLoader.cpp
index 680c2ee..d91e40b 100644
--- a/third_party/WebKit/Source/core/loader/LinkLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/LinkLoader.cpp
@@ -194,7 +194,7 @@ void LinkLoader::createLinkPreloadResourceClient(Resource* resource)
 {
     if (!resource)
         return;
-    switch (resource->type()) {
+    switch (resource->getType()) {
     case Resource::Image:
         m_linkPreloadResourceClient = LinkPreloadImageResourceClient::create(this, toImageResource(resource));
         break;
diff --git a/third_party/WebKit/Source/core/svg/UnsafeSVGAttributeSanitizationTest.cpp b/third_party/WebKit/Source/core/svg/UnsafeSVGAttributeSanitizationTest.cpp
index 6b9e522..a24c769 100644
--- a/third_party/WebKit/Source/core/svg/UnsafeSVGAttributeSanitizationTest.cpp
+++ b/third_party/WebKit/Source/core/svg/UnsafeSVGAttributeSanitizationTest.cpp
@@ -59,7 +59,7 @@ String contentAfterPastingHTML(
     // Make the body editable, and put the caret in it.
     body->setAttribute(HTMLNames::contenteditableAttr, "true");
     frame.selection().setSelection(VisibleSelection::selectionFromContentsOfNode(body));
-    EXPECT_EQ(CaretSelection, frame.selection().selectionType());
+    EXPECT_EQ(CaretSelection, frame.selection().getSelectionType());
     EXPECT_TRUE(frame.selection().isContentEditable()) <<
         "We should be pasting into something editable.";
 
diff --git a/third_party/WebKit/Source/core/testing/Internals.cpp b/third_party/WebKit/Source/core/testing/Internals.cpp
index 071c4ec..8ce2a51 100644
--- a/third_party/WebKit/Source/core/testing/Internals.cpp
+++ b/third_party/WebKit/Source/core/testing/Internals.cpp
@@ -401,7 +401,7 @@ bool Internals::isLoadingFromMemoryCache(const String& url)
         return false;
     const String cacheIdentifier = contextDocument()->fetcher()->getCacheIdentifier();
     Resource* resource = memoryCache()->resourceForURL(contextDocument()->completeURL(url), cacheIdentifier);
-    return resource && resource->status() == Resource::Cached;
+    return resource && resource->getStatus() == Resource::Cached;
 }
 
 bool Internals::isSharingStyle(Element* element1, Element* element2) const
diff --git a/third_party/WebKit/Source/modules/fetch/FetchManager.cpp b/third_party/WebKit/Source/modules/fetch/FetchManager.cpp
index 7705bad..2556742 100644
--- a/third_party/WebKit/Source/modules/fetch/FetchManager.cpp
+++ b/third_party/WebKit/Source/modules/fetch/FetchManager.cpp
@@ -545,7 +545,7 @@ void FetchManager::Loader::performHTTPFetch(bool corsFlag, bool corsPreflightFla
     //
     // The following code also invokes "determine request's referrer" which is
     // written in "Main fetch" operation.
-    ASSERT(m_request->referrerPolicy() == ReferrerPolicyDefault);
+    ASSERT(m_request->getReferrerPolicy() == ReferrerPolicyDefault);
     // Request's referrer policy is always default, so use the client's one.
     // TODO(yhirano): Fix here when we introduce requet's referrer policy.
     ReferrerPolicy policy = executionContext()->getReferrerPolicy();
diff --git a/third_party/WebKit/Source/modules/fetch/FetchRequestData.h b/third_party/WebKit/Source/modules/fetch/FetchRequestData.h
index fd20e4f..19a46f5 100644
--- a/third_party/WebKit/Source/modules/fetch/FetchRequestData.h
+++ b/third_party/WebKit/Source/modules/fetch/FetchRequestData.h
@@ -52,7 +52,7 @@ public:
     void setReferrer(const Referrer& r) { m_referrer = r; }
     const AtomicString& referrerString() const { return m_referrer.referrer; }
     void setReferrerString(const AtomicString& s) { m_referrer.referrer = s; }
-    ReferrerPolicy referrerPolicy() const { return m_referrer.referrerPolicy; }
+    ReferrerPolicy getReferrerPolicy() const { return m_referrer.referrerPolicy; }
     void setReferrerPolicy(ReferrerPolicy p) { m_referrer.referrerPolicy = p; }
     void setMode(WebURLRequest::FetchRequestMode mode) { m_mode = mode; }
     WebURLRequest::FetchRequestMode mode() const { return m_mode; }
diff --git a/third_party/WebKit/Source/modules/fetch/Request.cpp b/third_party/WebKit/Source/modules/fetch/Request.cpp
index 59ae714..b9aa270 100644
--- a/third_party/WebKit/Source/modules/fetch/Request.cpp
+++ b/third_party/WebKit/Source/modules/fetch/Request.cpp
@@ -628,7 +628,7 @@ void Request::populateWebServiceWorkerRequest(WebServiceWorkerRequest& webReques
         webRequest.appendHeader(header.first, header.second);
     }
 
-    webRequest.setReferrer(m_request->referrerString(), static_cast<WebReferrerPolicy>(m_request->referrerPolicy()));
+    webRequest.setReferrer(m_request->referrerString(), static_cast<WebReferrerPolicy>(m_request->getReferrerPolicy()));
     // FIXME: How can we set isReload properly? What is the correct place to load it in to the Request object? We should investigate the right way
     // to plumb this information in to here.
 }
diff --git a/third_party/WebKit/Source/modules/filesystem/DOMFileSystemBaseTest.cpp b/third_party/WebKit/Source/modules/filesystem/DOMFileSystemBaseTest.cpp
index d705c23..7a95f9b 100644
--- a/third_party/WebKit/Source/modules/filesystem/DOMFileSystemBaseTest.cpp
+++ b/third_party/WebKit/Source/modules/filesystem/DOMFileSystemBaseTest.cpp
@@ -34,7 +34,7 @@ TEST_F(DOMFileSystemBaseTest, externalFilesystemFilesAreUserVisible)
     File* file = DOMFileSystemBase::createFile(m_fileMetadata, rootUrl, FileSystemTypeExternal, "DOMFileSystemBaseTest.cpp");
     EXPECT_TRUE(file);
     EXPECT_TRUE(file->hasBackingFile());
-    EXPECT_EQ(File::IsUserVisible, file->userVisibility());
+    EXPECT_EQ(File::IsUserVisible, file->getUserVisibility());
     EXPECT_EQ("DOMFileSystemBaseTest.cpp", file->name());
     EXPECT_EQ(m_filePath, file->path());
 }
@@ -46,7 +46,7 @@ TEST_F(DOMFileSystemBaseTest, temporaryFilesystemFilesAreNotUserVisible)
     File* file = DOMFileSystemBase::createFile(m_fileMetadata, rootUrl, FileSystemTypeTemporary, "UserVisibleName.txt");
     EXPECT_TRUE(file);
     EXPECT_TRUE(file->hasBackingFile());
-    EXPECT_EQ(File::IsNotUserVisible, file->userVisibility());
+    EXPECT_EQ(File::IsNotUserVisible, file->getUserVisibility());
     EXPECT_EQ("UserVisibleName.txt", file->name());
     EXPECT_EQ(m_filePath, file->path());
 }
@@ -58,7 +58,7 @@ TEST_F(DOMFileSystemBaseTest, persistentFilesystemFilesAreNotUserVisible)
     File* file = DOMFileSystemBase::createFile(m_fileMetadata, rootUrl, FileSystemTypePersistent, "UserVisibleName.txt");
     EXPECT_TRUE(file);
     EXPECT_TRUE(file->hasBackingFile());
-    EXPECT_EQ(File::IsNotUserVisible, file->userVisibility());
+    EXPECT_EQ(File::IsNotUserVisible, file->getUserVisibility());
     EXPECT_EQ("UserVisibleName.txt", file->name());
     EXPECT_EQ(m_filePath, file->path());
 }
diff --git a/third_party/WebKit/Source/modules/filesystem/FileWriter.h b/third_party/WebKit/Source/modules/filesystem/FileWriter.h
index 07cda83..f59e2f6 100644
--- a/third_party/WebKit/Source/modules/filesystem/FileWriter.h
+++ b/third_party/WebKit/Source/modules/filesystem/FileWriter.h
@@ -72,7 +72,7 @@ public:
     void seek(long long position, ExceptionState&);
     void truncate(long long length, ExceptionState&);
     void abort(ExceptionState&);
-    ReadyState readyState() const { return m_readyState; }
+    ReadyState getReadyState() const { return m_readyState; }
     FileError* error() const { return m_error.get(); }
 
     // WebFileWriterClient
diff --git a/third_party/WebKit/Source/modules/filesystem/FileWriter.idl b/third_party/WebKit/Source/modules/filesystem/FileWriter.idl
index a58d4b7..0e07baf 100644
--- a/third_party/WebKit/Source/modules/filesystem/FileWriter.idl
+++ b/third_party/WebKit/Source/modules/filesystem/FileWriter.idl
@@ -38,7 +38,7 @@
     const unsigned short INIT = 0;
     const unsigned short WRITING = 1;
     const unsigned short DONE = 2;
-    readonly attribute unsigned short readyState;
+    [ImplementedAs=getReadyState] readonly attribute unsigned short readyState;
 
     // async write/modify methods
     [RaisesException] void write(Blob data);
diff --git a/third_party/WebKit/Source/platform/PlatformWheelEvent.h b/third_party/WebKit/Source/platform/PlatformWheelEvent.h
index 80734d7..66a27a4 100644
--- a/third_party/WebKit/Source/platform/PlatformWheelEvent.h
+++ b/third_party/WebKit/Source/platform/PlatformWheelEvent.h
@@ -91,7 +91,7 @@ public:
     bool canScroll() const { return m_canScroll; }
     void setCanScroll(bool b) { m_canScroll = b; }
     int resendingPluginId() const { return m_resendingPluginId; }
-    RailsMode railsMode() const { return m_railsMode; }
+    RailsMode getRailsMode() const { return m_railsMode; }
 
 #if OS(MACOSX)
     PlatformWheelEventPhase phase() const { return m_phase; }
diff --git a/third_party/WebKit/Source/platform/Prerender.h b/third_party/WebKit/Source/platform/Prerender.h
index 36c380e..f210640 100644
--- a/third_party/WebKit/Source/platform/Prerender.h
+++ b/third_party/WebKit/Source/platform/Prerender.h
@@ -66,7 +66,7 @@ public:
     const KURL& url() const { return m_url; }
     unsigned relTypes() const { return m_relTypes; }
     const String& referrer() const { return m_referrer.referrer; }
-    ReferrerPolicy referrerPolicy() const { return m_referrer.referrerPolicy; }
+    ReferrerPolicy getReferrerPolicy() const { return m_referrer.referrerPolicy; }
 
     void setExtraData(PassRefPtr<ExtraData> extraData) { m_extraData = extraData; }
     ExtraData* extraData() { return m_extraData.get(); }
diff --git a/third_party/WebKit/Source/platform/exported/WebPrerender.cpp b/third_party/WebKit/Source/platform/exported/WebPrerender.cpp
index 40b7f7c..426ef68 100644
--- a/third_party/WebKit/Source/platform/exported/WebPrerender.cpp
+++ b/third_party/WebKit/Source/platform/exported/WebPrerender.cpp
@@ -98,7 +98,7 @@ WebString WebPrerender::referrer() const
 
 WebReferrerPolicy WebPrerender::referrerPolicy() const
 {
-    return static_cast<WebReferrerPolicy>(m_private->referrerPolicy());
+    return static_cast<WebReferrerPolicy>(m_private->getReferrerPolicy());
 }
 
 void WebPrerender::setExtraData(WebPrerender::ExtraData* extraData)
diff --git a/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp b/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp
index 7369ba5..7f40a7d 100644
--- a/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp
+++ b/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp
@@ -147,10 +147,10 @@ void WebURLRequest::setAllowStoredCredentials(bool allowStoredCredentials)
     m_private->m_resourceRequest->setAllowStoredCredentials(allowStoredCredentials);
 }
 
-WebURLRequest::CachePolicy WebURLRequest::cachePolicy() const
+WebURLRequest::CachePolicy WebURLRequest::getCachePolicy() const
 {
     return static_cast<WebURLRequest::CachePolicy>(
-        m_private->m_resourceRequest->cachePolicy());
+        m_private->m_resourceRequest->getCachePolicy());
 }
 
 void WebURLRequest::setCachePolicy(CachePolicy cachePolicy)
diff --git a/third_party/WebKit/Source/platform/network/ResourceRequest.cpp b/third_party/WebKit/Source/platform/network/ResourceRequest.cpp
index 24fa32ae..f54b7d5 100644
--- a/third_party/WebKit/Source/platform/network/ResourceRequest.cpp
+++ b/third_party/WebKit/Source/platform/network/ResourceRequest.cpp
@@ -77,7 +77,7 @@ PassOwnPtr<CrossThreadResourceRequestData> ResourceRequest::copyData() const
 {
     OwnPtr<CrossThreadResourceRequestData> data = adoptPtr(new CrossThreadResourceRequestData());
     data->m_url = url().copy();
-    data->m_cachePolicy = cachePolicy();
+    data->m_cachePolicy = getCachePolicy();
     data->m_timeoutInterval = timeoutInterval();
     data->m_firstPartyForCookies = firstPartyForCookies().copy();
     data->m_requestorOrigin = requestorOrigin() ? requestorOrigin()->isolatedCopy() : nullptr;
@@ -143,7 +143,7 @@ void ResourceRequest::removeCredentials()
     m_url.setPass(String());
 }
 
-ResourceRequestCachePolicy ResourceRequest::cachePolicy() const
+ResourceRequestCachePolicy ResourceRequest::getCachePolicy() const
 {
     return m_cachePolicy;
 }
@@ -325,7 +325,7 @@ bool equalIgnoringHeaderFields(const ResourceRequest& a, const ResourceRequest&
     if (a.url() != b.url())
         return false;
 
-    if (a.cachePolicy() != b.cachePolicy())
+    if (a.getCachePolicy() != b.getCachePolicy())
         return false;
 
     if (a.timeoutInterval() != b.timeoutInterval())
diff --git a/third_party/WebKit/Source/platform/network/ResourceRequest.h b/third_party/WebKit/Source/platform/network/ResourceRequest.h
index 19bac77..ffab6da 100644
--- a/third_party/WebKit/Source/platform/network/ResourceRequest.h
+++ b/third_party/WebKit/Source/platform/network/ResourceRequest.h
@@ -102,7 +102,7 @@ public:
 
     void removeCredentials();
 
-    ResourceRequestCachePolicy cachePolicy() const;
+    ResourceRequestCachePolicy getCachePolicy() const;
     void setCachePolicy(ResourceRequestCachePolicy cachePolicy);
 
     double timeoutInterval() const; // May return 0 when using platform default.
diff --git a/third_party/WebKit/Source/platform/network/ResourceRequestTest.cpp b/third_party/WebKit/Source/platform/network/ResourceRequestTest.cpp
index 7a70605..c5282a0 100644
--- a/third_party/WebKit/Source/platform/network/ResourceRequestTest.cpp
+++ b/third_party/WebKit/Source/platform/network/ResourceRequestTest.cpp
@@ -50,7 +50,7 @@ TEST(ResourceRequestTest, CrossThreadResourceRequestData)
     original.setHTTPReferrer(Referrer("http://www.example.com/referrer.htm", ReferrerPolicyDefault));
 
     EXPECT_STREQ("http://www.example.com/test.htm", original.url().string().utf8().data());
-    EXPECT_EQ(UseProtocolCachePolicy, original.cachePolicy());
+    EXPECT_EQ(UseProtocolCachePolicy, original.getCachePolicy());
     EXPECT_EQ(10, original.timeoutInterval());
     EXPECT_STREQ("http://www.example.com/first_party.htm", original.firstPartyForCookies().string().utf8().data());
     EXPECT_STREQ("www.example.com", original.requestorOrigin()->host().utf8().data());
@@ -78,7 +78,7 @@ TEST(ResourceRequestTest, CrossThreadResourceRequestData)
     ResourceRequest copy1(data1.get());
 
     EXPECT_STREQ("http://www.example.com/test.htm", copy1.url().string().utf8().data());
-    EXPECT_EQ(UseProtocolCachePolicy, copy1.cachePolicy());
+    EXPECT_EQ(UseProtocolCachePolicy, copy1.getCachePolicy());
     EXPECT_EQ(10, copy1.timeoutInterval());
     EXPECT_STREQ("http://www.example.com/first_party.htm", copy1.firstPartyForCookies().string().utf8().data());
     EXPECT_STREQ("www.example.com", copy1.requestorOrigin()->host().utf8().data());
diff --git a/third_party/WebKit/Source/web/WebInputEventConversion.cpp b/third_party/WebKit/Source/web/WebInputEventConversion.cpp
index 43cff96..ebcf399 100644
--- a/third_party/WebKit/Source/web/WebInputEventConversion.cpp
+++ b/third_party/WebKit/Source/web/WebInputEventConversion.cpp
@@ -572,7 +572,7 @@ WebMouseWheelEventBuilder::WebMouseWheelEventBuilder(const Widget* widget, const
     scrollByPage = event.deltaMode() == WheelEvent::DOM_DELTA_PAGE;
     canScroll = event.canScroll();
     resendingPluginId = event.resendingPluginId();
-    railsMode = static_cast<RailsMode>(event.railsMode());
+    railsMode = static_cast<RailsMode>(event.getRailsMode());
     hasPreciseScrollingDeltas = event.hasPreciseScrollingDeltas();
 }
 
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
index 480a913..6626bf2 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -5888,7 +5888,7 @@ TEST_P(ParameterizedWebFrameTest, BackToReload)
     EXPECT_EQ(firstItem.get(), mainFrameLoader.currentItem());
 
     FrameTestHelpers::reloadFrame(frame);
-    EXPECT_EQ(WebURLRequest::ReloadIgnoringCacheData, frame->dataSource()->request().cachePolicy());
+    EXPECT_EQ(WebURLRequest::ReloadIgnoringCacheData, frame->dataSource()->request().getCachePolicy());
 }
 
 TEST_P(ParameterizedWebFrameTest, BackDuringChildFrameReload)
@@ -5931,7 +5931,7 @@ TEST_P(ParameterizedWebFrameTest, ReloadPost)
     EXPECT_EQ(WebString::fromUTF8("POST"), frame->dataSource()->request().httpMethod());
 
     FrameTestHelpers::reloadFrame(frame);
-    EXPECT_EQ(WebURLRequest::ReloadIgnoringCacheData, frame->dataSource()->request().cachePolicy());
+    EXPECT_EQ(WebURLRequest::ReloadIgnoringCacheData, frame->dataSource()->request().getCachePolicy());
     EXPECT_EQ(WebNavigationTypeFormResubmitted, frame->dataSource()->navigationType());
 }
 
@@ -5952,7 +5952,7 @@ TEST_P(ParameterizedWebFrameTest, LoadHistoryItemReload)
     // Cache policy overrides should take.
     FrameTestHelpers::loadHistoryItem(frame, WebHistoryItem(firstItem), WebHistoryDifferentDocumentLoad, WebURLRequest::ReloadIgnoringCacheData);
     EXPECT_EQ(firstItem.get(), mainFrameLoader.currentItem());
-    EXPECT_EQ(WebURLRequest::ReloadIgnoringCacheData, frame->dataSource()->request().cachePolicy());
+    EXPECT_EQ(WebURLRequest::ReloadIgnoringCacheData, frame->dataSource()->request().getCachePolicy());
 }
 
 
@@ -5968,7 +5968,7 @@ public:
     }
 
     void setChildWebFrameClient(TestCachePolicyWebFrameClient* client) { m_childClient = client; }
-    WebURLRequest::CachePolicy cachePolicy() const { return m_policy; }
+    WebURLRequest::CachePolicy getCachePolicy() const { return m_policy; }
     int willSendRequestCallCount() const { return m_willSendRequestCallCount; }
     int childFrameCreationCount() const { return m_childFrameCreationCount; }
 
@@ -6001,7 +6001,7 @@ public:
 
     void willSendRequest(WebLocalFrame* frame, unsigned, WebURLRequest& request, const WebURLResponse&) override
     {
-        m_policy = request.cachePolicy();
+        m_policy = request.getCachePolicy();
         m_willSendRequestCallCount++;
     }
 
@@ -6030,7 +6030,7 @@ TEST_P(ParameterizedWebFrameTest, ReloadIframe)
     ASSERT_EQ(childFrame->client(), &childClient);
     EXPECT_EQ(mainClient.childFrameCreationCount(), 1);
     EXPECT_EQ(childClient.willSendRequestCallCount(), 1);
-    EXPECT_EQ(childClient.cachePolicy(), WebURLRequest::UseProtocolCachePolicy);
+    EXPECT_EQ(childClient.getCachePolicy(), WebURLRequest::UseProtocolCachePolicy);
 
     FrameTestHelpers::reloadFrame(mainFrame);
 
@@ -6040,7 +6040,7 @@ TEST_P(ParameterizedWebFrameTest, ReloadIframe)
 
     EXPECT_EQ(mainClient.childFrameCreationCount(), 2);
     EXPECT_EQ(childClient.willSendRequestCallCount(), 2);
-    EXPECT_EQ(childClient.cachePolicy(), WebURLRequest::ReloadIgnoringCacheData);
+    EXPECT_EQ(childClient.getCachePolicy(), WebURLRequest::ReloadIgnoringCacheData);
 }
 
 class TestSameDocumentWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
@@ -6088,7 +6088,7 @@ public:
     {
         if (request.requestContext() == WebURLRequest::RequestContextImage) {
             m_numOfImageRequests++;
-            EXPECT_EQ(WebURLRequest::UseProtocolCachePolicy, request.cachePolicy());
+            EXPECT_EQ(WebURLRequest::UseProtocolCachePolicy, request.getCachePolicy());
         }
     }
 
@@ -6881,7 +6881,7 @@ TEST_P(ParameterizedWebFrameTest, ReloadBypassingCache)
     webViewHelper.initializeAndLoad(m_baseURL + "foo.html", true);
     WebFrame* frame = webViewHelper.webView()->mainFrame();
     FrameTestHelpers::reloadFrameIgnoringCache(frame);
-    EXPECT_EQ(WebURLRequest::ReloadBypassingCache, frame->dataSource()->request().cachePolicy());
+    EXPECT_EQ(WebURLRequest::ReloadBypassingCache, frame->dataSource()->request().getCachePolicy());
 }
 
 static void nodeImageTestValidation(const IntSize& referenceBitmapSize, DragImage* dragImage)
diff --git a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
index b738964..611297d 100644
--- a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
@@ -943,7 +943,7 @@ TEST(WebInputEventConversionTest, PlatformWheelEventBuilder)
         EXPECT_EQ(PlatformEvent::CtrlKey, platformWheelBuilder.modifiers());
         EXPECT_TRUE(platformWheelBuilder.hasPreciseScrollingDeltas());
         EXPECT_TRUE(platformWheelBuilder.canScroll());
-        EXPECT_EQ(platformWheelBuilder.railsMode(), PlatformEvent::RailsModeHorizontal);
+        EXPECT_EQ(platformWheelBuilder.getRailsMode(), PlatformEvent::RailsModeHorizontal);
     }
 
     {
@@ -966,7 +966,7 @@ TEST(WebInputEventConversionTest, PlatformWheelEventBuilder)
         EXPECT_EQ(PlatformEvent::ShiftKey, platformWheelBuilder.modifiers());
         EXPECT_FALSE(platformWheelBuilder.hasPreciseScrollingDeltas());
         EXPECT_FALSE(platformWheelBuilder.canScroll());
-        EXPECT_EQ(platformWheelBuilder.railsMode(), PlatformEvent::RailsModeFree);
+        EXPECT_EQ(platformWheelBuilder.getRailsMode(), PlatformEvent::RailsModeFree);
     }
 
     {
@@ -989,7 +989,7 @@ TEST(WebInputEventConversionTest, PlatformWheelEventBuilder)
         EXPECT_EQ(PlatformEvent::AltKey, platformWheelBuilder.modifiers());
         EXPECT_TRUE(platformWheelBuilder.hasPreciseScrollingDeltas());
         EXPECT_FALSE(platformWheelBuilder.canScroll());
-        EXPECT_EQ(platformWheelBuilder.railsMode(), PlatformEvent::RailsModeVertical);
+        EXPECT_EQ(platformWheelBuilder.getRailsMode(), PlatformEvent::RailsModeVertical);
     }
 }
 
diff --git a/third_party/WebKit/public/platform/WebURLRequest.h b/third_party/WebKit/public/platform/WebURLRequest.h
index 906b47d..f493a31 100644
--- a/third_party/WebKit/public/platform/WebURLRequest.h
+++ b/third_party/WebKit/public/platform/WebURLRequest.h
@@ -190,7 +190,7 @@ public:
     BLINK_PLATFORM_EXPORT bool allowStoredCredentials() const;
     BLINK_PLATFORM_EXPORT void setAllowStoredCredentials(bool);
 
-    BLINK_PLATFORM_EXPORT CachePolicy cachePolicy() const;
+    BLINK_PLATFORM_EXPORT CachePolicy getCachePolicy() const;
     BLINK_PLATFORM_EXPORT void setCachePolicy(CachePolicy);
 
     BLINK_PLATFORM_EXPORT WebString httpMethod() const;