Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849

* changes:
  Merge WebKit at r65072 : Update WebKit revision number.
  Merge WebKit at r65072 : Update test_expectations.
  Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
  Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
  Merge WebKit at r65072: JSC build fix in InspectorController.h
  Merge WebKit at r65072: Fix V8 code generator.
  Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
  Merge WebKit at r65072: String class has moved to the WTF namespace.
  Merge Webkit at r65072 : Fix conflicts.
  Merge Webkit at r65072 : Fix Makefiles.
  Merge WebKit at r65072 : Initial merge by git.

1 files changed, 3 insertions, 7 deletions

diff --git a/WebCore/inspector/InspectorCSSStore.cpp b/WebCore/inspector/InspectorCSSStore.cpp
index d098230..16d2508 100644
--- a/WebCore/inspector/InspectorCSSStore.cpp
+++ b/WebCore/inspector/InspectorCSSStore.cpp
@@ -81,7 +81,7 @@ void InspectorCSSStore::removeDocument(Document* doc)
     m_documentNodeToInspectorStyleSheetMap.remove(doc);
 }
 
-CSSStyleSheet* InspectorCSSStore::inspectorStyleSheet(Document* ownerDocument, bool createIfAbsent, long callId)
+CSSStyleSheet* InspectorCSSStore::inspectorStyleSheet(Document* ownerDocument, bool createIfAbsent)
 {
     DocumentToStyleSheetMap::iterator it = m_documentNodeToInspectorStyleSheetMap.find(ownerDocument);
     if (it != m_documentNodeToInspectorStyleSheetMap.end())
@@ -94,16 +94,12 @@ CSSStyleSheet* InspectorCSSStore::inspectorStyleSheet(Document* ownerDocument, b
         styleElement->setAttribute("type", "text/css", ec);
     if (!ec)
         ownerDocument->head()->appendChild(styleElement, ec);
-    if (ec) {
-        m_inspectorController->remoteInspectorFrontend()->didAddRule(callId, InspectorValue::null(), false);
+    if (ec)
         return 0;
-    }
     StyleSheetList* styleSheets = ownerDocument->styleSheets();
     StyleSheet* styleSheet = styleSheets->item(styleSheets->length() - 1);
-    if (!styleSheet->isCSSStyleSheet()) {
-        m_inspectorController->remoteInspectorFrontend()->didAddRule(callId, InspectorValue::null(), false);
+    if (!styleSheet->isCSSStyleSheet())
         return 0;
-    }
     CSSStyleSheet* inspectorStyleSheet = static_cast<CSSStyleSheet*>(styleSheet);
     m_documentNodeToInspectorStyleSheetMap.set(ownerDocument, inspectorStyleSheet);
     return inspectorStyleSheet;