projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
core
/
html
/
imports
/
HTMLImportsController.cpp
diff --git
a/src/third_party/WebKit/Source/core/html/imports/HTMLImportsController.cpp
b/src/third_party/WebKit/Source/core/html/imports/HTMLImportsController.cpp
index
04c69f1
..
170b828
100644
(file)
--- a/
src/third_party/WebKit/Source/core/html/imports/HTMLImportsController.cpp
+++ b/
src/third_party/WebKit/Source/core/html/imports/HTMLImportsController.cpp
@@
-120,7
+120,7
@@
HTMLImportChild* HTMLImportsController::load(HTMLImport* parent, HTMLImportChild
ClientDidNotRequestCredentials);
ResourcePtr<RawResource> resource = parent->document()->fetcher()->fetchImport(request);
if (!resource)
ClientDidNotRequestCredentials);
ResourcePtr<RawResource> resource = parent->document()->fetcher()->fetchImport(request);
if (!resource)
- return
0
;
+ return
nullptr
;
HTMLImportLoader* loader = createLoader();
HTMLImportChild* child = createChild(request.url(), loader, parent, client);
HTMLImportLoader* loader = createLoader();
HTMLImportChild* child = createChild(request.url(), loader, parent, client);
@@
-157,7
+157,7
@@
HTMLImportLoader* HTMLImportsController::loaderFor(const Document& document) con
return m_loaders[i].get();
}
return m_loaders[i].get();
}
- return
0
;
+ return
nullptr
;
}
Document* HTMLImportsController::loaderDocumentAt(size_t i) const
}
Document* HTMLImportsController::loaderDocumentAt(size_t i) const