From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 25 May 2011 19:08:45 +0100
Subject: Merge WebKit at r82507: Initial merge by git

Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
---
 Source/WebCore/inspector/front-end/Settings.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'Source/WebCore/inspector/front-end/Settings.js')

diff --git a/Source/WebCore/inspector/front-end/Settings.js b/Source/WebCore/inspector/front-end/Settings.js
index 68b81a5..9995ca2 100644
--- a/Source/WebCore/inspector/front-end/Settings.js
+++ b/Source/WebCore/inspector/front-end/Settings.js
@@ -44,7 +44,6 @@ var Preferences = {
     profilerAlwaysEnabled: false,
     onlineDetectionEnabled: true,
     nativeInstrumentationEnabled: false,
-    resourceExportEnabled: false,
     useDataURLForResourceImageIcons: true,
     showTimingTab: false,
     showCookiesTab: false,
@@ -58,6 +57,7 @@ WebInspector.Settings = function()
     this.installApplicationSetting("colorFormat", "hex");
     this.installApplicationSetting("consoleHistory", []);
     this.installApplicationSetting("debuggerEnabled", false);
+    this.installApplicationSetting("domWordWrap", true);
     this.installApplicationSetting("profilerEnabled", false);
     this.installApplicationSetting("eventListenersFilter", "all");
     this.installApplicationSetting("lastActivePanel", "elements");
@@ -71,6 +71,8 @@ WebInspector.Settings = function()
     this.installApplicationSetting("showUserAgentStyles", true);
     this.installApplicationSetting("watchExpressions", []);
     this.installApplicationSetting("breakpoints", []);
+    this.installApplicationSetting("eventListenerBreakpoints", []);
+    this.installApplicationSetting("xhrBreakpoints", []);
 
     this.installProjectSetting("nativeBreakpoints", []);
 }
@@ -112,6 +114,9 @@ WebInspector.Settings.prototype = {
     findSettingForAllProjects: function(key)
     {
         var result = {};
+        if (window.localStorage == null)
+            return result;
+
         var regexp = "^" + key + ":(.*)";
         for (var i = 0; i < window.localStorage.length; ++i) {
             var fullKey =  window.localStorage.key(i);
@@ -129,7 +134,7 @@ WebInspector.Settings.prototype = {
 
     _get: function(key, defaultValue)
     {
-        if (key in window.localStorage) {
+        if (window.localStorage != null && key in window.localStorage) {
             try {
                 return JSON.parse(window.localStorage[key]);
             } catch(e) {
@@ -141,7 +146,8 @@ WebInspector.Settings.prototype = {
 
     _set: function(key, value)
     {
-        window.localStorage[key] = JSON.stringify(value);
+        if (window.localStorage != null)
+            window.localStorage[key] = JSON.stringify(value);
     },
 
     _getProjectSetting: function(key, defaultValue)
-- 
cgit v1.1