Reviewed by Anders.

        Fixes <rdar://problem/4411845> lots of SPOD trying to scroll through
        Markup & Content inspecting body at apple.com (6614)
        http://bugzilla.opendarwin.org/show_bug.cgi?id=6614

        Removed the Markup & Content pane when viewing a element.
        This pane was not that useful and made the inspector really slow
        when the markup was large. Only show this pane for text nodes.

        * WebInspector/webInspector/inspector.css: use -webkit prefix
        * WebInspector/webInspector/inspector.html:
        * WebInspector/webInspector/inspector.js:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14303 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d9d1500fefce22b6ea8deb803491d1d4d417e24a..5e07ad4f5eaea137e43bbdc41006bcbd6670ff96 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2006-05-11  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Anders.
+
+        Fixes <rdar://problem/4411845> lots of SPOD trying to scroll through
+        Markup & Content inspecting body at apple.com (6614)
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6614
+
+        Removed the Markup & Content pane when viewing a element.
+        This pane was not that useful and made the inspector really slow
+        when the markup was large. Only show this pane for text nodes.
+
+        * WebInspector/webInspector/inspector.css: use -webkit prefix
+        * WebInspector/webInspector/inspector.html:
+        * WebInspector/webInspector/inspector.js:
+
 2006-05-11  Sam Weinig  <sam.weinig@gmail.com>
 
         Reviewed by Timothy.

