[IR2] Replace Resource::Status with ResourceStatus (issue 2642383003 by hiroshige@chromium.org)

1 view
Skip to first unread message

hiro...@chromium.org

unread,
Jan 22, 2017, 3:40:27 PM1/22/17
to toyoshim...@chromium.org, chromium...@chromium.org, apavlo...@chromium.org, kinuko...@chromium.org, rob....@samsung.com, yo...@yoav.ws, blink-re...@chromium.org, blink-rev...@chromium.org, dglazko...@chromium.org, blink-revie...@chromium.org, gavinp...@chromium.org, devtools...@chromium.org, blink-...@chromium.org, blink-rev...@chromium.org, caseq...@chromium.org, lushnik...@chromium.org, loading...@chromium.org, alexis...@intel.com, loading-re...@chromium.org, jap...@chromium.org, tyoshin...@chromium.org, loading-rev...@chromium.org, pfeldma...@chromium.org, kozyatins...@chromium.org
Reviewers: toyoshim
CL: https://codereview.chromium.org/2642383003/

Message:
PTAL.

Description:
Replace Resource::Status with ResourceStatus

BUG=

Affected files (+71, -84 lines):
M third_party/WebKit/Source/bindings/core/v8/ScriptStreamerTest.cpp
M third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
M third_party/WebKit/Source/core/css/cssom/CSSResourceValue.h
M third_party/WebKit/Source/core/css/cssom/CSSResourceValueTest.cpp
M third_party/WebKit/Source/core/css/cssom/CSSStyleImageValue.h
M third_party/WebKit/Source/core/fetch/MemoryCacheCorrectnessTest.cpp
M third_party/WebKit/Source/core/fetch/Resource.h
M third_party/WebKit/Source/core/fetch/Resource.cpp
M third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
M third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
M third_party/WebKit/Source/core/html/ImageDocument.cpp
M third_party/WebKit/Source/core/html/parser/CSSPreloadScannerTest.cpp
M third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
M third_party/WebKit/Source/core/loader/ImageLoader.cpp
M third_party/WebKit/Source/core/loader/resource/CSSStyleSheetResource.cpp
M third_party/WebKit/Source/core/loader/resource/FontResource.cpp
M third_party/WebKit/Source/core/loader/resource/ImageResource.cpp
M third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
M third_party/WebKit/Source/core/testing/Internals.cpp
M third_party/WebKit/Source/web/tests/WebFrameTest.cpp


toyo...@chromium.org

unread,
Jan 23, 2017, 4:29:10 AM1/23/17
to hiro...@chromium.org, chromium...@chromium.org, apavlo...@chromium.org, kinuko...@chromium.org, rob....@samsung.com, yo...@yoav.ws, blink-re...@chromium.org, blink-rev...@chromium.org, dglazko...@chromium.org, blink-revie...@chromium.org, gavinp...@chromium.org, devtools...@chromium.org, blink-...@chromium.org, blink-rev...@chromium.org, caseq...@chromium.org, lushnik...@chromium.org, loading...@chromium.org, alexis...@intel.com, loading-re...@chromium.org, jap...@chromium.org, tyoshin...@chromium.org, loading-rev...@chromium.org, pfeldma...@chromium.org, kozyatins...@chromium.org

kou...@chromium.org

unread,
Jan 23, 2017, 4:47:14 AM1/23/17
to hiro...@chromium.org, toyoshim...@chromium.org, chromium...@chromium.org, apavlo...@chromium.org, kinuko...@chromium.org, rob....@samsung.com, yo...@yoav.ws, blink-re...@chromium.org, blink-rev...@chromium.org, dglazko...@chromium.org, blink-revie...@chromium.org, gavinp...@chromium.org, devtools...@chromium.org, blink-...@chromium.org, blink-rev...@chromium.org, caseq...@chromium.org, lushnik...@chromium.org, loading...@chromium.org, alexis...@intel.com, loading-re...@chromium.org, jap...@chromium.org, tyoshin...@chromium.org, loading-rev...@chromium.org, pfeldma...@chromium.org, kozyatins...@chromium.org

hiro...@chromium.org

