Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I01166d4072567f174b02707d7a0850cb3fe1fd8a

1 files changed, 23 insertions, 10 deletions

diff --git a/Source/devtools/protocol.json b/Source/devtools/protocol.json
index 2fa374b74..6169b3bab 100644
--- a/Source/devtools/protocol.json
+++ b/Source/devtools/protocol.json
@@ -453,15 +453,9 @@
             {
                 "name": "captureScreenshot",
                 "description": "Capture page screenshot.",
-                "parameters": [
-                    { "name": "format", "type": "string", "optional": true, "enum": ["jpeg", "png"], "description": "Image compression format." },
-                    { "name": "quality", "type": "integer", "hidden": true, "optional": true, "description": "Compression quality from range [0..100]." },
-                    { "name": "maxWidth", "type": "integer", "hidden": true, "optional": true, "description": "Maximum screenshot width." },
-                    { "name": "maxHeight", "type": "integer", "hidden": true, "optional": true, "description": "Maximum screenshot height." }
-                ],
+                "parameters": [],
                 "returns": [
-                    { "name": "data", "type": "string", "description": "Base64-encoded image data (PNG)." },
-                    { "name": "metadata", "$ref": "ScreencastFrameMetadata", "description": "Screencast frame metadata"}
+                    { "name": "data", "type": "string", "description": "Base64-encoded image data (PNG)." }
                 ],
                 "hidden": true,
                 "handlers": ["browser"]
@@ -926,7 +920,8 @@
                     { "name": "count", "type": "integer", "description": "New repeat count value." },
                     { "name": "timestamp", "$ref": "Timestamp", "description": "Timestamp of most recent message in batch.", "hidden": true }
                 ],
-                "description": "Issued when subsequent message(s) are equal to the previous one(s)."
+                "description": "Is not issued. Will be gone in the future versions of the protocol.",
+                "deprecated": true
             },
             {
                 "name": "messagesCleared",
@@ -2778,6 +2773,7 @@
                 "parameters": [
                     { "name": "maxCallStackDepth", "optional": true, "type": "integer", "description": "Samples JavaScript stack traces up to <code>maxCallStackDepth</code>, defaults to 5." },
                     { "name": "bufferEvents", "optional": true, "type": "boolean", "hidden": true, "description": "Whether instrumentation events should be buffered and returned upon <code>stop</code> call." },
+                    { "name": "liveEvents", "optional": true, "type": "string", "hidden": true, "description": "Coma separated event types to issue although bufferEvents is set."},
                     { "name": "includeCounters", "optional": true, "type": "boolean", "hidden": true, "description": "Whether counters data should be included into timeline events." },
                     { "name": "includeGPUEvents", "optional": true, "type": "boolean", "hidden": true, "description": "Whether events from GPU process should be collected." }
                 ],
@@ -2800,6 +2796,13 @@
                 "description": "Fired for every instrumentation event while timeline is started."
             },
             {
+                "name": "progress",
+                "parameters": [
+                    { "name": "count", "type": "number" }
+                ],
+                "hidden": true
+            },
+            {
                 "name": "started",
                 "parameters": [
                     { "name": "consoleTimeline", "type": "boolean", "optional": true, "description": "If specified, identifies that timeline was started using console.timeline() call." }
@@ -3845,6 +3848,15 @@
                 "description": "Unique snapshot identifier."
             },
             {
+                "id": "ScrollRect",
+                "type": "object",
+                "description": "Rectangle where scrolling happens on the main thread.",
+                "properties": [
+                    { "name": "rect", "$ref": "DOM.Rect", "description": "Rectangle itself." },
+                    { "name": "type", "type": "string", "enum": ["RepaintsOnScroll", "TouchEventHandler", "WheelEventHandler"], "description": "Reason for rectangle to force scrolling on the main thread" }
+                ]
+            },
+            {
                 "id": "Layer",
                 "type": "object",
                 "description": "Information about a compositing layer.",
@@ -3861,7 +3873,8 @@
                     { "name": "anchorY", "type": "number", "optional": true, "description": "Transform anchor point Y, absent if no transform specified" },
                     { "name": "anchorZ", "type": "number", "optional": true, "description": "Transform anchor point Z, absent if no transform specified" },
                     { "name": "paintCount", "type": "integer", "description": "Indicates how many time this layer has painted." },
-                    { "name": "invisible", "type": "boolean", "optional": true, "description": "Set if layer is not visible." }
+                    { "name": "invisible", "type": "boolean", "optional": true, "description": "Set if layer is not visible." },
+                    { "name": "scrollRects", "type": "array", "items": { "$ref": "ScrollRect"}, "optional": true, "description": "Rectangles scrolling on main thread only."}
                 ]
             },
             {