diff options
Diffstat (limited to 'third_party/WebKit/Source/modules')
6 files changed, 8 insertions, 8 deletions
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); |