unread,
Jan 23, 2017, 1:47:51 PM1/23/17
to toyoshim...@chromium.org, kouhei+...@chromium.org, yhi...@chromium.org, chromium...@chromium.org, apavlo...@chromium.org, kinuko...@chromium.org, rob....@samsung.com, yo...@yoav.ws, blink-re...@chromium.org, blink-rev...@chromium.org, dglazko...@chromium.org, blink-revie...@chromium.org, gavinp...@chromium.org, devtools...@chromium.org, blink-...@chromium.org, blink-rev...@chromium.org, caseq...@chromium.org, lushnik...@chromium.org, loading...@chromium.org, alexis...@intel.com, loading-re...@chromium.org, jap...@chromium.org, tyoshin...@chromium.org, loading-rev...@chromium.org, pfeldma...@chromium.org, kozyatins...@chromium.org
+yhirano PTAL as a Source/bindings OWNER.

https://codereview.chromium.org/2642383003/

har...@chromium.org

unread,
Jan 23, 2017, 6:47:56 PM1/23/17
to hiro...@chromium.org, toyoshim...@chromium.org, kouhei+...@chromium.org, yhi...@chromium.org, chromium...@chromium.org, apavlo...@chromium.org, kinuko...@chromium.org, rob....@samsung.com, yo...@yoav.ws, blink-re...@chromium.org, blink-rev...@chromium.org, dglazko...@chromium.org, blink-revie...@chromium.org, gavinp...@chromium.org, devtools...@chromium.org, blink-...@chromium.org, blink-rev...@chromium.org, caseq...@chromium.org, lushnik...@chromium.org, loading...@chromium.org, alexis...@intel.com, loading-re...@chromium.org, jap...@chromium.org, tyoshin...@chromium.org, loading-rev...@chromium.org, pfeldma...@chromium.org, kozyatins...@chromium.org

yhi...@chromium.org

unread,
Jan 23, 2017, 10:26:21 PM1/23/17
to hiro...@chromium.org, toyoshim...@chromium.org, kouhei+...@chromium.org, chromium...@chromium.org, apavlo...@chromium.org, kinuko...@chromium.org, rob....@samsung.com, yo...@yoav.ws, blink-re...@chromium.org, blink-rev...@chromium.org, dglazko...@chromium.org, blink-revie...@chromium.org, gavinp...@chromium.org, devtools...@chromium.org, blink-...@chromium.org, blink-rev...@chromium.org, caseq...@chromium.org, lushnik...@chromium.org, loading...@chromium.org, alexis...@intel.com, loading-re...@chromium.org, jap...@chromium.org, tyoshin...@chromium.org, loading-rev...@chromium.org, pfeldma...@chromium.org, kozyatins...@chromium.org

commit-bot@chromium.org via codereview.chromium.org

unread,
Jan 24, 2017, 1:05:26 AM1/24/17
to hiro...@chromium.org, toyoshim...@chromium.org, kouhei+...@chromium.org, yhi...@chromium.org, commi...@chromium.org, chromium...@chromium.org, apavlo...@chromium.org, kinuko...@chromium.org, rob....@samsung.com, yo...@yoav.ws, blink-re...@chromium.org, blink-rev...@chromium.org, dglazko...@chromium.org, blink-revie...@chromium.org, gavinp...@chromium.org, devtools...@chromium.org, blink-...@chromium.org, blink-rev...@chromium.org, caseq...@chromium.org, lushnik...@chromium.org, loading...@chromium.org, alexis...@intel.com, loading-re...@chromium.org, jap...@chromium.org, tyoshin...@chromium.org, loading-rev...@chromium.org, pfeldma...@chromium.org, kozyatins...@chromium.org

commit-bot@chromium.org via codereview.chromium.org

unread,
Jan 24, 2017, 4:02:44 AM1/24/17
to hiro...@chromium.org, toyoshim...@chromium.org, kouhei+...@chromium.org, yhi...@chromium.org, commi...@chromium.org, chromium...@chromium.org, apavlo...@chromium.org, kinuko...@chromium.org, rob....@samsung.com, yo...@yoav.ws, blink-re...@chromium.org, blink-rev...@chromium.org, dglazko...@chromium.org, blink-revie...@chromium.org, gavinp...@chromium.org, devtools...@chromium.org, blink-...@chromium.org, blink-rev...@chromium.org, caseq...@chromium.org, lushnik...@chromium.org, loading...@chromium.org, alexis...@intel.com, loading-re...@chromium.org, jap...@chromium.org, tyoshin...@chromium.org, loading-rev...@chromium.org, pfeldma...@chromium.org, kozyatins...@chromium.org
Failed to apply patch for
third_party/WebKit/Source/core/loader/resource/ImageResource.cpp:
While running git apply --index -p1;
error: patch failed:
third_party/WebKit/Source/core/loader/resource/ImageResource.cpp:446
error: third_party/WebKit/Source/core/loader/resource/ImageResource.cpp: patch
does not apply

