|
|
Chromium Code Reviews|
Created:
5 years ago by Avi (use Gerrit) Modified:
5 years ago Reviewers:
Torne, mattm, Mark Mentovai, DaleCurtis, Michael van Ouwerkerk, Ben Goodger (Google), Jered CC:
chromium-reviews, skanuj+watch_chromium.org, qsr+mojo_chromium.org, vmpstr+watch_chromium.org, dhollowa+watch_chromium.org, dougw+watch_chromium.org, yzshen+watch_chromium.org, ben+mojo_chromium.org, cbentzel+watch_chromium.org, melevin+watch_chromium.org, mlamouri+watch-geolocation_chromium.org, viettrungluu+watch_chromium.org, jam, abarth-chromium, darin-cc_chromium.org, feature-media-reviews_chromium.org, jfweitz+watch_chromium.org, Michael van Ouwerkerk, Jered, donnd+watch_chromium.org, Aaron Boodman, David Black, samarth+watch_chromium.org, kmadhusu+watch_chromium.org, darin (slow to review) Base URL:
https://chromium.googlesource.com/chromium/src.git@kint3 Target Ref:
refs/pending/heads/master Project:
chromium Visibility:
Public. |
DescriptionRemove kint32min.
BUG=138542
TBR=jered@chromium.org
Committed: https://crrev.com/3ab0ae432ebb0990c783ad8b7216c8f20a9031c7
Cr-Commit-Position: refs/heads/master@{#362811}
Patch Set 1 #Patch Set 2 : fixes #Patch Set 3 : rebase #Patch Set 4 : android, rebase #Patch Set 5 : rebase #Patch Set 6 : rebase #Patch Set 7 : rebase #Dependent Patchsets: Messages
Total messages: 53 (27 generated)
The CQ bit was checked by avi@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1471693006/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1471693006/1
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: android_arm64_dbg_recipe on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/android_arm64_d...)
The CQ bit was checked by avi@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1471693006/20001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1471693006/20001
The CQ bit was checked by avi@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1471693006/40001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1471693006/40001
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: win_chromium_compile_dbg_ng on tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_comp...)
The CQ bit was checked by avi@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1471693006/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1471693006/60001
mark: base/ jered: chrome/renderer/ torne: base/android/ and content/browser/android/ mvanouwerkerk: content/browser/geolocation/ dalecurtis: media/ ben: mojo/ mattm: net/
LGTM
geolocation lgtm
mojo lgtm
android LGTM
media/ lgtm
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: linux_android_rel_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_android_r...)
net lgtm
The CQ bit was checked by avi@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1471693006/80001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1471693006/80001
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: ios_dbg_simulator_ninja on tryserver.chromium.mac (JOB_TIMED_OUT, no build URL) ios_rel_device_ninja on tryserver.chromium.mac (JOB_TIMED_OUT, no build URL)
Description was changed from ========== Remove kint32min. BUG=138542 ========== to ========== Remove kint32min. BUG=138542 TBR=jered@chromium.org ==========
The CQ bit was checked by avi@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from torne@chromium.org, mattm@chromium.org, mark@chromium.org, dalecurtis@chromium.org, mvanouwerkerk@chromium.org, ben@chromium.org Link to the patchset: https://codereview.chromium.org/1471693006/#ps80001 (title: "rebase")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1471693006/80001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1471693006/80001
The CQ bit was unchecked by avi@chromium.org
The CQ bit was checked by avi@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1471693006/80001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1471693006/80001
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for media/blink/buffered_resource_loader.h:
While running git apply --index -3 -p1;
error: patch failed: media/blink/buffered_resource_loader.h:22
Falling back to three-way merge...
Applied patch to 'media/blink/buffered_resource_loader.h' with conflicts.
U media/blink/buffered_resource_loader.h
Patch: media/blink/buffered_resource_loader.h
Index: media/blink/buffered_resource_loader.h
diff --git a/media/blink/buffered_resource_loader.h
b/media/blink/buffered_resource_loader.h
index
97c59f42eba092ae7aaece9fec87bd433221ffb6..96a422d56ba177a4c7c3169fa63a0563779debe9
100644
--- a/media/blink/buffered_resource_loader.h
+++ b/media/blink/buffered_resource_loader.h
@@ -22,7 +22,7 @@ namespace media {
class MediaLog;
class SeekableBuffer;
-const int64 kPositionNotSpecified = -1;
+const int64_t kPositionNotSpecified = -1;
// BufferedResourceLoader is single threaded and must be accessed on the
// render thread. It wraps a WebURLLoader and does in-memory buffering,
@@ -78,15 +78,14 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
// |strategy| is the initial loading strategy to use.
// |bitrate| is the bitrate of the media, 0 if unknown.
// |playback_rate| is the current playback rate of the media.
- BufferedResourceLoader(
- const GURL& url,
- CORSMode cors_mode,
- int64 first_byte_position,
- int64 last_byte_position,
- DeferStrategy strategy,
- int bitrate,
- double playback_rate,
- MediaLog* media_log);
+ BufferedResourceLoader(const GURL& url,
+ CORSMode cors_mode,
+ int64_t first_byte_position,
+ int64_t last_byte_position,
+ DeferStrategy strategy,
+ int bitrate,
+ double playback_rate,
+ MediaLog* media_log);
~BufferedResourceLoader() override;
// Start the resource loading with the specified URL and range.
@@ -95,7 +94,7 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
// |progress_cb| is executed when additional data has arrived.
typedef base::Callback<void(Status)> StartCB;
typedef base::Callback<void(LoadingState)> LoadingStateChangedCB;
- typedef base::Callback<void(int64)> ProgressCB;
+ typedef base::Callback<void(int64_t)> ProgressCB;
void Start(const StartCB& start_cb,
const LoadingStateChangedCB& loading_cb,
const ProgressCB& progress_cb,
@@ -116,17 +115,19 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
// If necessary will temporarily increase forward capacity of buffer to
// accomodate an unusually large read.
typedef base::Callback<void(Status, int)> ReadCB;
- void Read(int64 position, int read_size,
- uint8* buffer, const ReadCB& read_cb);
+ void Read(int64_t position,
+ int read_size,
+ uint8_t* buffer,
+ const ReadCB& read_cb);
// Gets the content length in bytes of the instance after this loader has
been
// started. If this value is |kPositionNotSpecified|, then content length is
// unknown.
- int64 content_length();
+ int64_t content_length();
// Gets the original size of the file requested. If this value is
// |kPositionNotSpecified|, then the size is unknown.
- int64 instance_size();
+ int64_t instance_size();
// Returns true if the server supports byte range requests.
bool range_supported();
@@ -155,10 +156,9 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
void didReceiveCachedMetadata(
blink::WebURLLoader* loader,
const char* data, int dataLength) override;
- void didFinishLoading(
- blink::WebURLLoader* loader,
- double finishTime,
- int64_t total_encoded_data_length) override;
+ void didFinishLoading(blink::WebURLLoader* loader,
+ double finishTime,
+ int64_t total_encoded_data_length) override;
void didFail(
blink::WebURLLoader* loader,
const blink::WebURLError&) override;
@@ -186,7 +186,7 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
void SetBitrate(int bitrate);
// Return the |first_byte_position| passed into the ctor.
- int64 first_byte_position() const;
+ int64_t first_byte_position() const;
// Parse a Content-Range header into its component pieces and return true if
// each of the expected elements was found & parsed correctly.
@@ -194,9 +194,10 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
// "/*".
// NOTE: only public for testing! This is an implementation detail of
// VerifyPartialResponse (a private method).
- static bool ParseContentRange(
- const std::string& content_range_str, int64* first_byte_position,
- int64* last_byte_position, int64* instance_size);
+ static bool ParseContentRange(const std::string& content_range_str,
+ int64_t* first_byte_position,
+ int64_t* last_byte_position,
+ int64_t* instance_size);
// Cancels and closes any outstanding deferred ActiveLoader instances. Does
// not report a failed state, so subsequent read calls to cache may still
@@ -286,8 +287,8 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
GURL url_;
CORSMode cors_mode_;
- const int64 first_byte_position_;
- const int64 last_byte_position_;
+ const int64_t first_byte_position_;
+ const int64_t last_byte_position_;
bool single_origin_;
// Executed whenever the state of resource loading has changed.
@@ -299,16 +300,16 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
// Members used during request start.
StartCB start_cb_;
- int64 offset_;
- int64 content_length_;
- int64 instance_size_;
+ int64_t offset_;
+ int64_t content_length_;
+ int64_t instance_size_;
// Members used during a read operation. They should be reset after each
// read has completed or failed.
ReadCB read_cb_;
- int64 read_position_;
+ int64_t read_position_;
int read_size_;
- uint8* read_buffer_;
+ uint8_t* read_buffer_;
// Offsets of the requested first byte and last byte in |buffer_|. They are
// written by Read().
The CQ bit was unchecked by commit-bot@chromium.org
The CQ bit was checked by avi@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from torne@chromium.org, mattm@chromium.org, mark@chromium.org, dalecurtis@chromium.org, mvanouwerkerk@chromium.org, ben@chromium.org Link to the patchset: https://codereview.chromium.org/1471693006/#ps100001 (title: "rebase")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1471693006/100001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1471693006/100001
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for media/blink/buffered_resource_loader.h:
While running git apply --index -3 -p1;
error: patch failed: media/blink/buffered_resource_loader.h:22
Falling back to three-way merge...
Applied patch to 'media/blink/buffered_resource_loader.h' with conflicts.
U media/blink/buffered_resource_loader.h
Patch: media/blink/buffered_resource_loader.h
Index: media/blink/buffered_resource_loader.h
diff --git a/media/blink/buffered_resource_loader.h
b/media/blink/buffered_resource_loader.h
index
97c59f42eba092ae7aaece9fec87bd433221ffb6..96a422d56ba177a4c7c3169fa63a0563779debe9
100644
--- a/media/blink/buffered_resource_loader.h
+++ b/media/blink/buffered_resource_loader.h
@@ -22,7 +22,7 @@ namespace media {
class MediaLog;
class SeekableBuffer;
-const int64 kPositionNotSpecified = -1;
+const int64_t kPositionNotSpecified = -1;
// BufferedResourceLoader is single threaded and must be accessed on the
// render thread. It wraps a WebURLLoader and does in-memory buffering,
@@ -78,15 +78,14 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
// |strategy| is the initial loading strategy to use.
// |bitrate| is the bitrate of the media, 0 if unknown.
// |playback_rate| is the current playback rate of the media.
- BufferedResourceLoader(
- const GURL& url,
- CORSMode cors_mode,
- int64 first_byte_position,
- int64 last_byte_position,
- DeferStrategy strategy,
- int bitrate,
- double playback_rate,
- MediaLog* media_log);
+ BufferedResourceLoader(const GURL& url,
+ CORSMode cors_mode,
+ int64_t first_byte_position,
+ int64_t last_byte_position,
+ DeferStrategy strategy,
+ int bitrate,
+ double playback_rate,
+ MediaLog* media_log);
~BufferedResourceLoader() override;
// Start the resource loading with the specified URL and range.
@@ -95,7 +94,7 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
// |progress_cb| is executed when additional data has arrived.
typedef base::Callback<void(Status)> StartCB;
typedef base::Callback<void(LoadingState)> LoadingStateChangedCB;
- typedef base::Callback<void(int64)> ProgressCB;
+ typedef base::Callback<void(int64_t)> ProgressCB;
void Start(const StartCB& start_cb,
const LoadingStateChangedCB& loading_cb,
const ProgressCB& progress_cb,
@@ -116,17 +115,19 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
// If necessary will temporarily increase forward capacity of buffer to
// accomodate an unusually large read.
typedef base::Callback<void(Status, int)> ReadCB;
- void Read(int64 position, int read_size,
- uint8* buffer, const ReadCB& read_cb);
+ void Read(int64_t position,
+ int read_size,
+ uint8_t* buffer,
+ const ReadCB& read_cb);
// Gets the content length in bytes of the instance after this loader has
been
// started. If this value is |kPositionNotSpecified|, then content length is
// unknown.
- int64 content_length();
+ int64_t content_length();
// Gets the original size of the file requested. If this value is
// |kPositionNotSpecified|, then the size is unknown.
- int64 instance_size();
+ int64_t instance_size();
// Returns true if the server supports byte range requests.
bool range_supported();
@@ -155,10 +156,9 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
void didReceiveCachedMetadata(
blink::WebURLLoader* loader,
const char* data, int dataLength) override;
- void didFinishLoading(
- blink::WebURLLoader* loader,
- double finishTime,
- int64_t total_encoded_data_length) override;
+ void didFinishLoading(blink::WebURLLoader* loader,
+ double finishTime,
+ int64_t total_encoded_data_length) override;
void didFail(
blink::WebURLLoader* loader,
const blink::WebURLError&) override;
@@ -186,7 +186,7 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
void SetBitrate(int bitrate);
// Return the |first_byte_position| passed into the ctor.
- int64 first_byte_position() const;
+ int64_t first_byte_position() const;
// Parse a Content-Range header into its component pieces and return true if
// each of the expected elements was found & parsed correctly.
@@ -194,9 +194,10 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
// "/*".
// NOTE: only public for testing! This is an implementation detail of
// VerifyPartialResponse (a private method).
- static bool ParseContentRange(
- const std::string& content_range_str, int64* first_byte_position,
- int64* last_byte_position, int64* instance_size);
+ static bool ParseContentRange(const std::string& content_range_str,
+ int64_t* first_byte_position,
+ int64_t* last_byte_position,
+ int64_t* instance_size);
// Cancels and closes any outstanding deferred ActiveLoader instances. Does
// not report a failed state, so subsequent read calls to cache may still
@@ -286,8 +287,8 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
GURL url_;
CORSMode cors_mode_;
- const int64 first_byte_position_;
- const int64 last_byte_position_;
+ const int64_t first_byte_position_;
+ const int64_t last_byte_position_;
bool single_origin_;
// Executed whenever the state of resource loading has changed.
@@ -299,16 +300,16 @@ class MEDIA_BLINK_EXPORT BufferedResourceLoader
// Members used during request start.
StartCB start_cb_;
- int64 offset_;
- int64 content_length_;
- int64 instance_size_;
+ int64_t offset_;
+ int64_t content_length_;
+ int64_t instance_size_;
// Members used during a read operation. They should be reset after each
// read has completed or failed.
ReadCB read_cb_;
- int64 read_position_;
+ int64_t read_position_;
int read_size_;
- uint8* read_buffer_;
+ uint8_t* read_buffer_;
// Offsets of the requested first byte and last byte in |buffer_|. They are
// written by Read().
The CQ bit was unchecked by commit-bot@chromium.org
The CQ bit was checked by avi@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from torne@chromium.org, mattm@chromium.org, mark@chromium.org, dalecurtis@chromium.org, mvanouwerkerk@chromium.org, ben@chromium.org Link to the patchset: https://codereview.chromium.org/1471693006/#ps120001 (title: "rebase")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1471693006/120001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1471693006/120001
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: mac_chromium_rel_ng on tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)
The CQ bit was checked by avi@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1471693006/120001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1471693006/120001
Message was sent while issue was closed.
Description was changed from ========== Remove kint32min. BUG=138542 TBR=jered@chromium.org ========== to ========== Remove kint32min. BUG=138542 TBR=jered@chromium.org ==========
Message was sent while issue was closed.
Committed patchset #7 (id:120001)
Message was sent while issue was closed.
Description was changed from ========== Remove kint32min. BUG=138542 TBR=jered@chromium.org ========== to ========== Remove kint32min. BUG=138542 TBR=jered@chromium.org Committed: https://crrev.com/3ab0ae432ebb0990c783ad8b7216c8f20a9031c7 Cr-Commit-Position: refs/heads/master@{#362811} ==========
Message was sent while issue was closed.
Patchset 7 (id:??) landed as https://crrev.com/3ab0ae432ebb0990c783ad8b7216c8f20a9031c7 Cr-Commit-Position: refs/heads/master@{#362811} |
