Merge WebKit at r73109: Initial merge by git.

Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8

1 files changed, 8 insertions, 5 deletions

diff --git a/WebCore/inspector/Inspector.idl b/WebCore/inspector/Inspector.idl
index 29a3ba0..c185d2d 100644
--- a/WebCore/inspector/Inspector.idl
+++ b/WebCore/inspector/Inspector.idl
@@ -58,10 +58,12 @@ module core {
 
 #if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER
         [notify] void addProfileHeader(out Object header);
+        [notify] void addHeapSnapshotChunk(out unsigned long uid, out String chunk);
         [notify] void attachDebuggerWhenShown();
         [notify] void debuggerWasEnabled();
         [notify] void debuggerWasDisabled();
         [notify] void failedToParseScriptSource(out String url, out String data, out int firstLine, out int errorLine, out String errorMessage);
+        [notify] void finishHeapSnapshot(out unsigned long uid);
         [notify] void parsedScriptSource(out String sourceID, out String url, out String data, out int firstLine, out int scriptWorldType);
         [notify] void pausedScript(out Object details);
         [notify] void profilerWasEnabled();
@@ -113,7 +115,7 @@ module core {
         [notify] void didFinishLoading(out long identifier, out double finishTime);
         [notify] void didFailLoading(out long identifier, out double time, out String localizedDescription);
         [notify] void didLoadResourceFromMemoryCache(out double time, out Object resource);
-        [notify] void setOverrideContent(out long identifier, out String sourceString, out String type);
+        [notify] void setInitialContent(out long identifier, out String sourceString, out String type);
         [notify] void didCommitLoadForFrame(out Object frame, out Object loader);
         [notify] void frameDetachedFromParent(out unsigned long frameId);
 
@@ -213,10 +215,11 @@ module core {
         [handler=CSS] void getInlineStyleForNode2(in long nodeId, out Value style);
         [handler=CSS] void getAllStyles2(out Array styleSheetIds);
         [handler=CSS] void getStyleSheet2(in String styleSheetId, out Value styleSheet);
-        [handler=CSS] void setStyleSheetText2(in String styleSheetId, in String text);
-        [handler=CSS] void setPropertyText2(in String styleId, in long propertyIndex, in String text, in boolean overwrite, out Value style);
-        [handler=CSS] void toggleProperty2(in String styleId, in long propertyIndex, in boolean disable, out Value style);
-        [handler=CSS] void setRuleSelector2(in String ruleId, in String selector, out Value rule);
+        [handler=CSS] void getStyleSheetText2(in String styleSheetId, out String url, out String text);
+        [handler=CSS] void setStyleSheetText2(in String styleSheetId, in String text, out boolean success);
+        [handler=CSS] void setPropertyText2(in Object styleId, in long propertyIndex, in String text, in boolean overwrite, out Value style);
+        [handler=CSS] void toggleProperty2(in Object styleId, in long propertyIndex, in boolean disable, out Value style);
+        [handler=CSS] void setRuleSelector2(in Object ruleId, in String selector, out Value rule);
         [handler=CSS] void addRule2(in long contextNodeId, in String selector, out Value rule);
         [handler=CSS] void getSupportedCSSProperties(out Array cssProperties);
         [handler=CSS] void querySelectorAll(in long documentId, in String selector, out Array result);