bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add the ability to customize the animation frame rate (issue #697).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@739 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-08-14 23:33:57 +00:00
parent a189761144
commit 03ced41cf2
16 changed files with 128 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
cef1/libcef/webwidget_host.cc
View File

@@ -14,24 +14,15 @@
using webkit::npapi::WebPluginGeometry;
using WebKit::WebSize;
const int WebWidgetHost::kDefaultFrameRate = 30;
const int WebWidgetHost::kMaxFrameRate = 90;
void WebWidgetHost::ScheduleComposite() {
if (invalidate_timer_.IsRunning())
return;
// Try to paint at 60fps.
static int64 kDesiredRate = 16;
// Maintain the desired rate.
invalidate_timer_.Start(
FROM_HERE,
base::TimeDelta::FromMilliseconds(kDesiredRate),
this,
&WebWidgetHost::Invalidate);
ScheduleInvalidateTimer();
}
void WebWidgetHost::ScheduleAnimation() {
ScheduleComposite();
ScheduleInvalidateTimer();
}
void WebWidgetHost::UpdatePaintRect(const gfx::Rect& rect) {
@@ -49,6 +40,12 @@ void WebWidgetHost::UpdateRedrawRect(const gfx::Rect& rect) {
redraw_rect_ = redraw_rect_.Union(rect);
}
void WebWidgetHost::InvalidateRect(const gfx::Rect& rect) {
if (rect.IsEmpty())
return;
DidInvalidateRect(rect);
}
void WebWidgetHost::SetSize(int width, int height) {
webwidget_->resize(WebSize(width, height));
DidInvalidateRect(gfx::Rect(0, 0, width, height));
@@ -98,28 +95,69 @@ gfx::PluginWindowHandle WebWidgetHost::GetWindowedPluginAt(int x, int y) {
return gfx::kNullPluginWindow;
}
void WebWidgetHost::SetFrameRate(int frames_per_second) {
if (frames_per_second <= 0)
frames_per_second = kDefaultFrameRate;
if (frames_per_second > kMaxFrameRate)
frames_per_second = kMaxFrameRate;
frame_delay_ = 1000 / frames_per_second;
}
void WebWidgetHost::ScheduleInvalidateTimer() {
if (invalidate_timer_.IsRunning())
return;
// Maintain the desired rate.
base::TimeDelta delta = base::TimeTicks::Now() - last_invalidate_time_;
int64 actualRate = delta.InMilliseconds();
if (actualRate >= frame_delay_)
delta = base::TimeDelta::FromMilliseconds(1);
else
delta = base::TimeDelta::FromMilliseconds(frame_delay_ - actualRate);
invalidate_timer_.Start(
FROM_HERE,
delta,
this,
&WebWidgetHost::DoInvalidate);
}
void WebWidgetHost::DoInvalidate() {
if (!webwidget_)
return;
WebSize size = webwidget_->size();
InvalidateRect(gfx::Rect(0, 0, size.width, size.height));
last_invalidate_time_ = base::TimeTicks::Now();
}
void WebWidgetHost::SchedulePaintTimer() {
if (layouting_ || paint_timer_.IsRunning())
return;
// Maintain the desired rate.
base::TimeDelta delta = base::TimeTicks::Now() - last_paint_time_;
int64 actualRate = delta.InMilliseconds();
if (actualRate >= frame_delay_)
delta = base::TimeDelta::FromMilliseconds(1);
else
delta = base::TimeDelta::FromMilliseconds(frame_delay_ - actualRate);
paint_timer_.Start(
FROM_HERE,
base::TimeDelta::FromMilliseconds(0), // Fire immediately.
delta,
this,
&WebWidgetHost::DoPaint);
}
void WebWidgetHost::DoPaint() {
if (MessageLoop::current()->IsIdle()) {
// Paint to the delegate.
#if defined(OS_MACOSX)
SkRegion region;
Paint(region);
SkRegion region;
Paint(region);
#else
Paint();
Paint();
#endif
} else {
// Try again later.
SchedulePaintTimer();
}
last_paint_time_ = base::TimeTicks::Now();
}