blink: Rename modules/ method to prefix with get when they collide.

blink: Rename modules/ method to prefix with get when they collide.

This focuses on modules/ to rename methods that are named foo() and
that return a Foo*, which will have collisions when foo() is renamed
to Foo() in chromium style.

This patch uses the following to do many of the replacements, so it's
a bit on the larger side..

git gs '\b$foo()'|grep '\.\(cpp\|h\|cc\):'|cut -d: -f1|sort|uniq|xargs sed -ie 's/\b$foo()/$getFoo()/g'

R=haraken@chromium.org
TBR=brettw, chrishtr
BUG=582312
Committed: https://chromium.googlesource.com/chromium/src/+/71331253d6537b9409518dec2368388c5d73cb94

[danakj, 2016-03-09 00:30:00]

You might want to disable some extensions for this site or use incognito if this
patch is too big. D:

[haraken, 2016-03-09 01:02:54]

WebKit/Source/ LGTM

[danakj, 2016-03-09 01:09:43]

danakj@chromium.org changed reviewers:
+ brettw@chromium.org, chrishtr@chromium.org

[danakj, 2016-03-09 01:09:45]

Thanks!

TBR=chrishtr@ for public/ and brettw@ for the rest.

[danakj, 2016-03-09 01:10:10]

Description was changed from

==========
blink: Rename modules/ method to prefix with get when they collide.

This focuses on modules/ to rename methods that are named foo() and
that return a Foo*, which will have collisions when foo() is renamed
to Foo() in chromium style.

This patch uses the following to do many of the replacements, so it's
a bit on the larger side..

git gs '\b$foo()'|grep '\.\(cpp\|h\|cc\):'|cut -d: -f1|sort|uniq|xargs sed -ie
's/\b$foo()/$getFoo()/g'

R=haraken@chromium.org
BUG=582312
==========

to

==========
blink: Rename modules/ method to prefix with get when they collide.

This focuses on modules/ to rename methods that are named foo() and
that return a Foo*, which will have collisions when foo() is renamed
to Foo() in chromium style.

This patch uses the following to do many of the replacements, so it's
a bit on the larger side..

git gs '\b$foo()'|grep '\.\(cpp\|h\|cc\):'|cut -d: -f1|sort|uniq|xargs sed -ie
's/\b$foo()/$getFoo()/g'

TBR=chrishtr,brettw
R=haraken@chromium.org
BUG=582312
==========

[danakj, 2016-03-09 01:17:07]

The CQ bit was checked by danakj@chromium.org

[danakj, 2016-03-09 01:17:08]

The patchset sent to the CQ was uploaded after l-g-t-m from haraken@chromium.org
Link to the patchset: https://codereview.chromium.org/1773813007/#ps10001
(title: "clash-modules: rebase")

[commit-bot: I haz the power, 2016-03-09 01:17:45]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1773813007/10001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1773813007/10001

[commit-bot: I haz the power, 2016-03-09 03:18:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-09 03:18:46]

Failed to apply patch for
third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp:
While running git apply --index -3 -p1;
  error: patch failed:
third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp:331
  Falling back to three-way merge...
  Applied patch to
'third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp' with
conflicts.
  U third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp

Patch:       third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp
Index: third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp
diff --git a/third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp
b/third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp
index
f7e12f897d70edf140472c74c0b8c2e2cd7278ce..b2c67b194b02171b287c5b4556d723e3484de88b
100644
--- a/third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp
+++ b/third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp
@@ -49,7 +49,7 @@ private:
     ScriptValue call(ScriptValue value) override
     {
         ASSERT(!value.isEmpty());
-        *m_value =
toCoreString(value.v8Value()->ToString(scriptState()->context()).ToLocalChecked());
+        *m_value =
toCoreString(value.v8Value()->ToString(getScriptState()->context()).ToLocalChecked());
         return value;
     }
 
