Title: [123574] trunk/Source/WebKit/chromium
- Revision
- 123574
- Author
- [email protected]
- Date
- 2012-07-24 22:04:10 -0700 (Tue, 24 Jul 2012)
Log Message
[chromium] Move renderingStats from WebView to WebWidget.
https://bugs.webkit.org/show_bug.cgi?id=92184
Patch by Dave Tu <[email protected]> on 2012-07-24
Reviewed by Adam Barth.
We are going to add some rendering stats that work in non-composited mode, so the renderingStats() method should be moved from WebView to WebWidget.
* public/WebView.h:
(WebKit):
(WebView):
* public/WebWidget.h:
(WebKit):
(WebWidget):
(WebKit::WebWidget::renderingStats):
* src/WebViewImpl.h:
(WebViewImpl):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (123573 => 123574)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-07-25 05:00:54 UTC (rev 123573)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-07-25 05:04:10 UTC (rev 123574)
@@ -1,3 +1,22 @@
+2012-07-24 Dave Tu <[email protected]>
+
+ [chromium] Move renderingStats from WebView to WebWidget.
+ https://bugs.webkit.org/show_bug.cgi?id=92184
+
+ Reviewed by Adam Barth.
+
+ We are going to add some rendering stats that work in non-composited mode, so the renderingStats() method should be moved from WebView to WebWidget.
+
+ * public/WebView.h:
+ (WebKit):
+ (WebView):
+ * public/WebWidget.h:
+ (WebKit):
+ (WebWidget):
+ (WebKit::WebWidget::renderingStats):
+ * src/WebViewImpl.h:
+ (WebViewImpl):
+
2012-07-24 Alec Flett <[email protected]>
IndexedDB: fix #include dependencies so IDBRequest isn't an include root
Modified: trunk/Source/WebKit/chromium/public/WebView.h (123573 => 123574)
--- trunk/Source/WebKit/chromium/public/WebView.h 2012-07-25 05:00:54 UTC (rev 123573)
+++ trunk/Source/WebKit/chromium/public/WebView.h 2012-07-25 05:04:10 UTC (rev 123574)
@@ -63,7 +63,6 @@
struct WebMediaPlayerAction;
struct WebPluginAction;
struct WebPoint;
-struct WebRenderingStats;
class WebView : public WebWidget {
public:
@@ -462,10 +461,6 @@
virtual bool isSelectionEditable() const = 0;
- // Fills in a WebRenderingStats struct containing information about the state of the compositor.
- // This call is relatively expensive in threaded mode as it blocks on the compositor thread.
- virtual void renderingStats(WebRenderingStats&) const { }
-
// Benchmarking support --------------------------------------------
virtual WebViewBenchmarkSupport* benchmarkSupport() { return 0; }
Modified: trunk/Source/WebKit/chromium/public/WebWidget.h (123573 => 123574)
--- trunk/Source/WebKit/chromium/public/WebWidget.h 2012-07-25 05:00:54 UTC (rev 123573)
+++ trunk/Source/WebKit/chromium/public/WebWidget.h 2012-07-25 05:04:10 UTC (rev 123574)
@@ -48,6 +48,7 @@
class WebMouseEvent;
class WebString;
struct WebPoint;
+struct WebRenderingStats;
template <typename T> class WebVector;
class WebWidget {
@@ -221,6 +222,10 @@
// following the call to instrumentBeginFrame().
virtual void instrumentCancelFrame() { }
+ // Fills in a WebRenderingStats struct containing information about the state of the compositor.
+ // This call is relatively expensive in threaded mode as it blocks on the compositor thread.
+ virtual void renderingStats(WebRenderingStats&) const { }
+
// The page background color. Can be used for filling in areas without
// content.
virtual WebColor backgroundColor() const { return 0xFFFFFFFF; /* SK_ColorWHITE */ }
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (123573 => 123574)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-07-25 05:00:54 UTC (rev 123573)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-07-25 05:04:10 UTC (rev 123574)
@@ -174,6 +174,7 @@
virtual void didChangeWindowResizerRect();
virtual void instrumentBeginFrame();
virtual void instrumentCancelFrame();
+ virtual void renderingStats(WebRenderingStats&) const;
// WebView methods:
virtual void initializeMainFrame(WebFrameClient*);
@@ -298,7 +299,6 @@
virtual void updateBatteryStatus(const WebBatteryStatus&);
#endif
virtual void transferActiveWheelFlingAnimation(const WebActiveWheelFlingParameters&);
- virtual void renderingStats(WebRenderingStats&) const;
virtual WebViewBenchmarkSupport* benchmarkSupport();
// WebLayerTreeViewClient
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