Patch: third_party/WebKit/Source/core/loader/resource/ImageResource.cpp
Index: third_party/WebKit/Source/core/loader/resource/ImageResource.cpp
diff --git a/third_party/WebKit/Source/core/loader/resource/ImageResource.cpp
b/third_party/WebKit/Source/core/loader/resource/ImageResource.cpp
index
dd1d1395b3d4b687c44cec7f393655bf55af7ba2..c95c9da9d689f7ff686b63d9057108bc711c8abd
100644
--- a/third_party/WebKit/Source/core/loader/resource/ImageResource.cpp
+++ b/third_party/WebKit/Source/core/loader/resource/ImageResource.cpp
@@ -76,9 +76,7 @@ class ImageResource::ImageResourceInfoImpl final
const ResourceResponse& response() const override {
return m_resource->response();
}
- Resource::Status getStatus() const override {
- return m_resource->getStatus();
- }
+ ResourceStatus getStatus() const override { return m_resource->getStatus(); }
bool isPlaceholder() const override { return m_resource->isPlaceholder(); }
bool isCacheValidator() const override {
return m_resource->isCacheValidator();
@@ -329,7 +327,7 @@ void ImageResource::decodeError(bool allDataReceived) {
clearData();
setEncodedSize(0);
if (!errorOccurred())
- setStatus(DecodeError);
+ setStatus(ResourceStatus::DecodeError);

if (!allDataReceived && loader()) {
// TODO(hiroshige): Do not call didFinishLoading() directly.
@@ -446,7 +444,7 @@ void ImageResource::reloadIfLoFiOrPlaceholderImage(
nullptr, ImageResourceContent::ClearImageAndNotifyObservers, false);
}

- setStatus(NotStarted);
+ setStatus(ResourceStatus::NotStarted);

DCHECK(m_isSchedulingReload);
m_isSchedulingReload = false;
@@ -470,7 +468,7 @@ void ImageResource::onePartInMultipartReceived(
m_multipartParsingState = MultipartParsingState::FinishedParsingFirstPart;
// Notify finished when the first part ends.
if (!errorOccurred())
- setStatus(Cached);
+ setStatus(ResourceStatus::Cached);
// We notify clients and observers of finish in checkNotify() and
// updateImageAndClearBuffer(), respectively, and they will not be
// notified again in Resource::finish()/error().


https://codereview.chromium.org/2642383003/

commit-bot@chromium.org via codereview.chromium.org

unread,
Jan 24, 2017, 11:37:45 AM1/24/17
to hiro...@chromium.org, toyoshim...@chromium.org, kouhei+...@chromium.org, yhi...@chromium.org, commi...@chromium.org, chromium...@chromium.org, apavlo...@chromium.org, kinuko...@chromium.org, rob....@samsung.com, yo...@yoav.ws, blink-re...@chromium.org, blink-rev...@chromium.org, dglazko...@chromium.org, blink-revie...@chromium.org, gavinp...@chromium.org, devtools...@chromium.org, blink-...@chromium.org, blink-rev...@chromium.org, caseq...@chromium.org, lushnik...@chromium.org, loading...@chromium.org, alexis...@intel.com, loading-re...@chromium.org, jap...@chromium.org, tyoshin...@chromium.org, loading-rev...@chromium.org, pfeldma...@chromium.org, kozyatins...@chromium.org
CQ is trying da patch. Follow status at

commit-bot@chromium.org via codereview.chromium.org

unread,
Jan 24, 2017, 11:42:21 AM1/24/17
to hiro...@chromium.org, toyoshim...@chromium.org, kouhei+...@chromium.org, yhi...@chromium.org, commi...@chromium.org, chromium...@chromium.org, apavlo...@chromium.org, kinuko...@chromium.org, rob....@samsung.com, yo...@yoav.ws, blink-re...@chromium.org, blink-rev...@chromium.org, dglazko...@chromium.org, blink-revie...@chromium.org, gavinp...@chromium.org, devtools...@chromium.org, blink-...@chromium.org, blink-rev...@chromium.org, caseq...@chromium.org, lushnik...@chromium.org, loading...@chromium.org, alexis...@intel.com, loading-re...@chromium.org, jap...@chromium.org, tyoshin...@chromium.org, loading-rev...@chromium.org, pfeldma...@chromium.org, kozyatins...@chromium.org
Try jobs failed on following builders:
android_arm64_dbg_recipe on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_arm64_dbg_recipe/builds/199032)
android_clang_dbg_recipe on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_clang_dbg_recipe/builds/199660)
android_compile_dbg on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_compile_dbg/builds/199744)
linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_android_rel_ng/builds/218929)
chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presubmit/builds/348754)