@@ -74,14 +74,14 @@ private:
     ScriptValue call(ScriptValue result) override
     {
         ASSERT(!result.isEmpty());
-        v8::Isolate* isolate = scriptState()->isolate();
+        v8::Isolate* isolate = getScriptState()->isolate();
         if (!result.isObject()) {
             return result;
         }
         v8::Local<v8::Object> object = result.v8Value().As<v8::Object>();
         v8::Local<v8::String> doneString = v8String(isolate, "done");
         v8::Local<v8::String> valueString = v8String(isolate, "value");
-        v8::Local<v8::Context> context = scriptState()->context();
+        v8::Local<v8::Context> context = getScriptState()->context();
         v8::Maybe<bool> hasDone = object->Has(context, doneString);
         v8::Maybe<bool> hasValue = object->Has(context, valueString);
 
@@ -98,7 +98,7 @@ private:
 
         m_result->isSet = true;
         m_result->isDone = done.As<v8::Boolean>()->Value();
-        m_result->valueString =
toCoreString(value->ToString(scriptState()->context()).ToLocalChecked());
+        m_result->valueString =
toCoreString(value->ToString(getScriptState()->context()).ToLocalChecked());
         return result;
     }
 
@@ -136,18 +136,18 @@ public:
         m_stream->error(DOMException::create(AbortError, "done"));
     }
 
-    ScriptState* scriptState() { return
ScriptState::forMainWorld(m_page->document().frame()); }
-    v8::Isolate* isolate() { return scriptState()->isolate(); }
-    ExecutionContext* executionContext() { return
scriptState()->executionContext(); }
+    ScriptState* getScriptState() { return
ScriptState::forMainWorld(m_page->document().frame()); }
+    v8::Isolate* isolate() { return getScriptState()->isolate(); }
+    ExecutionContext* getExecutionContext() { return
getScriptState()->getExecutionContext(); }
 
     v8::Local<v8::Function> createCaptor(String* value)
     {
-        return StringCapturingFunction::createFunction(scriptState(), value);
+        return StringCapturingFunction::createFunction(getScriptState(),
value);
     }
 
     v8::Local<v8::Function> createResultCaptor(ReadResult* value)
     {
-        return ReadResultCapturingFunction::createFunction(scriptState(),
value);
+        return ReadResultCapturingFunction::createFunction(getScriptState(),
value);
     }
 
     OwnPtr<DummyPageHolder> m_page;
