Merge 67651 - 2010-09-16 Pavel Podivilov <podivilov@chromium.org>...

WebCore/inspector/InspectorController.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 1589 matching lines @@
     ScriptFunctionCall function(window, "didEvaluateForTestInFrontend");
     function.appendArgument(callId);
     function.appendArgument(jsonResult);
     function.call();
 }
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
 String InspectorController::breakpointsSettingKey()
 {
     DEFINE_STATIC_LOCAL(String, keyPrefix, ("breakpoints:"));
+    if (!m_mainResource)
+        return "";
     return keyPrefix + InspectorDebuggerAgent::md5Base16(m_mainResource->requestURL());
 }
 
 PassRefPtr<InspectorValue> InspectorController::loadBreakpoints()
 {
     return InspectorValue::parseJSON(setting(breakpointsSettingKey()));
 }
 
 void InspectorController::saveBreakpoints(PassRefPtr<InspectorObject> breakpoints)
 {
@@ skipping 295 matching lines @@
 void InspectorController::didModifyDOMAttrImpl(Element* element)
 {
     if (m_domAgent)
         m_domAgent->didModifyDOMAttr(element);
 }
 
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)