Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(401)

Side by Side Diff: third_party/WebKit/Source/core/fetch/ScriptResource.cpp

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4
Patch Set: get-names-5 Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 // and refuse to serve them if we only accept application/x-javascript. 57 // and refuse to serve them if we only accept application/x-javascript.
58 setAccept(acceptScript); 58 setAccept(acceptScript);
59 } 59 }
60 60
61 ScriptResource::~ScriptResource() 61 ScriptResource::~ScriptResource()
62 { 62 {
63 } 63 }
64 64
65 void ScriptResource::didAddClient(ResourceClient* client) 65 void ScriptResource::didAddClient(ResourceClient* client)
66 { 66 {
67 ASSERT(client->resourceClientType() == ScriptResourceClient::expectedType()) ; 67 ASSERT(client->getResourceClientType() == ScriptResourceClient::expectedType ());
68 Resource::didAddClient(client); 68 Resource::didAddClient(client);
69 } 69 }
70 70
71 void ScriptResource::appendData(const char* data, size_t length) 71 void ScriptResource::appendData(const char* data, size_t length)
72 { 72 {
73 Resource::appendData(data, length); 73 Resource::appendData(data, length);
74 ResourceClientWalker<ScriptResourceClient> walker(m_clients); 74 ResourceClientWalker<ScriptResourceClient> walker(m_clients);
75 while (ScriptResourceClient* client = walker.next()) 75 while (ScriptResourceClient* client = walker.next())
76 client->notifyAppendData(this); 76 client->notifyAppendData(this);
77 } 77 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 } 125 }
126 bool ScriptResource::mustRefetchDueToIntegrityMetadata(const FetchRequest& reque st) const 126 bool ScriptResource::mustRefetchDueToIntegrityMetadata(const FetchRequest& reque st) const
127 { 127 {
128 if (request.integrityMetadata().isEmpty()) 128 if (request.integrityMetadata().isEmpty())
129 return false; 129 return false;
130 130
131 return !IntegrityMetadata::setsEqual(m_integrityMetadata, request.integrityM etadata()); 131 return !IntegrityMetadata::setsEqual(m_integrityMetadata, request.integrityM etadata());
132 } 132 }
133 133
134 } // namespace blink 134 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698