https://codereview.chromium.org/2642383003/

commit-bot@chromium.org via codereview.chromium.org

unread,
Jan 24, 2017, 1:23:28 PM1/24/17
to hiro...@chromium.org, toyoshim...@chromium.org, kouhei+...@chromium.org, yhi...@chromium.org, commi...@chromium.org, chromium...@chromium.org, apavlo...@chromium.org, kinuko...@chromium.org, rob....@samsung.com, yo...@yoav.ws, blink-re...@chromium.org, blink-rev...@chromium.org, dglazko...@chromium.org, blink-revie...@chromium.org, gavinp...@chromium.org, devtools...@chromium.org, blink-...@chromium.org, blink-rev...@chromium.org, caseq...@chromium.org, lushnik...@chromium.org, loading...@chromium.org, alexis...@intel.com, loading-re...@chromium.org, jap...@chromium.org, tyoshin...@chromium.org, loading-rev...@chromium.org, pfeldma...@chromium.org, kozyatins...@chromium.org

commit-bot@chromium.org via codereview.chromium.org

unread,
Jan 24, 2017, 1:27:35 PM1/24/17
to hiro...@chromium.org, toyoshim...@chromium.org, kouhei+...@chromium.org, yhi...@chromium.org, commi...@chromium.org, chromium...@chromium.org, apavlo...@chromium.org, kinuko...@chromium.org, rob....@samsung.com, yo...@yoav.ws, blink-re...@chromium.org, blink-rev...@chromium.org, dglazko...@chromium.org, blink-revie...@chromium.org, gavinp...@chromium.org, devtools...@chromium.org, blink-...@chromium.org, blink-rev...@chromium.org, caseq...@chromium.org, lushnik...@chromium.org, loading...@chromium.org, alexis...@intel.com, loading-re...@chromium.org, jap...@chromium.org, tyoshin...@chromium.org, loading-rev...@chromium.org, pfeldma...@chromium.org, kozyatins...@chromium.org
Try jobs failed on following builders:

commit-bot@chromium.org via codereview.chromium.org

unread,
Jan 24, 2017, 1:57:35 PM1/24/17
to hiro...@chromium.org, toyoshim...@chromium.org, kouhei+...@chromium.org, yhi...@chromium.org, commi...@chromium.org, chromium...@chromium.org, apavlo...@chromium.org, kinuko...@chromium.org, rob....@samsung.com, yo...@yoav.ws, blink-re...@chromium.org, blink-rev...@chromium.org, dglazko...@chromium.org, blink-revie...@chromium.org, gavinp...@chromium.org, devtools...@chromium.org, blink-...@chromium.org, blink-rev...@chromium.org, caseq...@chromium.org, lushnik...@chromium.org, loading...@chromium.org, alexis...@intel.com, loading-re...@chromium.org, jap...@chromium.org, tyoshin...@chromium.org, loading-rev...@chromium.org, pfeldma...@chromium.org, kozyatins...@chromium.org
CQ is trying da patch. Follow status at

commit-bot@chromium.org via codereview.chromium.org

unread,
Jan 24, 2017, 3:47:29 PM1/24/17
to hiro...@chromium.org, toyoshim...@chromium.org, kouhei+...@chromium.org, yhi...@chromium.org, commi...@chromium.org, chromium...@chromium.org, apavlo...@chromium.org, kinuko...@chromium.org, rob....@samsung.com, yo...@yoav.ws, blink-re...@chromium.org, blink-rev...@chromium.org, dglazko...@chromium.org, blink-revie...@chromium.org, gavinp...@chromium.org, devtools...@chromium.org, blink-...@chromium.org, blink-rev...@chromium.org, caseq...@chromium.org, lushnik...@chromium.org, loading...@chromium.org, alexis...@intel.com, loading-re...@chromium.org, jap...@chromium.org, tyoshin...@chromium.org, loading-rev...@chromium.org, pfeldma...@chromium.org, kozyatins...@chromium.org
Reply all
Reply to author
Forward
0 new messages