diff --git a/WebKit/WebInspector/webInspector/inspector.css b/WebKit/WebInspector/webInspector/inspector.css
index 6f7a342fb0d676bb754c6799b3e91b59b997fa5a..17da28daae173029543dec9e22c9826822e3696f 100644 (file)
--- a/WebKit/WebInspector/webInspector/inspector.css
+++ b/WebKit/WebInspector/webInspector/inspector.css
@@ -36,7 +36,7 @@ body {
 }
 
 * {
-    -apple-user-select: none;
+    -webkit-user-select: none;
 }
 
 a:link {
@@ -44,7 +44,7 @@ a:link {
 }
 
 button {
-    -apple-dashboard-region: dashboard-region(control rectangle);
+    -webkit-dashboard-region: dashboard-region(control rectangle);
 }
 
 .disabled {
@@ -439,7 +439,7 @@ button.square:active .right, button.square.selected .right {
     width: 16px;
     height: 16px;
     z-index: 10;
-    -apple-dashboard-region: dashboard-region(resize rectangle);
+    -webkit-dashboard-region: dashboard-region(resize rectangle);
     background-image: url( file:///System/Library/WidgetResources/resize.png );
     background-repeat: no-repeat;
 }
@@ -476,7 +476,7 @@ button.square:active .right, button.square.selected .right {
     height: 10px;
     cursor: move;
     z-index: 10;
-    -apple-dashboard-region: dashboard-region(control rectangle);
+    -webkit-dashboard-region: dashboard-region(control rectangle);
 }
 
 #splitter hr {
@@ -497,7 +497,7 @@ button.square:active .right, button.square.selected .right {
     bottom: 4px;
     left: 10px;
     right: 10px;
-    -apple-dashboard-region: dashboard-region(control rectangle);
+    -webkit-dashboard-region: dashboard-region(control rectangle);
 }
 
 #treeScrollArea {
@@ -551,13 +551,13 @@ button.toggle.right {
 }
 
 #nodePane {
-    display: -apple-box;
-    -apple-box-orient: vertical;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
 }
 
 .infoRow {
-    display: -apple-box;
-    -apple-box-orient: horizontal;
+    display: -webkit-box;
+    -webkit-box-orient: horizontal;
     margin-top: 2px;
 }
 
@@ -576,10 +576,10 @@ button.toggle.right {
 }
 
 .infoRow .value {
-    display: -apple-box;
-    -apple-box-flex: 1;
-    -apple-dashboard-region: dashboard-region(control rectangle);
-    -apple-user-select: text;
+    display: -webkit-box;
+    -webkit-box-flex: 1;
+    -webkit-dashboard-region: dashboard-region(control rectangle);
+    -webkit-user-select: text;
     white-space: nowrap;
 }
 
@@ -589,19 +589,19 @@ button.toggle.right {
     width: 100%;
     overflow: hidden;
     text-overflow: ellipsis;
-    -apple-user-select: text;
+    -webkit-user-select: text;
 }
 
 #elementAttributes {
-    display: -apple-box;
-    -apple-box-flex: 3;
-    -apple-box-orient: vertical;
+    display: -webkit-box;
+    -webkit-box-flex: 3;
+    -webkit-box-orient: vertical;
     min-height: 60px;
     max-height: 160px;
 }
 
 #elementAttributesList {
-    -apple-dashboard-region: dashboard-region(control rectangle);
+    -webkit-dashboard-region: dashboard-region(control rectangle);
 }
 
 .attributeList {
@@ -613,7 +613,7 @@ button.toggle.right {
 
 .attributeList ul {
     list-style-type: none;
-    -apple-padding-start: 10px;
+    -webkit-padding-start: 10px;
 }
 
 .attributeList li {
@@ -624,7 +624,7 @@ button.toggle.right {
 }
 
 .attributeList li span {
-    -apple-user-select: text;
+    -webkit-user-select: text;
 }
 
 .attributeList li .property::after {
@@ -646,31 +646,31 @@ button.toggle.right {
 }
 
 #nodeContents {
-    display: -apple-box;
-    -apple-box-flex: 12;
-    -apple-box-orient: vertical;
+    display: -webkit-box;
+    -webkit-box-flex: 12;
+    -webkit-box-orient: vertical;
     overflow: hidden;
 }
 
 #nodeContentsScrollview {
-    -apple-dashboard-region: dashboard-region(control rectangle);
-    -apple-user-select: text;
+    -webkit-dashboard-region: dashboard-region(control rectangle);
+    -webkit-user-select: text;
     overflow: hidden;
     font-size: 11px;
     word-wrap: break-word;
 }
 
 .scrollArea {
-    display: -apple-box;
-    -apple-box-orient: horizontal;
-    -apple-box-flex: 1;
+    display: -webkit-box;
+    -webkit-box-orient: horizontal;
+    -webkit-box-flex: 1;
     position: relative;
 }
 
 .scrollArea > .view {
     position: relative;
-    display: -apple-box;
-    -apple-box-flex: 1;
+    display: -webkit-box;
+    -webkit-box-flex: 1;
 }
 
 .scrollArea > .view > div {
@@ -688,13 +688,13 @@ button.toggle.right {
     bottom: 0;
     right: 0;
     width: 19px;
-    -apple-dashboard-region: dashboard-region(control rectangle);
+    -webkit-dashboard-region: dashboard-region(control rectangle);
 }
 
 #stylePane {
-    display: -apple-box;
-    -apple-box-flex: 1;
-    -apple-box-orient: vertical;
+    display: -webkit-box;
+    -webkit-box-flex: 1;
+    -webkit-box-orient: vertical;
     overflow: hidden;
 }
 
@@ -714,10 +714,10 @@ button.toggle.right {
 }
 
 #styleRulesScrollview {
-    display: -apple-box;
-    -apple-box-orient: vertical;
-    -apple-dashboard-region: dashboard-region(control rectangle);
-    -apple-box-flex: 1;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-dashboard-region: dashboard-region(control rectangle);
+    -webkit-box-flex: 1;
 }
 
 #styleRulesScrollview hr.divider {
@@ -750,8 +750,8 @@ button.toggle.right {
 #styleProperties {
     background-color: rgba(0,0,0,0.2);
     border: 1px solid rgba(255,255,255,0.4);
-    -apple-box-flex: 1;
-    -apple-dashboard-region: dashboard-region(control rectangle);
+    -webkit-box-flex: 1;
+    -webkit-dashboard-region: dashboard-region(control rectangle);
     padding: 3px;
 }
 
@@ -764,7 +764,7 @@ button.toggle.right {
 
 .treeList ul {
     list-style-type: none;
-    -apple-padding-start: 10px;
+    -webkit-padding-start: 10px;
 }
 
 .treeList li {
@@ -804,7 +804,7 @@ button.toggle.right {
 }
 
 .treeList li span {
-    -apple-user-select: text;
+    -webkit-user-select: text;
 }
 
 .treeList li .property::after {

diff --git a/WebKit/WebInspector/webInspector/inspector.html b/WebKit/WebInspector/webInspector/inspector.html
index e242bd71f2ec275ead061d563d2c1ee3e84735a5..1a4447c3654c839a93e10f4bb9642142757fb0b3 100644 (file)
--- a/WebKit/WebInspector/webInspector/inspector.html
+++ b/WebKit/WebInspector/webInspector/inspector.html
@@ -88,7 +88,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </div>
         <div id="nodeContents">
             <div class="infoRow header">
-                <span class="label" style="width: initial">Markup &amp; Content</span>
+                <span class="label" style="width: initial">Text Content</span>
             </div>
             <div class="scrollArea">
                 <div class="view"><div id="nodeContentsScrollview"></div></div>

diff --git a/WebKit/WebInspector/webInspector/inspector.js b/WebKit/WebInspector/webInspector/inspector.js
index 7df0710157f36bb7b2edb44fa870750597540fa0..c457ae7b3d5d13bb635603f67049ddd5c0c0bc6f 100644 (file)
--- a/WebKit/WebInspector/webInspector/inspector.js
+++ b/WebKit/WebInspector/webInspector/inspector.js
@@ -324,8 +324,8 @@ function updateNodePane() {
         nodeContentsScrollArea.refresh();
     } else if (focusedNode.nodeType == Node.ELEMENT_NODE) {
         document.getElementById("elementAttributes").style.display = null;
-        document.getElementById("nodeContents").style.display = null;
-        
+        document.getElementById("nodeContents").style.display = "none";
+
         updateElementAttributes();
         
         if (focusedNode.namespaceURI.length > 0) {
@@ -335,12 +335,6 @@ function updateNodePane() {
         } else {
             document.getElementById("nodeNamespaceRow").style.display = "none";
         }
-
-        document.getElementById("nodeContentsScrollview").innerHTML = "<span class=\"disabled\">Loading...</span>";
-        nodeContentsScrollArea.refresh();
-
-        clearTimeout(nodeUpdateTimeout);
-        nodeUpdateTimeout = setTimeout("delayedNodePaneUpdate()", 250);
     } else if (focusedNode.nodeType == Node.DOCUMENT_NODE) {
         document.getElementById("nodeNamespaceRow").style.display = "none";
         document.getElementById("elementAttributes").style.display = "none";
@@ -349,15 +343,8 @@ function updateNodePane() {
 
     document.getElementById("nodeType").textContent = nodeTypeName(focusedNode);
     document.getElementById("nodeName").textContent = focusedNode.nodeName;
-}
 
-var nodeUpdateTimeout = null;
-function delayedNodePaneUpdate()
-{
-    var focusedNode = Inspector.focusedDOMNode();
-    var serializer = new XMLSerializer();
-    document.getElementById("nodeContentsScrollview").textContent = serializer.serializeToString(focusedNode);
-    nodeContentsScrollArea.refresh();
+    refreshScrollbars();
 }
 
 var styleRules = null;