[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
pfeldman at chromium.org
pfeldman at chromium.org
Wed Dec 22 15:19:55 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9a4cdb1f30ef0e386becfeafaa0ff9c46cf63f30
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 1 11:09:14 2010 +0000
2010-11-01 Pavel Feldman <pfeldman at chromium.org>
Not reviewed: simplify inspector styles test to make all bots happy.
(drive-by fix for overriden inspector styles in network panel).
* inspector/InspectorController.h:
* inspector/front-end/networkPanel.css:
2010-11-01 Pavel Feldman <pfeldman at chromium.org>
Not reviewed: simplify styles test to make all bots happy.
* inspector/styles-source-lines-inline-expected.txt:
* inspector/styles-source-lines-inline.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71017 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c2a3313..024417e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,12 @@
2010-11-01 Pavel Feldman <pfeldman at chromium.org>
+ Not reviewed: simplify styles test to make all bots happy.
+
+ * inspector/styles-source-lines-inline-expected.txt:
+ * inspector/styles-source-lines-inline.html:
+
+2010-11-01 Pavel Feldman <pfeldman at chromium.org>
+
Not reviewed. Updating inspector test expectation as a follow up to r71010.
* inspector/styles-source-lines-inline-expected.txt:
diff --git a/LayoutTests/inspector/styles-source-lines-inline-expected.txt b/LayoutTests/inspector/styles-source-lines-inline-expected.txt
index 0c31849..5822f5e 100644
--- a/LayoutTests/inspector/styles-source-lines-inline-expected.txt
+++ b/LayoutTests/inspector/styles-source-lines-inline-expected.txt
@@ -12,14 +12,4 @@ color: blue;
/-- overloaded --/ display: block;
-[expanded] element.style { ()
-
-======== Matched CSS Rules ========
-[expanded] .bar { (styles-source-lines-inline-iframe.html:4)
-color: red;
-
-[expanded] div { (user agent stylesheet)
-display: block;
-
-
diff --git a/LayoutTests/inspector/styles-source-lines-inline.html b/LayoutTests/inspector/styles-source-lines-inline.html
index 31e5afc..dcc8a21 100644
--- a/LayoutTests/inspector/styles-source-lines-inline.html
+++ b/LayoutTests/inspector/styles-source-lines-inline.html
@@ -39,12 +39,7 @@ function frontend_selectElementContinuation(testController)
function frontend_selectElementContinuation2(testController)
{
var result = frontend_getSelectedElementStyles(true);
- function dumpSelectedElementStyles()
- {
- result = result.concat(frontend_getSelectedElementStyles(true));
- testController.notifyDone(result);
- }
- frontend_selectElementAndRun(testController, "bar", dumpSelectedElementStyles);
+ testController.notifyDone(result);
}
</script>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b01aa6a..6fb4994 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-01 Pavel Feldman <pfeldman at chromium.org>
+
+ Not reviewed: simplify inspector styles test to make all bots happy.
+ (drive-by fix for overriden inspector styles in network panel).
+
+ * inspector/InspectorController.h:
+ * inspector/front-end/networkPanel.css:
+
2010-11-01 Nikolas Zimmermann <nzimmermann at rim.com>
Reviewed by Rob Buis.
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 1fc6e32..640987b 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -23,7 +23,7 @@
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef InspectorController_h
diff --git a/WebCore/inspector/front-end/networkPanel.css b/WebCore/inspector/front-end/networkPanel.css
index 2c683f0..300c647 100644
--- a/WebCore/inspector/front-end/networkPanel.css
+++ b/WebCore/inspector/front-end/networkPanel.css
@@ -2,7 +2,7 @@
-webkit-mask-image: url(Images/largerResourcesButtonGlyph.png);
}
-.network.panel .data-grid {
+.network-sidebar .data-grid {
border: none;
position: absolute;
top: 0;
@@ -12,17 +12,17 @@
font-size: 11px;
}
-.network.panel .data-grid table.data {
+.network-sidebar .data-grid table.data {
-webkit-background-size: 1px 82px;
background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), color-stop(0.5, rgba(0, 0, 0, 0)), color-stop(0.5, rgba(0, 0, 0, 0.05)), to(rgba(0, 0, 0, 0.05)));
font-size: 11px;
}
-.network.panel .data-grid.small table.data {
+.network-sidebar .data-grid.small table.data {
-webkit-background-size: 1px 42px;
}
-.network.panel .data-grid td:not(.network-summary) {
+.network-sidebar .data-grid td:not(.network-summary) {
line-height: 17px;
height: 37px;
border-right: 1px solid rgb(210, 210, 210);
@@ -30,34 +30,34 @@
vertical-align: middle;
}
-.network.panel .data-grid.small td {
+.network-sidebar .data-grid.small td {
height: 17px;
}
-.network.panel .data-grid th {
+.network-sidebar .data-grid th {
border-bottom: 1px solid rgb(64%, 64%, 64%);
height: 30px;
font-size: 11px;
font-weight: bold;
}
-.network.panel .data-grid.small th {
+.network-sidebar .data-grid.small th {
height: 22px;
}
-.network.panel .data-grid th, .network.panel .data-grid th.sort-descending, .network.panel .data-grid th.sort-ascending {
+.network-sidebar .data-grid th, .network.panel .data-grid th.sort-descending, .network.panel .data-grid th.sort-ascending {
background: -webkit-gradient(linear, left top, left bottom, from(rgb(236, 236, 236)), to(rgb(217, 217, 217)));
}
-.network.panel .data-grid .data-container {
+.network-sidebar .data-grid .data-container {
top: 31px;
}
-.network.panel .data-grid.small .data-container {
+.network-sidebar .data-grid.small .data-container {
top: 23px;
}
-.network.panel .data-grid select {
+.network-sidebar .data-grid select {
-webkit-appearance: none;
background-color: transparent;
border: none;
@@ -66,32 +66,32 @@
font-weight: bold;
}
-.network.panel .data-grid tr.filler {
+.network-sidebar .data-grid tr.filler {
background-color: white;
}
-.network.panel .data-grid td.name-column {
+.network-sidebar .data-grid td.name-column {
font-weight: bold;
}
-.network.panel .data-grid td.method-column,
-.network.panel .data-grid td.status-column,
-.network.panel .data-grid td.type-column,
-.network.panel .data-grid td.size-column,
-.network.panel .data-grid td.time-column {
+.network-sidebar .data-grid td.method-column,
+.network-sidebar .data-grid td.status-column,
+.network-sidebar .data-grid td.type-column,
+.network-sidebar .data-grid td.size-column,
+.network-sidebar .data-grid td.time-column {
background-color: rgba(0, 0, 0, 0.07);
}
-.network.panel .data-grid td.size-column,
-.network.panel .data-grid td.time-column {
+.network-sidebar .data-grid td.size-column,
+.network-sidebar .data-grid td.time-column {
text-align: right;
}
-.network.panel .small .network-graph-side {
+.network-sidebar .small .network-graph-side {
height: 14px;
}
-.network.panel .data-grid th.sortable:active {
+.network-sidebar .data-grid th.sortable:active {
background-image: none;
}
@@ -104,66 +104,66 @@
color: grey;
}
-.network.panel .data-grid.small .network-cell-subtitle,
-.network.panel .data-grid.small .network-header-subtitle
+.network-sidebar .data-grid.small .network-cell-subtitle,
+.network-sidebar .data-grid.small .network-header-subtitle
{
display: none;
}
/* Resource preview icons */
-.network.panel .data-grid .icon {
+.network-sidebar .data-grid .icon {
content: url(Images/resourcePlainIcon.png);
}
-.network.panel .data-grid.small .icon {
+.network-sidebar .data-grid.small .icon {
content: url(Images/resourcePlainIconSmall.png);
}
-.network.panel .network-category-scripts .icon {
+.network-sidebar .network-category-scripts .icon {
content: url(Images/resourceJSIcon.png);
}
-.network.panel .data-grid.small .network-category-scripts .icon {
+.network-sidebar .data-grid.small .network-category-scripts .icon {
content: url(Images/resourceDocumentIconSmall.png);
}
-.network.panel .network-category-documents .icon {
+.network-sidebar .network-category-documents .icon {
content: url(Images/resourceDocumentIcon.png);
}
-.network.panel .data-grid.small .network-category-documents .icon {
+.network-sidebar .data-grid.small .network-category-documents .icon {
content: url(Images/resourceDocumentIconSmall.png);
}
-.network.panel .network-category-stylesheets .icon {
+.network-sidebar .network-category-stylesheets .icon {
content: url(Images/resourceCSSIcon.png);
}
-.network.panel .data-grid.small .network-category-stylesheets .icon {
+.network-sidebar .data-grid.small .network-category-stylesheets .icon {
content: url(Images/resourceDocumentIconSmall.png);
}
-.network.panel .network-category-images .icon {
+.network-sidebar .network-category-images .icon {
position: relative;
background-image: url(Images/resourcePlainIcon.png);
background-repeat: no-repeat;
content: "";
}
-.network.panel .network-category-images .icon {
+.network-sidebar .network-category-images .icon {
position: relative;
background-image: url(Images/resourcePlainIcon.png);
background-repeat: no-repeat;
content: "";
}
-.network.panel .data-grid.small .network-category-images .icon {
+.network-sidebar .data-grid.small .network-category-images .icon {
background-image: url(Images/resourcePlainIconSmall.png);
content: "";
}
-.network.panel .data-grid .icon {
+.network-sidebar .data-grid .icon {
float: left;
width: 32px;
height: 32px;
@@ -171,12 +171,12 @@
margin-right: 3px;
}
-.network.panel .data-grid.small .icon {
+.network-sidebar .data-grid.small .icon {
width: 16px;
height: 16px;
}
-.network.panel .image-network-icon-preview {
+.network-sidebar .image-network-icon-preview {
position: absolute;
margin: auto;
top: 3px;
@@ -189,7 +189,7 @@
min-height: 1px;
}
-.network.panel .data-grid.small .image-network-icon-preview {
+.network-sidebar .data-grid.small .image-network-icon-preview {
top: 2px;
bottom: 1px;
left: 3px;
@@ -407,7 +407,7 @@
z-index: 300;
}
-.network.panel .network-timeline-grid.small .network-event-divider {
+.network-sidebar .network-timeline-grid.small .network-event-divider {
top: 23px;
}
@@ -419,40 +419,40 @@
background-color: rgba(0, 0, 255, 0.5);
}
-.network.panel .resources-dividers {
+.network-sidebar .resources-dividers {
z-index: 0;
}
-.network.panel .resources-dividers-label-bar {
+.network-sidebar .resources-dividers-label-bar {
background-color: transparent;
border: none;
height: 30px;
pointer-events: none;
}
-.network.panel .network-timeline-grid.small .resources-dividers-label-bar {
+.network-sidebar .network-timeline-grid.small .resources-dividers-label-bar {
height: 23px;
}
-.network.panel .resources-divider-label {
+.network-sidebar .resources-divider-label {
top: 0px;
margin-top: -4px;
color: black;
}
-.network.panel .resources-dividers-label-bar .resources-divider {
+.network-sidebar .resources-dividers-label-bar .resources-divider {
top: 23px;
}
-.network.panel .network-timeline-grid.small .resources-dividers-label-bar .resources-divider {
+.network-sidebar .network-timeline-grid.small .resources-dividers-label-bar .resources-divider {
top: 15px;
}
-.network.panel .resources-divider.first .resources-divider-label {
+.network-sidebar .resources-divider.first .resources-divider-label {
display: none;
}
-.network.panel .resources-dividers-label-bar .resources-divider.first {
+.network-sidebar .resources-dividers-label-bar .resources-divider.first {
background-color: transparent;
}
@@ -505,14 +505,14 @@
white-space: pre;
}
-.network.panel .data-grid td.network-summary {
+.network-sidebar .data-grid td.network-summary {
padding: 0;
}
/* Viewer */
-.network.panel.viewing-resource .data-grid td,
-.network.panel.viewing-resource .data-grid th {
+.network.panel.viewing-resource .network-sidebar .data-grid td,
+.network.panel.viewing-resource .network-sidebar .data-grid th {
border-right: none;
}
@@ -562,16 +562,16 @@
display: block;
}
-.network.panel .data-grid.full-grid-mode .viewer-column {
+.network-sidebar .data-grid.full-grid-mode .viewer-column {
display: none;
}
-.network.panel .data-grid.brief-grid-mode .viewer-column,
-.network.panel .data-grid.brief-grid-mode .method-column,
-.network.panel .data-grid.brief-grid-mode .status-column,
-.network.panel .data-grid.brief-grid-mode .type-column,
-.network.panel .data-grid.brief-grid-mode .size-column,
-.network.panel .data-grid.brief-grid-mode .time-column {
+.network-sidebar .data-grid.brief-grid-mode .viewer-column,
+.network-sidebar .data-grid.brief-grid-mode .method-column,
+.network-sidebar .data-grid.brief-grid-mode .status-column,
+.network-sidebar .data-grid.brief-grid-mode .type-column,
+.network-sidebar .data-grid.brief-grid-mode .size-column,
+.network-sidebar .data-grid.brief-grid-mode .time-column {
display: none;
}
@@ -579,12 +579,12 @@
display: none;
}
-.network.panel .data-grid.viewing-resource-mode .method-column,
-.network.panel .data-grid.viewing-resource-mode .status-column,
-.network.panel .data-grid.viewing-resource-mode .type-column,
-.network.panel .data-grid.viewing-resource-mode .size-column,
-.network.panel .data-grid.viewing-resource-mode .time-column,
-.network.panel .data-grid.viewing-resource-mode .timeline-column {
+.network-sidebar .data-grid.viewing-resource-mode .method-column,
+.network-sidebar .data-grid.viewing-resource-mode .status-column,
+.network-sidebar .data-grid.viewing-resource-mode .type-column,
+.network-sidebar .data-grid.viewing-resource-mode .size-column,
+.network-sidebar .data-grid.viewing-resource-mode .time-column,
+.network-sidebar .data-grid.viewing-resource-mode .timeline-column {
display: none;
}
@@ -600,7 +600,7 @@
display: none;
}
-.network.panel.viewing-resource .data-grid-resizer {
+.network.panel.viewing-resource .network-sidebar .data-grid-resizer {
display: none;
}
@@ -609,19 +609,17 @@
padding-top: 5px;
}
-#network-views .resource-view.headers-visible .resource-view-content {
- top: 31px;
-}
-
-#network-views.small .resource-view.headers-visible .resource-view-content {
- top: 23px;
-}
-
-#network-views .resource-view-headers {
+#network-views .resource-view-headers,
+#network-views .resource-view-content,
+#network-views .resource-view-cookies
+{
top: 31px;
}
-#network-views.small .resource-view-headers {
+#network-views.small .resource-view-headers,
+#network-views.small .resource-view-content,
+#network-views.small .resource-view-cookies
+{
top: 23px;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list