|
|
Created:
4 years, 4 months ago by Takashi Toyoshima Modified:
4 years, 4 months ago CC:
blink-reviews, chromium-reviews, gavinp+loader_chromium.org, Nate Chapin, kinuko+watch, loading-reviews_chromium.org, tyoshino+watch_chromium.org, Yoav Weiss Base URL:
https://chromium.googlesource.com/chromium/src.git@master Target Ref:
refs/pending/heads/master Project:
chromium Visibility:
Public. |
DescriptionFrameLoader: add and export isReloadLoadType()
Now FrameLoader.h export isBackForwardLoadType(), but isReloadLoadType()
equivalent code exist here and there. Let me add isReloadLoadType() too
and export it to use from other places.
BUG=332602
Committed: https://crrev.com/af0efbea73ecde533d1577864982288fa53b96e5
Cr-Commit-Position: refs/heads/master@{#409742}
Patch Set 1 #
Total comments: 5
Patch Set 2 : one more replace #Patch Set 3 : speculative fix #
Total comments: 2
Patch Set 4 : review #23 #Patch Set 5 : revert of wrong revert #
Messages
Total messages: 42 (21 generated)
Description was changed from ========== FrameLoader: add and export isReloadLoadType() Now FrameLoader.h export isBackForwardLoadType(), but isReloadLoadType() equivalent code exist here and there. Let me add isReloadLoadType() too and export it to use from other places. BUG=332602 ========== to ========== FrameLoader: add and export isReloadLoadType() Now FrameLoader.h export isBackForwardLoadType(), but isReloadLoadType() equivalent code exist here and there. Let me add isReloadLoadType() too and export it to use from other places. BUG=332602 ==========
toyoshim@chromium.org changed reviewers: + kinuko@chromium.org
Can you take a look? This is split from https://codereview.chromium.org/2167623002 https://codereview.chromium.org/2186863002/diff/1/third_party/WebKit/Source/c... File third_party/WebKit/Source/core/frame/LocalFrame.cpp (right): https://codereview.chromium.org/2186863002/diff/1/third_party/WebKit/Source/c... third_party/WebKit/Source/core/frame/LocalFrame.cpp:359: DCHECK(isReloadLoadType(loadType)); This isn't mechanical change, but this should allow FrameLoadTypeReloadMainResource. https://codereview.chromium.org/2186863002/diff/1/third_party/WebKit/Source/c... third_party/WebKit/Source/core/frame/LocalFrame.cpp:368: DCHECK(loadType == FrameLoadTypeReload); For me, this DCHECK is easier to understand the intention than the original ASSERT that I was confused a little at the first glance. What do you think? Note: ClientRedirectPolicy is binary of NotClientRedirect or ClientRedirect. https://codereview.chromium.org/2186863002/diff/1/third_party/WebKit/Source/c... File third_party/WebKit/Source/core/loader/FrameLoader.cpp (right): https://codereview.chromium.org/2186863002/diff/1/third_party/WebKit/Source/c... third_party/WebKit/Source/core/loader/FrameLoader.cpp:113: return type == FrameLoadTypeBackForward cl format did. https://codereview.chromium.org/2186863002/diff/1/third_party/WebKit/Source/c... third_party/WebKit/Source/core/loader/FrameLoader.cpp:126: return type == FrameLoadTypeBackForward || isReloadLoadType(type); This also should include ReloadMainResource.
Looks reasonable change to me, but this looks to have possible behavior changes and test failure looks relevant?
Sorry for asking review before checking dbg run results. I kicked new try of linux_precise_blink_dbg because linux_blink_* seem to be turned down before I checked results :(
Just in case, notes from layout test results for record. virtual/threaded/fast/scroll-behavior/overflow-scroll-scrollTo.html virtual/threaded/fast/scroll-behavior/smooth-scroll/main-thread-scrolling-reason-correctness.html crash => STDERR: [1:3:0727/182649:4164017782:FATAL:scheduler.cc(160)] Check failed: state_machine_.pending_swaps() > 0 (0 vs. 0){"compositor_timing_history": http/tests/security/media-element-audio-source-node-cross-origin.html diff => +CONSOLE ERROR: line 34: Uncaught (in promise) InvalidStateError: cannot startRendering when an OfflineAudioContext is running
https://codereview.chromium.org/2186863002/diff/1/third_party/WebKit/Source/c... File third_party/WebKit/Source/core/loader/FrameLoader.cpp (right): https://codereview.chromium.org/2186863002/diff/1/third_party/WebKit/Source/c... third_party/WebKit/Source/core/loader/FrameLoader.cpp:126: return type == FrameLoadTypeBackForward || isReloadLoadType(type); This is the only change that could change behavior. Let me investigate this.
I could not reproduce them on local machine. https://build.chromium.org/p/tryserver.blink/builders/linux_precise_blink_dbg It seems same tests are failing for other developers, e.g. https://build.chromium.org/p/tryserver.blink/builders/linux_precise_blink_dbg... https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux%20(dbg) Also they look flaky even on the trunk waterfall. Let me post try jobs for other platforms.
The CQ bit was checked by toyoshim@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)
New try of linux_precise_blink_dbg passed, but linux_android_rel_ng failed again. Let me take a look.
In my Nexus4, failed four tests could not pass even without my patch, but because of different reason. FYI, these are failed four tests of android_webview_test_apk. org.chromium.android_webview.test.AwSettingsTest#testLoadWithOverviewModeWithTwoViews org.chromium.android_webview.test.AwSettingsTest#testLoadWithOverviewModeViewportTagWithTwoViews org.chromium.android_webview.test.AwSettingsTest#testLoadWithOverviewModeWithTwoViews with {--webview-sandboxed-renderer} org.chromium.android_webview.test.AwSettingsTest#testLoadWithOverviewModeViewportTagWithTwoViews with {--webview-sandboxed-renderer} Failure reason: C 40.015s Main [FAIL] org.chromium.android_webview.test.AwSettingsTest#testLoadWithOverviewModeViewportTagWithTwoViews with {--webview-sandboxed-renderer}: C 40.015s Main junit.framework.AssertionFailedError: expected:<1.0> but was:<0.25> C 40.016s Main at org.chromium.android_webview.test.AwSettingsTest$AwSettingsLoadWithOverviewModeTestHelper.doEnsureSettingHasValue(AwSettingsTest.java:1348) C 40.016s Main at org.chromium.android_webview.test.AwSettingsTest$AwSettingsLoadWithOverviewModeTestHelper.doEnsureSettingHasValue(AwSettingsTest.java:1298) C 40.016s Main at org.chromium.android_webview.test.AwSettingsTest$AwSettingsTestHelper.ensureSettingHasValue(AwSettingsTest.java:144) C 40.016s Main at org.chromium.android_webview.test.AwSettingsTest$AwSettingsTestHelper.ensureSettingHasInitialValue(AwSettingsTest.java:88) C 40.016s Main at org.chromium.android_webview.test.AwSettingsTest.runPerViewSettingsTest(AwSettingsTest.java:2993) C 40.016s Main at org.chromium.android_webview.test.AwSettingsTest.testLoadWithOverviewModeViewportTagWithTwoViews(AwSettingsTest.java:2672) C 40.016s Main at android.test.InstrumentationTestCase.runMethod(InstrumentationTestCase.java:214) C 40.016s Main at android.test.InstrumentationTestCase.runTest(InstrumentationTestCase.java:199) C 40.016s Main at android.test.ActivityInstrumentationTestCase2.runTest(ActivityInstrumentationTestCase2.java:192) C 40.017s Main at org.chromium.base.test.BaseTestResult.runParameterized(BaseTestResult.java:161) C 40.017s Main at org.chromium.base.test.BaseTestResult.run(BaseTestResult.java:124) C 40.017s Main at android.test.AndroidTestRunner.runTest(AndroidTestRunner.java:191) C 40.017s Main at android.test.AndroidTestRunner.runTest(AndroidTestRunner.java:176) C 40.017s Main at android.test.InstrumentationTestRunner.onStart(InstrumentationTestRunner.java:555) C 40.017s Main at android.app.Instrumentation$InstrumentationThread.run(Instrumentation.java:1853) I'd speculatively revert a part that may change behavior, and see what happens on try.
Kinuko-san, I partially reverted the behavior change from this CL, and it works fine. What do you think about the Patch Set 3? This might be related to the original CL's failures, and I will investigate what happens there. FYI, the original CL means https://codereview.chromium.org/2167623002
The CQ bit was checked by toyoshim@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
ok, lgtm. (sorry for slow review)
toyoshim@chromium.org changed reviewers: + tkent@chromium.org
+tkent@chromium.org for Source/web
lgtm https://codereview.chromium.org/2186863002/diff/40001/third_party/WebKit/Sour... File third_party/WebKit/Source/core/frame/LocalFrame.cpp (right): https://codereview.chromium.org/2186863002/diff/40001/third_party/WebKit/Sour... third_party/WebKit/Source/core/frame/LocalFrame.cpp:368: DCHECK(loadType == FrameLoadTypeReload); DCHECK -> DCHECK_EQ
https://codereview.chromium.org/2186863002/diff/40001/third_party/WebKit/Sour... File third_party/WebKit/Source/core/frame/LocalFrame.cpp (right): https://codereview.chromium.org/2186863002/diff/40001/third_party/WebKit/Sour... third_party/WebKit/Source/core/frame/LocalFrame.cpp:368: DCHECK(loadType == FrameLoadTypeReload); On 2016/08/02 23:12:14, tkent wrote: > DCHECK -> DCHECK_EQ Done.
The CQ bit was checked by toyoshim@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from tkent@chromium.org, kinuko@chromium.org Link to the patchset: https://codereview.chromium.org/2186863002/#ps60001 (title: "review #23")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)
The CQ bit was checked by toyoshim@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)
Patchset #5 (id:80001) has been deleted
Oops, I mistakenly reverted the fix of PS3 in the PS4, and failed in CQ. PS5 should pass!
The CQ bit was checked by toyoshim@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from tkent@chromium.org, kinuko@chromium.org Link to the patchset: https://codereview.chromium.org/2186863002/#ps100001 (title: "revert of wrong revert")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
Message was sent while issue was closed.
Description was changed from ========== FrameLoader: add and export isReloadLoadType() Now FrameLoader.h export isBackForwardLoadType(), but isReloadLoadType() equivalent code exist here and there. Let me add isReloadLoadType() too and export it to use from other places. BUG=332602 ========== to ========== FrameLoader: add and export isReloadLoadType() Now FrameLoader.h export isBackForwardLoadType(), but isReloadLoadType() equivalent code exist here and there. Let me add isReloadLoadType() too and export it to use from other places. BUG=332602 ==========
Message was sent while issue was closed.
Committed patchset #5 (id:100001)
Message was sent while issue was closed.
Description was changed from ========== FrameLoader: add and export isReloadLoadType() Now FrameLoader.h export isBackForwardLoadType(), but isReloadLoadType() equivalent code exist here and there. Let me add isReloadLoadType() too and export it to use from other places. BUG=332602 ========== to ========== FrameLoader: add and export isReloadLoadType() Now FrameLoader.h export isBackForwardLoadType(), but isReloadLoadType() equivalent code exist here and there. Let me add isReloadLoadType() too and export it to use from other places. BUG=332602 Committed: https://crrev.com/af0efbea73ecde533d1577864982288fa53b96e5 Cr-Commit-Position: refs/heads/master@{#409742} ==========
Message was sent while issue was closed.
Patchset 5 (id:??) landed as https://crrev.com/af0efbea73ecde533d1577864982288fa53b96e5 Cr-Commit-Position: refs/heads/master@{#409742} |