[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 15:36:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 42ae019fc0c4780a571cf89ce92084384843ae89
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 9 07:48:16 2010 +0000
2010-11-08 John Knottenbelt <jknotten at chromium.org>
Reviewed by Steve Block.
Convert to and from DOMTimeStamp with converter functions
https://bugs.webkit.org/show_bug.cgi?id=49066
* src/WebDataSourceImpl.cpp:
(WebKit::WebDataSourceImpl::triggeringEventTime):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71610 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index f376626..0c30afa 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -24,7 +24,19 @@
(WebKit::WebURLRequest::hasUserGesture):
(WebKit::WebURLRequest::setHasUserGesture):
-2010-11-08 Alexey Proskuryakov <ap at apple.com>
+2010-11-08 Jay Civelli <jcivelli at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ Add an API to WebViewClient that report the load progress for a frame.
+ https://bugs.webkit.org/show_bug.cgi?id=49137
+
+ * public/WebViewClient.h:
+ (WebKit::WebViewClient::didChangeLoadProgress):
+ * src/FrameLoaderClientImpl.cpp:
+ (WebKit::FrameLoaderClientImpl::postProgressEstimateChangedNotification):
+
+ 2010-11-08 Alexey Proskuryakov <ap at apple.com>
Reviewed by Darin Adler.
diff --git a/WebKit/chromium/public/WebViewClient.h b/WebKit/chromium/public/WebViewClient.h
index edd9579..6af7582 100644
--- a/WebKit/chromium/public/WebViewClient.h
+++ b/WebKit/chromium/public/WebViewClient.h
@@ -117,6 +117,10 @@ public:
virtual void didStartLoading() { }
virtual void didStopLoading() { }
+ // Notification that some progress was made loading the current page.
+ // loadProgress is a value between 0 (nothing loaded) and 1.0 (frame fully
+ // loaded).
+ virtual void didChangeLoadProgress(WebFrame*, double loadProgress) { }
// Editing -------------------------------------------------------------
diff --git a/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
index ef28981..9d79599 100644
--- a/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+++ b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -51,6 +51,7 @@
#include "PlatformString.h"
#include "PluginData.h"
#include "PluginDataChromium.h"
+#include "ProgressTracker.h"
#include "Settings.h"
#include "StringExtras.h"
#include "WebDataSourceImpl.h"
@@ -1010,7 +1011,12 @@ void FrameLoaderClientImpl::postProgressStartedNotification()
void FrameLoaderClientImpl::postProgressEstimateChangedNotification()
{
- // FIXME
+ WebViewImpl* webview = m_webFrame->viewImpl();
+ if (webview && webview->client()) {
+ webview->client()->didChangeLoadProgress(
+ m_webFrame, m_webFrame->frame()->page()->progress()->estimatedProgress());
+ }
+
}
void FrameLoaderClientImpl::postProgressFinishedNotification()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list