@@ -156,22 +156,22 @@ public:
 
 TEST_F(ReadableStreamReaderTest, Construct)
 {
-    ScriptState::Scope scope(scriptState());
-    ExceptionState exceptionState(ExceptionState::ConstructionContext,
"property", "interface", scriptState()->context()->Global(), isolate());
-    ReadableStreamReader* reader = new ReadableStreamReader(executionContext(),
m_stream);
+    ScriptState::Scope scope(getScriptState());
+    ExceptionState exceptionState(ExceptionState::ConstructionContext,
"property", "interface", getScriptState()->context()->Global(), isolate());
+    ReadableStreamReader* reader = new
ReadableStreamReader(getExecutionContext(), m_stream);
     EXPECT_TRUE(reader->isActive());
     EXPECT_FALSE(exceptionState.hadException());
 }
 
 TEST_F(ReadableStreamReaderTest, Release)
 {
-    ScriptState::Scope scope(scriptState());
-    ExceptionState exceptionState(ExceptionState::ConstructionContext,
"property", "interface", scriptState()->context()->Global(), isolate());
+    ScriptState::Scope scope(getScriptState());
+    ExceptionState exceptionState(ExceptionState::ConstructionContext,
"property", "interface", getScriptState()->context()->Global(), isolate());
     String onFulfilled, onRejected;
-    ReadableStreamReader* reader = new ReadableStreamReader(executionContext(),
m_stream);
+    ReadableStreamReader* reader = new
ReadableStreamReader(getExecutionContext(), m_stream);
     EXPECT_TRUE(reader->isActive());
 
-    reader->closed(scriptState()).then(createCaptor(&onFulfilled),
createCaptor(&onRejected));
+    reader->closed(getScriptState()).then(createCaptor(&onFulfilled),
createCaptor(&onRejected));
     reader->releaseLock(exceptionState);
     EXPECT_FALSE(reader->isActive());
     EXPECT_FALSE(exceptionState.hadException());
@@ -183,7 +183,7 @@ TEST_F(ReadableStreamReaderTest, Release)
     EXPECT_TRUE(onFulfilled.isNull());
     EXPECT_EQ("AbortError: the reader is already released", onRejected);
 
-    ReadableStreamReader* another = new
ReadableStreamReader(executionContext(), m_stream);
+    ReadableStreamReader* another = new
ReadableStreamReader(getExecutionContext(), m_stream);
     EXPECT_TRUE(another->isActive());
     EXPECT_FALSE(reader->isActive());
     reader->releaseLock(exceptionState);
@@ -194,9 +194,9 @@ TEST_F(ReadableStreamReaderTest, Release)
 
 TEST_F(ReadableStreamReaderTest, ReadAfterRelease)
 {
-    ScriptState::Scope scope(scriptState());
-    ExceptionState exceptionState(ExceptionState::ConstructionContext,
"property", "interface", scriptState()->context()->Global(), isolate());
-    ReadableStreamReader* reader = new ReadableStreamReader(executionContext(),
m_stream);
+    ScriptState::Scope scope(getScriptState());
+    ExceptionState exceptionState(ExceptionState::ConstructionContext,
"property", "interface", getScriptState()->context()->Global(), isolate());
+    ReadableStreamReader* reader = new
ReadableStreamReader(getExecutionContext(), m_stream);
     EXPECT_TRUE(reader->isActive());
     reader->releaseLock(exceptionState);
     EXPECT_FALSE(exceptionState.hadException());
@@ -204,7 +204,7 @@ TEST_F(ReadableStreamReaderTest, ReadAfterRelease)
 
     ReadResult result;
     String onRejected;
-    reader->read(scriptState()).then(createResultCaptor(&result),
createCaptor(&onRejected));
+    reader->read(getScriptState()).then(createResultCaptor(&result),
createCaptor(&onRejected));
 
     EXPECT_FALSE(result.isSet);
     EXPECT_TRUE(onRejected.isNull());
@@ -217,11 +217,11 @@ TEST_F(ReadableStreamReaderTest, ReadAfterRelease)
 
 TEST_F(ReadableStreamReaderTest, ReleaseShouldFailWhenCalledWhileReading)
 {
-    ScriptState::Scope scope(scriptState());
-    ExceptionState exceptionState(ExceptionState::ConstructionContext,
"property", "interface", scriptState()->context()->Global(), isolate());
-    ReadableStreamReader* reader = new ReadableStreamReader(executionContext(),
m_stream);
+    ScriptState::Scope scope(getScriptState());
+    ExceptionState exceptionState(ExceptionState::ConstructionContext,
"property", "interface", getScriptState()->context()->Global(), isolate());
+    ReadableStreamReader* reader = new
ReadableStreamReader(getExecutionContext(), m_stream);
     EXPECT_TRUE(reader->isActive());
-    reader->read(scriptState());
+    reader->read(getScriptState());
 
     reader->releaseLock(exceptionState);
     EXPECT_TRUE(reader->isActive());
@@ -236,16 +236,16 @@ TEST_F(ReadableStreamReaderTest,
ReleaseShouldFailWhenCalledWhileReading)
 
 TEST_F(ReadableStreamReaderTest, EnqueueThenRead)
 {
-    ScriptState::Scope scope(scriptState());
-    ExceptionState exceptionState(ExceptionState::ConstructionContext,
"property", "interface", scriptState()->context()->Global(), isolate());
+    ScriptState::Scope scope(getScriptState());
+    ExceptionState exceptionState(ExceptionState::ConstructionContext,
"property", "interface", getScriptState()->context()->Global(), isolate());
     m_stream->enqueue("hello");
     m_stream->enqueue("world");
-    ReadableStreamReader* reader = new ReadableStreamReader(executionContext(),
m_stream);
+    ReadableStreamReader* reader = new
ReadableStreamReader(getExecutionContext(), m_stream);
     EXPECT_EQ(ReadableStream::Readable, m_stream->stateInternal());
 
     ReadResult result;
     String onRejected;
-    reader->read(scriptState()).then(createResultCaptor(&result),
createCaptor(&onRejected));
+    reader->read(getScriptState()).then(createResultCaptor(&result),
createCaptor(&onRejected));
 
     EXPECT_FALSE(result.isSet);
     EXPECT_TRUE(onRejected.isNull());
@@ -259,7 +259,7 @@ TEST_F(ReadableStreamReaderTest, EnqueueThenRead)
 
     ReadResult result2;
     String onRejected2;
-    reader->read(scriptState()).then(createResultCaptor(&result2),
createCaptor(&onRejected2));
+    reader->read(getScriptState()).then(createResultCaptor(&result2),
createCaptor(&onRejected2));
 
     EXPECT_FALSE(result2.isSet);
     EXPECT_TRUE(onRejected2.isNull());
@@ -275,15 +275,15 @@ TEST_F(ReadableStreamReaderTest, EnqueueThenRead)
 
 TEST_F(ReadableStreamReaderTest, ReadThenEnqueue)
 {
-    ScriptState::Scope scope(scriptState());
-    ExceptionState exceptionState(ExceptionState::ConstructionContext,
"property", "interface", scriptState()->context()->Global(), isolate());
…
(message too large)

[commit-bot: I haz the power, 2016-03-09 03:18:50]

The CQ bit was unchecked by commit-bot@chromium.org

[danakj, 2016-03-09 19:13:17]

The CQ bit was checked by danakj@chromium.org

[danakj, 2016-03-09 19:13:19]

The patchset sent to the CQ was uploaded after l-g-t-m from haraken@chromium.org
Link to the patchset: https://codereview.chromium.org/1773813007/#ps20001
(title: "clash-modules: rebase")

[commit-bot: I haz the power, 2016-03-09 19:13:43]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1773813007/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1773813007/20001

[danakj, 2016-03-09 19:27:03]

The CQ bit was checked by danakj@chromium.org

[danakj, 2016-03-09 19:27:04]

The patchset sent to the CQ was uploaded after l-g-t-m from haraken@chromium.org
Link to the patchset: https://codereview.chromium.org/1773813007/#ps30001
(title: "clash-modules: rebase-fixes")

[commit-bot: I haz the power, 2016-03-09 19:27:50]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1773813007/30001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1773813007/30001

[commit-bot: I haz the power, 2016-03-09 21:00:12]

Description was changed from

==========
blink: Rename modules/ method to prefix with get when they collide.

This focuses on modules/ to rename methods that are named foo() and
that return a Foo*, which will have collisions when foo() is renamed
to Foo() in chromium style.

This patch uses the following to do many of the replacements, so it's
a bit on the larger side..

git gs '\b$foo()'|grep '\.\(cpp\|h\|cc\):'|cut -d: -f1|sort|uniq|xargs sed -ie
's/\b$foo()/$getFoo()/g'

TBR=chrishtr,brettw
R=haraken@chromium.org
BUG=582312
==========

to

==========
blink: Rename modules/ method to prefix with get when they collide.

This focuses on modules/ to rename methods that are named foo() and
that return a Foo*, which will have collisions when foo() is renamed
to Foo() in chromium style.

This patch uses the following to do many of the replacements, so it's
a bit on the larger side..

git gs '\b$foo()'|grep '\.\(cpp\|h\|cc\):'|cut -d: -f1|sort|uniq|xargs sed -ie
's/\b$foo()/$getFoo()/g'

R=haraken@chromium.org
TBR=brettw, chrishtr
BUG=582312

Committed: https://crrev.com/71331253d6537b9409518dec2368388c5d73cb94
Cr-Commit-Position: refs/heads/master@{#380209}
==========

[commit-bot: I haz the power, 2016-03-09 21:00:17]

Patchset 4 (id:??) landed as
https://crrev.com/71331253d6537b9409518dec2368388c5d73cb94
Cr-Commit-Position: refs/heads/master@{#380209}

[danakj, 2016-03-09 21:00:56]

Description was changed from

==========
blink: Rename modules/ method to prefix with get when they collide.

This focuses on modules/ to rename methods that are named foo() and
that return a Foo*, which will have collisions when foo() is renamed
to Foo() in chromium style.

This patch uses the following to do many of the replacements, so it's
a bit on the larger side..

git gs '\b$foo()'|grep '\.\(cpp\|h\|cc\):'|cut -d: -f1|sort|uniq|xargs sed -ie
's/\b$foo()/$getFoo()/g'

R=haraken@chromium.org
TBR=brettw, chrishtr
BUG=582312

Committed: https://crrev.com/71331253d6537b9409518dec2368388c5d73cb94
Cr-Commit-Position: refs/heads/master@{#380209}
==========

to

==========
blink: Rename modules/ method to prefix with get when they collide.

This focuses on modules/ to rename methods that are named foo() and
that return a Foo*, which will have collisions when foo() is renamed
to Foo() in chromium style.

This patch uses the following to do many of the replacements, so it's
a bit on the larger side..

git gs '\b$foo()'|grep '\.\(cpp\|h\|cc\):'|cut -d: -f1|sort|uniq|xargs sed -ie
's/\b$foo()/$getFoo()/g'

R=haraken@chromium.org
TBR=brettw, chrishtr
BUG=582312

Committed:
https://chromium.googlesource.com/chromium/src/+/71331253d6537b9409518dec2368...
==========

[danakj, 2016-03-09 21:01:02]

Committed patchset #4 (id:30001) manually as
71331253d6537b9409518dec2368388c5d73cb94.