[webkit-changes] [147198] trunk/Source/WebCore
Title: [147198] trunk/Source/WebCore
Revision 147198
Author eus...@chromium.org
Date 2013-03-28 23:31:25 -0700 (Thu, 28 Mar 2013)
Log Message
Web Inspector: [Cookies] CookiesTable should integrate with DataGrid context menu.
https://bugs.webkit.org/show_bug.cgi?id=113496
Reviewed by Pavel Feldman.
Integrate CookiesTable with DataGrid context menu
instead of overriding it.
* inspector/front-end/CookiesTable.js:
Pass context menu callback to DataGrid constructor.
* inspector/front-end/DataGrid.js:
Added context menu callback constructor parameter. Fixed JSDoc.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/CookiesTable.js
trunk/Source/WebCore/inspector/front-end/DataGrid.js
Diff
Modified: trunk/Source/WebCore/ChangeLog (147197 => 147198)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 05:53:14 UTC (rev 147197)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 06:31:25 UTC (rev 147198)
@@ -1,3 +1,18 @@
+2013-03-28 Eugene Klyuchnikov eus...@chromium.org
+
+Web Inspector: [Cookies] CookiesTable should integrate with DataGrid context menu.
+https://bugs.webkit.org/show_bug.cgi?id=113496
+
+Reviewed by Pavel Feldman.
+
+Integrate CookiesTable with DataGrid context menu
+instead of overriding it.
+
+* inspector/front-end/CookiesTable.js:
+Pass context menu callback to DataGrid constructor.
+* inspector/front-end/DataGrid.js:
+Added context menu callback constructor parameter. Fixed JSDoc.
+
2013-03-28 Philip Rogers p...@google.com
Fix compiler warning in IDBTransaction::modeToString
Modified: trunk/Source/WebCore/inspector/front-end/CookiesTable.js (147197 => 147198)
--- trunk/Source/WebCore/inspector/front-end/CookiesTable.js 2013-03-29 05:53:14 UTC (rev 147197)
+++ trunk/Source/WebCore/inspector/front-end/CookiesTable.js 2013-03-29 06:31:25 UTC (rev 147198)
@@ -55,11 +55,9 @@
];
if (readOnly)
-this._dataGrid = new WebInspector.DataGrid(columns, null, null, refreshCallback);
-else {
this._dataGrid = new WebInspector.DataGrid(columns);
-this._dataGrid.element.addEventListener(contextmenu, this._handleContextMenuEvent.bind(this), true);
-}
+else
+this._dataGrid = new WebInspector.DataGrid(columns, undefined, this._onDeleteCookie.bind(this), refreshCallback, this._onContextMenu.bind(this));
this._dataGrid.addEventListener(WebInspector.DataGrid.Events.SortingChanged, this._rebuildTable, this);
@@ -85,35 +83,22 @@
_clearAndRefresh: function(domain)
{
this.clear(domain);
-if (this._refreshCallback)
-this._refreshCallback();
+this._refresh();
},
-_handleContextMenuEvent: function(event)
+/**
+ * @param {!WebInspector.ContextMenu} contextMenu
+ * @param {WebInspector.DataGridNode} node
+ */
+_onContextMenu: function(contextMenu, node)
{
-var gridNode = this._dataGrid.dataGridNodeFromNode(event.target);
-
-if (!gridNode)
+if (node === this._dataGrid.creationNode)
return;
-
-var contextMenu = new WebInspector.ContextMenu(event);
-var cookie = gridNode.cookie;
-
-if (this._refreshCallback)
-contextMenu.appendItem(WebInspector.UIString(Refresh), this._refreshCallback);
-
-if (cookie) {
-contextMenu.appendItem(WebInspector.UIString(Delete), this._onDeleteCookie.bind(this, gridNode));
-contextMenu.appendSeparator();
-var cookieDomain = cookie.domain();
-
-contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? Clear all from \%s\ : Clear All from \%s\, cookieDomain), this._clearAndRefresh.bind(this, cookieDomain));
-} else
-contextMenu.appendSeparator();
-
+var cookie = node.cookie;
+var domain = cookie.domain();
+if (domain)
+contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? Clear all from \%s\ : Clear All from \%s\, domain), this._clearAndRefresh.bind(this, domain));
contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? Clear all : Clear All), this._clearAndRefresh.bind(this, null));
-
-contextMenu.show();
},
/**
@@ -290,6 +275,11 @@
if (neighbour)
this._nextSelectedCookie = neighbour.cookie;
cookie.remove();
+this._refresh();
+},
+
+_refresh: function()
+{
if (this._refreshCallback)
this._refreshCallback();
},
Modified: trunk/Source/WebCore/inspector/front-end/DataGrid.js (147197 => 147198)
--- trunk/Source/WebCore/inspector/front-end/DataGrid.js 2013-03-29 05:53:14 UTC (rev 147197)
+++ trunk/Source/WebCore/inspector/front-end/DataGrid.js 2013-03-29 06:31:25 UTC (rev 147198)
@@ -27,11 +27,12 @@
* @constructor
* @extends
[webkit-changes] [147199] trunk
Title: [147199] trunk
Revision 147199
Author commit-qu...@webkit.org
Date 2013-03-29 00:36:58 -0700 (Fri, 29 Mar 2013)
Log Message
REGRESSION(r143102): Ignore table cell's height attribute when checking if containing block has auto height.
https://bugs.webkit.org/show_bug.cgi?id=113526
Source/WebCore:
It matches shipping Safari and Firefox behaviour.
Patch by Zalan Bujtas za...@apple.com on 2013-03-29
Reviewed by Antti Koivisto.
Test: fast/replaced/iframe-with-percentage-height-within-table-with-table-cell-ignore-height.html
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight):
LayoutTests:
Patch by Zalan Bujtas za...@apple.com on 2013-03-29
Reviewed by Antti Koivisto.
* fast/replaced/iframe-with-percentage-height-within-table-with-table-cell-ignore-height-expected.txt: Added.
* fast/replaced/iframe-with-percentage-height-within-table-with-table-cell-ignore-height.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp
Added Paths
trunk/LayoutTests/fast/replaced/iframe-with-percentage-height-within-table-with-table-cell-ignore-height-expected.txt
trunk/LayoutTests/fast/replaced/iframe-with-percentage-height-within-table-with-table-cell-ignore-height.html
Diff
Modified: trunk/LayoutTests/ChangeLog (147198 => 147199)
--- trunk/LayoutTests/ChangeLog 2013-03-29 06:31:25 UTC (rev 147198)
+++ trunk/LayoutTests/ChangeLog 2013-03-29 07:36:58 UTC (rev 147199)
@@ -1,3 +1,13 @@
+2013-03-29 Zalan Bujtas za...@apple.com
+
+REGRESSION(r143102): Ignore table cell's height attribute when checking if containing block has auto height.
+https://bugs.webkit.org/show_bug.cgi?id=113526
+
+Reviewed by Antti Koivisto.
+
+* fast/replaced/iframe-with-percentage-height-within-table-with-table-cell-ignore-height-expected.txt: Added.
+* fast/replaced/iframe-with-percentage-height-within-table-with-table-cell-ignore-height.html: Added.
+
2013-03-28 Sheriff Bot webkit.review@gmail.com
Unreviewed, rolling out r147123.
Added: trunk/LayoutTests/fast/replaced/iframe-with-percentage-height-within-table-with-table-cell-ignore-height-expected.txt (0 => 147199)
--- trunk/LayoutTests/fast/replaced/iframe-with-percentage-height-within-table-with-table-cell-ignore-height-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/replaced/iframe-with-percentage-height-within-table-with-table-cell-ignore-height-expected.txt 2013-03-29 07:36:58 UTC (rev 147199)
@@ -0,0 +1,10 @@
+This test checks that iframe with percentage height within table cell ignores the table cell height attribute (strict mode).
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+PASS getHeight('iframe-100') is window.innerHeight
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/fast/replaced/iframe-with-percentage-height-within-table-with-table-cell-ignore-height.html (0 => 147199)
--- trunk/LayoutTests/fast/replaced/iframe-with-percentage-height-within-table-with-table-cell-ignore-height.html (rev 0)
+++ trunk/LayoutTests/fast/replaced/iframe-with-percentage-height-within-table-with-table-cell-ignore-height.html 2013-03-29 07:36:58 UTC (rev 147199)
@@ -0,0 +1,71 @@
+!DOCTYPE html
+html
+head
+
+script src=""
+script
+if (window.testRunner) {
+testRunner.waitUntilDone();
+testRunner.dumpAsText();
+}
+
+function getComputedStyleForElement(element, cssPropertyName)
+{
+if (!element) {
+return null;
+}
+if (window.getComputedStyle) {
+return window.getComputedStyle(element, '').getPropertyValue(cssPropertyName.replace(/([A-Z])/g, -$1).toLowerCase());
+}
+if (element.currentStyle) {
+return element.currentStyle[cssPropertyName];
+}
+return null;
+}
+
+function parsePixelValue(str)
+{
+if (typeof str != string || str.length 3 || str.substr(str.length - 2) != px) {
+testFailed(str + is unparsable.);
+return -1;
+}
+return parseFloat(str);
+}
+
+function getHeight(id)
+{
+return parsePixelValue(getComputedStyleForElement(document.getElementById(id), 'height'));
+}
+
+function test()
+{
+description(This test checks that iframe with percentage height within table cell ignores the table cell height attribute (strict mode).);
+
+shouldBe(getHeight('iframe-100'), window.innerHeight);
+
+isSuccessfullyParsed();
+
+if (window.testRunner) {
+testRunner.notifyDone();
+}
+}
+/script
+
+style
+html, body { height: 100%; margin: 0px; }
+iframe { height: 100%;}
+/style
+/head
+
+body _onload_=test()
+p id=description/p
+div id=console/div
+div style='height: 100%; display:table;'
+div style='height: 100%; display:table-row;'
+div style='display:table-cell;'
+iframe id='iframe-100' frameborder='0px'
[webkit-changes] [147200] trunk/LayoutTests
Title: [147200] trunk/LayoutTests Revision 147200 Author commit-qu...@webkit.org Date 2013-03-29 00:59:39 -0700 (Fri, 29 Mar 2013) Log Message [EFL] New baselines for accessibility tests. https://bugs.webkit.org/show_bug.cgi?id=113510 Unreviewed, EFL gardening. Patch by Krzysztof Czech k.cz...@samsung.com on 2013-03-29 * platform/efl-wk1/TestExpectations: * platform/efl-wk2/TestExpectations: * platform/efl/accessibility/adjacent-continuations-cause-assertion-failure-expected.txt: Added. * platform/efl/accessibility/aria-checkbox-text-expected.txt: Added. * platform/efl/accessibility/aria-combobox-expected.txt: Added. * platform/efl/accessibility/aria-fallback-roles-expected.txt: Added. * platform/efl/accessibility/aria-labelledby-overrides-aria-label-expected.txt: Added. * platform/efl/accessibility/aria-menubar-menuitems-expected.txt: Added. * platform/efl/accessibility/aria-roles-expected.txt: Added. * platform/efl/accessibility/aria-tables-expected.txt: Added. * platform/efl/accessibility/aria-toggle-button-with-title-expected.txt: Added. * platform/efl/accessibility/canvas-description-and-role-expected.txt: Added. * platform/efl/accessibility/div-within-anchors-causes-crash-expected.txt: Added. * platform/efl/accessibility/image-link-expected.txt: Added. * platform/efl/accessibility/image-map1-expected.txt: Added. * platform/efl/accessibility/image-map2-expected.txt: Added. * platform/efl/accessibility/img-alt-tag-only-whitespace-expected.txt: Added. * platform/efl/accessibility/legend-expected.txt: Added. * platform/efl/accessibility/menu-list-sends-change-notification-expected.txt: Added. * platform/efl/accessibility/notification-listeners-expected.txt: Added. * platform/efl/accessibility/svg-image-expected.txt: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/efl-wk1/TestExpectations trunk/LayoutTests/platform/efl-wk2/TestExpectations Added Paths trunk/LayoutTests/platform/efl/accessibility/adjacent-continuations-cause-assertion-failure-expected.txt trunk/LayoutTests/platform/efl/accessibility/aria-checkbox-text-expected.txt trunk/LayoutTests/platform/efl/accessibility/aria-combobox-expected.txt trunk/LayoutTests/platform/efl/accessibility/aria-fallback-roles-expected.txt trunk/LayoutTests/platform/efl/accessibility/aria-labelledby-overrides-aria-label-expected.txt trunk/LayoutTests/platform/efl/accessibility/aria-menubar-menuitems-expected.txt trunk/LayoutTests/platform/efl/accessibility/aria-roles-expected.txt trunk/LayoutTests/platform/efl/accessibility/aria-tables-expected.txt trunk/LayoutTests/platform/efl/accessibility/aria-toggle-button-with-title-expected.txt trunk/LayoutTests/platform/efl/accessibility/canvas-description-and-role-expected.txt trunk/LayoutTests/platform/efl/accessibility/div-within-anchors-causes-crash-expected.txt trunk/LayoutTests/platform/efl/accessibility/image-link-expected.txt trunk/LayoutTests/platform/efl/accessibility/image-map1-expected.txt trunk/LayoutTests/platform/efl/accessibility/image-map2-expected.txt trunk/LayoutTests/platform/efl/accessibility/img-alt-tag-only-whitespace-expected.txt trunk/LayoutTests/platform/efl/accessibility/legend-expected.txt trunk/LayoutTests/platform/efl/accessibility/menu-list-sends-change-notification-expected.txt trunk/LayoutTests/platform/efl/accessibility/notification-listeners-expected.txt trunk/LayoutTests/platform/efl/accessibility/svg-image-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (147199 => 147200) --- trunk/LayoutTests/ChangeLog 2013-03-29 07:36:58 UTC (rev 147199) +++ trunk/LayoutTests/ChangeLog 2013-03-29 07:59:39 UTC (rev 147200) @@ -1,3 +1,32 @@ +2013-03-29 Krzysztof Czech k.cz...@samsung.com + +[EFL] New baselines for accessibility tests. +https://bugs.webkit.org/show_bug.cgi?id=113510 + +Unreviewed, EFL gardening. + +* platform/efl-wk1/TestExpectations: +* platform/efl-wk2/TestExpectations: +* platform/efl/accessibility/adjacent-continuations-cause-assertion-failure-expected.txt: Added. +* platform/efl/accessibility/aria-checkbox-text-expected.txt: Added. +* platform/efl/accessibility/aria-combobox-expected.txt: Added. +* platform/efl/accessibility/aria-fallback-roles-expected.txt: Added. +* platform/efl/accessibility/aria-labelledby-overrides-aria-label-expected.txt: Added. +* platform/efl/accessibility/aria-menubar-menuitems-expected.txt: Added. +* platform/efl/accessibility/aria-roles-expected.txt: Added. +* platform/efl/accessibility/aria-tables-expected.txt: Added. +* platform/efl/accessibility/aria-toggle-button-with-title-expected.txt: Added. +* platform/efl/accessibility/canvas-description-and-role-expected.txt: Added. +* platform/efl/accessibility/div-within-anchors-causes-crash-expected.txt: Added. +* platform/efl/accessibility/image-link-expected.txt: Added. +*
[webkit-changes] [147201] trunk/LayoutTests
Title: [147201] trunk/LayoutTests
Revision 147201
Author zandober...@gmail.com
Date 2013-03-29 01:51:57 -0700 (Fri, 29 Mar 2013)
Log Message
Unreviewed GTK gardening.
* platform/gtk/TestExpectations: Adding a crashing expectation for the
ttp/tests/security/XFrameOptions/x-frame-options-deny-multiple-clients.html layout test. Skipping the perf/ tests when
using the debug build.
* platform/gtk/fast/text/shaping/shaping-selection-rect-expected.txt: Rebaselining after r147156.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/gtk/TestExpectations
trunk/LayoutTests/platform/gtk/fast/text/shaping/shaping-selection-rect-expected.txt
Diff
Modified: trunk/LayoutTests/ChangeLog (147200 => 147201)
--- trunk/LayoutTests/ChangeLog 2013-03-29 07:59:39 UTC (rev 147200)
+++ trunk/LayoutTests/ChangeLog 2013-03-29 08:51:57 UTC (rev 147201)
@@ -1,3 +1,12 @@
+2013-03-29 Zan Dobersek zdober...@igalia.com
+
+Unreviewed GTK gardening.
+
+* platform/gtk/TestExpectations: Adding a crashing expectation for the
+ttp/tests/security/XFrameOptions/x-frame-options-deny-multiple-clients.html layout test. Skipping the perf/ tests when
+using the debug build.
+* platform/gtk/fast/text/shaping/shaping-selection-rect-expected.txt: Rebaselining after r147156.
+
2013-03-29 Krzysztof Czech k.cz...@samsung.com
[EFL] New baselines for accessibility tests.
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (147200 => 147201)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2013-03-29 07:59:39 UTC (rev 147200)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2013-03-29 08:51:57 UTC (rev 147201)
@@ -429,6 +429,9 @@
# Snapshotted plugins not enabled
webkit.org/b/98696 plugins/snapshotting [ Skip ]
+# Skip the perf/ tests in debug builds
+Bug(GTK) [ Debug ] perf [ Skip ]
+
#
# End of Expected failures
#
@@ -500,6 +503,8 @@
webkit.org/b/113019 [ Debug ] storage/indexeddb/factory-basics-workers.html [ Crash ]
webkit.org/b/113019 [ Debug ] storage/indexeddb/transaction-error.html [ Crash ]
+webkit.org/b/111902 [ Debug ] http/tests/security/XFrameOptions/x-frame-options-deny-multiple-clients.html [ Crash ]
+
#
# End of Crashing tests
#
Modified: trunk/LayoutTests/platform/gtk/fast/text/shaping/shaping-selection-rect-expected.txt (147200 => 147201)
--- trunk/LayoutTests/platform/gtk/fast/text/shaping/shaping-selection-rect-expected.txt 2013-03-29 07:59:39 UTC (rev 147200)
+++ trunk/LayoutTests/platform/gtk/fast/text/shaping/shaping-selection-rect-expected.txt 2013-03-29 08:51:57 UTC (rev 147201)
@@ -4,8 +4,8 @@
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x18
-RenderText {#text} at (0,0) size 606x19
- text run at (0,0) width 606: The selection should cover the all of the below text. There should be no blank between C and F.
+RenderText {#text} at (0,0) size 645x19
+ text run at (0,0) width 645: The selection should cover the all of the below text. There should be no blank between either C and F.
RenderBlock {DIV} at (0,34) size 784x18
RenderText {#text} at (0,0) size 34x19
text run at (0,0) width 34: ABC
@@ -14,5 +14,13 @@
text run at (34,0) width 31 RTL override: DEF
RenderText {#text} at (65,0) size 29x19
text run at (65,0) width 29: GHI
+ RenderBlock {DIV} at (0,52) size 784x18
+RenderText {#text} at (0,0) size 34x19
+ text run at (0,0) width 34: ABC
+RenderInline {SPAN} at (0,0) size 31x19
+ RenderText {#text} at (34,0) size 31x19
+text run at (34,0) width 31 RTL override: DEF
+RenderText {#text} at (65,0) size 29x19
+ text run at (65,0) width 29: GHI
selection start: position 1 of child 0 {#text} of child 2 {DIV} of body
-selection end: position 3 of child 2 {#text} of child 2 {DIV} of body
+selection end: position 3 of child 2 {#text} of child 4 {DIV} of body
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147202] trunk/Source/WebCore
Title: [147202] trunk/Source/WebCore
Revision 147202
Author ca...@chromium.org
Date 2013-03-29 02:25:37 -0700 (Fri, 29 Mar 2013)
Log Message
Web Inspector: generalize InspectorDOMAgent::highlightRect() to highlightQuad()
https://bugs.webkit.org/show_bug.cgi?id=112911
Reviewed by Pavel Feldman.
- added Quad type and DOMAgent.highlightQuad() to protocol;
- retained DOMAgent.highlightRect(), but implement it via highlightQuad.
* inspector/Inspector.json:
* inspector/InspectorDOMAgent.cpp:
(WebCore::parseQuad):
(WebCore):
(WebCore::InspectorDOMAgent::highlightRect):
(WebCore::InspectorDOMAgent::highlightQuad):
(WebCore::InspectorDOMAgent::innerHighlightQuad):
* inspector/InspectorDOMAgent.h:
(InspectorDOMAgent):
* inspector/InspectorOverlay.cpp: Mostly just renames of rect to quad.
(WebCore::InspectorOverlay::paint):
(WebCore::InspectorOverlay::getHighlight):
(WebCore::InspectorOverlay::hideHighlight):
(WebCore::InspectorOverlay::highlightQuad):
(WebCore::InspectorOverlay::update):
(WebCore::InspectorOverlay::drawQuadHighlight):
(WebCore::InspectorOverlay::reportMemoryUsage):
* inspector/InspectorOverlay.h:
(InspectorOverlay):
* inspector/InspectorOverlayPage.html: Ditto.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/Inspector.json
trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp
trunk/Source/WebCore/inspector/InspectorDOMAgent.h
trunk/Source/WebCore/inspector/InspectorOverlay.cpp
trunk/Source/WebCore/inspector/InspectorOverlay.h
trunk/Source/WebCore/inspector/InspectorOverlayPage.html
Diff
Modified: trunk/Source/WebCore/ChangeLog (147201 => 147202)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 08:51:57 UTC (rev 147201)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 09:25:37 UTC (rev 147202)
@@ -1,3 +1,34 @@
+2013-03-21 Andrey Kosyakov ca...@chromium.org
+
+Web Inspector: generalize InspectorDOMAgent::highlightRect() to highlightQuad()
+https://bugs.webkit.org/show_bug.cgi?id=112911
+
+Reviewed by Pavel Feldman.
+
+- added Quad type and DOMAgent.highlightQuad() to protocol;
+- retained DOMAgent.highlightRect(), but implement it via highlightQuad.
+
+* inspector/Inspector.json:
+* inspector/InspectorDOMAgent.cpp:
+(WebCore::parseQuad):
+(WebCore):
+(WebCore::InspectorDOMAgent::highlightRect):
+(WebCore::InspectorDOMAgent::highlightQuad):
+(WebCore::InspectorDOMAgent::innerHighlightQuad):
+* inspector/InspectorDOMAgent.h:
+(InspectorDOMAgent):
+* inspector/InspectorOverlay.cpp: Mostly just renames of rect to quad.
+(WebCore::InspectorOverlay::paint):
+(WebCore::InspectorOverlay::getHighlight):
+(WebCore::InspectorOverlay::hideHighlight):
+(WebCore::InspectorOverlay::highlightQuad):
+(WebCore::InspectorOverlay::update):
+(WebCore::InspectorOverlay::drawQuadHighlight):
+(WebCore::InspectorOverlay::reportMemoryUsage):
+* inspector/InspectorOverlay.h:
+(InspectorOverlay):
+* inspector/InspectorOverlayPage.html: Ditto.
+
2013-03-29 Zalan Bujtas za...@apple.com
REGRESSION(r143102): Ignore table cell's height attribute when checking if containing block has auto height.
Modified: trunk/Source/WebCore/inspector/Inspector.json (147201 => 147202)
--- trunk/Source/WebCore/inspector/Inspector.json 2013-03-29 08:51:57 UTC (rev 147201)
+++ trunk/Source/WebCore/inspector/Inspector.json 2013-03-29 09:25:37 UTC (rev 147202)
@@ -1769,6 +1769,14 @@
description: A structure holding an RGBA color.
},
{
+id: Quad,
+type: array,
+items: { type: number },
+minItems: 8,
+maxItems: 8,
+description: An array of quad vertices, x immediately followed by y for each point, points clock-wise.
+},
+{
id: HighlightConfig,
type: object,
properties: [
@@ -1966,6 +1974,15 @@
description: Highlights given rectangle. Coordinates are absolute with respect to the main frame viewport.
},
{
+name: highlightQuad,
+parameters: [
+{ name: quad, $ref: Quad, description: Quad to highlight },
+{ name: color, $ref: RGBA, optional: true, description: The highlight fill color (default: transparent). },
+{ name: outlineColor, $ref: RGBA, optional: true, description: The highlight outline color (default: transparent). }
+],
+description: Highlights given quad. Coordinates are absolute with respect to the main frame viewport.
+},
+{
name: highlightNode,
parameters: [
{ name: highlightConfig, $ref: HighlightConfig, description: A descriptor for
[webkit-changes] [147204] trunk
Title: [147204] trunk
Revision 147204
Author ca...@chromium.org
Date 2013-03-29 02:44:53 -0700 (Fri, 29 Mar 2013)
Log Message
Web Inspector: timeline paint rectangles are off for transformed layers
https://bugs.webkit.org/show_bug.cgi?id=112919
Reviewed by Pavel Feldman.
Source/WebCore:
- pass RenderObject instead of Frame to InspectorInstrumentation::didPaint;
- take transforms into account and convert paint clip rect into quad;
- emit quads, not rects as Paint and Layout record data;
- adjust client to using quads, compute width/height from quad coords.
* inspector/InspectorInstrumentation.cpp: Pass RenderObject, not frame to {will,did}Paint.
(WebCore):
(WebCore::InspectorInstrumentation::willPaintImpl):
(WebCore::InspectorInstrumentation::didPaintImpl):
(WebCore::InspectorInstrumentation::instrumentingAgentsForRenderer): Added.
* inspector/InspectorInstrumentation.h:
(WebCore):
(InspectorInstrumentation):
(WebCore::InspectorInstrumentation::willPaint):
(WebCore::InspectorInstrumentation::didPaint):
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::didLayout):
(WebCore::InspectorTimelineAgent::didPaint):
(WebCore::InspectorTimelineAgent::localToPageQuad): Convert local clip rect to transformed quad.
(WebCore):
* inspector/InspectorTimelineAgent.h:
(WebCore):
(InspectorTimelineAgent):
* inspector/TimelineRecordFactory.cpp: Emit quads as Paint and Layout records data.
(WebCore::createQuad):
(WebCore):
(WebCore::TimelineRecordFactory::createPaintData):
(WebCore::TimelineRecordFactory::createLayoutData):
* inspector/TimelineRecordFactory.h:
(WebCore):
(TimelineRecordFactory):
* inspector/front-end/TimelinePanel.js: Highlight a quad iff formatted record has highlightQuad field.
(WebInspector.TimelinePanel.prototype._mouseOut):
(WebInspector.TimelinePanel.prototype._mouseMove):
(WebInspector.TimelinePanel.prototype._highlightQuad):
(WebInspector.TimelinePanel.prototype._hideQuadHighlight):
* inspector/front-end/TimelinePresentationModel.js:
(WebInspector.TimelinePresentationModel.Record): Set highlightQuad for Paint and Layout
(WebInspector.TimelinePresentationModel.Record.prototype._generatePopupContentWithImagePreview):
(WebInspector.TimelinePresentationModel.Record.prototype._getRecordDetails):
(WebInspector.TimelinePresentationModel.quadWidth):
(WebInspector.TimelinePresentationModel.quadHeight):
* page/FrameView.cpp:
(WebCore::FrameView::paintContents):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::paintContents):
LayoutTests:
- adjust to changed record format;
- simplify test using InspectorTest.evaluateWithTimeline().
* http/tests/inspector/timeline-test.js:
* inspector/timeline/timeline-layout-expected.txt:
* inspector/timeline/timeline-paint-expected.txt:
* inspector/timeline/timeline-paint.html:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/http/tests/inspector/timeline-test.js
trunk/LayoutTests/inspector/timeline/timeline-layout-expected.txt
trunk/LayoutTests/inspector/timeline/timeline-paint-expected.txt
trunk/LayoutTests/inspector/timeline/timeline-paint.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp
trunk/Source/WebCore/inspector/InspectorInstrumentation.h
trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp
trunk/Source/WebCore/inspector/InspectorTimelineAgent.h
trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp
trunk/Source/WebCore/inspector/TimelineRecordFactory.h
trunk/Source/WebCore/inspector/front-end/TimelinePanel.js
trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js
trunk/Source/WebCore/page/FrameView.cpp
trunk/Source/WebCore/rendering/RenderLayerBacking.cpp
Diff
Modified: trunk/LayoutTests/ChangeLog (147203 => 147204)
--- trunk/LayoutTests/ChangeLog 2013-03-29 09:33:41 UTC (rev 147203)
+++ trunk/LayoutTests/ChangeLog 2013-03-29 09:44:53 UTC (rev 147204)
@@ -1,3 +1,18 @@
+2013-03-22 Andrey Kosyakov ca...@chromium.org
+
+Web Inspector: timeline paint rectangles are off for transformed layers
+https://bugs.webkit.org/show_bug.cgi?id=112919
+
+Reviewed by Pavel Feldman.
+
+- adjust to changed record format;
+- simplify test using InspectorTest.evaluateWithTimeline().
+
+* http/tests/inspector/timeline-test.js:
+* inspector/timeline/timeline-layout-expected.txt:
+* inspector/timeline/timeline-paint-expected.txt:
+* inspector/timeline/timeline-paint.html:
+
2013-03-29 Zoltan Arvai zar...@inf.u-szeged.hu
[Qt] Unreviewed gardening.
Modified: trunk/LayoutTests/http/tests/inspector/timeline-test.js (147203 => 147204)
--- trunk/LayoutTests/http/tests/inspector/timeline-test.js 2013-03-29 09:33:41 UTC (rev 147203)
+++ trunk/LayoutTests/http/tests/inspector/timeline-test.js 2013-03-29 09:44:53 UTC (rev 147204)
@@ -4,10 +4,8 @@
InspectorTest.timelinePropertyFormatters = {
children: formatAsTypeName,
endTime: formatAsTypeName,
-height:
[webkit-changes] [147206] trunk/Source/WebCore
Title: [147206] trunk/Source/WebCore
Revision 147206
Author ph...@webkit.org
Date 2013-03-29 04:28:54 -0700 (Fri, 29 Mar 2013)
Log Message
[GStreamer] playback gets bumpy sometimes when on-disk buffering is slow
https://bugs.webkit.org/show_bug.cgi?id=113512
Reviewed by Martin Robinson.
When the HTTP source element is slow downloading data for on-disk
buffering the playback position might reach an unbuffered region
and have bad consequences, pausing the pipeline beforehand
prevents this case to happen.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::processBufferingStats):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (147205 => 147206)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 09:59:09 UTC (rev 147205)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 11:28:54 UTC (rev 147206)
@@ -1,3 +1,18 @@
+2013-03-28 Philippe Normand pnorm...@igalia.com
+
+[GStreamer] playback gets bumpy sometimes when on-disk buffering is slow
+https://bugs.webkit.org/show_bug.cgi?id=113512
+
+Reviewed by Martin Robinson.
+
+When the HTTP source element is slow downloading data for on-disk
+buffering the playback position might reach an unbuffered region
+and have bad consequences, pausing the pipeline beforehand
+prevents this case to happen.
+
+* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+(WebCore::MediaPlayerPrivateGStreamer::processBufferingStats):
+
2013-03-29 Keishi Hattori kei...@webkit.org
Add the event handler content attributes that are defined in the spec to HTMLElement
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (147205 => 147206)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2013-03-29 09:59:09 UTC (rev 147205)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2013-03-29 11:28:54 UTC (rev 147206)
@@ -802,6 +802,11 @@
m_fillTimer.startRepeating(0.2);
}
+
+if (!m_paused m_bufferingPercentage 100) {
+LOG_MEDIA_MESSAGE([Buffering] Download in progress, pausing pipeline.);
+gst_element_set_state(m_playBin.get(), GST_STATE_PAUSED);
+}
}
void MediaPlayerPrivateGStreamer::fillTimerFired(TimerMediaPlayerPrivateGStreamer*)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147208] trunk/Source/WebCore
Title: [147208] trunk/Source/WebCore
Revision 147208
Author ca...@chromium.org
Date 2013-03-29 05:31:19 -0700 (Fri, 29 Mar 2013)
Log Message
Web Inspector: assign Scroll events to rendering category (was painting)
https://bugs.webkit.org/show_bug.cgi?id=113564
Reviewed by Pavel Feldman.
* inspector/front-end/TimelinePresentationModel.js: /ScrollLayer.*category/s/painting/rendering/
(WebInspector.TimelinePresentationModel._initRecordStyles):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js
Diff
Modified: trunk/Source/WebCore/ChangeLog (147207 => 147208)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 12:27:18 UTC (rev 147207)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 12:31:19 UTC (rev 147208)
@@ -1,3 +1,13 @@
+2013-03-29 Andrey Kosyakov ca...@chromium.org
+
+Web Inspector: assign Scroll events to rendering category (was painting)
+https://bugs.webkit.org/show_bug.cgi?id=113564
+
+Reviewed by Pavel Feldman.
+
+* inspector/front-end/TimelinePresentationModel.js: /ScrollLayer.*category/s/painting/rendering/
+(WebInspector.TimelinePresentationModel._initRecordStyles):
+
2013-03-28 Philippe Normand pnorm...@igalia.com
[GStreamer] playback gets bumpy sometimes when on-disk buffering is slow
Modified: trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js (147207 => 147208)
--- trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js 2013-03-29 12:27:18 UTC (rev 147207)
+++ trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js 2013-03-29 12:31:19 UTC (rev 147208)
@@ -77,7 +77,7 @@
recordStyles[recordTypes.Layout] = { title: WebInspector.UIString(Layout), category: categories[rendering] };
recordStyles[recordTypes.Paint] = { title: WebInspector.UIString(Paint), category: categories[painting] };
recordStyles[recordTypes.Rasterize] = { title: WebInspector.UIString(Rasterize), category: categories[painting] };
-recordStyles[recordTypes.ScrollLayer] = { title: WebInspector.UIString(Scroll), category: categories[painting] };
+recordStyles[recordTypes.ScrollLayer] = { title: WebInspector.UIString(Scroll), category: categories[rendering] };
recordStyles[recordTypes.DecodeImage] = { title: WebInspector.UIString(Image Decode), category: categories[painting] };
recordStyles[recordTypes.ResizeImage] = { title: WebInspector.UIString(Image Resize), category: categories[painting] };
recordStyles[recordTypes.CompositeLayers] = { title: WebInspector.UIString(Composite Layers), category: categories[painting] };
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147209] trunk/Source/WebCore
Title: [147209] trunk/Source/WebCore
Revision 147209
Author commit-qu...@webkit.org
Date 2013-03-29 05:40:28 -0700 (Fri, 29 Mar 2013)
Log Message
Web Inspector: ability to use AnchorBox as an anchor for Popover
https://bugs.webkit.org/show_bug.cgi?id=113563
Patch by Andrey Lushnikov lushni...@chromium.org on 2013-03-29
Reviewed by Pavel Feldman.
No new test: no change in behaviour.
- Ability to pass AnchorBox instead of Element for popover anchor.
* inspector/front-end/Popover.js:
(WebInspector.Popover.prototype._positionElement):
(WebInspector.PopoverHelper.prototype._eventInHoverElement):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/Popover.js
Diff
Modified: trunk/Source/WebCore/ChangeLog (147208 => 147209)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 12:31:19 UTC (rev 147208)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 12:40:28 UTC (rev 147209)
@@ -1,3 +1,18 @@
+2013-03-29 Andrey Lushnikov lushni...@chromium.org
+
+Web Inspector: ability to use AnchorBox as an anchor for Popover
+https://bugs.webkit.org/show_bug.cgi?id=113563
+
+Reviewed by Pavel Feldman.
+
+No new test: no change in behaviour.
+
+- Ability to pass AnchorBox instead of Element for popover anchor.
+
+* inspector/front-end/Popover.js:
+(WebInspector.Popover.prototype._positionElement):
+(WebInspector.PopoverHelper.prototype._eventInHoverElement):
+
2013-03-29 Andrey Kosyakov ca...@chromium.org
Web Inspector: assign Scroll events to rendering category (was painting)
Modified: trunk/Source/WebCore/inspector/front-end/Popover.js (147208 => 147209)
--- trunk/Source/WebCore/inspector/front-end/Popover.js 2013-03-29 12:31:19 UTC (rev 147208)
+++ trunk/Source/WebCore/inspector/front-end/Popover.js 2013-03-29 12:40:28 UTC (rev 147209)
@@ -53,7 +53,7 @@
WebInspector.Popover.prototype = {
/**
* @param {Element} element
- * @param {Element} anchor
+ * @param {Element|AnchorBox} anchor
* @param {?number=} preferredWidth
* @param {?number=} preferredHeight
* @param {?WebInspector.Popover.Orientation=} arrowDirection
@@ -65,7 +65,7 @@
/**
* @param {WebInspector.View} view
- * @param {Element} anchor
+ * @param {Element|AnchorBox} anchor
* @param {?number=} preferredWidth
* @param {?number=} preferredHeight
*/
@@ -77,7 +77,7 @@
/**
* @param {WebInspector.View?} view
* @param {Element} contentElement
- * @param {Element} anchor
+ * @param {Element|AnchorBox} anchor
* @param {?number=} preferredWidth
* @param {?number=} preferredHeight
* @param {?WebInspector.Popover.Orientation=} arrowDirection
@@ -137,6 +137,12 @@
this._contentDiv.addStyleClass(fixed-height);
},
+/**
+ * @param {Element|AnchorBox} anchorElement
+ * @param {number} preferredWidth
+ * @param {number} preferredHeight
+ * @param {?WebInspector.Popover.Orientation=} arrowDirection
+ */
_positionElement: function(anchorElement, preferredWidth, preferredHeight, arrowDirection)
{
const borderWidth = 25;
@@ -150,7 +156,7 @@
const totalWidth = window.innerWidth;
const totalHeight = window.innerHeight;
-var anchorBox = anchorElement.boxInWindow(window);
+var anchorBox = anchorElement instanceof AnchorBox ? anchorElement : anchorElement.boxInWindow(window);
var newElementPosition = { x: 0, y: 0, width: preferredWidth + scrollerWidth, height: preferredHeight };
var verticalAlignment;
@@ -220,7 +226,7 @@
/**
* @constructor
* @param {Element} panelElement
- * @param {function(Element, Event):Element|undefined} getAnchor
+ * @param {function(Element, Event):(Element|AnchorBox)|undefined} getAnchor
* @param {function(Element, WebInspector.Popover):undefined} showPopover
* @param {function()=} onHide
* @param {boolean=} disableOnClick
@@ -252,7 +258,7 @@
{
if (!this._hoverElement)
return false;
-var box = this._hoverElement.boxInWindow();
+var box = this._hoverElement instanceof AnchorBox ? this._hoverElement : this._hoverElement.boxInWindow();
return (box.x = event.clientX event.clientX = box.x + box.width
box.y = event.clientY event.clientY = box.y + box.height);
},
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147210] trunk/Source/WebCore
Title: [147210] trunk/Source/WebCore Revision 147210 Author commit-qu...@webkit.org Date 2013-03-29 05:55:50 -0700 (Fri, 29 Mar 2013) Log Message Fix build warning after r147022 https://bugs.webkit.org/show_bug.cgi?id=113567 Patch by KwangYong Choi ky0.c...@samsung.com on 2013-03-29 Reviewed by Kentaro Hara. Use UNUSED_PARAM macro to fix -Wunused-parameter build warning. No new tests, no change on behavior. * page/EventHandler.cpp: (WebCore::expandSelectionToRespectUserSelectAll): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/page/EventHandler.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (147209 => 147210) --- trunk/Source/WebCore/ChangeLog 2013-03-29 12:40:28 UTC (rev 147209) +++ trunk/Source/WebCore/ChangeLog 2013-03-29 12:55:50 UTC (rev 147210) @@ -1,3 +1,16 @@ +2013-03-29 KwangYong Choi ky0.c...@samsung.com + +Fix build warning after r147022 +https://bugs.webkit.org/show_bug.cgi?id=113567 + +Reviewed by Kentaro Hara. + +Use UNUSED_PARAM macro to fix -Wunused-parameter build warning. +No new tests, no change on behavior. + +* page/EventHandler.cpp: +(WebCore::expandSelectionToRespectUserSelectAll): + 2013-03-29 Andrey Lushnikov lushni...@chromium.org Web Inspector: ability to use AnchorBox as an anchor for Popover Modified: trunk/Source/WebCore/page/EventHandler.cpp (147209 => 147210) --- trunk/Source/WebCore/page/EventHandler.cpp 2013-03-29 12:40:28 UTC (rev 147209) +++ trunk/Source/WebCore/page/EventHandler.cpp 2013-03-29 12:55:50 UTC (rev 147210) @@ -455,6 +455,7 @@ return newSelection; #else +UNUSED_PARAM(targetNode); return selection; #endif } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147211] trunk/Source/WebKit/blackberry
Title: [147211] trunk/Source/WebKit/blackberry
Revision 147211
Author charles@torchmobile.com.cn
Date 2013-03-29 06:08:33 -0700 (Fri, 29 Mar 2013)
Log Message
[BlackBerry] Context menu doesn't showup anymore after rebase.
https://bugs.webkit.org/show_bug.cgi?id=113570
Reviewed by George Staikos.
The upstreaming patch for bug: 103058, reverses the return value of
Node::dispatchMouseEvent() to be consistent with Node::dispatchEvent(),
so we should reverse our logic in webkit part that calls it also.
This only applys to master_41 which is a new rebase, don't apply it to master_40.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::webContext):
Modified Paths
trunk/Source/WebKit/blackberry/Api/WebPage.cpp
trunk/Source/WebKit/blackberry/ChangeLog
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (147210 => 147211)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-03-29 12:55:50 UTC (rev 147210)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-03-29 13:08:33 UTC (rev 147211)
@@ -2274,7 +2274,7 @@
// which node we want, we can send it directly to the node and not do a hit test. The onContextMenu event doesn't require
// mouse positions so we just set the position at (0,0)
PlatformMouseEvent mouseEvent(IntPoint(), IntPoint(), PlatformEvent::MouseMoved, 0, NoButton, false, false, false, TouchScreen);
-if (m_currentContextNode-dispatchMouseEvent(mouseEvent, eventNames().contextmenuEvent, 0)) {
+if (!m_currentContextNode-dispatchMouseEvent(mouseEvent, eventNames().contextmenuEvent, 0)) {
context.setFlag(Platform::WebContext::IsOnContextMenuPrevented);
return context;
}
Modified: trunk/Source/WebKit/blackberry/ChangeLog (147210 => 147211)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-03-29 12:55:50 UTC (rev 147210)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-03-29 13:08:33 UTC (rev 147211)
@@ -1,3 +1,18 @@
+2013-03-29 Charles Wei charles@torchmobile.com.cn
+
+[BlackBerry] Context menu doesn't showup anymore after rebase.
+https://bugs.webkit.org/show_bug.cgi?id=113570
+
+Reviewed by George Staikos.
+
+The upstreaming patch for bug: 103058, reverses the return value of
+Node::dispatchMouseEvent() to be consistent with Node::dispatchEvent(),
+so we should reverse our logic in webkit part that calls it also.
+
+This only applys to master_41 which is a new rebase, don't apply it to master_40.
+* Api/WebPage.cpp:
+(BlackBerry::WebKit::WebPagePrivate::webContext):
+
2013-03-28 Iris Wu sh...@blackberry.com
[BlackBerry] Don't cross editing boundary when touch hold selection expands
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147212] trunk
Title: [147212] trunk
Revision 147212
Author charles@torchmobile.com.cn
Date 2013-03-29 06:18:39 -0700 (Fri, 29 Mar 2013)
Log Message
[BlackBerry] Cleanup the CONTEXT_MENUS in BlackBerry porting
https://bugs.webkit.org/show_bug.cgi?id=113562
Reviewed by George Staikos.
Internally reviewed by Mike Fenton and Gen Mak.
.:
* Source/cmake/OptionsBlackBerry.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:
Source/WebCore:
No new tests, just disable CONTEXT_MENUS for blackberry porting.
* platform/blackberry/ContextMenuBlackBerry.cpp:
* platform/blackberry/ContextMenuItemBlackBerry.cpp:
Source/WebKit/blackberry:
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::init):
* WebCoreSupport/ContextMenuClientBlackBerry.cpp:
* WebCoreSupport/ContextMenuClientBlackBerry.h:
Modified Paths
trunk/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/blackberry/ContextMenuBlackBerry.cpp
trunk/Source/WebCore/platform/blackberry/ContextMenuItemBlackBerry.cpp
trunk/Source/WebKit/blackberry/Api/WebPage.cpp
trunk/Source/WebKit/blackberry/ChangeLog
trunk/Source/WebKit/blackberry/WebCoreSupport/ContextMenuClientBlackBerry.cpp
trunk/Source/WebKit/blackberry/WebCoreSupport/ContextMenuClientBlackBerry.h
trunk/Source/cmake/OptionsBlackBerry.cmake
trunk/Source/cmake/WebKitFeatures.cmake
trunk/Source/cmakeconfig.h.cmake
Diff
Modified: trunk/ChangeLog (147211 => 147212)
--- trunk/ChangeLog 2013-03-29 13:08:33 UTC (rev 147211)
+++ trunk/ChangeLog 2013-03-29 13:18:39 UTC (rev 147212)
@@ -1,3 +1,15 @@
+2013-03-29 Charles Wei charles@torchmobile.com.cn
+
+[BlackBerry] Cleanup the CONTEXT_MENUS in BlackBerry porting
+https://bugs.webkit.org/show_bug.cgi?id=113562
+
+Reviewed by George Staikos.
+Internally reviewed by Mike Fenton and Gen Mak.
+
+* Source/cmake/OptionsBlackBerry.cmake:
+* Source/cmake/WebKitFeatures.cmake:
+* Source/cmakeconfig.h.cmake:
+
2013-03-28 Zan Dobersek zdober...@igalia.com
[GTK] Build GTK-specific, non-layer-violating source code into WebCore-independent libPlatformGtk.la
Modified: trunk/Source/WebCore/ChangeLog (147211 => 147212)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 13:08:33 UTC (rev 147211)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 13:18:39 UTC (rev 147212)
@@ -1,3 +1,16 @@
+2013-03-29 Charles Wei charles@torchmobile.com.cn
+
+[BlackBerry] Cleanup the CONTEXT_MENUS in BlackBerry porting
+https://bugs.webkit.org/show_bug.cgi?id=113562
+
+Reviewed by George Staikos.
+Internally reviewed by Mike Fenton and Gen Mak.
+
+No new tests, just disable CONTEXT_MENUS for blackberry porting.
+
+* platform/blackberry/ContextMenuBlackBerry.cpp:
+* platform/blackberry/ContextMenuItemBlackBerry.cpp:
+
2013-03-29 KwangYong Choi ky0.c...@samsung.com
Fix build warning after r147022
Modified: trunk/Source/WebCore/platform/blackberry/ContextMenuBlackBerry.cpp (147211 => 147212)
--- trunk/Source/WebCore/platform/blackberry/ContextMenuBlackBerry.cpp 2013-03-29 13:08:33 UTC (rev 147211)
+++ trunk/Source/WebCore/platform/blackberry/ContextMenuBlackBerry.cpp 2013-03-29 13:18:39 UTC (rev 147212)
@@ -19,6 +19,7 @@
#include config.h
#include ContextMenu.h
+#if ENABLE(CONTEXT_MENUS)
#include NotImplemented.h
namespace WebCore {
@@ -50,3 +51,4 @@
}
} // namespace WebCore
+#endif
Modified: trunk/Source/WebCore/platform/blackberry/ContextMenuItemBlackBerry.cpp (147211 => 147212)
--- trunk/Source/WebCore/platform/blackberry/ContextMenuItemBlackBerry.cpp 2013-03-29 13:08:33 UTC (rev 147211)
+++ trunk/Source/WebCore/platform/blackberry/ContextMenuItemBlackBerry.cpp 2013-03-29 13:18:39 UTC (rev 147212)
@@ -19,6 +19,7 @@
#include config.h
#include ContextMenuItem.h
+#if ENABLE(CONTEXT_MENUS)
#include ContextMenu.h
#include NotImplemented.h
@@ -73,3 +74,4 @@
}
} // namespace WebCore
+#endif
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (147211 => 147212)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-03-29 13:08:33 UTC (rev 147211)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-03-29 13:18:39 UTC (rev 147212)
@@ -514,8 +514,8 @@
void WebPagePrivate::init(const BlackBerry::Platform::String pageGroupName)
{
ChromeClientBlackBerry* chromeClient = new ChromeClientBlackBerry(this);
+#if ENABLE(CONTEXT_MENUS)
ContextMenuClientBlackBerry* contextMenuClient = 0;
-#if ENABLE(CONTEXT_MENUS)
contextMenuClient = new ContextMenuClientBlackBerry();
#endif
EditorClientBlackBerry* editorClient = new EditorClientBlackBerry(this);
@@ -531,7 +531,9 @@
Page::PageClients pageClients;
pageClients.chromeClient = chromeClient;
+#if ENABLE(CONTEXT_MENUS)
pageClients.contextMenuClient = contextMenuClient;
+#endif
pageClients.editorClient = editorClient;
pageClients.dragClient = dragClient;
pageClients.inspectorClient =
[webkit-changes] [147213] trunk/Source/WebCore
Title: [147213] trunk/Source/WebCore
Revision 147213
Author loi...@chromium.org
Date 2013-03-29 06:56:55 -0700 (Fri, 29 Mar 2013)
Log Message
Web Inspector: Flame Chart. Developers will have more clue
if two different profiles will have same colors for same functions.
https://bugs.webkit.org/show_bug.cgi?id=113410
Reviewed by Pavel Feldman.
The code related to color generator was extracted into a separate class.
The instance of the class was stored as static private member of the FlameChart class,
so all the profiles will share the same instance and will use same colors.
The colors itself were slightly adjusted.
Drive by fix: coordinatesToNodeIndex was fixed. The error was introduced in the patch about left padding.
* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.ColorGenerator):
(WebInspector.FlameChart.ColorGenerator.prototype._colorPairForID):
(WebInspector.FlameChart.prototype._calculateTimelineData):
(WebInspector.FlameChart.prototype._calculateTimelineDataForSamples):
(WebInspector.FlameChart.prototype._coordinatesToNodeIndex):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js
Diff
Modified: trunk/Source/WebCore/ChangeLog (147212 => 147213)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 13:18:39 UTC (rev 147212)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 13:56:55 UTC (rev 147213)
@@ -1,3 +1,26 @@
+2013-03-29 Ilya Tikhonovsky loi...@chromium.org
+
+Web Inspector: Flame Chart. Developers will have more clue
+if two different profiles will have same colors for same functions.
+https://bugs.webkit.org/show_bug.cgi?id=113410
+
+Reviewed by Pavel Feldman.
+
+The code related to color generator was extracted into a separate class.
+The instance of the class was stored as static private member of the FlameChart class,
+so all the profiles will share the same instance and will use same colors.
+The colors itself were slightly adjusted.
+
+Drive by fix: coordinatesToNodeIndex was fixed. The error was introduced in the patch about left padding.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.ColorGenerator):
+(WebInspector.FlameChart.ColorGenerator.prototype._colorPairForID):
+(WebInspector.FlameChart.prototype._calculateTimelineData):
+(WebInspector.FlameChart.prototype._calculateTimelineDataForSamples):
+(WebInspector.FlameChart.prototype._coordinatesToNodeIndex):
+
2013-03-29 Charles Wei charles@torchmobile.com.cn
[BlackBerry] Cleanup the CONTEXT_MENUS in BlackBerry porting
Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (147212 => 147213)
--- trunk/Source/WebCore/inspector/front-end/FlameChart.js 2013-03-29 13:18:39 UTC (rev 147212)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js 2013-03-29 13:56:55 UTC (rev 147213)
@@ -70,6 +70,9 @@
this._anchorElement.className = item-anchor;
this._linkifier = new WebInspector.Linkifier();
this._highlightedNodeIndex = -1;
+
+if (!WebInspector.FlameChart._colorGenerator)
+WebInspector.FlameChart._colorGenerator = new WebInspector.FlameChart.ColorGenerator();
}
/**
@@ -184,6 +187,33 @@
SelectedNode: SelectedNode
}
+/**
+ * @constructor
+ */
+WebInspector.FlameChart.ColorGenerator = function()
+{
+this._colorPairs = {};
+this._currentColorIndex = 0;
+}
+
+WebInspector.FlameChart.ColorGenerator.prototype = {
+/**
+ * @param {!string} id
+ */
+_colorPairForID: function(id)
+{
+var colorPairs = this._colorPairs;
+var colorPair = colorPairs[id];
+if (!colorPair) {
+var currentColorIndex = ++this._currentColorIndex;
+var hue = (currentColorIndex * 5 + 11 * (currentColorIndex % 2)) % 360;
+colorPairs[id] = colorPair = {highlighted: hsla( + hue + , 100%, 33%, 0.7), normal: hsla( + hue + , 100%, 66%, 0.7)};
+}
+return colorPair;
+}
+}
+
+
WebInspector.FlameChart.prototype = {
_onWindowChanged: function(event)
{
@@ -253,19 +283,14 @@
var levelOffsets = /** @type {Array.!number} */ ([0]);
var levelExitIndexes = /** @type {Array.!number} */ ([0]);
+var colorGenerator = WebInspector.FlameChart._colorGenerator;
while (stack.length) {
var level = levelOffsets.length - 1;
var node = stack.pop();
var offset = levelOffsets[level];
-var functionUID = node.functionName + : + node.url + : + node.lineNumber;
-var colorPair = functionColorPairs[functionUID];
-if (!colorPair) {
-++currentColorIndex;
-var hue = (currentColorIndex * 5 + 11 * (currentColorIndex % 2)) % 360;
-functionColorPairs[functionUID] = colorPair = {highlighted: hsl( + hue + ,
[webkit-changes] [147214] trunk/PerformanceTests
Title: [147214] trunk/PerformanceTests
Revision 147214
Author abu...@adobe.com
Date 2013-03-29 07:14:23 -0700 (Fri, 29 Mar 2013)
Log Message
[CSS Regions] Add performance tests
https://bugs.webkit.org/show_bug.cgi?id=113303
Reviewed by Antti Koivisto.
Add simple performance tests for regions, without nested named flows: a region chain and a flow article.
The regions.js script is used to generate the tests and can set the following parameters: the number of regions,
the number of paragraphs, the regions width, height, max-height and the propability of a forced break after a paragraph.
The tests are skipped for now. They should be enabled once the regions performance is stable enough to create a baseline.
* Layout/RegionsAuto.html: Added. A few regions with a short article. The regions have auto-height and some
paragraphs (80%) have forced breaks after. Stress test for the auto-height algorithm.
* Layout/RegionsAutoMaxHeight.html: Added. A lot of regions with auto-height and max-height. Tests the impact of
max-height on the auto-height algorithm.
* Layout/RegionsFixed.html: Added. A lot of regions with a long article. Some paragraphs (50%) have forced breaks after.
Stress test for the regions layout algorithm.
* Layout/RegionsFixedShort.html: Added. A lot of short regions with a long content. Tests the impact of unforced breaks
on the layout speed.
* Layout/resources/regions.css: Added.
(.articleInFlow):
(.articleNone):
(.region):
(.contentParagraph):
(.breakAfter):
(.regionContainer):
* Layout/resources/regions.js: Added.
(.):
* Skipped:
Modified Paths
trunk/PerformanceTests/ChangeLog
trunk/PerformanceTests/Skipped
Added Paths
trunk/PerformanceTests/Layout/RegionsAuto.html
trunk/PerformanceTests/Layout/RegionsAutoMaxHeight.html
trunk/PerformanceTests/Layout/RegionsFixed.html
trunk/PerformanceTests/Layout/RegionsFixedShort.html
trunk/PerformanceTests/Layout/resources/regions.css
trunk/PerformanceTests/Layout/resources/regions.js
Diff
Modified: trunk/PerformanceTests/ChangeLog (147213 => 147214)
--- trunk/PerformanceTests/ChangeLog 2013-03-29 13:56:55 UTC (rev 147213)
+++ trunk/PerformanceTests/ChangeLog 2013-03-29 14:14:23 UTC (rev 147214)
@@ -1,3 +1,35 @@
+2013-03-29 Andrei Bucur abu...@adobe.com
+
+[CSS Regions] Add performance tests
+https://bugs.webkit.org/show_bug.cgi?id=113303
+
+Reviewed by Antti Koivisto.
+
+Add simple performance tests for regions, without nested named flows: a region chain and a flow article.
+The regions.js script is used to generate the tests and can set the following parameters: the number of regions,
+the number of paragraphs, the regions width, height, max-height and the propability of a forced break after a paragraph.
+
+The tests are skipped for now. They should be enabled once the regions performance is stable enough to create a baseline.
+
+* Layout/RegionsAuto.html: Added. A few regions with a short article. The regions have auto-height and some
+paragraphs (80%) have forced breaks after. Stress test for the auto-height algorithm.
+* Layout/RegionsAutoMaxHeight.html: Added. A lot of regions with auto-height and max-height. Tests the impact of
+max-height on the auto-height algorithm.
+* Layout/RegionsFixed.html: Added. A lot of regions with a long article. Some paragraphs (50%) have forced breaks after.
+Stress test for the regions layout algorithm.
+* Layout/RegionsFixedShort.html: Added. A lot of short regions with a long content. Tests the impact of unforced breaks
+on the layout speed.
+* Layout/resources/regions.css: Added.
+(.articleInFlow):
+(.articleNone):
+(.region):
+(.contentParagraph):
+(.breakAfter):
+(.regionContainer):
+* Layout/resources/regions.js: Added.
+(.):
+* Skipped:
+
2013-03-26 Ryosuke Niwa rn...@webkit.org
Add a performance tests for selecting all content in a document
Added: trunk/PerformanceTests/Layout/RegionsAuto.html (0 => 147214)
--- trunk/PerformanceTests/Layout/RegionsAuto.html (rev 0)
+++ trunk/PerformanceTests/Layout/RegionsAuto.html 2013-03-29 14:14:23 UTC (rev 147214)
@@ -0,0 +1,19 @@
+!DOCTYPE html
+html
+head
+link rel=stylesheet href="" TYPE=text/css/link
+script src=""
+script src=""
+style type=text/css
+#log {
+position: fixed;
+}
+/style
+/head
+body
+pre id=log/pre
+script
+PerfTestRunner.measureTime(createRegionsTest(300px, auto, 400, 400, auto, 0.8));
+/script
+/body
+/html
Added: trunk/PerformanceTests/Layout/RegionsAutoMaxHeight.html (0 => 147214)
--- trunk/PerformanceTests/Layout/RegionsAutoMaxHeight.html (rev 0)
+++ trunk/PerformanceTests/Layout/RegionsAutoMaxHeight.html 2013-03-29 14:14:23 UTC (rev 147214)
@@
[webkit-changes] [147216] trunk/LayoutTests
Title: [147216] trunk/LayoutTests Revision 147216 Author timo...@apple.com Date 2013-03-29 07:17:09 -0700 (Fri, 29 Mar 2013) Log Message Unreviewed Mac gardening. * platform/mac/fast/events/event-attribute-expected.txt: Added. New baseline after r147205. Modified Paths trunk/LayoutTests/ChangeLog Added Paths trunk/LayoutTests/platform/mac/fast/events/event-attribute-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (147215 => 147216) --- trunk/LayoutTests/ChangeLog 2013-03-29 14:15:34 UTC (rev 147215) +++ trunk/LayoutTests/ChangeLog 2013-03-29 14:17:09 UTC (rev 147216) @@ -1,3 +1,10 @@ +2013-03-29 Timothy Hatcher timo...@apple.com + +Unreviewed Mac gardening. + +* platform/mac/fast/events/event-attribute-expected.txt: Added. +New baseline after r147205. + 2013-03-29 Ádám Kallai ka...@inf.u-szeged.hu [Qt] Removal of misplaced stuff after r146692. Added: trunk/LayoutTests/platform/mac/fast/events/event-attribute-expected.txt (0 => 147216) --- trunk/LayoutTests/platform/mac/fast/events/event-attribute-expected.txt (rev 0) +++ trunk/LayoutTests/platform/mac/fast/events/event-attribute-expected.txt 2013-03-29 14:17:09 UTC (rev 147216) @@ -0,0 +1,274 @@ +Test that setting event handlers with attribute works. + +On success, you will see a series of PASS messages, followed by TEST COMPLETE. + + +cancelled onbeforeload async +PASS /*img*/ typeof (element[onclick]) is function +PASS /*img*/ typeof (element[oncontextmenu]) is function +PASS /*img*/ typeof (element[ondblclick]) is function +PASS /*img*/ typeof (element[onmousedown]) is function +PASS /*img*/ typeof (element[onmousemove]) is function +PASS /*img*/ typeof (element[onmouseout]) is function +PASS /*img*/ typeof (element[onmouseover]) is function +PASS /*img*/ typeof (element[onmouseup]) is function +PASS /*img*/ typeof (element[onmousewheel]) is function +PASS /*img*/ typeof (element[onfocus]) is function +PASS /*img*/ typeof (element[onblur]) is function +PASS /*img*/ typeof (element[onkeydown]) is function +PASS /*img*/ typeof (element[onkeypress]) is function +PASS /*img*/ typeof (element[onkeyup]) is function +PASS /*img*/ typeof (element[onscroll]) is function +PASS /*img*/ typeof (element[onbeforecut]) is function +PASS /*img*/ typeof (element[oncut]) is function +PASS /*img*/ typeof (element[onbeforecopy]) is function +PASS /*img*/ typeof (element[oncopy]) is function +PASS /*img*/ typeof (element[onbeforepaste]) is function +PASS /*img*/ typeof (element[onpaste]) is function +PASS /*img*/ typeof (element[ondragenter]) is function +PASS /*img*/ typeof (element[ondragover]) is function +PASS /*img*/ typeof (element[ondragleave]) is function +PASS /*img*/ typeof (element[ondrop]) is function +PASS /*img*/ typeof (element[ondragstart]) is function +PASS /*img*/ typeof (element[ondrag]) is function +PASS /*img*/ typeof (element[ondragend]) is function +PASS /*img*/ typeof (element[onselectstart]) is function +PASS /*img*/ typeof (element[onsubmit]) is function +PASS /*img*/ typeof (element[onerror]) is function +PASS /*img*/ typeof (element[oninput]) is function +PASS /*img*/ typeof (element[oninvalid]) is function +FAIL /*img*/ typeof (element[ontouchstart]) should be function. Was undefined. +FAIL /*img*/ typeof (element[ontouchmove]) should be function. Was undefined. +FAIL /*img*/ typeof (element[ontouchend]) should be function. Was undefined. +FAIL /*img*/ typeof (element[ontouchcancel]) should be function. Was undefined. +PASS /*img*/ typeof (element[onwebkitfullscreenchange]) is function +PASS /*img*/ typeof (element[onwebkitfullscreenerror]) is function +PASS /*img*/ typeof (element[onabort]) is function +PASS /*img*/ typeof (element[onchange]) is function +PASS /*img*/ typeof (element[onreset]) is function +PASS /*img*/ typeof (element[onselect]) is function +PASS /*img*/ typeof (element[onload]) is function +PASS /*script*/ typeof (element[onclick]) is function +PASS /*script*/ typeof (element[oncontextmenu]) is function +PASS /*script*/ typeof (element[ondblclick]) is function +PASS /*script*/ typeof (element[onmousedown]) is function +PASS /*script*/ typeof (element[onmousemove]) is function +PASS /*script*/ typeof (element[onmouseout]) is function +PASS /*script*/ typeof (element[onmouseover]) is function +PASS /*script*/ typeof (element[onmouseup]) is function +PASS /*script*/ typeof (element[onmousewheel]) is function +PASS /*script*/ typeof (element[onfocus]) is function +PASS /*script*/ typeof (element[onblur]) is function +PASS /*script*/ typeof (element[onkeydown]) is function +PASS /*script*/ typeof (element[onkeypress]) is function +PASS /*script*/ typeof (element[onkeyup]) is function +PASS /*script*/ typeof (element[onscroll]) is function +PASS /*script*/ typeof (element[onbeforecut]) is function +PASS /*script*/ typeof (element[oncut]) is function +PASS /*script*/ typeof (element[onbeforecopy]) is function +PASS /*script*/ typeof
[webkit-changes] [147217] trunk/LayoutTests
Title: [147217] trunk/LayoutTests Revision 147217 Author timo...@apple.com Date 2013-03-29 07:21:14 -0700 (Fri, 29 Mar 2013) Log Message Unreviewed Windows gardening. * platform/win/fast/events/event-attribute-expected.txt: Added. New baseline after r147205. Modified Paths trunk/LayoutTests/ChangeLog Added Paths trunk/LayoutTests/platform/win/fast/events/event-attribute-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (147216 => 147217) --- trunk/LayoutTests/ChangeLog 2013-03-29 14:17:09 UTC (rev 147216) +++ trunk/LayoutTests/ChangeLog 2013-03-29 14:21:14 UTC (rev 147217) @@ -1,5 +1,12 @@ 2013-03-29 Timothy Hatcher timo...@apple.com +Unreviewed Windows gardening. + +* platform/win/fast/events/event-attribute-expected.txt: Added. +New baseline after r147205. + +2013-03-29 Timothy Hatcher timo...@apple.com + Unreviewed Mac gardening. * platform/mac/fast/events/event-attribute-expected.txt: Added. Added: trunk/LayoutTests/platform/win/fast/events/event-attribute-expected.txt (0 => 147217) --- trunk/LayoutTests/platform/win/fast/events/event-attribute-expected.txt (rev 0) +++ trunk/LayoutTests/platform/win/fast/events/event-attribute-expected.txt 2013-03-29 14:21:14 UTC (rev 147217) @@ -0,0 +1,274 @@ +Test that setting event handlers with attribute works. + +On success, you will see a series of PASS messages, followed by TEST COMPLETE. + + +cancelled onbeforeload async +PASS /*img*/ typeof (element[onclick]) is function +PASS /*img*/ typeof (element[oncontextmenu]) is function +PASS /*img*/ typeof (element[ondblclick]) is function +PASS /*img*/ typeof (element[onmousedown]) is function +PASS /*img*/ typeof (element[onmousemove]) is function +PASS /*img*/ typeof (element[onmouseout]) is function +PASS /*img*/ typeof (element[onmouseover]) is function +PASS /*img*/ typeof (element[onmouseup]) is function +PASS /*img*/ typeof (element[onmousewheel]) is function +PASS /*img*/ typeof (element[onfocus]) is function +PASS /*img*/ typeof (element[onblur]) is function +PASS /*img*/ typeof (element[onkeydown]) is function +PASS /*img*/ typeof (element[onkeypress]) is function +PASS /*img*/ typeof (element[onkeyup]) is function +PASS /*img*/ typeof (element[onscroll]) is function +PASS /*img*/ typeof (element[onbeforecut]) is function +PASS /*img*/ typeof (element[oncut]) is function +PASS /*img*/ typeof (element[onbeforecopy]) is function +PASS /*img*/ typeof (element[oncopy]) is function +PASS /*img*/ typeof (element[onbeforepaste]) is function +PASS /*img*/ typeof (element[onpaste]) is function +PASS /*img*/ typeof (element[ondragenter]) is function +PASS /*img*/ typeof (element[ondragover]) is function +PASS /*img*/ typeof (element[ondragleave]) is function +PASS /*img*/ typeof (element[ondrop]) is function +PASS /*img*/ typeof (element[ondragstart]) is function +PASS /*img*/ typeof (element[ondrag]) is function +PASS /*img*/ typeof (element[ondragend]) is function +PASS /*img*/ typeof (element[onselectstart]) is function +PASS /*img*/ typeof (element[onsubmit]) is function +PASS /*img*/ typeof (element[onerror]) is function +PASS /*img*/ typeof (element[oninput]) is function +PASS /*img*/ typeof (element[oninvalid]) is function +FAIL /*img*/ typeof (element[ontouchstart]) should be function. Was undefined. +FAIL /*img*/ typeof (element[ontouchmove]) should be function. Was undefined. +FAIL /*img*/ typeof (element[ontouchend]) should be function. Was undefined. +FAIL /*img*/ typeof (element[ontouchcancel]) should be function. Was undefined. +PASS /*img*/ typeof (element[onwebkitfullscreenchange]) is function +PASS /*img*/ typeof (element[onwebkitfullscreenerror]) is function +PASS /*img*/ typeof (element[onabort]) is function +PASS /*img*/ typeof (element[onchange]) is function +PASS /*img*/ typeof (element[onreset]) is function +PASS /*img*/ typeof (element[onselect]) is function +PASS /*img*/ typeof (element[onload]) is function +PASS /*script*/ typeof (element[onclick]) is function +PASS /*script*/ typeof (element[oncontextmenu]) is function +PASS /*script*/ typeof (element[ondblclick]) is function +PASS /*script*/ typeof (element[onmousedown]) is function +PASS /*script*/ typeof (element[onmousemove]) is function +PASS /*script*/ typeof (element[onmouseout]) is function +PASS /*script*/ typeof (element[onmouseover]) is function +PASS /*script*/ typeof (element[onmouseup]) is function +PASS /*script*/ typeof (element[onmousewheel]) is function +PASS /*script*/ typeof (element[onfocus]) is function +PASS /*script*/ typeof (element[onblur]) is function +PASS /*script*/ typeof (element[onkeydown]) is function +PASS /*script*/ typeof (element[onkeypress]) is function +PASS /*script*/ typeof (element[onkeyup]) is function +PASS /*script*/ typeof (element[onscroll]) is function +PASS /*script*/ typeof (element[onbeforecut]) is function +PASS /*script*/ typeof (element[oncut]) is function +PASS /*script*/ typeof
[webkit-changes] [147218] trunk
Title: [147218] trunk
Revision 147218
Author commit-qu...@webkit.org
Date 2013-03-29 08:02:17 -0700 (Fri, 29 Mar 2013)
Log Message
Web Inspector: gather accessor property getter and setter under a single tree node
https://bugs.webkit.org/show_bug.cgi?id=113357
Patch by Peter Rybin pry...@chromium.org on 2013-03-29
Reviewed by Yury Semikhatsky.
Source/WebCore:
A new tree element class AccessorPropertyTreeElemenet is added.
RemoteObjectProperty can now represent accessor property (if value is null).
New tree element is supported in CSS stylesheet.
Testing code is slightly modified for exploring new tree elements.
* inspector/InjectedScriptSource.js:
(.):
* inspector/front-end/ObjectPropertiesSection.js:
(WebInspector.ObjectPropertyTreeElement.populateWithProperties):
(WebInspector.AccessorPropertyTreeElement):
(WebInspector.AccessorPropertyTreeElement.prototype.onattach):
(WebInspector.AccessorPropertyTreeElement.prototype.update):
(WebInspector.AccessorPropertyTreeElement.prototype.onpopulate):
* inspector/front-end/RemoteObject.js:
* inspector/front-end/inspector.css:
(.accessor-property-name):
LayoutTests:
Expectations are fixed with changed functionality and changed tests.
* inspector/debugger/properties-special-expected.txt:
* inspector/debugger/properties-special.html:
* inspector/runtime/runtime-getProperties-expected.txt:
* inspector/runtime/runtime-getProperties.html:
* platform/chromium/inspector/debugger/properties-special-expected.txt:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/inspector/console/command-line-api-expected.txt
trunk/LayoutTests/inspector/debugger/properties-special-expected.txt
trunk/LayoutTests/inspector/debugger/properties-special.html
trunk/LayoutTests/inspector/runtime/runtime-getProperties-expected.txt
trunk/LayoutTests/inspector/runtime/runtime-getProperties.html
trunk/LayoutTests/platform/chromium/inspector/debugger/properties-special-expected.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/InjectedScriptSource.js
trunk/Source/WebCore/inspector/front-end/ObjectPropertiesSection.js
trunk/Source/WebCore/inspector/front-end/RemoteObject.js
trunk/Source/WebCore/inspector/front-end/inspector.css
Diff
Modified: trunk/LayoutTests/ChangeLog (147217 => 147218)
--- trunk/LayoutTests/ChangeLog 2013-03-29 14:21:14 UTC (rev 147217)
+++ trunk/LayoutTests/ChangeLog 2013-03-29 15:02:17 UTC (rev 147218)
@@ -1,3 +1,18 @@
+2013-03-29 Peter Rybin pry...@chromium.org
+
+Web Inspector: gather accessor property getter and setter under a single tree node
+https://bugs.webkit.org/show_bug.cgi?id=113357
+
+Reviewed by Yury Semikhatsky.
+
+Expectations are fixed with changed functionality and changed tests.
+
+* inspector/debugger/properties-special-expected.txt:
+* inspector/debugger/properties-special.html:
+* inspector/runtime/runtime-getProperties-expected.txt:
+* inspector/runtime/runtime-getProperties.html:
+* platform/chromium/inspector/debugger/properties-special-expected.txt:
+
2013-03-29 Timothy Hatcher timo...@apple.com
Unreviewed Windows gardening.
Modified: trunk/LayoutTests/inspector/console/command-line-api-expected.txt (147217 => 147218)
--- trunk/LayoutTests/inspector/console/command-line-api-expected.txt 2013-03-29 14:21:14 UTC (rev 147217)
+++ trunk/LayoutTests/inspector/console/command-line-api-expected.txt 2013-03-29 15:02:17 UTC (rev 147218)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 1222: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $(#%s)
+CONSOLE MESSAGE: line 1226: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $(#%s)
Tests that command line api works.
Modified: trunk/LayoutTests/inspector/debugger/properties-special-expected.txt (147217 => 147218)
--- trunk/LayoutTests/inspector/debugger/properties-special-expected.txt 2013-03-29 14:21:14 UTC (rev 147217)
+++ trunk/LayoutTests/inspector/debugger/properties-special-expected.txt 2013-03-29 15:02:17 UTC (rev 147218)
@@ -5,6 +5,8 @@
Set timer for test function.
Watch expressions updated.
Nodes are expanded.
+error: Function scope data is not available
+Subnodes are expanded.
'Object(true)' = 'Boolean'
'__proto__' = 'Boolean'
'(function(a,b) { return a + b; })' = 'function (a, b) { return a + b; }'
@@ -13,15 +15,19 @@
'length' = '2'
'name' = ''
'prototype' = 'Object'
+'constructor' = 'function (a, b) { return a + b; }'
+'__proto__' = 'Object'
'__proto__' = 'function () {'
function scope
'(function(a,b) { return a + b; }).bind({}, 2)' = 'function () {'
-'get arguments' = 'function () {'
-'get caller' = 'function () {'
+'arguments' = null
+'get' = 'function () {'
+'set' = 'function () {'
+'caller' = null
+'get' = 'function () {'
+'set' = 'function () {'
[webkit-changes] [147219] trunk/LayoutTests
Title: [147219] trunk/LayoutTests
Revision 147219
Author commit-qu...@webkit.org
Date 2013-03-29 08:09:48 -0700 (Fri, 29 Mar 2013)
Log Message
Web Inspector: Update test expectation for resource-har-conversion.html
https://bugs.webkit.org/show_bug.cgi?id=113460
Patch by Seokju Kwon seokju.k...@gmail.com on 2013-03-29
Reviewed by Vsevolod Vlasov.
The value of pageref and title had been changed after r105596.
(Use page ids, not document URLs in HAR entries to refer to pages.
Use page URL as a title field of a HAR page.)
* http/tests/inspector/resource-har-conversion-expected.txt:
* platform/mac-snowleopard/http/tests/inspector/resource-har-conversion-expected.txt:
* platform/mac/http/tests/inspector/resource-har-conversion-expected.txt:
* platform/win/http/tests/inspector/resource-har-conversion-expected.txt:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt
trunk/LayoutTests/platform/mac/http/tests/inspector/resource-har-conversion-expected.txt
trunk/LayoutTests/platform/mac-snowleopard/http/tests/inspector/resource-har-conversion-expected.txt
trunk/LayoutTests/platform/win/http/tests/inspector/resource-har-conversion-expected.txt
Diff
Modified: trunk/LayoutTests/ChangeLog (147218 => 147219)
--- trunk/LayoutTests/ChangeLog 2013-03-29 15:02:17 UTC (rev 147218)
+++ trunk/LayoutTests/ChangeLog 2013-03-29 15:09:48 UTC (rev 147219)
@@ -1,3 +1,19 @@
+2013-03-29 Seokju Kwon seokju.k...@gmail.com
+
+Web Inspector: Update test expectation for resource-har-conversion.html
+https://bugs.webkit.org/show_bug.cgi?id=113460
+
+Reviewed by Vsevolod Vlasov.
+
+The value of pageref and title had been changed after r105596.
+(Use page ids, not document URLs in HAR entries to refer to pages.
+ Use page URL as a title field of a HAR page.)
+
+* http/tests/inspector/resource-har-conversion-expected.txt:
+* platform/mac-snowleopard/http/tests/inspector/resource-har-conversion-expected.txt:
+* platform/mac/http/tests/inspector/resource-har-conversion-expected.txt:
+* platform/win/http/tests/inspector/resource-har-conversion-expected.txt:
+
2013-03-29 Peter Rybin pry...@chromium.org
Web Inspector: gather accessor property getter and setter under a single tree node
Modified: trunk/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt (147218 => 147219)
--- trunk/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt 2013-03-29 15:02:17 UTC (rev 147218)
+++ trunk/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt 2013-03-29 15:09:48 UTC (rev 147219)
@@ -10,7 +10,7 @@
{
cache : {
}
-pageref : http://127.0.0.1:8000/inspector/resource-har-conversion.html
+pageref : page_1
request : {
bodySize : number
cookies : [
@@ -99,7 +99,7 @@
{
cache : {
}
-pageref : http://127.0.0.1:8000/inspector/resource-har-conversion.html
+pageref : page_1
request : {
bodySize : number
cookies : [
@@ -135,7 +135,7 @@
{
cache : {
}
-pageref : http://127.0.0.1:8000/inspector/resource-har-conversion.html
+pageref : page_1
request : {
bodySize : number
cookies : [
@@ -170,7 +170,7 @@
{
cache : {
}
-pageref : http://127.0.0.1:8000/inspector/resource-har-conversion.html
+pageref : page_1
request : {
bodySize : number
cookies : [
@@ -216,7 +216,7 @@
onLoad : number
}
startedDateTime : plausible
-title :
+title : http://127.0.0.1:8000/inspector/resource-har-conversion.html
}
]
version : string
Modified: trunk/LayoutTests/platform/mac/http/tests/inspector/resource-har-conversion-expected.txt (147218 => 147219)
--- trunk/LayoutTests/platform/mac/http/tests/inspector/resource-har-conversion-expected.txt 2013-03-29 15:02:17 UTC (rev 147218)
+++ trunk/LayoutTests/platform/mac/http/tests/inspector/resource-har-conversion-expected.txt 2013-03-29 15:09:48 UTC (rev 147219)
@@ -11,7 +11,7 @@
{
startedDateTime : object
id : string
-title :
+title : http://127.0.0.1:8000/inspector/resource-har-conversion.html
pageTimings : {
onContentLoad : number
onLoad : number
@@ -20,7 +20,7 @@
]
entries : [
{
-pageref : http://127.0.0.1:8000/inspector/resource-har-conversion.html
+pageref : page_1
startedDateTime : object
time : number
request : {
@@ -110,7 +110,7 @@
[webkit-changes] [147220] trunk/Source/WebCore
Title: [147220] trunk/Source/WebCore
Revision 147220
Author ca...@chromium.org
Date 2013-03-29 08:20:38 -0700 (Fri, 29 Mar 2013)
Log Message
Web Inspector: extract common base for 3 timeline overview controls (Events/Frames/Memory)
https://bugs.webkit.org/show_bug.cgi?id=113572
Reviewed by Yury Semikhatsky.
Refactoring, covered by existing tests.
- introduce TimelineOverviewBase as a common base for 3 overview controls;
- make every overview control a view.
This does not yet take advantage of common base (subject of the next patch).
* inspector/front-end/OverviewGrid.js:
(WebInspector.OverviewGrid.prototype.gridElement):
(WebInspector.OverviewGrid.prototype.itemsGraphsElement):
* inspector/front-end/TimelineOverviewPane.js:
(WebInspector.TimelineOverviewPane):
(WebInspector.TimelineOverviewPane.prototype.setMode):
(WebInspector.TimelineOverviewPane.prototype._update):
(WebInspector.TimelineOverviewBase):
(WebInspector.TimelineOverviewBase.prototype.update):
(WebInspector.TimelineMemoryOverview):
(WebInspector.TimelineEventOverview):
(WebInspector.TimelineEventOverview.prototype._renderBar):
(WebInspector.TimelineFrameOverview):
(WebInspector.TimelineFrameOverview.prototype.update):
(WebInspector.TimelineFrameOverview.prototype._renderBars):
(WebInspector.TimelineFrameOverview.prototype._drawFPSMarks):
(WebInspector.TimelineFrameOverview.prototype._renderBar):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/OverviewGrid.js
trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js
Diff
Modified: trunk/Source/WebCore/ChangeLog (147219 => 147220)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 15:09:48 UTC (rev 147219)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 15:20:38 UTC (rev 147220)
@@ -1,3 +1,35 @@
+2013-03-29 Andrey Kosyakov ca...@chromium.org
+
+Web Inspector: extract common base for 3 timeline overview controls (Events/Frames/Memory)
+https://bugs.webkit.org/show_bug.cgi?id=113572
+
+Reviewed by Yury Semikhatsky.
+
+Refactoring, covered by existing tests.
+
+- introduce TimelineOverviewBase as a common base for 3 overview controls;
+- make every overview control a view.
+
+This does not yet take advantage of common base (subject of the next patch).
+
+* inspector/front-end/OverviewGrid.js:
+(WebInspector.OverviewGrid.prototype.gridElement):
+(WebInspector.OverviewGrid.prototype.itemsGraphsElement):
+* inspector/front-end/TimelineOverviewPane.js:
+(WebInspector.TimelineOverviewPane):
+(WebInspector.TimelineOverviewPane.prototype.setMode):
+(WebInspector.TimelineOverviewPane.prototype._update):
+(WebInspector.TimelineOverviewBase):
+(WebInspector.TimelineOverviewBase.prototype.update):
+(WebInspector.TimelineMemoryOverview):
+(WebInspector.TimelineEventOverview):
+(WebInspector.TimelineEventOverview.prototype._renderBar):
+(WebInspector.TimelineFrameOverview):
+(WebInspector.TimelineFrameOverview.prototype.update):
+(WebInspector.TimelineFrameOverview.prototype._renderBars):
+(WebInspector.TimelineFrameOverview.prototype._drawFPSMarks):
+(WebInspector.TimelineFrameOverview.prototype._renderBar):
+
2013-03-29 Peter Rybin pry...@chromium.org
Web Inspector: gather accessor property getter and setter under a single tree node
Modified: trunk/Source/WebCore/inspector/front-end/OverviewGrid.js (147219 => 147220)
--- trunk/Source/WebCore/inspector/front-end/OverviewGrid.js 2013-03-29 15:09:48 UTC (rev 147219)
+++ trunk/Source/WebCore/inspector/front-end/OverviewGrid.js 2013-03-29 15:20:38 UTC (rev 147220)
@@ -49,17 +49,14 @@
}
WebInspector.OverviewGrid.prototype = {
-itemsGraphsElement: function()
+gridElement: function()
{
-return this._grid.itemsGraphsElement;
+return this._grid.element;
},
-/**
- * @param {!Node} child
- */
-insertBeforeItemsGraphsElement: function(child)
+itemsGraphsElement: function()
{
-this._grid.element.insertBefore(child, this._grid.itemsGraphsElement);
+return this._grid.itemsGraphsElement;
},
/**
Modified: trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js (147219 => 147220)
--- trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js 2013-03-29 15:09:48 UTC (rev 147219)
+++ trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js 2013-03-29 15:20:38 UTC (rev 147220)
@@ -78,15 +78,13 @@
this.element.appendChild(this._overviewGrid.element);
this._memoryOverview = new WebInspector.TimelineMemoryOverview(this._model);
-this._memoryOverview.element.id = timeline-overview-memory;
-this._overviewGrid.insertBeforeItemsGraphsElement(this._memoryOverview.element);
var separatorElement = document.createElement(div);
separatorElement.id =
[webkit-changes] [147221] trunk
Title: [147221] trunk
Revision 147221
Author commit-qu...@webkit.org
Date 2013-03-29 08:50:44 -0700 (Fri, 29 Mar 2013)
Log Message
Unreviewed, rolling out r147218.
http://trac.webkit.org/changeset/147218
https://bugs.webkit.org/show_bug.cgi?id=113585
We should rethink UI of this feature. (Requested by vsevik on
#webkit).
Patch by Sheriff Bot webkit.review@gmail.com on 2013-03-29
Source/WebCore:
* inspector/InjectedScriptSource.js:
(.):
* inspector/front-end/ObjectPropertiesSection.js:
(WebInspector.ObjectPropertyTreeElement.populateWithProperties):
* inspector/front-end/RemoteObject.js:
(WebInspector.RemoteObject.prototype.set else):
(WebInspector.RemoteObjectProperty):
* inspector/front-end/inspector.css:
LayoutTests:
* inspector/console/command-line-api-expected.txt:
* inspector/debugger/properties-special-expected.txt:
* inspector/debugger/properties-special.html:
* inspector/runtime/runtime-getProperties-expected.txt:
* inspector/runtime/runtime-getProperties.html:
* platform/chromium/inspector/debugger/properties-special-expected.txt:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/inspector/console/command-line-api-expected.txt
trunk/LayoutTests/inspector/debugger/properties-special-expected.txt
trunk/LayoutTests/inspector/debugger/properties-special.html
trunk/LayoutTests/inspector/runtime/runtime-getProperties-expected.txt
trunk/LayoutTests/inspector/runtime/runtime-getProperties.html
trunk/LayoutTests/platform/chromium/inspector/debugger/properties-special-expected.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/InjectedScriptSource.js
trunk/Source/WebCore/inspector/front-end/ObjectPropertiesSection.js
trunk/Source/WebCore/inspector/front-end/RemoteObject.js
trunk/Source/WebCore/inspector/front-end/inspector.css
Diff
Modified: trunk/LayoutTests/ChangeLog (147220 => 147221)
--- trunk/LayoutTests/ChangeLog 2013-03-29 15:20:38 UTC (rev 147220)
+++ trunk/LayoutTests/ChangeLog 2013-03-29 15:50:44 UTC (rev 147221)
@@ -1,3 +1,19 @@
+2013-03-29 Sheriff Bot webkit.review@gmail.com
+
+Unreviewed, rolling out r147218.
+http://trac.webkit.org/changeset/147218
+https://bugs.webkit.org/show_bug.cgi?id=113585
+
+We should rethink UI of this feature. (Requested by vsevik on
+#webkit).
+
+* inspector/console/command-line-api-expected.txt:
+* inspector/debugger/properties-special-expected.txt:
+* inspector/debugger/properties-special.html:
+* inspector/runtime/runtime-getProperties-expected.txt:
+* inspector/runtime/runtime-getProperties.html:
+* platform/chromium/inspector/debugger/properties-special-expected.txt:
+
2013-03-29 Seokju Kwon seokju.k...@gmail.com
Web Inspector: Update test expectation for resource-har-conversion.html
Modified: trunk/LayoutTests/inspector/console/command-line-api-expected.txt (147220 => 147221)
--- trunk/LayoutTests/inspector/console/command-line-api-expected.txt 2013-03-29 15:20:38 UTC (rev 147220)
+++ trunk/LayoutTests/inspector/console/command-line-api-expected.txt 2013-03-29 15:50:44 UTC (rev 147221)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 1226: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $(#%s)
+CONSOLE MESSAGE: line 1222: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $(#%s)
Tests that command line api works.
Modified: trunk/LayoutTests/inspector/debugger/properties-special-expected.txt (147220 => 147221)
--- trunk/LayoutTests/inspector/debugger/properties-special-expected.txt 2013-03-29 15:20:38 UTC (rev 147220)
+++ trunk/LayoutTests/inspector/debugger/properties-special-expected.txt 2013-03-29 15:50:44 UTC (rev 147221)
@@ -5,8 +5,6 @@
Set timer for test function.
Watch expressions updated.
Nodes are expanded.
-error: Function scope data is not available
-Subnodes are expanded.
'Object(true)' = 'Boolean'
'__proto__' = 'Boolean'
'(function(a,b) { return a + b; })' = 'function (a, b) { return a + b; }'
@@ -15,19 +13,15 @@
'length' = '2'
'name' = ''
'prototype' = 'Object'
-'constructor' = 'function (a, b) { return a + b; }'
-'__proto__' = 'Object'
'__proto__' = 'function () {'
function scope
'(function(a,b) { return a + b; }).bind({}, 2)' = 'function () {'
-'arguments' = null
-'get' = 'function () {'
-'set' = 'function () {'
-'caller' = null
-'get' = 'function () {'
-'set' = 'function () {'
+'get arguments' = 'function () {'
+'get caller' = 'function () {'
'length' = '1'
'name' = ''
+'set arguments' = 'function () {'
+'set caller' = 'function () {'
'__proto__' = 'function () {'
function scope
Debugger was disabled.
Modified: trunk/LayoutTests/inspector/debugger/properties-special.html (147220 => 147221)
---
[webkit-changes] [147222] trunk/Source
Title: [147222] trunk/Source Revision 147222 Author commit-qu...@webkit.org Date 2013-03-29 09:07:15 -0700 (Fri, 29 Mar 2013) Log Message [EFL][EGL] Add support for creating offscreen surface. https://bugs.webkit.org/show_bug.cgi?id=113359 Patch by Kondapally Kalyan kalyan.kondapa...@intel.com on 2013-03-29 Reviewed by Noam Rosenthal. This is in preparation for enabling EGL and GLES2 support for EFL port. This patch adds support for using EGLPixmapSurface as an offscreensurface. * PlatformEfl.cmake: * platform/graphics/opengl/GLPlatformSurface.cpp: (WebCore::GLPlatformSurface::createOffScreenSurface): * platform/graphics/surfaces/efl/GLTransportSurface.cpp: (WebCore::GLTransportSurface::createTransportSurface): * platform/graphics/surfaces/egl/EGLConfigSelector.cpp: (WebCore::EGLConfigSelector::EGLConfigSelector): (WebCore::EGLConfigSelector::pixmapContextConfig): (WebCore::EGLConfigSelector::surfaceContextConfig): (WebCore::EGLConfigSelector::nativeVisualId): (WebCore::EGLConfigSelector::reset): (WebCore::EGLConfigSelector::createConfig): * platform/graphics/surfaces/egl/EGLConfigSelector.h: (EGLConfigSelector): Added logic to select EGLConfig supporting alpha and opaque as needed. Moved Code related to display to EGLHelper class. * platform/graphics/surfaces/egl/EGLHelper.cpp: Added. (WebCore): (EGLDisplayConnection): (WebCore::EGLDisplayConnection::EGLDisplayConnection): (WebCore::EGLDisplayConnection::~EGLDisplayConnection): (WebCore::EGLDisplayConnection::display): (WebCore::EGLDisplayConnection::terminate): (WebCore::EGLHelper::eglDisplay): * platform/graphics/surfaces/egl/EGLHelper.h: Copied from Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h. (WebCore): (EGLHelper): * platform/graphics/surfaces/egl/EGLSurface.cpp: (WebCore::EGLTransportSurface::createTransportSurface): (WebCore::EGLTransportSurface::EGLTransportSurface): (WebCore::EGLTransportSurface::attributes): (WebCore::EGLTransportSurface::~EGLTransportSurface): (WebCore::EGLTransportSurface::destroy): (WebCore::EGLTransportSurface::configuration): (WebCore::EGLOffScreenSurface::createOffScreenSurface): (WebCore::EGLOffScreenSurface::EGLOffScreenSurface): (WebCore::EGLOffScreenSurface::~EGLOffScreenSurface): (WebCore::EGLOffScreenSurface::attributes): (WebCore::EGLOffScreenSurface::configuration): (WebCore::EGLOffScreenSurface::destroy): * platform/graphics/surfaces/egl/EGLSurface.h: (WebCore): (EGLTransportSurface): (EGLOffScreenSurface): * platform/graphics/surfaces/egl/EGLXSurface.cpp: Copied from Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.cpp. (WebCore): (WebCore::EGLWindowTransportSurface::EGLWindowTransportSurface): (WebCore::EGLWindowTransportSurface::~EGLWindowTransportSurface): (WebCore::EGLWindowTransportSurface::swapBuffers): (WebCore::EGLWindowTransportSurface::destroy): (WebCore::EGLPixmapSurface::EGLPixmapSurface): (WebCore::EGLPixmapSurface::~EGLPixmapSurface): (WebCore::EGLPixmapSurface::destroy): * platform/graphics/surfaces/egl/EGLXSurface.h: Copied from Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h. (WebCore): (EGLWindowTransportSurface): (EGLPixmapSurface): EGLPixmapSurface implementation. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/PlatformEfl.cmake trunk/Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp trunk/Source/WebCore/platform/graphics/surfaces/efl/GLTransportSurface.cpp trunk/Source/WebCore/platform/graphics/surfaces/egl/EGLConfigSelector.cpp trunk/Source/WebCore/platform/graphics/surfaces/egl/EGLConfigSelector.h trunk/Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.cpp trunk/Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h trunk/Source/cmake/OptionsEfl.cmake Added Paths trunk/Source/WebCore/platform/graphics/surfaces/egl/EGLHelper.cpp trunk/Source/WebCore/platform/graphics/surfaces/egl/EGLHelper.h trunk/Source/WebCore/platform/graphics/surfaces/egl/EGLXSurface.cpp trunk/Source/WebCore/platform/graphics/surfaces/egl/EGLXSurface.h Diff Modified: trunk/Source/WebCore/ChangeLog (147221 => 147222) --- trunk/Source/WebCore/ChangeLog 2013-03-29 15:50:44 UTC (rev 147221) +++ trunk/Source/WebCore/ChangeLog 2013-03-29 16:07:15 UTC (rev 147222) @@ -1,3 +1,77 @@ +2013-03-29 Kondapally Kalyan kalyan.kondapa...@intel.com + +[EFL][EGL] Add support for creating offscreen surface. +https://bugs.webkit.org/show_bug.cgi?id=113359 + +Reviewed by Noam Rosenthal. + +This is in preparation for enabling EGL and GLES2 +support for EFL port. This patch adds support for using +EGLPixmapSurface as an offscreensurface. + +* PlatformEfl.cmake: +* platform/graphics/opengl/GLPlatformSurface.cpp: +(WebCore::GLPlatformSurface::createOffScreenSurface): +* platform/graphics/surfaces/efl/GLTransportSurface.cpp: +(WebCore::GLTransportSurface::createTransportSurface): +* platform/graphics/surfaces/egl/EGLConfigSelector.cpp: +
[webkit-changes] [147224] trunk/Source/WebCore
Title: [147224] trunk/Source/WebCore
Revision 147224
Author loi...@chromium.org
Date 2013-03-29 09:47:27 -0700 (Fri, 29 Mar 2013)
Log Message
Web Inspector: Flame Chart. Remove hopping ancorElement and use anchorBox instead.
https://bugs.webkit.org/show_bug.cgi?id=113579
Reviewed by Pavel Feldman.
Initially I made a fake anchor element and moved it according to the highlighted element position.
It was a hack and after http://trac.webkit.org/changeset/147209 I'm able to remove it.
Drive by fix: the code was moved from onMouseMove to getPopoverAnchor.
* inspector/front-end/FlameChart.js:
(WebInspector.FlameChart):
(WebInspector.FlameChart.prototype._getPopoverAnchor):
-(WebInspector.FlameChart.prototype._onMouseMove)
* inspector/front-end/flameChart.css:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/FlameChart.js
trunk/Source/WebCore/inspector/front-end/flameChart.css
Diff
Modified: trunk/Source/WebCore/ChangeLog (147223 => 147224)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 16:37:59 UTC (rev 147223)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 16:47:27 UTC (rev 147224)
@@ -1,3 +1,21 @@
+2013-03-29 Ilya Tikhonovsky loi...@chromium.org
+
+Web Inspector: Flame Chart. Remove hopping ancorElement and use anchorBox instead.
+https://bugs.webkit.org/show_bug.cgi?id=113579
+
+Reviewed by Pavel Feldman.
+
+Initially I made a fake anchor element and moved it according to the highlighted element position.
+It was a hack and after http://trac.webkit.org/changeset/147209 I'm able to remove it.
+
+Drive by fix: the code was moved from onMouseMove to getPopoverAnchor.
+
+* inspector/front-end/FlameChart.js:
+(WebInspector.FlameChart):
+(WebInspector.FlameChart.prototype._getPopoverAnchor):
+-(WebInspector.FlameChart.prototype._onMouseMove)
+* inspector/front-end/flameChart.css:
+
2013-03-29 Kondapally Kalyan kalyan.kondapa...@intel.com
[EFL][EGL] Add support for creating offscreen surface.
Modified: trunk/Source/WebCore/inspector/front-end/FlameChart.js (147223 => 147224)
--- trunk/Source/WebCore/inspector/front-end/FlameChart.js 2013-03-29 16:37:59 UTC (rev 147223)
+++ trunk/Source/WebCore/inspector/front-end/FlameChart.js 2013-03-29 16:47:27 UTC (rev 147224)
@@ -61,13 +61,11 @@
this._barHeight = 15;
this._minWidth = 1;
this._paddingLeft = 15;
-this._canvas.addEventListener(mousemove, this._onMouseMove.bind(this), false);
this._canvas.addEventListener(mousewheel, this._onMouseWheel.bind(this), false);
this.element.addEventListener(click, this._onClick.bind(this), false);
this._popoverHelper = new WebInspector.PopoverHelper(this._chartContainer, this._getPopoverAnchor.bind(this), this._showPopover.bind(this));
this._popoverHelper.setTimeout(250);
-this._anchorElement = this._chartContainer.createChild(span);
-this._anchorElement.className = item-anchor;
+this._anchorBox = new AnchorBox(0, 0, 0, 0);
this._linkifier = new WebInspector.Linkifier();
this._highlightedNodeIndex = -1;
@@ -393,11 +391,36 @@
return this._timelineData;
},
-_getPopoverAnchor: function()
+_getPopoverAnchor: function(element, event)
{
-if (this._highlightedNodeIndex === -1 || this._isDragging)
+if (this._isDragging)
return null;
-return this._anchorElement;
+
+var nodeIndex = this._coordinatesToNodeIndex(event.offsetX, event.offsetY);
+
+this._highlightedNodeIndex = nodeIndex;
+this.update();
+
+if (nodeIndex === -1)
+return null;
+
+var timelineEntries = this._timelineData.entries;
+
+var anchorLeft = Math.floor(timelineEntries[nodeIndex].startTime * this._timeToPixel - this._pixelWindowLeft + this._paddingLeft);
+var anchorTop = Math.floor(this._canvas.height - (timelineEntries[nodeIndex].depth + 1) * this._barHeight);
+
+var anchorWidth = Math.floor(timelineEntries[nodeIndex].duration * this._timeToPixel);
+if (anchorLeft 0) {
+anchorWidth += anchorLeft;
+anchorLeft = 0;
+}
+
+anchorLeft = Number.constrain(anchorLeft, 0, this._canvas.width);
+anchorWidth = Number.constrain(anchorWidth, 0, this._canvas.width - anchorLeft);
+
+var canvasOffsetLeft = event.pageX - event.offsetX;
+var canvasOffsetTop = event.pageY - event.offsetY;
+return new AnchorBox(anchorLeft + canvasOffsetLeft, anchorTop + canvasOffsetTop, anchorWidth, this._barHeight);
},
_showPopover: function(anchor, popover)
@@ -434,35 +457,6 @@
this.dispatchEventToListeners(WebInspector.FlameChart.Events.SelectedNode, node);
},
-_onMouseMove: function(e)
-{
-if (this._isDragging)
-return;
-var nodeIndex = this._coordinatesToNodeIndex(e.offsetX, e.offsetY);
-if (nodeIndex
[webkit-changes] [147225] trunk/Tools
Title: [147225] trunk/Tools Revision 147225 Author rn...@webkit.org Date 2013-03-29 09:59:49 -0700 (Fri, 29 Mar 2013) Log Message Fix a typo in r147147 to fix Mac EWS. * Scripts/webkitpy/tool/commands/queues.py: (PatchProcessingQueue._new_port_name_from_old): Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/tool/commands/queues.py Diff Modified: trunk/Tools/ChangeLog (147224 => 147225) --- trunk/Tools/ChangeLog 2013-03-29 16:47:27 UTC (rev 147224) +++ trunk/Tools/ChangeLog 2013-03-29 16:59:49 UTC (rev 147225) @@ -1,3 +1,10 @@ +2013-03-29 Ryosuke Niwa rn...@webkit.org + +Fix a typo in r147147 to fix Mac EWS. + +* Scripts/webkitpy/tool/commands/queues.py: +(PatchProcessingQueue._new_port_name_from_old): + 2013-03-28 Ryuan Choi ryuan.c...@samsung.com [EFL] Build break with latest EFL libraries after r146265 Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues.py (147224 => 147225) --- trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2013-03-29 16:47:27 UTC (rev 147224) +++ trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2013-03-29 16:59:49 UTC (rev 147225) @@ -266,7 +266,7 @@ return 'chromium' # ApplePort.determine_full_port_name asserts if the name doesn't include version. if port_name == 'mac': -return 'mac-' + platform.os_name +return 'mac-' + platform.os_version if port_name == 'win': return 'win-future' return port_name ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147226] trunk/Source/WebCore
Title: [147226] trunk/Source/WebCore
Revision 147226
Author vse...@chromium.org
Date 2013-03-29 10:06:36 -0700 (Fri, 29 Mar 2013)
Log Message
Web Inspector: Prompt before closing dirty tab.
https://bugs.webkit.org/show_bug.cgi?id=113576
Reviewed by Pavel Feldman.
* inspector/front-end/TabbedEditorContainer.js:
(WebInspector.TabbedEditorContainer):
(WebInspector.TabbedEditorContainer.prototype._maybeCloseTab):
(WebInspector.TabbedEditorContainer.prototype._closeTabs):
(WebInspector.EditorContainerTabDelegate):
(WebInspector.EditorContainerTabDelegate.prototype.closeTabs):
* inspector/front-end/TabbedPane.js:
(WebInspector.TabbedPane.prototype.setTabDelegate):
(WebInspector.TabbedPane.prototype.appendTab):
(WebInspector.TabbedPane.prototype.allTabs):
(WebInspector.TabbedPane.prototype.otherTabs):
(WebInspector.TabbedPaneTab.prototype.setDelegate):
(WebInspector.TabbedPaneTab.prototype._tabClicked):
(WebInspector.TabbedPaneTab.prototype._closeTabs):
(WebInspector.TabbedPaneTab.prototype._tabContextMenu):
(WebInspector.TabbedPaneTab.prototype._tabContextMenu.closeOthers):
(WebInspector.TabbedPaneTab.prototype._tabContextMenu.closeAll):
(WebInspector.TabbedPaneTabDelegate):
(WebInspector.TabbedPaneTabDelegate.prototype.closeTabs):
* inspector/front-end/UISourceCode.js:
(WebInspector.UISourceCode.prototype.resetWorkingCopy):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/TabbedEditorContainer.js
trunk/Source/WebCore/inspector/front-end/TabbedPane.js
trunk/Source/WebCore/inspector/front-end/UISourceCode.js
Diff
Modified: trunk/Source/WebCore/ChangeLog (147225 => 147226)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 16:59:49 UTC (rev 147225)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 17:06:36 UTC (rev 147226)
@@ -1,3 +1,32 @@
+2013-03-29 Vsevolod Vlasov vse...@chromium.org
+
+Web Inspector: Prompt before closing dirty tab.
+https://bugs.webkit.org/show_bug.cgi?id=113576
+
+Reviewed by Pavel Feldman.
+
+* inspector/front-end/TabbedEditorContainer.js:
+(WebInspector.TabbedEditorContainer):
+(WebInspector.TabbedEditorContainer.prototype._maybeCloseTab):
+(WebInspector.TabbedEditorContainer.prototype._closeTabs):
+(WebInspector.EditorContainerTabDelegate):
+(WebInspector.EditorContainerTabDelegate.prototype.closeTabs):
+* inspector/front-end/TabbedPane.js:
+(WebInspector.TabbedPane.prototype.setTabDelegate):
+(WebInspector.TabbedPane.prototype.appendTab):
+(WebInspector.TabbedPane.prototype.allTabs):
+(WebInspector.TabbedPane.prototype.otherTabs):
+(WebInspector.TabbedPaneTab.prototype.setDelegate):
+(WebInspector.TabbedPaneTab.prototype._tabClicked):
+(WebInspector.TabbedPaneTab.prototype._closeTabs):
+(WebInspector.TabbedPaneTab.prototype._tabContextMenu):
+(WebInspector.TabbedPaneTab.prototype._tabContextMenu.closeOthers):
+(WebInspector.TabbedPaneTab.prototype._tabContextMenu.closeAll):
+(WebInspector.TabbedPaneTabDelegate):
+(WebInspector.TabbedPaneTabDelegate.prototype.closeTabs):
+* inspector/front-end/UISourceCode.js:
+(WebInspector.UISourceCode.prototype.resetWorkingCopy):
+
2013-03-29 Ilya Tikhonovsky loi...@chromium.org
Web Inspector: Flame Chart. Remove hopping ancorElement and use anchorBox instead.
Modified: trunk/Source/WebCore/inspector/front-end/TabbedEditorContainer.js (147225 => 147226)
--- trunk/Source/WebCore/inspector/front-end/TabbedEditorContainer.js 2013-03-29 16:59:49 UTC (rev 147225)
+++ trunk/Source/WebCore/inspector/front-end/TabbedEditorContainer.js 2013-03-29 17:06:36 UTC (rev 147226)
@@ -51,6 +51,8 @@
this._delegate = delegate;
this._tabbedPane = new WebInspector.TabbedPane();
+this._tabbedPane.setTabDelegate(new WebInspector.EditorContainerTabDelegate(this));
+
this._tabbedPane.closeableTabs = true;
this._tabbedPane.element.id = scripts-editor-container-tabbed-pane;
@@ -178,6 +180,50 @@
},
/**
+ * @param {string} id
+ * @param {string} nextTabId
+ */
+_maybeCloseTab: function(id, nextTabId)
+{
+var uiSourceCode = this._files[id];
+var shouldPrompt = uiSourceCode.isDirty() uiSourceCode.project().canSetFileContent();
+// FIXME: this should be replaced with common Save/Discard/Cancel dialog.
+if (!shouldPrompt || confirm(WebInspector.UIString(Are you sure you want to close unsaved file: %s?, uiSourceCode.name( {
+uiSourceCode.resetWorkingCopy();
+if (nextTabId)
+this._tabbedPane.selectTab(nextTabId, true);
+this._tabbedPane.closeTab(id, true);
+return true;
+}
+return false;
+},
+
+/**
+ * @param {Array.string} ids
+ */
+_closeTabs: function(ids)
+{
+var dirtyTabs = [];
+var cleanTabs = [];
+for
[webkit-changes] [147227] trunk/Source/WebCore
Title: [147227] trunk/Source/WebCore
Revision 147227
Author vse...@chromium.org
Date 2013-03-29 10:24:52 -0700 (Fri, 29 Mar 2013)
Log Message
Web Inspector: Content should not be lost when uiSourceCode's file was removed externally on file system.
https://bugs.webkit.org/show_bug.cgi?id=113581
Reviewed by Pavel Feldman.
* inspector/front-end/IsolatedFileSystem.js:
(WebInspector.IsolatedFileSystem.prototype.errorHandler):
(WebInspector.IsolatedFileSystem.prototype.requestFileContent):
(WebInspector.IsolatedFileSystem.prototype.fileSystemLoaded):
* inspector/front-end/UISourceCode.js:
(WebInspector.UISourceCode.prototype.checkContentUpdated.contentLoaded):
(WebInspector.UISourceCode.prototype.checkContentUpdated):
(WebInspector.UISourceCode.prototype._commitContent):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/front-end/IsolatedFileSystem.js
trunk/Source/WebCore/inspector/front-end/UISourceCode.js
Diff
Modified: trunk/Source/WebCore/ChangeLog (147226 => 147227)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 17:06:36 UTC (rev 147226)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 17:24:52 UTC (rev 147227)
@@ -1,5 +1,21 @@
2013-03-29 Vsevolod Vlasov vse...@chromium.org
+Web Inspector: Content should not be lost when uiSourceCode's file was removed externally on file system.
+https://bugs.webkit.org/show_bug.cgi?id=113581
+
+Reviewed by Pavel Feldman.
+
+* inspector/front-end/IsolatedFileSystem.js:
+(WebInspector.IsolatedFileSystem.prototype.errorHandler):
+(WebInspector.IsolatedFileSystem.prototype.requestFileContent):
+(WebInspector.IsolatedFileSystem.prototype.fileSystemLoaded):
+* inspector/front-end/UISourceCode.js:
+(WebInspector.UISourceCode.prototype.checkContentUpdated.contentLoaded):
+(WebInspector.UISourceCode.prototype.checkContentUpdated):
+(WebInspector.UISourceCode.prototype._commitContent):
+
+2013-03-29 Vsevolod Vlasov vse...@chromium.org
+
Web Inspector: Prompt before closing dirty tab.
https://bugs.webkit.org/show_bug.cgi?id=113576
Modified: trunk/Source/WebCore/inspector/front-end/IsolatedFileSystem.js (147226 => 147227)
--- trunk/Source/WebCore/inspector/front-end/IsolatedFileSystem.js 2013-03-29 17:06:36 UTC (rev 147226)
+++ trunk/Source/WebCore/inspector/front-end/IsolatedFileSystem.js 2013-03-29 17:24:52 UTC (rev 147227)
@@ -178,6 +178,11 @@
function errorHandler(error)
{
+if (error.code === FileError.NOT_FOUND_ERR) {
+callback(null);
+return;
+}
+
var errorMessage = WebInspector.IsolatedFileSystem.errorMessage(error);
console.error(errorMessage + when getting content for file ' + (this._path + / + path) + ');
callback(null);
@@ -198,7 +203,7 @@
*/
function fileSystemLoaded(domFileSystem)
{
-domFileSystem.root.getFile(path, null, fileEntryLoaded, errorHandler);
+domFileSystem.root.getFile(path, { create: true }, fileEntryLoaded, errorHandler);
}
/**
Modified: trunk/Source/WebCore/inspector/front-end/UISourceCode.js (147226 => 147227)
--- trunk/Source/WebCore/inspector/front-end/UISourceCode.js 2013-03-29 17:06:36 UTC (rev 147226)
+++ trunk/Source/WebCore/inspector/front-end/UISourceCode.js 2013-03-29 17:24:52 UTC (rev 147227)
@@ -225,11 +225,19 @@
function contentLoaded(updatedContent)
{
+if (updatedContent === null) {
+var workingCopy = this.workingCopy();
+this._commitContent(, false);
+this.setWorkingCopy(workingCopy);
+delete this._checkingContent;
+return;
+}
if (typeof this._lastAcceptedContent === string this._lastAcceptedContent === updatedContent) {
delete this._checkingContent;
return;
}
if (this._content === updatedContent) {
+delete this._lastAcceptedContent;
delete this._checkingContent;
return;
}
@@ -263,6 +271,7 @@
*/
_commitContent: function(content, shouldSetContentInProject)
{
+delete this._lastAcceptedContent;
this._content = content;
this._contentLoaded = true;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147228] trunk
Title: [147228] trunk
Revision 147228
Author jap...@chromium.org
Date 2013-03-29 11:10:42 -0700 (Fri, 29 Mar 2013)
Log Message
ASSERT d-m_defersLoading != defers on detik.com and drive.google.com
https://bugs.webkit.org/show_bug.cgi?id=111902
Reviewed by Alexey Proskuryakov.
Source/WebCore:
Test: http/tests/navigation/same-url-iframes-defer-crash.html
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::setDefersLoading): If multiple DocumentLoaders are
using loading the same main resource, ensure only one of them can call
ResourceLoader::setDefersLoading.
LayoutTests:
* http/tests/navigation/same-url-iframes-defer-crash-expected.txt: Added.
* http/tests/navigation/same-url-iframes-defer-crash.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/DocumentLoader.cpp
Added Paths
trunk/LayoutTests/http/tests/navigation/same-url-iframes-defer-crash-expected.txt
trunk/LayoutTests/http/tests/navigation/same-url-iframes-defer-crash.html
Diff
Modified: trunk/LayoutTests/ChangeLog (147227 => 147228)
--- trunk/LayoutTests/ChangeLog 2013-03-29 17:24:52 UTC (rev 147227)
+++ trunk/LayoutTests/ChangeLog 2013-03-29 18:10:42 UTC (rev 147228)
@@ -1,3 +1,13 @@
+2013-03-29 Nate Chapin jap...@chromium.org
+
+ASSERT d-m_defersLoading != defers on detik.com and drive.google.com
+https://bugs.webkit.org/show_bug.cgi?id=111902
+
+Reviewed by Alexey Proskuryakov.
+
+* http/tests/navigation/same-url-iframes-defer-crash-expected.txt: Added.
+* http/tests/navigation/same-url-iframes-defer-crash.html: Added.
+
2013-03-29 Zoltan Arvai zar...@inf.u-szeged.hu
[Qt] Unreviewed gardneing. Updated png expected results after r146206.
Added: trunk/LayoutTests/http/tests/navigation/same-url-iframes-defer-crash-expected.txt (0 => 147228)
--- trunk/LayoutTests/http/tests/navigation/same-url-iframes-defer-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/navigation/same-url-iframes-defer-crash-expected.txt 2013-03-29 18:10:42 UTC (rev 147228)
@@ -0,0 +1,3 @@
+ALERT: PASS
+This tests that we can cause the Page to defer loading while loading the same resource in multiple iframes. In this test, the load deferral is because of a modal dialog via window.alert. We pass if we don't assert in debug.
+See https://bugs.webkit.org/show_bug.cgi?id=111902.
Added: trunk/LayoutTests/http/tests/navigation/same-url-iframes-defer-crash.html (0 => 147228)
--- trunk/LayoutTests/http/tests/navigation/same-url-iframes-defer-crash.html (rev 0)
+++ trunk/LayoutTests/http/tests/navigation/same-url-iframes-defer-crash.html 2013-03-29 18:10:42 UTC (rev 147228)
@@ -0,0 +1,11 @@
+body
+This tests that we can cause the Page to defer loading while loading the same resource in multiple iframes. In this test, the load deferral is because of a modal dialog via window.alert. We pass if we don't assert in debug.br
+See https://bugs.webkit.org/show_bug.cgi?id=111902.
+iframe src=""
+iframe src=""
+script
+if (window.testRunner)
+testRunner.dumpAsText();
+alert(PASS);
+/script
+/body
Modified: trunk/Source/WebCore/ChangeLog (147227 => 147228)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 17:24:52 UTC (rev 147227)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 18:10:42 UTC (rev 147228)
@@ -1,3 +1,17 @@
+2013-03-29 Nate Chapin jap...@chromium.org
+
+ASSERT d-m_defersLoading != defers on detik.com and drive.google.com
+https://bugs.webkit.org/show_bug.cgi?id=111902
+
+Reviewed by Alexey Proskuryakov.
+
+Test: http/tests/navigation/same-url-iframes-defer-crash.html
+
+* loader/DocumentLoader.cpp:
+(WebCore::DocumentLoader::setDefersLoading): If multiple DocumentLoaders are
+ using loading the same main resource, ensure only one of them can call
+ ResourceLoader::setDefersLoading.
+
2013-03-29 Vsevolod Vlasov vse...@chromium.org
Web Inspector: Content should not be lost when uiSourceCode's file was removed externally on file system.
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (147227 => 147228)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-03-29 17:24:52 UTC (rev 147227)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-03-29 18:10:42 UTC (rev 147228)
@@ -1286,8 +1286,12 @@
void DocumentLoader::setDefersLoading(bool defers)
{
-if (mainResourceLoader())
+// Multiple frames may be loading the same main resource simultaneously. If deferral state changes,
+// each frame's DocumentLoader will try to send a setDefersLoading() to the same underlying ResourceLoader. Ensure only
+// the owning DocumentLoader does so, as setDefersLoading() is not resilient to setting the same value repeatedly.
+if (mainResourceLoader() mainResourceLoader()-documentLoader() == this)
mainResourceLoader()-setDefersLoading(defers);
+
[webkit-changes] [147229] tags/Safari-537.35.4/
Title: [147229] tags/Safari-537.35.4/ Revision 147229 Author lforsch...@apple.com Date 2013-03-29 11:40:53 -0700 (Fri, 29 Mar 2013) Log Message New Tag. Added Paths tags/Safari-537.35.4/ Diff Property changes: tags/Safari-537.35.4 Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147230] trunk/LayoutTests
Title: [147230] trunk/LayoutTests Revision 147230 Author timo...@apple.com Date 2013-03-29 11:49:45 -0700 (Fri, 29 Mar 2013) Log Message Mark inspector/debugger/debugger-scripts-reload.html as flaky. http://webkit.org/b/113589 Unreviewed. * platform/mac/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/mac/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (147229 => 147230) --- trunk/LayoutTests/ChangeLog 2013-03-29 18:40:53 UTC (rev 147229) +++ trunk/LayoutTests/ChangeLog 2013-03-29 18:49:45 UTC (rev 147230) @@ -1,3 +1,13 @@ +2013-03-29 Timothy Hatcher timo...@apple.com + +Mark inspector/debugger/debugger-scripts-reload.html as flaky. + +http://webkit.org/b/113589 + +Unreviewed. + +* platform/mac/TestExpectations: + 2013-03-29 Nate Chapin jap...@chromium.org ASSERT d-m_defersLoading != defers on detik.com and drive.google.com Modified: trunk/LayoutTests/platform/mac/TestExpectations (147229 => 147230) --- trunk/LayoutTests/platform/mac/TestExpectations 2013-03-29 18:40:53 UTC (rev 147229) +++ trunk/LayoutTests/platform/mac/TestExpectations 2013-03-29 18:49:45 UTC (rev 147230) @@ -266,6 +266,9 @@ inspector/debugger/step-through-event-listeners.html inspector/debugger/xhr-breakpoints.html +# Test is flaky and thus not useful until fixed. +webkit.org/b/113589 inspector/debugger/debugger-scripts-reload.html [ Pass Failure ] + # JSC doesn't support heap profiling # https://bugs.webkit.org/show_bug.cgi?id=50485 inspector/profiler/heap-snapshot-inspect-dom-wrapper.html ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147231] trunk/WebKitLibraries
Title: [147231] trunk/WebKitLibraries Revision 147231 Author roger_f...@apple.com Date 2013-03-29 11:52:27 -0700 (Fri, 29 Mar 2013) Log Message Unreviewed. Rollout r146818. * win/tools/vsprops/FeatureDefines.props: Modified Paths trunk/WebKitLibraries/ChangeLog trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props Diff Modified: trunk/WebKitLibraries/ChangeLog (147230 => 147231) --- trunk/WebKitLibraries/ChangeLog 2013-03-29 18:49:45 UTC (rev 147230) +++ trunk/WebKitLibraries/ChangeLog 2013-03-29 18:52:27 UTC (rev 147231) @@ -1,3 +1,9 @@ +2013-03-29 Roger Fong roger_f...@apple.com + +Unreviewed. Rollout r146818. + +* win/tools/vsprops/FeatureDefines.props: + 2013-03-25 Kent Tamura tk...@chromium.org Rename ENABLE_INPUT_TYPE_DATETIME Modified: trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props (147230 => 147231) --- trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props 2013-03-29 18:49:45 UTC (rev 147230) +++ trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props 2013-03-29 18:52:27 UTC (rev 147231) @@ -12,7 +12,7 @@ ENABLE_CSS3_TEXT / ENABLE_CSS_BOX_DECORATION_BREAKENABLE_CSS_BOX_DECORATION_BREAK/ENABLE_CSS_BOX_DECORATION_BREAK ENABLE_CSS_COMPOSITING / -ENABLE_CSS_EXCLUSIONSENABLE_CSS_EXCLUSIONS/ENABLE_CSS_EXCLUSIONS +ENABLE_CSS_EXCLUSIONS / ENABLE_CSS_FILTERSENABLE_CSS_FILTERS/ENABLE_CSS_FILTERS ENABLE_CSS_GRID_LAYOUT / ENABLE_CSS_REGIONSENABLE_CSS_REGIONS/ENABLE_CSS_REGIONS ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147232] trunk/LayoutTests
Title: [147232] trunk/LayoutTests Revision 147232 Author timo...@apple.com Date 2013-03-29 11:54:24 -0700 (Fri, 29 Mar 2013) Log Message Mark fast/workers/worker-close-more.html, worker-document-leak.html and worker-lifecycle.html as flaky on Windows. http://webkit.org/b/106415 Unreviewed. * platform/win/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/win/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (147231 => 147232) --- trunk/LayoutTests/ChangeLog 2013-03-29 18:52:27 UTC (rev 147231) +++ trunk/LayoutTests/ChangeLog 2013-03-29 18:54:24 UTC (rev 147232) @@ -1,5 +1,16 @@ 2013-03-29 Timothy Hatcher timo...@apple.com +Mark fast/workers/worker-close-more.html, worker-document-leak.html and +worker-lifecycle.html as flaky on Windows. + +http://webkit.org/b/106415 + +Unreviewed. + +* platform/win/TestExpectations: + +2013-03-29 Timothy Hatcher timo...@apple.com + Mark inspector/debugger/debugger-scripts-reload.html as flaky. http://webkit.org/b/113589 Modified: trunk/LayoutTests/platform/win/TestExpectations (147231 => 147232) --- trunk/LayoutTests/platform/win/TestExpectations 2013-03-29 18:52:27 UTC (rev 147231) +++ trunk/LayoutTests/platform/win/TestExpectations 2013-03-29 18:54:24 UTC (rev 147232) @@ -433,6 +433,10 @@ # Sometimes times out http://webkit.org/b/48457 fast/workers/storage/use-same-database-in-page-and-workers.html +webkit.org/b/106415 fast/workers/worker-close-more.html [ Pass Failure ] +webkit.org/b/106415 fast/workers/worker-document-leak.html [ Pass Failure ] +webkit.org/b/106415 fast/workers/worker-lifecycle.html [ Pass Failure ] + # Times out on apple-windows-3 http://webkit.org/b/48750 fast/frames/sandboxed-iframe-storage.html ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147233] trunk/Source
Title: [147233] trunk/Source
Revision 147233
Author jsb...@chromium.org
Date 2013-03-29 12:12:04 -0700 (Fri, 29 Mar 2013)
Log Message
IndexedDB: Bind lifetime of in-memory backing stores to IDBFactory backend
https://bugs.webkit.org/show_bug.cgi?id=110820
Reviewed by Tony Chang.
Source/WebCore:
Backing stores are dropped as soon as all connections are closed. That makes sense for
disk-backed stores to free up memory (although there's a performance trade-off...). But
for memory-backed stores, the expected lifetime should match the lifetime of the factory
so that an open/write/close/re-open/read yields the written data.
Test: Chromium's webkit_unit_tests, IDBFactoryBackendTest.MemoryBackingStoreLifetime
* Modules/indexeddb/IDBBackingStore.cpp:
(WebCore::IDBBackingStore::IDBBackingStore): Pass comparator into constructor since it was always
assigned immediately afterwards anyway.
(WebCore::IDBBackingStore::open): Split into three parts - open() which is disk-backed...
(WebCore::IDBBackingStore::openInMemory): ...explit in-memory creation (previously: specified by empty path)
(WebCore::IDBBackingStore::create): ... and the common logic which calls the constructor.
* Modules/indexeddb/IDBBackingStore.h: Headers for the above.
* Modules/indexeddb/IDBFactoryBackendImpl.cpp:
(WebCore::IDBFactoryBackendImpl::openBackingStore): Add in-memory backing stores to dependent set.
* Modules/indexeddb/IDBFactoryBackendImpl.h: Add member to track dependent backing stores.
Source/WebKit/chromium:
* tests/IDBBackingStoreTest.cpp:
(WebCore::IDBBackingStoreTest::SetUp): Use openInMemory rather than empty path.
(WebCore::TEST): Added IDBFactoryBackendTest.MemoryBackingStoreLifetime to verify refs.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.cpp
trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.h
trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendImpl.cpp
trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendImpl.h
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/tests/IDBBackingStoreTest.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (147232 => 147233)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 18:54:24 UTC (rev 147232)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 19:12:04 UTC (rev 147233)
@@ -1,3 +1,28 @@
+2013-03-29 Joshua Bell jsb...@chromium.org
+
+IndexedDB: Bind lifetime of in-memory backing stores to IDBFactory backend
+https://bugs.webkit.org/show_bug.cgi?id=110820
+
+Reviewed by Tony Chang.
+
+Backing stores are dropped as soon as all connections are closed. That makes sense for
+disk-backed stores to free up memory (although there's a performance trade-off...). But
+for memory-backed stores, the expected lifetime should match the lifetime of the factory
+so that an open/write/close/re-open/read yields the written data.
+
+Test: Chromium's webkit_unit_tests, IDBFactoryBackendTest.MemoryBackingStoreLifetime
+
+* Modules/indexeddb/IDBBackingStore.cpp:
+(WebCore::IDBBackingStore::IDBBackingStore): Pass comparator into constructor since it was always
+assigned immediately afterwards anyway.
+(WebCore::IDBBackingStore::open): Split into three parts - open() which is disk-backed...
+(WebCore::IDBBackingStore::openInMemory): ...explit in-memory creation (previously: specified by empty path)
+(WebCore::IDBBackingStore::create): ... and the common logic which calls the constructor.
+* Modules/indexeddb/IDBBackingStore.h: Headers for the above.
+* Modules/indexeddb/IDBFactoryBackendImpl.cpp:
+(WebCore::IDBFactoryBackendImpl::openBackingStore): Add in-memory backing stores to dependent set.
+* Modules/indexeddb/IDBFactoryBackendImpl.h: Add member to track dependent backing stores.
+
2013-03-29 Nate Chapin jap...@chromium.org
ASSERT d-m_defersLoading != defers on detik.com and drive.google.com
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.cpp (147232 => 147233)
--- trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.cpp 2013-03-29 18:54:24 UTC (rev 147232)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.cpp 2013-03-29 19:12:04 UTC (rev 147233)
@@ -43,6 +43,9 @@
#include LevelDBTransaction.h
#include SecurityOrigin.h
#include SharedBuffer.h
+#if PLATFORM(CHROMIUM)
+#include public/Platform.h
+#endif
#include wtf/Assertions.h
namespace WebCore {
@@ -335,9 +338,10 @@
}
};
-IDBBackingStore::IDBBackingStore(const String identifier, PassOwnPtrLevelDBDatabase db)
+IDBBackingStore::IDBBackingStore(const String identifier, PassOwnPtrLevelDBDatabase db, PassOwnPtrLevelDBComparator comparator)
: m_identifier(identifier)
, m_db(db)
+, m_comparator(comparator)
, m_weakFactory(this)
{
}
@@ -345,6 +349,10 @@
IDBBackingStore::IDBBackingStore()
: m_weakFactory(this)
{
+// This constructor
[webkit-changes] [147234] trunk/Source/JavaScriptCore
Title: [147234] trunk/Source/_javascript_Core
Revision 147234
Author gga...@apple.com
Date 2013-03-29 12:12:18 -0700 (Fri, 29 Mar 2013)
Log Message
Simplified bytecode generation by unforking condition context codegen
https://bugs.webkit.org/show_bug.cgi?id=113554
Reviewed by Mark Hahnenberg.
Now, a node that establishes a condition context can always ask its child
nodes to generate into that context.
This has a few advantages:
(*) Removes a bunch of code;
(*) Optimizes a few missed cases like if (!(x 2)), if (!!x), and
if (!x || !y);
(*) Paves the way to removing more opcodes.
* bytecode/Opcode.h:
(JSC): Separated out the branching opcodes for clarity.
* bytecompiler/NodesCodegen.cpp:
(JSC::ExpressionNode::emitBytecodeInConditionContext): All expressions
can be emitted in a condition context now -- the default behavior is
to branch based on the _expression_'s value.
(JSC::LogicalNotNode::emitBytecodeInConditionContext):
(JSC::LogicalOpNode::emitBytecodeInConditionContext):
(JSC::ConditionalNode::emitBytecode):
(JSC::IfNode::emitBytecode):
(JSC::IfElseNode::emitBytecode):
(JSC::DoWhileNode::emitBytecode):
(JSC::WhileNode::emitBytecode):
(JSC::ForNode::emitBytecode):
* parser/Nodes.h:
(JSC::ExpressionNode::isSubtract):
(ExpressionNode):
(LogicalNotNode):
(LogicalOpNode): Removed lots of code for handling expressions
that couldn't generate into a condition context because all expressions
can now.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/bytecode/Opcode.h
trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h
trunk/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp
trunk/Source/_javascript_Core/parser/Nodes.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (147233 => 147234)
--- trunk/Source/_javascript_Core/ChangeLog 2013-03-29 19:12:04 UTC (rev 147233)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-03-29 19:12:18 UTC (rev 147234)
@@ -1,3 +1,45 @@
+2013-03-29 Geoffrey Garen gga...@apple.com
+
+Simplified bytecode generation by unforking condition context codegen
+https://bugs.webkit.org/show_bug.cgi?id=113554
+
+Reviewed by Mark Hahnenberg.
+
+Now, a node that establishes a condition context can always ask its child
+nodes to generate into that context.
+
+This has a few advantages:
+
+(*) Removes a bunch of code;
+
+(*) Optimizes a few missed cases like if (!(x 2)), if (!!x), and
+if (!x || !y);
+
+(*) Paves the way to removing more opcodes.
+
+* bytecode/Opcode.h:
+(JSC): Separated out the branching opcodes for clarity.
+* bytecompiler/NodesCodegen.cpp:
+(JSC::ExpressionNode::emitBytecodeInConditionContext): All expressions
+can be emitted in a condition context now -- the default behavior is
+to branch based on the _expression_'s value.
+
+(JSC::LogicalNotNode::emitBytecodeInConditionContext):
+(JSC::LogicalOpNode::emitBytecodeInConditionContext):
+(JSC::ConditionalNode::emitBytecode):
+(JSC::IfNode::emitBytecode):
+(JSC::IfElseNode::emitBytecode):
+(JSC::DoWhileNode::emitBytecode):
+(JSC::WhileNode::emitBytecode):
+(JSC::ForNode::emitBytecode):
+* parser/Nodes.h:
+(JSC::ExpressionNode::isSubtract):
+(ExpressionNode):
+(LogicalNotNode):
+(LogicalOpNode): Removed lots of code for handling expressions
+that couldn't generate into a condition context because all expressions
+can now.
+
2013-03-28 Geoffrey Garen gga...@apple.com
Simplified the bytecode by removing op_loop and op_loop_if_*
Modified: trunk/Source/_javascript_Core/bytecode/Opcode.h (147233 => 147234)
--- trunk/Source/_javascript_Core/bytecode/Opcode.h 2013-03-29 19:12:04 UTC (rev 147233)
+++ trunk/Source/_javascript_Core/bytecode/Opcode.h 2013-03-29 19:12:18 UTC (rev 147234)
@@ -172,7 +172,9 @@
macro(op_jnlesseq, 4) \
macro(op_jngreater, 4) \
macro(op_jngreatereq, 4) \
+\
macro(op_loop_hint, 1) \
+\
macro(op_switch_imm, 4) \
macro(op_switch_char, 4) \
macro(op_switch_string, 4) \
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h (147233 => 147234)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2013-03-29 19:12:04 UTC (rev 147233)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2013-03-29 19:12:18 UTC (rev 147234)
@@ -354,11 +354,11 @@
return emitNode(0, n);
}
-void emitNodeInConditionContext(ExpressionNode* n, Label* trueTarget, Label* falseTarget, bool fallThroughMeansTrue)
+void emitNodeInConditionContext(ExpressionNode* n, Label* trueTarget, Label* falseTarget, FallThroughMode fallThroughMode)
{
addLineInfo(n-lineNo());
if (m_stack.isSafeToRecurse())
-n-emitBytecodeInConditionContext(*this,
[webkit-changes] [147235] tags/Safari-537.35.4/Source
Title: [147235] tags/Safari-537.35.4/Source Revision 147235 Author lforsch...@apple.com Date 2013-03-29 12:13:29 -0700 (Fri, 29 Mar 2013) Log Message Versioning. Modified Paths tags/Safari-537.35.4/Source/_javascript_Core/Configurations/Version.xcconfig tags/Safari-537.35.4/Source/WebCore/Configurations/Version.xcconfig tags/Safari-537.35.4/Source/WebKit/mac/Configurations/Version.xcconfig tags/Safari-537.35.4/Source/WebKit2/Configurations/Version.xcconfig Diff Modified: tags/Safari-537.35.4/Source/_javascript_Core/Configurations/Version.xcconfig (147234 => 147235) --- tags/Safari-537.35.4/Source/_javascript_Core/Configurations/Version.xcconfig 2013-03-29 19:12:18 UTC (rev 147234) +++ tags/Safari-537.35.4/Source/_javascript_Core/Configurations/Version.xcconfig 2013-03-29 19:13:29 UTC (rev 147235) @@ -23,7 +23,7 @@ MAJOR_VERSION = 537; MINOR_VERSION = 35; -TINY_VERSION = 3; +TINY_VERSION = 4; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: tags/Safari-537.35.4/Source/WebCore/Configurations/Version.xcconfig (147234 => 147235) --- tags/Safari-537.35.4/Source/WebCore/Configurations/Version.xcconfig 2013-03-29 19:12:18 UTC (rev 147234) +++ tags/Safari-537.35.4/Source/WebCore/Configurations/Version.xcconfig 2013-03-29 19:13:29 UTC (rev 147235) @@ -23,7 +23,7 @@ MAJOR_VERSION = 537; MINOR_VERSION = 35; -TINY_VERSION = 3; +TINY_VERSION = 4; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: tags/Safari-537.35.4/Source/WebKit/mac/Configurations/Version.xcconfig (147234 => 147235) --- tags/Safari-537.35.4/Source/WebKit/mac/Configurations/Version.xcconfig 2013-03-29 19:12:18 UTC (rev 147234) +++ tags/Safari-537.35.4/Source/WebKit/mac/Configurations/Version.xcconfig 2013-03-29 19:13:29 UTC (rev 147235) @@ -23,7 +23,7 @@ MAJOR_VERSION = 537; MINOR_VERSION = 35; -TINY_VERSION = 3; +TINY_VERSION = 4; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: tags/Safari-537.35.4/Source/WebKit2/Configurations/Version.xcconfig (147234 => 147235) --- tags/Safari-537.35.4/Source/WebKit2/Configurations/Version.xcconfig 2013-03-29 19:12:18 UTC (rev 147234) +++ tags/Safari-537.35.4/Source/WebKit2/Configurations/Version.xcconfig 2013-03-29 19:13:29 UTC (rev 147235) @@ -23,7 +23,7 @@ MAJOR_VERSION = 537; MINOR_VERSION = 35; -TINY_VERSION = 3; +TINY_VERSION = 4; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147236] trunk
Title: [147236] trunk Revision 147236 Author commit-qu...@webkit.org Date 2013-03-29 12:14:35 -0700 (Fri, 29 Mar 2013) Log Message Allow multiple searchKeys to be passed to AXUIElementCopyParameterizedAttributeValue https://bugs.webkit.org/show_bug.cgi?id=112276 Patch by Greg Hughes ghug...@apple.com on 2013-03-29 Reviewed by Chris Fleizach. Source/WebCore: Added support for accessibility search predicates to accept multiple search keys. The search will return the first item that matches any one of the provided search keys. * accessibility/AccessibilityObject.cpp: (WebCore::AccessibilityObject::isAccessibilityObjectSearchMatchAtIndex): (WebCore::AccessibilityObject::isAccessibilityObjectSearchMatch): (WebCore): * accessibility/AccessibilityObject.h: (AccessibilitySearchCriteria): (WebCore::AccessibilitySearchCriteria::AccessibilitySearchCriteria): (AccessibilityObject): * accessibility/mac/WebAccessibilityObjectWrapperMac.mm: (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]): Tools: Added support to test accessibility search predicates with multiple keys. * DumpRenderTree/AccessibilityUIElement.cpp: (uiElementForSearchPredicateCallback): * DumpRenderTree/AccessibilityUIElement.h: (AccessibilityUIElement): * DumpRenderTree/atk/AccessibilityUIElementAtk.cpp: (AccessibilityUIElement::uiElementForSearchPredicate): * DumpRenderTree/blackberry/AccessibilityUIElementBlackBerry.cpp: (AccessibilityUIElement::uiElementForSearchPredicate): * DumpRenderTree/ios/AccessibilityUIElementIOS.mm: (AccessibilityUIElement::uiElementForSearchPredicate): * DumpRenderTree/mac/AccessibilityUIElementMac.mm: (AccessibilityUIElement::uiElementForSearchPredicate): * DumpRenderTree/win/AccessibilityUIElementWin.cpp: (AccessibilityUIElement::uiElementForSearchPredicate): * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp: (WTR::AccessibilityUIElement::uiElementForSearchPredicate): * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h: (AccessibilityUIElement): * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl: * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp: (WTR::AccessibilityUIElement::uiElementForSearchPredicate): * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm: (WTR::AccessibilityUIElement::uiElementForSearchPredicate): LayoutTests: Updated the search predicate test to test passing multiple search keys (link OR heading). * platform/mac/accessibility/search-predicate-expected.txt: * platform/mac/accessibility/search-predicate.html: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/mac/accessibility/search-predicate-expected.txt trunk/LayoutTests/platform/mac/accessibility/search-predicate.html trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/accessibility/AccessibilityObject.cpp trunk/Source/WebCore/accessibility/AccessibilityObject.h trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp trunk/Tools/DumpRenderTree/AccessibilityUIElement.h trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp trunk/Tools/DumpRenderTree/blackberry/AccessibilityUIElementBlackBerry.cpp trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm Diff Modified: trunk/LayoutTests/ChangeLog (147235 => 147236) --- trunk/LayoutTests/ChangeLog 2013-03-29 19:13:29 UTC (rev 147235) +++ trunk/LayoutTests/ChangeLog 2013-03-29 19:14:35 UTC (rev 147236) @@ -1,3 +1,15 @@ +2013-03-29 Greg Hughes ghug...@apple.com + +Allow multiple searchKeys to be passed to AXUIElementCopyParameterizedAttributeValue +https://bugs.webkit.org/show_bug.cgi?id=112276 + +Reviewed by Chris Fleizach. + +Updated the search predicate test to test passing multiple search keys (link OR heading). + +* platform/mac/accessibility/search-predicate-expected.txt: +* platform/mac/accessibility/search-predicate.html: + 2013-03-29 Timothy Hatcher timo...@apple.com Mark fast/workers/worker-close-more.html, worker-document-leak.html and Modified: trunk/LayoutTests/platform/mac/accessibility/search-predicate-expected.txt (147235 => 147236) --- trunk/LayoutTests/platform/mac/accessibility/search-predicate-expected.txt 2013-03-29 19:13:29 UTC (rev 147235) +++ trunk/LayoutTests/platform/mac/accessibility/search-predicate-expected.txt 2013-03-29 19:14:35 UTC (rev 147236) @@ -103,6 +103,12 @@ PASS
[webkit-changes] [147237] tags/Safari-537.35.4
Title: [147237] tags/Safari-537.35.4
Revision 147237
Author lforsch...@apple.com
Date 2013-03-29 12:22:13 -0700 (Fri, 29 Mar 2013)
Log Message
Merged r146704. rdar://problem/13337564
Modified Paths
tags/Safari-537.35.4/LayoutTests/ChangeLog
tags/Safari-537.35.4/LayoutTests/fast/dom/timer-throttling-hidden-page.html
tags/Safari-537.35.4/Source/WebCore/ChangeLog
tags/Safari-537.35.4/Source/WebCore/WebCore.exp.in
tags/Safari-537.35.4/Source/WebCore/page/Page.cpp
tags/Safari-537.35.4/Source/WebCore/page/Page.h
tags/Safari-537.35.4/Source/WebCore/page/Settings.cpp
tags/Safari-537.35.4/Source/WebCore/page/Settings.h
tags/Safari-537.35.4/Source/WebKit/mac/ChangeLog
tags/Safari-537.35.4/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
tags/Safari-537.35.4/Source/WebKit/mac/WebView/WebPreferences.mm
tags/Safari-537.35.4/Source/WebKit/mac/WebView/WebPreferencesPrivate.h
tags/Safari-537.35.4/Source/WebKit/mac/WebView/WebView.mm
tags/Safari-537.35.4/Source/WebKit2/ChangeLog
tags/Safari-537.35.4/Source/WebKit2/Shared/WebPreferencesStore.h
tags/Safari-537.35.4/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp
tags/Safari-537.35.4/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h
tags/Safari-537.35.4/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
tags/Safari-537.35.4/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Diff
Modified: tags/Safari-537.35.4/LayoutTests/ChangeLog (147236 => 147237)
--- tags/Safari-537.35.4/LayoutTests/ChangeLog 2013-03-29 19:14:35 UTC (rev 147236)
+++ tags/Safari-537.35.4/LayoutTests/ChangeLog 2013-03-29 19:22:13 UTC (rev 147237)
@@ -1,3 +1,20 @@
+2013-03-29 Lucas Forschler lforsch...@apple.com
+
+Merge r146704
+
+2013-03-21 Kiran Muppala cmupp...@apple.com
+
+Add runtime setting for hidden page DOM timer throttling and CSS animation suspension
+https://bugs.webkit.org/show_bug.cgi?id=112308
+
+Reviewed by Gavin Barraclough.
+
+Hidden page DOM timer throttling is disabled by default in WebKit1 and
+in WebKit2 for platforms other than Mac. Override the preference to
+enable it during the test.
+
+* fast/dom/timer-throttling-hidden-page.html:
+
2013-03-28 Lucas Forschler lforsch...@apple.com
Merge r146955
Modified: tags/Safari-537.35.4/LayoutTests/fast/dom/timer-throttling-hidden-page.html (147236 => 147237)
--- tags/Safari-537.35.4/LayoutTests/fast/dom/timer-throttling-hidden-page.html 2013-03-29 19:14:35 UTC (rev 147236)
+++ tags/Safari-537.35.4/LayoutTests/fast/dom/timer-throttling-hidden-page.html 2013-03-29 19:22:13 UTC (rev 147237)
@@ -56,6 +56,8 @@
debug('This test requires testRunner');
return;
}
+testRunner.overridePreference(WebKitHiddenPageDOMTimerThrottlingEnabled, 1);
+
var timeoutIntervalSpans = document.getElementsByClassName('timeoutInterval');
for (var i = 0; i timeoutIntervalSpans.length; i++)
timeoutIntervalSpans[i].innerText = timeoutInterval;
Modified: tags/Safari-537.35.4/Source/WebCore/ChangeLog (147236 => 147237)
--- tags/Safari-537.35.4/Source/WebCore/ChangeLog 2013-03-29 19:14:35 UTC (rev 147236)
+++ tags/Safari-537.35.4/Source/WebCore/ChangeLog 2013-03-29 19:22:13 UTC (rev 147237)
@@ -1,3 +1,36 @@
+2013-03-29 Lucas Forschler lforsch...@apple.com
+
+Merge r146704
+
+2013-03-21 Kiran Muppala cmupp...@apple.com
+
+Add runtime setting for hidden page DOM timer throttling and CSS animation suspension
+https://bugs.webkit.org/show_bug.cgi?id=112308
+
+Reviewed by Gavin Barraclough.
+
+No new tests. Only adding settings to enable/disable existing features
+and hence existing tests suffice.
+
+* WebCore.exp.in:
+* page/Page.cpp:
+(WebCore::Page::setVisibilityState): Check if DOM timer throttling
+and CSS animation suspension are enabled before turning them on.
+(WebCore::Page::hiddenPageDOMTimerThrottlingStateChanged): Start or stop
+DOM timer throttling based on page visibility and the new setting state.
+(WebCore::Page::hiddenPageCSSAnimationSuspensionStateChanged): Ditto
+for CSS animation suspension.
+* page/Page.h:
+* page/Settings.cpp:
+(WebCore::Settings::Settings): Initialize the flags for enabling hidden
+page DOM timer throttling and CSS animation suspension to false.
+(WebCore::Settings::setHiddenPageDOMTimerThrottlingEnabled): Update flag
+and notify page that the state of the setting has changed.
+(WebCore::Settings::setHiddenPageCSSAnimationSuspensionEnabled): Ditto.
+* page/Settings.h:
+(WebCore::Settings::hiddenPageDOMTimerThrottlingEnabled):
+(WebCore::Settings::hiddenPageCSSAnimationSuspensionEnabled):
+
2013-03-28
[webkit-changes] [147238] trunk/Source/WebCore
Title: [147238] trunk/Source/WebCore Revision 147238 Author simon.fra...@apple.com Date 2013-03-29 12:26:36 -0700 (Fri, 29 Mar 2013) Log Message removeViewportConstrainedLayer() should remove the layer from m_viewportConstrainedLayersNeedingUpdate too https://bugs.webkit.org/show_bug.cgi?id=113596 Reviewed by Tim Horton. It's possible, with some combination of position:fixed and opacity transitions in iframes, to end up with a RenderLayer in m_viewportConstrainedLayersNeedingUpdate that has been removed from m_viewportConstrainedLayers, which leads to later assertions and/or crashes. Fix by removing a layer from m_viewportConstrainedLayersNeedingUpdate when we remove it from m_viewportConstrainedLayers. I was not able to come up with a testcase that reliably reproduces this. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::removeViewportConstrainedLayer): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (147237 => 147238) --- trunk/Source/WebCore/ChangeLog 2013-03-29 19:22:13 UTC (rev 147237) +++ trunk/Source/WebCore/ChangeLog 2013-03-29 19:26:36 UTC (rev 147238) @@ -1,3 +1,23 @@ +2013-03-29 Simon Fraser simon.fra...@apple.com + +removeViewportConstrainedLayer() should remove the layer from m_viewportConstrainedLayersNeedingUpdate too +https://bugs.webkit.org/show_bug.cgi?id=113596 + +Reviewed by Tim Horton. + +It's possible, with some combination of position:fixed and opacity transitions +in iframes, to end up with a RenderLayer in m_viewportConstrainedLayersNeedingUpdate +that has been removed from m_viewportConstrainedLayers, which leads to later assertions +and/or crashes. + +Fix by removing a layer from m_viewportConstrainedLayersNeedingUpdate when we +remove it from m_viewportConstrainedLayers. + +I was not able to come up with a testcase that reliably reproduces this. + +* rendering/RenderLayerCompositor.cpp: +(WebCore::RenderLayerCompositor::removeViewportConstrainedLayer): + 2013-03-29 Greg Hughes ghug...@apple.com Allow multiple searchKeys to be passed to AXUIElementCopyParameterizedAttributeValue Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (147237 => 147238) --- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2013-03-29 19:22:13 UTC (rev 147237) +++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2013-03-29 19:26:36 UTC (rev 147238) @@ -2978,6 +2978,7 @@ unregisterViewportConstrainedLayer(layer); m_viewportConstrainedLayers.remove(layer); +m_viewportConstrainedLayersNeedingUpdate.remove(layer); } FixedPositionViewportConstraints RenderLayerCompositor::computeFixedViewportConstraints(RenderLayer* layer) const ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147240] trunk/Source/WebCore
Title: [147240] trunk/Source/WebCore
Revision 147240
Author d...@apple.com
Date 2013-03-29 12:31:45 -0700 (Fri, 29 Mar 2013)
Log Message
Snapshotted plugins must be able to restart on appropriate mouseup events
https://bugs.webkit.org/show_bug.cgi?id=113577
Reviewed by Tim Horton.
If the page content prevents the default behaviour of a mousedown event, then a snapshotted
plugin would never receive a click event, and thus be unable to restart. We have to also
look for a mouseup that happens with an associated mousedown, and trigger restart. This
won't call any page code - it's just behind the scenes.
* rendering/RenderSnapshottedPlugIn.cpp:
(WebCore::RenderSnapshottedPlugIn::RenderSnapshottedPlugIn): Initialize new member variable.
(WebCore::RenderSnapshottedPlugIn::handleEvent): Track the state of mousedown and up pairs, and restart
if you see an appropriate mouseup.
* rendering/RenderSnapshottedPlugIn.h: New member variable to track mouse state.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp
trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (147239 => 147240)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 19:27:52 UTC (rev 147239)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 19:31:45 UTC (rev 147240)
@@ -1,3 +1,21 @@
+2013-03-29 Dean Jackson d...@apple.com
+
+Snapshotted plugins must be able to restart on appropriate mouseup events
+https://bugs.webkit.org/show_bug.cgi?id=113577
+
+Reviewed by Tim Horton.
+
+If the page content prevents the default behaviour of a mousedown event, then a snapshotted
+plugin would never receive a click event, and thus be unable to restart. We have to also
+look for a mouseup that happens with an associated mousedown, and trigger restart. This
+won't call any page code - it's just behind the scenes.
+
+* rendering/RenderSnapshottedPlugIn.cpp:
+(WebCore::RenderSnapshottedPlugIn::RenderSnapshottedPlugIn): Initialize new member variable.
+(WebCore::RenderSnapshottedPlugIn::handleEvent): Track the state of mousedown and up pairs, and restart
+if you see an appropriate mouseup.
+* rendering/RenderSnapshottedPlugIn.h: New member variable to track mouse state.
+
2013-03-29 Simon Fraser simon.fra...@apple.com
removeViewportConstrainedLayer() should remove the layer from m_viewportConstrainedLayersNeedingUpdate too
Modified: trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp (147239 => 147240)
--- trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp 2013-03-29 19:27:52 UTC (rev 147239)
+++ trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp 2013-03-29 19:31:45 UTC (rev 147240)
@@ -46,6 +46,7 @@
RenderSnapshottedPlugIn::RenderSnapshottedPlugIn(HTMLPlugInImageElement* element)
: RenderEmbeddedObject(element)
, m_snapshotResource(RenderImageResource::create())
+, m_isPotentialMouseActivation(false)
{
m_snapshotResource-initialize(this);
}
@@ -154,17 +155,27 @@
MouseEvent* mouseEvent = static_castMouseEvent*(event);
-if (event-type() == eventNames().clickEvent) {
-if (mouseEvent-button() != LeftButton)
-return;
+// If we're a snapshotted plugin, we want to make sure we activate on
+// clicks even if the page is preventing our default behaviour. Otherwise
+// we can never restart. One we do restart, then the page will happily
+// block the new plugin in the normal renderer. All this means we have to
+// be on the lookout for a mouseup event that comes after a mousedown
+// event. The code below is not completely foolproof, but the worst that
+// could happen is that a snapshotted plugin restarts.
+if (event-type() == eventNames().mouseoutEvent)
+m_isPotentialMouseActivation = false;
+
+if (mouseEvent-button() != LeftButton)
+return;
+
+if (event-type() == eventNames().clickEvent || (m_isPotentialMouseActivation event-type() == eventNames().mouseupEvent)) {
+m_isPotentialMouseActivation = false;
plugInImageElement()-setDisplayState(HTMLPlugInElement::RestartingWithPendingMouseClick);
plugInImageElement()-userDidClickSnapshot(mouseEvent);
event-setDefaultHandled();
} else if (event-type() == eventNames().mousedownEvent) {
-if (mouseEvent-button() != LeftButton)
-return;
-
+m_isPotentialMouseActivation = true;
event-setDefaultHandled();
}
}
Modified: trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.h (147239 => 147240)
--- trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.h 2013-03-29 19:27:52 UTC (rev 147239)
+++ trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.h 2013-03-29 19:31:45 UTC (rev 147240)
@@ -58,6 +58,7 @@
virtual void layout() OVERRIDE;
OwnPtrRenderImageResource m_snapshotResource;
[webkit-changes] [147241] trunk
Title: [147241] trunk
Revision 147241
Author jsb...@chromium.org
Date 2013-03-29 12:36:38 -0700 (Fri, 29 Mar 2013)
Log Message
[V8] IndexedDB: Exceptions thrown inconsistently for non-cloneable values
https://bugs.webkit.org/show_bug.cgi?id=113091
Reviewed by Kentaro Hara.
Source/WebCore:
The exception thrown by SerializedScriptValue into the JS engine is not
observable by ScriptState. (We should fix that, but it appears non-trivial.)
Ask the SerializedScriptValue directly if it failed to clone. If so, don't
set an exception - one was already set so let that be processed normally.
Test: storage/indexeddb/clone-exception.html
* Modules/indexeddb/IDBObjectStore.cpp:
(WebCore::IDBObjectStore::put):
LayoutTests:
* storage/indexeddb/clone-exception-expected.txt: Added.
* storage/indexeddb/clone-exception.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp
Added Paths
trunk/LayoutTests/storage/indexeddb/clone-exception-expected.txt
trunk/LayoutTests/storage/indexeddb/clone-exception.html
Diff
Modified: trunk/LayoutTests/ChangeLog (147240 => 147241)
--- trunk/LayoutTests/ChangeLog 2013-03-29 19:31:45 UTC (rev 147240)
+++ trunk/LayoutTests/ChangeLog 2013-03-29 19:36:38 UTC (rev 147241)
@@ -1,3 +1,13 @@
+2013-03-29 Joshua Bell jsb...@chromium.org
+
+[V8] IndexedDB: Exceptions thrown inconsistently for non-cloneable values
+https://bugs.webkit.org/show_bug.cgi?id=113091
+
+Reviewed by Kentaro Hara.
+
+* storage/indexeddb/clone-exception-expected.txt: Added.
+* storage/indexeddb/clone-exception.html: Added.
+
2013-03-29 Greg Hughes ghug...@apple.com
Allow multiple searchKeys to be passed to AXUIElementCopyParameterizedAttributeValue
Added: trunk/LayoutTests/storage/indexeddb/clone-exception-expected.txt (0 => 147241)
--- trunk/LayoutTests/storage/indexeddb/clone-exception-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/clone-exception-expected.txt 2013-03-29 19:36:38 UTC (rev 147241)
@@ -0,0 +1,37 @@
+Ensure DataCloneError is consistently thrown by IndexedDB methods
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+dbname = clone-exception.html
+
+doFirstOpen():
+indexedDB.open(dbname + '1')
+
+onUpgradeNeeded():
+Expecting exception from db.createObjectStore('store').put(NON_CLONEABLE, 0);
+PASS Exception was thrown.
+PASS code is 25
+PASS ename is 'DataCloneError'
+
+doSecondOpen():
+indexedDB.open(dbname + '2')
+
+onUpgradeNeeded():
+Expecting exception from db.createObjectStore('store').put(NON_CLONEABLE, 0);
+PASS Exception was thrown.
+PASS code is 25
+PASS ename is 'DataCloneError'
+
+doThirdOpen():
+indexedDB.open(dbname + '3')
+
+onUpgradeNeeded():
+Expecting exception from db.createObjectStore('store').put(NON_CLONEABLE, INVALID_KEY);
+PASS Exception was thrown.
+PASS code is 25
+PASS ename is 'DataCloneError'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/storage/indexeddb/clone-exception.html (0 => 147241)
--- trunk/LayoutTests/storage/indexeddb/clone-exception.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/clone-exception.html 2013-03-29 19:36:38 UTC (rev 147241)
@@ -0,0 +1,51 @@
+!DOCTYPE html
+script src=""
+script src=""
+script
+
+description(Ensure DataCloneError is consistently thrown by IndexedDB methods);
+
+var NON_CLONEABLE = self;
+var INVALID_KEY = {};
+
+setDBNameFromPath();
+doFirstOpen();
+
+function doFirstOpen()
+{
+preamble();
+request = evalAndLog(indexedDB.open(dbname + '1'));
+request._onupgradeneeded_ = function onUpgradeNeeded(e) {
+preamble();
+db = e.target.result;
+evalAndExpectException(db.createObjectStore('store').put(NON_CLONEABLE, 0);, 25, 'DataCloneError');
+doSecondOpen();
+};
+}
+
+function doSecondOpen()
+{
+preamble();
+request = evalAndLog(indexedDB.open(dbname + '2'));
+request._onupgradeneeded_ = function onUpgradeNeeded(e) {
+preamble();
+db = e.target.result;
+evalAndExpectException(db.createObjectStore('store').put(NON_CLONEABLE, 0);, 25, 'DataCloneError');
+doThirdOpen();
+};
+}
+
+function doThirdOpen()
+{
+preamble();
+request = evalAndLog(indexedDB.open(dbname + '3'));
+request._onupgradeneeded_ = function onUpgradeNeeded(e) {
+preamble();
+db = e.target.result;
+evalAndExpectException(db.createObjectStore('store').put(NON_CLONEABLE, INVALID_KEY);, 25, 'DataCloneError');
+finishJSTest();
+};
+}
+
+/script
+script src=""
Modified: trunk/Source/WebCore/ChangeLog (147240 => 147241)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 19:31:45 UTC (rev 147240)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 19:36:38 UTC (rev 147241)
@@ -1,3 +1,20 @@
+2013-03-29 Joshua Bell jsb...@chromium.org
+
+[V8]
[webkit-changes] [147242] tags/Safari-537.35.4/Source
Title: [147242] tags/Safari-537.35.4/Source Revision 147242 Author lforsch...@apple.com Date 2013-03-29 12:49:47 -0700 (Fri, 29 Mar 2013) Log Message Merged r146544. rdar://problem/13479890 Modified Paths tags/Safari-537.35.4/Source/WebCore/ChangeLog tags/Safari-537.35.4/Source/WebCore/WebCore.exp.in tags/Safari-537.35.4/Source/WebCore/loader/ResourceBuffer.h tags/Safari-537.35.4/Source/WebCore/loader/cache/CachedResource.cpp tags/Safari-537.35.4/Source/WebCore/loader/cache/CachedResource.h tags/Safari-537.35.4/Source/WebCore/loader/mac/ResourceBuffer.mm tags/Safari-537.35.4/Source/WebCore/platform/SharedBuffer.h tags/Safari-537.35.4/Source/WebCore/platform/cf/SharedBufferCF.cpp tags/Safari-537.35.4/Source/WebKit2/ChangeLog tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm tags/Safari-537.35.4/Source/WebKit2/Platform/SharedMemory.h tags/Safari-537.35.4/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp tags/Safari-537.35.4/Source/WebKit2/Shared/ShareableResource.cpp tags/Safari-537.35.4/Source/WebKit2/Shared/ShareableResource.h tags/Safari-537.35.4/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp tags/Safari-537.35.4/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp tags/Safari-537.35.4/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h tags/Safari-537.35.4/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.messages.in tags/Safari-537.35.4/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp Diff Modified: tags/Safari-537.35.4/Source/WebCore/ChangeLog (147241 => 147242) --- tags/Safari-537.35.4/Source/WebCore/ChangeLog 2013-03-29 19:36:38 UTC (rev 147241) +++ tags/Safari-537.35.4/Source/WebCore/ChangeLog 2013-03-29 19:49:47 UTC (rev 147242) @@ -1,5 +1,35 @@ 2013-03-29 Lucas Forschler lforsch...@apple.com +Merge r146544 + +2013-03-21 Brady Eidson beid...@apple.com + +If a previously loaded resource is later stored to the disk cache, replace the buffer with MMAP'ed memory. +rdar://problem/13414154 and https://bugs.webkit.org/show_bug.cgi?id=112943 + +Reviewed by Geoff Garen. + +No new tests (No change in behavior.) + +Give SharedBuffer the ability to replace its contents from another SharedBuffer: +* platform/SharedBuffer.h: +* platform/cf/SharedBufferCF.cpp: +(WebCore::SharedBuffer:: tryReplaceContentsWithPlatformBuffer): + +Forward along SharedBuffer's new ability to ResourceBuffer: +* loader/mac/ResourceBuffer.mm: +(WebCore::ResourceBuffer:: tryReplaceSharedBufferContents): +* loader/ResourceBuffer.h: + +Give CachedResource the ability to replace its encoded data buffer if appropriate: +* loader/cache/CachedResource.cpp: +(WebCore::CachedResource:: tryReplaceEncodedData): +* loader/cache/CachedResource.h: + +* WebCore.exp.in: + +2013-03-29 Lucas Forschler lforsch...@apple.com + Merge r146704 2013-03-21 Kiran Muppala cmupp...@apple.com Modified: tags/Safari-537.35.4/Source/WebCore/WebCore.exp.in (147241 => 147242) --- tags/Safari-537.35.4/Source/WebCore/WebCore.exp.in 2013-03-29 19:36:38 UTC (rev 147241) +++ tags/Safari-537.35.4/Source/WebCore/WebCore.exp.in 2013-03-29 19:49:47 UTC (rev 147242) @@ -170,6 +170,7 @@ __ZN7WebCore11MemoryCache13setCapacitiesEjjj __ZN7WebCore11MemoryCache14evictResourcesEv __ZN7WebCore11MemoryCache14resourceForURLERKNS_4KURLE +__ZN7WebCore11MemoryCache18resourceForRequestERKNS_15ResourceRequestE __ZN7WebCore11MemoryCache19getOriginsWithCacheERN3WTF7HashSetINS1_6RefPtrINS_14SecurityOriginEEENS_18SecurityOriginHashENS1_10HashTraitsIS5_ __ZN7WebCore11MemoryCache25removeResourcesWithOriginEPNS_14SecurityOriginE __ZN7WebCore11URLWithDataEP6NSDataP5NSURL @@ -273,6 +274,7 @@ __ZN7WebCore13toJSDOMWindowEN3JSC7JSValueE __ZN7WebCore14CachedResource12removeClientEPNS_20CachedResourceClientE __ZN7WebCore14CachedResource16unregisterHandleEPNS_24CachedResourceHandleBaseE +__ZN7WebCore14CachedResource21tryReplaceEncodedDataEN3WTF10PassRefPtrINS_12SharedBufferEEE __ZN7WebCore14CachedResource9addClientEPNS_20CachedResourceClientE __ZN7WebCore14ClientRectListC1ERKN3WTF6VectorINS_9FloatQuadELm0EEE __ZN7WebCore14ClientRectListC1Ev @@ -1608,6 +1610,7 @@ _stringIsCaseInsensitiveEqualToString _suggestedFilenameWithMIMEType #if ENABLE(CACHE_PARTITIONING) +__ZN7WebCore15ResourceRequest13partitionNameERKN3WTF6StringE _wkCachePartitionKey #endif _wkDestroyRenderingResources Modified: tags/Safari-537.35.4/Source/WebCore/loader/ResourceBuffer.h (147241 => 147242) --- tags/Safari-537.35.4/Source/WebCore/loader/ResourceBuffer.h 2013-03-29 19:36:38 UTC (rev 147241) +++
[webkit-changes] [147243] trunk/LayoutTests
Title: [147243] trunk/LayoutTests Revision 147243 Author timo...@apple.com Date 2013-03-29 12:51:22 -0700 (Fri, 29 Mar 2013) Log Message Marking animation-delay-changed.html and reinserting-svg-into-document.html as flaky. https://webkit.org/b/113598 https://webkit.org/b/113599 Unreviewed. * platform/mac/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/mac/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (147242 => 147243) --- trunk/LayoutTests/ChangeLog 2013-03-29 19:49:47 UTC (rev 147242) +++ trunk/LayoutTests/ChangeLog 2013-03-29 19:51:22 UTC (rev 147243) @@ -1,3 +1,14 @@ +2013-03-29 Timothy Hatcher timo...@apple.com + +Marking animation-delay-changed.html and reinserting-svg-into-document.html as flaky. + +https://webkit.org/b/113598 +https://webkit.org/b/113599 + +Unreviewed. + +* platform/mac/TestExpectations: + 2013-03-29 Joshua Bell jsb...@chromium.org [V8] IndexedDB: Exceptions thrown inconsistently for non-cloneable values Modified: trunk/LayoutTests/platform/mac/TestExpectations (147242 => 147243) --- trunk/LayoutTests/platform/mac/TestExpectations 2013-03-29 19:49:47 UTC (rev 147242) +++ trunk/LayoutTests/platform/mac/TestExpectations 2013-03-29 19:51:22 UTC (rev 147243) @@ -250,6 +250,9 @@ # https://bugs.webkit.org/show_bug.cgi?id=42821 animations/play-state.html +webkit.org/b/113598 animations/animation-delay-changed.html [ Pass Failure ] +webkit.org/b/113599 svg/animations/reinserting-svg-into-document.html [ Pass Failure ] + # window.eventSender doesn't exist in devtools front-end on mac. # https://bugs.webkit.org/show_bug.cgi?id=106793 inspector/editor/text-editor-formatter.html [ Skip ] ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147244] trunk/Source/WebCore
Title: [147244] trunk/Source/WebCore
Revision 147244
Author jsb...@chromium.org
Date 2013-03-29 12:56:59 -0700 (Fri, 29 Mar 2013)
Log Message
IndexedDB: Use WTF::TemporaryChange rather than manually resetting a flag
https://bugs.webkit.org/show_bug.cgi?id=113594
Reviewed by Tony Chang.
Split out from another patch: rather than m_foo = true; ... m_foo = false; use
the handy WTF::TemporaryChange scoped variable change doohickey.
Test: http/tests/inspector/indexeddb/database-structure.html
* Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
(WebCore::IDBDatabaseBackendImpl::close):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (147243 => 147244)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 19:51:22 UTC (rev 147243)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 19:56:59 UTC (rev 147244)
@@ -1,5 +1,20 @@
2013-03-29 Joshua Bell jsb...@chromium.org
+IndexedDB: Use WTF::TemporaryChange rather than manually resetting a flag
+https://bugs.webkit.org/show_bug.cgi?id=113594
+
+Reviewed by Tony Chang.
+
+Split out from another patch: rather than m_foo = true; ... m_foo = false; use
+the handy WTF::TemporaryChange scoped variable change doohickey.
+
+Test: http/tests/inspector/indexeddb/database-structure.html
+
+* Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
+(WebCore::IDBDatabaseBackendImpl::close):
+
+2013-03-29 Joshua Bell jsb...@chromium.org
+
[V8] IndexedDB: Exceptions thrown inconsistently for non-cloneable values
https://bugs.webkit.org/show_bug.cgi?id=113091
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp (147243 => 147244)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp 2013-03-29 19:51:22 UTC (rev 147243)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp 2013-03-29 19:56:59 UTC (rev 147244)
@@ -38,6 +38,7 @@
#include IDBTransactionBackendImpl.h
#include IDBTransactionCoordinator.h
#include SharedBuffer.h
+#include wtf/TemporaryChange.h
namespace WebCore {
@@ -1334,7 +1335,7 @@
// To avoid that situation, don't proceed in case of reentrancy.
if (m_closingConnection)
return;
-m_closingConnection = true;
+TemporaryChangebool closingConnection(m_closingConnection, true);
processPendingCalls();
// FIXME: Add a test for the m_pendingOpenCalls cases below.
@@ -1351,7 +1352,6 @@
if (m_factory)
m_factory-removeIDBDatabaseBackend(m_identifier);
}
-m_closingConnection = false;
}
void CreateObjectStoreAbortOperation::perform(IDBTransactionBackendImpl* transaction)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147246] tags/Safari-537.35.4/Source/WebKit2
Title: [147246] tags/Safari-537.35.4/Source/WebKit2
Revision 147246
Author lforsch...@apple.com
Date 2013-03-29 13:22:26 -0700 (Fri, 29 Mar 2013)
Log Message
Merged r147006. rdar://problem/13479890
Modified Paths
tags/Safari-537.35.4/Source/WebKit2/ChangeLog
tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h
tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm
tags/Safari-537.35.4/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Added Paths
tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.h
tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm
Diff
Modified: tags/Safari-537.35.4/Source/WebKit2/ChangeLog (147245 => 147246)
--- tags/Safari-537.35.4/Source/WebKit2/ChangeLog 2013-03-29 20:12:16 UTC (rev 147245)
+++ tags/Safari-537.35.4/Source/WebKit2/ChangeLog 2013-03-29 20:22:26 UTC (rev 147246)
@@ -1,5 +1,47 @@
2013-03-29 Lucas Forschler lforsch...@apple.com
+Merge r147006
+
+2013-03-27 Brady Eidson beid...@apple.com
+
+Mem mapped resource data improvements.
+rdar://problem/13196481 and https://bugs.webkit.org/show_bug.cgi?id=113422
+
+Reviewed by Alexey Proskuryakov (and looked over by Geoff Garen).
+
+Remove timer-based approach support code:
+* NetworkProcess/NetworkResourceLoader.cpp:
+(WebKit::NetworkResourceLoader::NetworkResourceLoader):
+(WebKit::NetworkResourceLoader::abortInProgressLoad):
+(WebKit::NetworkResourceLoader::didFinishLoading):
+* NetworkProcess/NetworkResourceLoader.h:
+
+Add an object to encapsulate monitoring a resource going in to the disk cache.
+It listens for a callback on the cached response indicating it is disk backed
+and also sets a timeout so we don't keep the monitor alive and waiting forever.
+* NetworkProcess/mac/DiskCacheMonitor.h: Added.
+(WebKit::DiskCacheMonitor::destinationID):
+(WebKit::DiskCacheMonitor::connectionToWebProcess):
+(WebKit::DiskCacheMonitor::resourceRequest):
+* NetworkProcess/mac/DiskCacheMonitor.mm: Added.
+(CFCachedURLResponseSetBecameFileBackedCallBackBlock):
+(WebKit::monitorFileBackingStoreCreation):
+(WebKit::DiskCacheMonitor::DiskCachingMonitor):
+(WebKit::DiskCacheMonitor::connection):
+
+Refactoring and monitor certain cached responses:
+* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+(CFCachedURLResponseGetMemMappedData):
+(WebKit::NetworkResourceLoader::tryGetShareableHandleFromCFURLCachedResponse): Use CFCachedURLResponseGetMemMappedData
+ to explicitly get an mem-mapped data object.
+(WebKit::NetworkResourceLoader::tryGetShareableHandleForResource):
+(WebKit::NetworkResourceLoader::willCacheResponseAsync): If the resource is over the minimum
+ size then set up a disk caching monitor.
+
+* WebKit2.xcodeproj/project.pbxproj:
+
+2013-03-29 Lucas Forschler lforsch...@apple.com
+
Merge r146544
2013-03-21 Brady Eidson beid...@apple.com
Modified: tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (147245 => 147246)
--- tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2013-03-29 20:12:16 UTC (rev 147245)
+++ tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2013-03-29 20:22:26 UTC (rev 147246)
@@ -54,9 +54,6 @@
NetworkResourceLoader::NetworkResourceLoader(const NetworkResourceLoadParameters loadParameters, NetworkConnectionToWebProcess* connection)
: SchedulableLoader(loadParameters, connection)
, m_bytesReceived(0)
-#if __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
-, m_diskCacheTimer(RunLoop::main(), this, NetworkResourceLoader::diskCacheTimerFired)
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
{
ASSERT(isMainThread());
}
@@ -174,21 +171,6 @@
cleanup();
}
-#if __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
-void NetworkResourceLoader::diskCacheTimerFired()
-{
-ASSERT(isMainThread());
-RefPtrNetworkResourceLoader adoptedRef = adoptRef(this); // Balance out the ref() when setting the timer.
-
-ShareableResource::Handle handle;
-tryGetShareableHandleForResource(handle);
-if (handle.isNull())
-return;
-
-send(Messages::NetworkProcessConnection::DidCacheResource(request(), handle));
-}
-#endif // #if __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
-
templatetypename U bool NetworkResourceLoader::sendAbortingOnFailure(const U message)
{
bool result = send(message);
@@ -208,8 +190,8 @@
void NetworkResourceLoader::abortInProgressLoad()
{
ASSERT(m_handle);
-ASSERT(!isMainThread());
-
+ASSERT(isMainThread());
+
[webkit-changes] [147247] tags/Safari-537.35.4/Source/WebKit2
Title: [147247] tags/Safari-537.35.4/Source/WebKit2
Revision 147247
Author lforsch...@apple.com
Date 2013-03-29 13:24:24 -0700 (Fri, 29 Mar 2013)
Log Message
Merged r147010. rdar://problem/13479890
Modified Paths
tags/Safari-537.35.4/Source/WebKit2/ChangeLog
tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm
Diff
Modified: tags/Safari-537.35.4/Source/WebKit2/ChangeLog (147246 => 147247)
--- tags/Safari-537.35.4/Source/WebKit2/ChangeLog 2013-03-29 20:22:26 UTC (rev 147246)
+++ tags/Safari-537.35.4/Source/WebKit2/ChangeLog 2013-03-29 20:24:24 UTC (rev 147247)
@@ -1,5 +1,16 @@
2013-03-29 Lucas Forschler lforsch...@apple.com
+Merge r147010
+
+2013-03-27 Brady Eidson beid...@apple.com
+
+Blind attempt at fixing the release build.
+
+* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+(WebKit::NetworkResourceLoader::willCacheResponseAsync):
+
+2013-03-29 Lucas Forschler lforsch...@apple.com
+
Merge r147006
2013-03-27 Brady Eidson beid...@apple.com
Modified: tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (147246 => 147247)
--- tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2013-03-29 20:22:26 UTC (rev 147246)
+++ tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2013-03-29 20:24:24 UTC (rev 147247)
@@ -98,7 +98,7 @@
void NetworkResourceLoader::willCacheResponseAsync(ResourceHandle* handle, NSCachedURLResponse *nsResponse)
{
-ASSERT(handle == m_handle);
+ASSERT_UNUSED(handle, handle == m_handle);
#if __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
if (m_bytesReceived = fileBackedResourceMinimumSize())
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147248] tags/Safari-537.35.4/Source/WebKit2
Title: [147248] tags/Safari-537.35.4/Source/WebKit2
Revision 147248
Author lforsch...@apple.com
Date 2013-03-29 13:26:23 -0700 (Fri, 29 Mar 2013)
Log Message
Merged r147179. rdar://problem/13479890
Modified Paths
tags/Safari-537.35.4/Source/WebKit2/ChangeLog
tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h
tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm
Diff
Modified: tags/Safari-537.35.4/Source/WebKit2/ChangeLog (147247 => 147248)
--- tags/Safari-537.35.4/Source/WebKit2/ChangeLog 2013-03-29 20:24:24 UTC (rev 147247)
+++ tags/Safari-537.35.4/Source/WebKit2/ChangeLog 2013-03-29 20:26:23 UTC (rev 147248)
@@ -1,5 +1,36 @@
2013-03-29 Lucas Forschler lforsch...@apple.com
+Merge r147179
+
+2013-03-28 Brady Eidson beid...@apple.com
+
+Resources are never revalidated/reloaded if a cached response exists on disk.
+rdar://problem/13479890 and https://bugs.webkit.org/show_bug.cgi?id=113542
+
+Reviewed by Alexey Proskuryakov.
+
+Trying to get a cached resource in didReceiveResponse and then aborting the load
+meant we never performed any new loads.
+
+We can check and see if the data is cached data inside didReceiveBuffer, instead.
+
+* NetworkProcess/NetworkResourceLoader.cpp:
+(WebKit::NetworkResourceLoader::didReceiveResponse): Don't try for cached resources here.
+(WebKit::NetworkResourceLoader::didReceiveData): This callback should never be used.
+(WebKit::NetworkResourceLoader::didReceiveBuffer): Try to see if this data objected represents
+ a file based mmaped buffer.
+* NetworkProcess/NetworkResourceLoader.h:
+
+Refactor these utility functions to start from either a CFURLCachedResponse or a SharedBuffer:
+* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+(CFCachedURLResponseGetMemMappedData):
+(CFURLCacheIsMemMappedData):
+(WebKit::tryGetShareableHandleFromCFData):
+(WebKit::NetworkResourceLoader::tryGetShareableHandleFromCFURLCachedResponse):
+(WebKit::NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer):
+
+2013-03-29 Lucas Forschler lforsch...@apple.com
+
Merge r147010
2013-03-27 Brady Eidson beid...@apple.com
Modified: tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (147247 => 147248)
--- tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2013-03-29 20:24:24 UTC (rev 147247)
+++ tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2013-03-29 20:26:23 UTC (rev 147248)
@@ -203,30 +203,35 @@
if (FormData* formData = request().httpBody())
formData-removeGeneratedFilesIfNeeded();
-if (!sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponseWithCertificateInfo(response, PlatformCertificateInfo(response
-return;
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
-ShareableResource::Handle handle;
-tryGetShareableHandleForResource(handle);
-if (handle.isNull())
-return;
-
-// Since we're delivering this resource by ourselves all at once, we'll abort the resource handle since we don't need anymore callbacks from ResourceHandle.
-abortInProgressLoad();
-
-send(Messages::WebResourceLoader::DidReceiveResource(handle, currentTime()));
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
+sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponseWithCertificateInfo(response, PlatformCertificateInfo(response)));
}
void NetworkResourceLoader::didReceiveData(ResourceHandle*, const char* data, int length, int encodedDataLength)
{
+// The NetworkProcess should never get a didReceiveData callback.
+// We should always be using didReceiveBuffer.
+ASSERT_NOT_REACHED();
+}
+
+void NetworkResourceLoader::didReceiveBuffer(WebCore::ResourceHandle*, PassRefPtrWebCore::SharedBuffer buffer, int encodedDataLength)
+{
// FIXME (NetworkProcess): For the memory cache we'll also need to cache the response data here.
// Such buffering will need to be thread safe, as this callback is happening on a background thread.
-m_bytesReceived += length;
+m_bytesReceived += buffer-size();
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
+ShareableResource::Handle handle;
+tryGetShareableHandleFromSharedBuffer(handle, buffer.get());
+if (!handle.isNull()) {
+// Since we're delivering this resource by ourselves all at once, we'll abort the resource handle since we don't need anymore callbacks from ResourceHandle.
+abortInProgressLoad();
+send(Messages::WebResourceLoader::DidReceiveResource(handle, currentTime()));
+return;
+}
+#endif // __MAC_OS_X_VERSION_MIN_REQUIRED
[webkit-changes] [147250] trunk
Title: [147250] trunk
Revision 147250
Author commit-qu...@webkit.org
Date 2013-03-29 14:13:02 -0700 (Fri, 29 Mar 2013)
Log Message
[CSS Exclusions] shape outside segments not properly calculated for ellipses
https://bugs.webkit.org/show_bug.cgi?id=112587
Patch by Bem Jones-Bey bjone...@adobe.com on 2013-03-29
Reviewed by Julien Chaffraix.
Source/WebCore:
When converting the line top coordinates from the parent's coordinate
space to the coordinate space of the float, the offset given by the
shape was not being accounted for. This patch accounts for that
offset.
Test: fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::logicalLeftOffsetForLine): Fix the coordinate conversion.
(WebCore::RenderBlock::logicalRightOffsetForLine): Ditto.
* rendering/RenderBlockLineLayout.cpp:
(WebCore::LineWidth::shrinkAvailableWidthForNewFloatIfNeeded): Ditto.
LayoutTests:
Check that shapes with a non-zero y value are properly wrapped.
* fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y.html: Added.
* fast/exclusions/resources/rounded-rectangle.js:
(generateSimulatedShapeOutsideOnFloat): For simulating, we ignore the
x and y values, since we're not attempting to draw the float's content
in the right place, we just want to simulate the shape's effect.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/exclusions/resources/rounded-rectangle.js
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderBlock.cpp
trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp
Added Paths
trunk/LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y-expected.html
trunk/LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y.html
Diff
Modified: trunk/LayoutTests/ChangeLog (147249 => 147250)
--- trunk/LayoutTests/ChangeLog 2013-03-29 20:34:17 UTC (rev 147249)
+++ trunk/LayoutTests/ChangeLog 2013-03-29 21:13:02 UTC (rev 147250)
@@ -1,3 +1,18 @@
+2013-03-29 Bem Jones-Bey bjone...@adobe.com
+
+[CSS Exclusions] shape outside segments not properly calculated for ellipses
+https://bugs.webkit.org/show_bug.cgi?id=112587
+
+Reviewed by Julien Chaffraix.
+
+Check that shapes with a non-zero y value are properly wrapped.
+
+* fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y.html: Added.
+* fast/exclusions/resources/rounded-rectangle.js:
+(generateSimulatedShapeOutsideOnFloat): For simulating, we ignore the
+x and y values, since we're not attempting to draw the float's content
+in the right place, we just want to simulate the shape's effect.
+
2013-03-29 Hans Muller hmul...@adobe.com
[CSS Exclusions] Incorrect margin corner radii formula
Modified: trunk/LayoutTests/fast/exclusions/resources/rounded-rectangle.js (147249 => 147250)
--- trunk/LayoutTests/fast/exclusions/resources/rounded-rectangle.js 2013-03-29 20:34:17 UTC (rev 147249)
+++ trunk/LayoutTests/fast/exclusions/resources/rounded-rectangle.js 2013-03-29 21:13:02 UTC (rev 147250)
@@ -212,7 +212,13 @@
}
element.insertAdjacentHTML('afterend', simulationHTML);
+// For simulating, we ignore the x and y values, since we're not attempting
+// to draw the float's content in the right place, we just want to simulate
+// the shape's effect.
if (floatValue == right)
dimensions.shapeX = -dimensions.shapeWidth;
+else
+dimensions.shapeX = 0;
+dimensions.shapeY = 0;
simulateShapeOutline(elementId, stylesheet, dimensions);
}
Added: trunk/LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y-expected.html (0 => 147250)
--- trunk/LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y-expected.html (rev 0)
+++ trunk/LayoutTests/fast/exclusions/shape-outside-floats/shape-outside-floats-non-zero-y-expected.html 2013-03-29 21:13:02 UTC (rev 147250)
@@ -0,0 +1,70 @@
+!DOCTYPE html
+html
+head
+script src=""
+script src=""
+script
+window._onload_ = function () {
+var stylesheet = document.getElementById(stylesheet);
+generateSimulatedShapeOutsideOnFloat(
+float-left, stylesheet.sheet,
+{
+'shapeX': 25, 'shapeY': 50,
+'shapeWidth': 75, 'shapeHeight': 100,
+'shapeRadiusX': 20, 'shapeRadiusY': 20
+},
+'left',
+10
+);
+generateSimulatedShapeOutsideOnFloat(
+float-right, stylesheet.sheet,
+{
+'shapeCenterX': 25, 'shapeCenterY': 50,
+'shapeRadiusX': 50, 'shapeRadiusY': 100
+},
+'right',
+10
+);
+}
+/script
+style id=stylesheet
+.container {
+font: 10px/1 Ahem, sans-serif;
+width: 200px;
+text-align: justify;
+
[webkit-changes] [147251] trunk/Source/WebKit2
Title: [147251] trunk/Source/WebKit2
Revision 147251
Author beid...@apple.com
Date 2013-03-29 14:32:27 -0700 (Fri, 29 Mar 2013)
Log Message
Empty cache... clears the disk cache from each WebProcess.
rdar://problem/12456652 and https://bugs.webkit.org/show_bug.cgi?id=113603
Reviewed by Sam Weinig.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::NetworkProcess):
(WebKit::NetworkProcess::terminate): Override ChildProcess::terminate to allow us to finish clearing the cache.
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcess.messages.in: Add the ClearCacheForAllOrigins message.
* NetworkProcess/mac/NetworkProcessMac.mm:
(WebKit::NetworkProcess::clearCacheForAllOrigins): Clear the disk cache.
(WebKit::NetworkProcess::platformTerminate): Wait for the clear to complete.
* UIProcess/WebResourceCacheManagerProxy.cpp:
(WebKit::WebResourceCacheManagerProxy::clearCacheForAllOrigins): Message the network process, also.
* WebProcess/mac/WebProcessMac.mm:
(WebKit::WebProcess::platformClearResourceCaches): Don't clear the disk cache if we use the network process.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp
trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h
trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in
trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm
trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp
trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (147250 => 147251)
--- trunk/Source/WebKit2/ChangeLog 2013-03-29 21:13:02 UTC (rev 147250)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-29 21:32:27 UTC (rev 147251)
@@ -1,3 +1,27 @@
+2013-03-29 Brady Eidson beid...@apple.com
+
+Empty cache... clears the disk cache from each WebProcess.
+rdar://problem/12456652 and https://bugs.webkit.org/show_bug.cgi?id=113603
+
+Reviewed by Sam Weinig.
+
+* NetworkProcess/NetworkProcess.cpp:
+(WebKit::NetworkProcess::NetworkProcess):
+(WebKit::NetworkProcess::terminate): Override ChildProcess::terminate to allow us to finish clearing the cache.
+* NetworkProcess/NetworkProcess.h:
+
+* NetworkProcess/NetworkProcess.messages.in: Add the ClearCacheForAllOrigins message.
+
+* NetworkProcess/mac/NetworkProcessMac.mm:
+(WebKit::NetworkProcess::clearCacheForAllOrigins): Clear the disk cache.
+(WebKit::NetworkProcess::platformTerminate): Wait for the clear to complete.
+
+* UIProcess/WebResourceCacheManagerProxy.cpp:
+(WebKit::WebResourceCacheManagerProxy::clearCacheForAllOrigins): Message the network process, also.
+
+* WebProcess/mac/WebProcessMac.mm:
+(WebKit::WebProcess::platformClearResourceCaches): Don't clear the disk cache if we use the network process.
+
2013-03-28 Brady Eidson beid...@apple.com
We leak NetworkConnectionToWebProcess objects.
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (147250 => 147251)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2013-03-29 21:13:02 UTC (rev 147250)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2013-03-29 21:32:27 UTC (rev 147251)
@@ -64,6 +64,9 @@
NetworkProcess::NetworkProcess()
: m_hasSetCacheModel(false)
, m_cacheModel(CacheModelDocumentViewer)
+#if PLATFORM(MAC)
+, m_clearCacheDispatchGroup(0)
+#endif
{
NetworkProcessPlatformStrategies::initialize();
@@ -238,6 +241,12 @@
parentProcessConnection()-send(Messages::WebContext::DidGetStatistics(data, callbackID), 0);
}
+void NetworkProcess::terminate()
+{
+platformTerminate();
+ChildProcess::terminate();
+}
+
#if !PLATFORM(MAC)
void NetworkProcess::initializeProcessName(const ChildProcessInitializationParameters)
{
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (147250 => 147251)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2013-03-29 21:13:02 UTC (rev 147250)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2013-03-29 21:32:27 UTC (rev 147251)
@@ -77,6 +77,9 @@
void platformInitializeNetworkProcess(const NetworkProcessCreationParameters);
+virtual void terminate() OVERRIDE;
+void platformTerminate();
+
// ChildProcess
virtual void initializeProcessName(const ChildProcessInitializationParameters) OVERRIDE;
virtual void initializeSandbox(const ChildProcessInitializationParameters, SandboxInitializationParameters) OVERRIDE;
@@ -104,10 +107,9 @@
void downloadRequest(uint64_t downloadID, const WebCore::ResourceRequest);
void cancelDownload(uint64_t downloadID);
void setCacheModel(uint32_t);
-
void allowSpecificHTTPSCertificateForHost(const PlatformCertificateInfo, const String host);
-
void getNetworkProcessStatistics(uint64_t callbackID);
+void clearCacheForAllOrigins(uint32_t cachesToClear);
// Platform Helpers
void
[webkit-changes] [147252] trunk/Source/JavaScriptCore
Title: [147252] trunk/Source/_javascript_Core
Revision 147252
Author mhahnenb...@apple.com
Date 2013-03-29 14:37:04 -0700 (Fri, 29 Mar 2013)
Log Message
Objective-C API: Remove -[JSManagedValue managedValueWithValue:owner:]
https://bugs.webkit.org/show_bug.cgi?id=113602
Reviewed by Geoffrey Garen.
Since we put the primary way of keeping track of external object graphs (i.e. managed references)
in JSVirtualMachine, there is some overlap in the functionality of that interface and JSManagedValue.
Specifically, we no longer need the methods that include an owner, since ownership is now tracked
by JSVirtualMachine. These JSManagedValues will become weak pointers unless they are used
with [JSVirtualMachine addManagedReference:withOwner:], in which case their lifetime is tied to that
of their owner.
* API/JSManagedValue.h:
* API/JSManagedValue.mm:
(-[JSManagedValue init]):
(-[JSManagedValue initWithValue:]):
(JSManagedValueHandleOwner::isReachableFromOpaqueRoots):
* API/JSVirtualMachine.mm:
(getInternalObjcObject):
* API/tests/testapi.mm:
(-[TextXYZ setOnclick:]):
(-[TextXYZ dealloc]):
Modified Paths
trunk/Source/_javascript_Core/API/JSManagedValue.h
trunk/Source/_javascript_Core/API/JSManagedValue.mm
trunk/Source/_javascript_Core/API/JSVirtualMachine.mm
trunk/Source/_javascript_Core/API/tests/testapi.mm
trunk/Source/_javascript_Core/ChangeLog
Diff
Modified: trunk/Source/_javascript_Core/API/JSManagedValue.h (147251 => 147252)
--- trunk/Source/_javascript_Core/API/JSManagedValue.h 2013-03-29 21:32:27 UTC (rev 147251)
+++ trunk/Source/_javascript_Core/API/JSManagedValue.h 2013-03-29 21:37:04 UTC (rev 147252)
@@ -37,10 +37,8 @@
@interface JSManagedValue : NSObject
+ (JSManagedValue *)managedValueWithValue:(JSValue *)value;
-+ (JSManagedValue *)managedValueWithValue:(JSValue *)value owner:(id)owner;
- (id)initWithValue:(JSValue *)value;
-- (id)initWithValue:(JSValue *)value owner:(id)owner;
- (JSValue *)value;
Modified: trunk/Source/_javascript_Core/API/JSManagedValue.mm (147251 => 147252)
--- trunk/Source/_javascript_Core/API/JSManagedValue.mm 2013-03-29 21:32:27 UTC (rev 147251)
+++ trunk/Source/_javascript_Core/API/JSManagedValue.mm 2013-03-29 21:37:04 UTC (rev 147252)
@@ -49,13 +49,8 @@
return jsManagedValueHandleOwner;
}
-@interface JSManagedValue (Internal)
-- (id)weakOwner;
-@end
-
@implementation JSManagedValue {
JSC::WeakJSC::JSObject m_value;
-id m_weakOwner;
}
+ (JSManagedValue *)managedValueWithValue:(JSValue *)value
@@ -63,23 +58,13 @@
return [[[self alloc] initWithValue:value] autorelease];
}
-+ (JSManagedValue *)managedValueWithValue:(JSValue *)value owner:(id)owner
-{
-return [[[self alloc] initWithValue:value owner:owner] autorelease];
-}
-
- (id)init
{
-return [self initWithValue:nil owner:nil];
+return [self initWithValue:nil];
}
- (id)initWithValue:(JSValue *)value
{
-return [self initWithValue:value owner:nil];
-}
-
-- (id)initWithValue:(JSValue *)value owner:(id)owner
-{
self = [super init];
if (!self)
return nil;
@@ -93,17 +78,9 @@
m_value.swap(weak);
}
-objc_initWeak(m_weakOwner, owner);
-
return self;
}
-- (void)dealloc
-{
-objc_destroyWeak(m_weakOwner);
-[super dealloc];
-}
-
- (JSValue *)value
{
if (!m_value)
@@ -115,22 +92,10 @@
@end
-@implementation JSManagedValue (Internal)
-
-- (id)weakOwner
-{
-return objc_loadWeak(m_weakOwner);
-}
-
-@end
-
bool JSManagedValueHandleOwner::isReachableFromOpaqueRoots(JSC::HandleJSC::Unknown, void* context, JSC::SlotVisitor visitor)
{
JSManagedValue *managedValue = static_castJSManagedValue *(context);
-id weakOwner = [managedValue weakOwner];
-if (!weakOwner)
-return false;
-return visitor.containsOpaqueRoot(weakOwner);
+return visitor.containsOpaqueRoot(managedValue);
}
#endif // JSC_OBJC_API_ENABLED
Modified: trunk/Source/_javascript_Core/API/JSVirtualMachine.mm (147251 => 147252)
--- trunk/Source/_javascript_Core/API/JSVirtualMachine.mm 2013-03-29 21:32:27 UTC (rev 147251)
+++ trunk/Source/_javascript_Core/API/JSVirtualMachine.mm 2013-03-29 21:37:04 UTC (rev 147252)
@@ -125,14 +125,19 @@
static id getInternalObjcObject(id object)
{
-if ([object isKindOfClass:[JSManagedValue class]])
-object = [static_castJSManagedValue *(object) value];
+if ([object isKindOfClass:[JSManagedValue class]]) {
+JSValue* value = [static_castJSManagedValue *(object) value];
+id temp = tryUnwrapObjcObject([value.context globalContextRef], [value JSValueRef]);
+if (temp)
+return temp;
+return object;
+}
if ([object isKindOfClass:[JSValue class]]) {
JSValue *value = static_castJSValue *(object);
object = tryUnwrapObjcObject([value.context globalContextRef], [value JSValueRef]);
}
-
+
return object;
}
Modified: trunk/Source/_javascript_Core/API/tests/testapi.mm
[webkit-changes] [147253] trunk/Source/WebKit2
Title: [147253] trunk/Source/WebKit2
Revision 147253
Author beid...@apple.com
Date 2013-03-29 14:56:45 -0700 (Fri, 29 Mar 2013)
Log Message
Should never send events to plugins waiting on asynchronous initialization.
rdar://problem/13538945 and https://bugs.webkit.org/show_bug.cgi?id=113612
Reviewed by Anders Carlsson.
Sending mouse and keyboard events to a plugin in the middle of asynchronous initialization is silly.
A quick audit of the sendSync() messages in PluginProxy suggests the following 8 can just have an early return:
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::handleMouseEvent):
(WebKit::PluginProxy::handleWheelEvent):
(WebKit::PluginProxy::handleMouseEnterEvent):
(WebKit::PluginProxy::handleMouseLeaveEvent):
(WebKit::PluginProxy::handleKeyboardEvent):
(WebKit::PluginProxy::handleEditingCommand):
(WebKit::PluginProxy::isEditingCommandEnabled):
(WebKit::PluginProxy::handlesPageScaleFactor):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (147252 => 147253)
--- trunk/Source/WebKit2/ChangeLog 2013-03-29 21:37:04 UTC (rev 147252)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-29 21:56:45 UTC (rev 147253)
@@ -1,5 +1,26 @@
2013-03-29 Brady Eidson beid...@apple.com
+Should never send events to plugins waiting on asynchronous initialization.
+rdar://problem/13538945 and https://bugs.webkit.org/show_bug.cgi?id=113612
+
+Reviewed by Anders Carlsson.
+
+Sending mouse and keyboard events to a plugin in the middle of asynchronous initialization is silly.
+
+A quick audit of the sendSync() messages in PluginProxy suggests the following 8 can just have an early return:
+
+* WebProcess/Plugins/PluginProxy.cpp:
+(WebKit::PluginProxy::handleMouseEvent):
+(WebKit::PluginProxy::handleWheelEvent):
+(WebKit::PluginProxy::handleMouseEnterEvent):
+(WebKit::PluginProxy::handleMouseLeaveEvent):
+(WebKit::PluginProxy::handleKeyboardEvent):
+(WebKit::PluginProxy::handleEditingCommand):
+(WebKit::PluginProxy::isEditingCommandEnabled):
+(WebKit::PluginProxy::handlesPageScaleFactor):
+
+2013-03-29 Brady Eidson beid...@apple.com
+
Empty cache... clears the disk cache from each WebProcess.
rdar://problem/12456652 and https://bugs.webkit.org/show_bug.cgi?id=113603
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (147252 => 147253)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2013-03-29 21:37:04 UTC (rev 147252)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2013-03-29 21:56:45 UTC (rev 147253)
@@ -354,6 +354,9 @@
bool PluginProxy::handleMouseEvent(const WebMouseEvent mouseEvent)
{
+if (m_waitingOnAsynchronousInitialization)
+return false;
+
bool handled = false;
if (!m_connection-connection()-sendSync(Messages::PluginControllerProxy::HandleMouseEvent(mouseEvent), Messages::PluginControllerProxy::HandleMouseEvent::Reply(handled), m_pluginInstanceID))
return false;
@@ -363,6 +366,9 @@
bool PluginProxy::handleWheelEvent(const WebWheelEvent wheelEvent)
{
+if (m_waitingOnAsynchronousInitialization)
+return false;
+
bool handled = false;
if (!m_connection-connection()-sendSync(Messages::PluginControllerProxy::HandleWheelEvent(wheelEvent), Messages::PluginControllerProxy::HandleWheelEvent::Reply(handled), m_pluginInstanceID))
return false;
@@ -372,6 +378,9 @@
bool PluginProxy::handleMouseEnterEvent(const WebMouseEvent mouseEnterEvent)
{
+if (m_waitingOnAsynchronousInitialization)
+return false;
+
bool handled = false;
if (!m_connection-connection()-sendSync(Messages::PluginControllerProxy::HandleMouseEnterEvent(mouseEnterEvent), Messages::PluginControllerProxy::HandleMouseEnterEvent::Reply(handled), m_pluginInstanceID))
return false;
@@ -381,6 +390,9 @@
bool PluginProxy::handleMouseLeaveEvent(const WebMouseEvent mouseLeaveEvent)
{
+if (m_waitingOnAsynchronousInitialization)
+return false;
+
bool handled = false;
if (!m_connection-connection()-sendSync(Messages::PluginControllerProxy::HandleMouseLeaveEvent(mouseLeaveEvent), Messages::PluginControllerProxy::HandleMouseLeaveEvent::Reply(handled), m_pluginInstanceID))
return false;
@@ -396,6 +408,9 @@
bool PluginProxy::handleKeyboardEvent(const WebKeyboardEvent keyboardEvent)
{
+if (m_waitingOnAsynchronousInitialization)
+return false;
+
bool handled = false;
if (!m_connection-connection()-sendSync(Messages::PluginControllerProxy::HandleKeyboardEvent(keyboardEvent), Messages::PluginControllerProxy::HandleKeyboardEvent::Reply(handled), m_pluginInstanceID))
return false;
@@ -410,6 +425,9 @@
bool PluginProxy::handleEditingCommand(const String commandName, const String argument)
{
+if
[webkit-changes] [147254] trunk/LayoutTests
Title: [147254] trunk/LayoutTests
Revision 147254
Author jsb...@chromium.org
Date 2013-03-29 15:10:06 -0700 (Fri, 29 Mar 2013)
Log Message
[Chromium] IndexedDB: Update terminated worker connection test
https://bugs.webkit.org/show_bug.cgi?id=113608
Reviewed by Tony Chang.
Update layout test only run under Chromium's content_shell that ensures that
worker termination does not result in stuck connections. The test was using
the obsolete setVersion() API.
* storage/indexeddb/pending-version-change-stuck-works-with-terminate-expected.txt:
* storage/indexeddb/pending-version-change-stuck-works-with-terminate.html:
* storage/indexeddb/resources/pending-version-change-stuck.js:
(test.request.onblocked):
(test):
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate-expected.txt
trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate.html
trunk/LayoutTests/storage/indexeddb/resources/pending-version-change-stuck.js
Diff
Modified: trunk/LayoutTests/ChangeLog (147253 => 147254)
--- trunk/LayoutTests/ChangeLog 2013-03-29 21:56:45 UTC (rev 147253)
+++ trunk/LayoutTests/ChangeLog 2013-03-29 22:10:06 UTC (rev 147254)
@@ -1,3 +1,20 @@
+2013-03-29 Joshua Bell jsb...@chromium.org
+
+[Chromium] IndexedDB: Update terminated worker connection test
+https://bugs.webkit.org/show_bug.cgi?id=113608
+
+Reviewed by Tony Chang.
+
+Update layout test only run under Chromium's content_shell that ensures that
+worker termination does not result in stuck connections. The test was using
+the obsolete setVersion() API.
+
+* storage/indexeddb/pending-version-change-stuck-works-with-terminate-expected.txt:
+* storage/indexeddb/pending-version-change-stuck-works-with-terminate.html:
+* storage/indexeddb/resources/pending-version-change-stuck.js:
+(test.request.onblocked):
+(test):
+
2013-03-29 Bem Jones-Bey bjone...@adobe.com
[CSS Exclusions] shape outside segments not properly calculated for ellipses
Modified: trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate-expected.txt (147253 => 147254)
--- trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate-expected.txt 2013-03-29 21:56:45 UTC (rev 147253)
+++ trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate-expected.txt 2013-03-29 22:10:06 UTC (rev 147254)
@@ -1,11 +1,12 @@
-Explicitly terminating worker with blocked setVersion call should allow later open calls to proceed
+Explicitly terminating worker with blocked call should allow later open calls to proceed
On success, you will see a series of PASS messages, followed by TEST COMPLETE.
indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
-request = indexedDB.open(pending-version-change-stuck-works-with-terminate.html)
+dbname = pending-version-change-stuck-works-with-terminate.html
+indexedDB.open(dbname)
PASS Open worked after page reload.
PASS successfullyParsed is true
Modified: trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate.html (147253 => 147254)
--- trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate.html 2013-03-29 21:56:45 UTC (rev 147253)
+++ trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate.html 2013-03-29 22:10:06 UTC (rev 147254)
@@ -6,28 +6,45 @@
body
script
-description(Explicitly terminating worker with blocked setVersion call should allow later open calls to proceed);
+description(Explicitly terminating worker with blocked call should allow later open calls to proceed);
function test()
{
removeVendorPrefixes();
-dbname = self.location.pathname.substring(1 + self.location.pathname.lastIndexOf(/));
-evalAndLog(request = indexedDB.open(\ + dbname + \));
+setDBNameFromPath();
+if (self.location.search !== ?second) {
+firstOpen();
+} else {
+secondOpen();
+}
+}
+
+function firstOpen() {
+request = evalAndLog(indexedDB.deleteDatabase(dbname));
request._onblocked_ = unexpectedBlockedCallback;
request._onerror_ = unexpectedErrorCallback;
-if (self.location.search == ?second) {
-request._onsuccess_ = function() {
-testPassed(Open worked after page reload.);
-finishJSTest();
-};
-} else {
+request._onsuccess_ = function() {
+request = evalAndLog(indexedDB.open(dbname));
+request._onblocked_ = unexpectedBlockedCallback;
+request._onerror_ = unexpectedErrorCallback;
request._onsuccess_ = startTheWorker;
-}
+};
}
+function secondOpen() {
+request = evalAndLog(indexedDB.open(dbname));
+request._onblocked_ = unexpectedBlockedCallback;
+request._onerror_ =
[webkit-changes] [147255] trunk/LayoutTests
Title: [147255] trunk/LayoutTests Revision 147255 Author acolw...@chromium.org Date 2013-03-29 15:18:03 -0700 (Fri, 29 Mar 2013) Log Message Add LayoutTests that verify MediaSource.duration behavior. https://bugs.webkit.org/show_bug.cgi?id=113438 Reviewed by Eric Carlson. * http/tests/media/media-source/video-media-source-duration-boundaryconditions-expected.txt: Added. * http/tests/media/media-source/video-media-source-duration-boundaryconditions.html: Added. * http/tests/media/media-source/video-media-source-duration-expected.txt: Added. * http/tests/media/media-source/video-media-source-duration.html: Added. Modified Paths trunk/LayoutTests/ChangeLog Added Paths trunk/LayoutTests/http/tests/media/media-source/video-media-source-duration-boundaryconditions-expected.txt trunk/LayoutTests/http/tests/media/media-source/video-media-source-duration-boundaryconditions.html trunk/LayoutTests/http/tests/media/media-source/video-media-source-duration-expected.txt trunk/LayoutTests/http/tests/media/media-source/video-media-source-duration.html Diff Modified: trunk/LayoutTests/ChangeLog (147254 => 147255) --- trunk/LayoutTests/ChangeLog 2013-03-29 22:10:06 UTC (rev 147254) +++ trunk/LayoutTests/ChangeLog 2013-03-29 22:18:03 UTC (rev 147255) @@ -1,3 +1,15 @@ +2013-03-29 Aaron Colwell acolw...@chromium.org + +Add LayoutTests that verify MediaSource.duration behavior. +https://bugs.webkit.org/show_bug.cgi?id=113438 + +Reviewed by Eric Carlson. + +* http/tests/media/media-source/video-media-source-duration-boundaryconditions-expected.txt: Added. +* http/tests/media/media-source/video-media-source-duration-boundaryconditions.html: Added. +* http/tests/media/media-source/video-media-source-duration-expected.txt: Added. +* http/tests/media/media-source/video-media-source-duration.html: Added. + 2013-03-29 Joshua Bell jsb...@chromium.org [Chromium] IndexedDB: Update terminated worker connection test Added: trunk/LayoutTests/http/tests/media/media-source/video-media-source-duration-boundaryconditions-expected.txt (0 => 147255) --- trunk/LayoutTests/http/tests/media/media-source/video-media-source-duration-boundaryconditions-expected.txt (rev 0) +++ trunk/LayoutTests/http/tests/media/media-source/video-media-source-duration-boundaryconditions-expected.txt 2013-03-29 22:18:03 UTC (rev 147255) @@ -0,0 +1,95 @@ +Tests boundary values for duration attribute on MediaSource object. + + +running testSetMaxInt +EVENT(webkitsourceopen) +onDurationChange : video.duration is 6.042 +EXPECTED (mediaSource.duration == 'video.duration') OK +EVENT(loadedmetadata) +EXPECTED (mediaSource.duration == 'testDurationValue'), OBSERVED '2147483648' FAIL +onDurationChange : video.duration is 2147483648.000 +EXPECTED (mediaSource.duration == 'video.duration') OK +EVENT(durationchange) + +running testSetMinInt +EVENT(webkitsourceopen) +onDurationChange : video.duration is 6.042 +EXPECTED (mediaSource.duration == 'video.duration') OK +EVENT(loadedmetadata) +EXPECTED (mediaSource.duration == 'testDurationValue') OK +onDurationChange : video.duration is 1.000 +EXPECTED (mediaSource.duration == 'video.duration') OK +EVENT(durationchange) + +running testSetMaxValue +EVENT(webkitsourceopen) +onDurationChange : video.duration is 6.042 +EXPECTED (mediaSource.duration == 'video.duration') OK +EVENT(loadedmetadata) +EXPECTED (mediaSource.duration == 'testDurationValue'), OBSERVED '3.4028234663852886e+38' FAIL +onDurationChange : video.duration is 3.4028234663852886e+38 +EXPECTED (mediaSource.duration == 'video.duration') OK +EVENT(durationchange) + +running testSetMaxValueMinusOne +EVENT(webkitsourceopen) +onDurationChange : video.duration is 6.042 +EXPECTED (mediaSource.duration == 'video.duration') OK +EVENT(loadedmetadata) +EXPECTED (mediaSource.duration == 'testDurationValue'), OBSERVED '3.4028234663852886e+38' FAIL +onDurationChange : video.duration is 3.4028234663852886e+38 +EXPECTED (mediaSource.duration == 'video.duration') OK +EVENT(durationchange) + +running testSetMinValue +EVENT(webkitsourceopen) +onDurationChange : video.duration is 6.042 +EXPECTED (mediaSource.duration == 'video.duration') OK +EVENT(loadedmetadata) +EXPECTED (mediaSource.duration == 'testDurationValue'), OBSERVED '1.1754943508222875e-38' FAIL +onDurationChange : video.duration is 0.000 +EXPECTED (mediaSource.duration == 'video.duration') OK +EVENT(durationchange) + +running testSetMinValueMinusOne +EVENT(webkitsourceopen) +onDurationChange : video.duration is 6.042 +EXPECTED (mediaSource.duration == 'video.duration') OK +EVENT(loadedmetadata) +PASS: Media Source set duration. Got expected exception Error: InvalidAccessError: DOM Exception 15 + +running testSetPositiveInfinity +EVENT(webkitsourceopen) +onDurationChange : video.duration is 6.042 +EXPECTED (mediaSource.duration == 'video.duration') OK +EVENT(loadedmetadata) +EXPECTED (mediaSource.duration ==
[webkit-changes] [147256] trunk/Source/WebKit/chromium
Title: [147256] trunk/Source/WebKit/chromium
Revision 147256
Author commit-qu...@webkit.org
Date 2013-03-29 15:32:30 -0700 (Fri, 29 Mar 2013)
Log Message
Unreviewed. Rolled Chromium DEPS to r191432. Requested by
Philip Rogers p...@google.com via sheriffbot.
Patch by Sheriff Bot webkit.review@gmail.com on 2013-03-29
* DEPS:
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/DEPS
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (147255 => 147256)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-03-29 22:18:03 UTC (rev 147255)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-03-29 22:32:30 UTC (rev 147256)
@@ -1,3 +1,10 @@
+2013-03-29 Sheriff Bot webkit.review@gmail.com
+
+Unreviewed. Rolled Chromium DEPS to r191432. Requested by
+Philip Rogers p...@google.com via sheriffbot.
+
+* DEPS:
+
2013-03-29 Joshua Bell jsb...@chromium.org
IndexedDB: Bind lifetime of in-memory backing stores to IDBFactory backend
Modified: trunk/Source/WebKit/chromium/DEPS (147255 => 147256)
--- trunk/Source/WebKit/chromium/DEPS 2013-03-29 22:18:03 UTC (rev 147255)
+++ trunk/Source/WebKit/chromium/DEPS 2013-03-29 22:32:30 UTC (rev 147256)
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '191172'
+ 'chromium_rev': '191432'
}
deps = {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147257] trunk/Source/WebKit2
Title: [147257] trunk/Source/WebKit2
Revision 147257
Author beid...@apple.com
Date 2013-03-29 16:02:28 -0700 (Fri, 29 Mar 2013)
Log Message
Crash when willSendRequest causes the ResourceLoader to be cancelled.
rdar://problem/13531679 and https://bugs.webkit.org/show_bug.cgi?id=113616
Reviewed by Alexey Proskuryakov.
These callbacks to the WebCore ResourceLoader can cause the WebResourceLoader to be destroyed.
A RefPtr protector fixes that.
Additionally we can invalidate the WebResourceLoader to avoid unnecessary callbacks to the NetworkProcess.
* WebProcess/Network/WebResourceLoadScheduler.cpp:
(WebKit::WebResourceLoadScheduler::remove): Call detachFromCoreLoader() on a removed WebResourceLoader.
* WebProcess/Network/WebResourceLoader.cpp:
(WebKit::WebResourceLoader::detachFromCoreLoader): Clear out the ResourceLoader pointer.
(WebKit::WebResourceLoader::willSendRequest): Protect this, and don't message back to the NetworkProcess if its not needed.
(WebKit::WebResourceLoader::canAuthenticateAgainstProtectionSpace): Ditto
(WebKit::WebResourceLoader::didReceiveResource): Paranoid hardening - Protect this before delivering the data to the WebCore
ResourceLoader, and null check it before delivering the didFinishLoader call.
* WebProcess/Network/WebResourceLoader.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp
trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (147256 => 147257)
--- trunk/Source/WebKit2/ChangeLog 2013-03-29 22:32:30 UTC (rev 147256)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-29 23:02:28 UTC (rev 147257)
@@ -1,5 +1,28 @@
2013-03-29 Brady Eidson beid...@apple.com
+Crash when willSendRequest causes the ResourceLoader to be cancelled.
+rdar://problem/13531679 and https://bugs.webkit.org/show_bug.cgi?id=113616
+
+Reviewed by Alexey Proskuryakov.
+
+These callbacks to the WebCore ResourceLoader can cause the WebResourceLoader to be destroyed.
+A RefPtr protector fixes that.
+
+Additionally we can invalidate the WebResourceLoader to avoid unnecessary callbacks to the NetworkProcess.
+
+* WebProcess/Network/WebResourceLoadScheduler.cpp:
+(WebKit::WebResourceLoadScheduler::remove): Call detachFromCoreLoader() on a removed WebResourceLoader.
+
+* WebProcess/Network/WebResourceLoader.cpp:
+(WebKit::WebResourceLoader::detachFromCoreLoader): Clear out the ResourceLoader pointer.
+(WebKit::WebResourceLoader::willSendRequest): Protect this, and don't message back to the NetworkProcess if its not needed.
+(WebKit::WebResourceLoader::canAuthenticateAgainstProtectionSpace): Ditto
+(WebKit::WebResourceLoader::didReceiveResource): Paranoid hardening - Protect this before delivering the data to the WebCore
+ ResourceLoader, and null check it before delivering the didFinishLoader call.
+* WebProcess/Network/WebResourceLoader.h:
+
+2013-03-29 Brady Eidson beid...@apple.com
+
Should never send events to plugins waiting on asynchronous initialization.
rdar://problem/13538945 and https://bugs.webkit.org/show_bug.cgi?id=113612
Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (147256 => 147257)
--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2013-03-29 22:32:30 UTC (rev 147256)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2013-03-29 23:02:28 UTC (rev 147257)
@@ -155,8 +155,12 @@
// If a resource load was actually started within the NetworkProcess then the NetworkProcess handles clearing out the identifier.
WebProcess::shared().networkConnection()-connection()-send(Messages::NetworkConnectionToWebProcess::RemoveLoadIdentifier(identifier), 0);
-ASSERT(m_webResourceLoaders.contains(identifier));
-m_webResourceLoaders.remove(identifier);
+RefPtrWebResourceLoader loader = m_webResourceLoaders.take(identifier);
+ASSERT(loader);
+
+// It's possible that this WebResourceLoader might be just about to message back to the NetworkProcess (e.g. ContinueWillSendRequest)
+// but there's no point in doing so anymore.
+loader-detachFromCoreLoader();
}
void WebResourceLoadScheduler::crossOriginRedirectReceived(ResourceLoader*, const KURL)
Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (147256 => 147257)
--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2013-03-29 22:32:30 UTC (rev 147256)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2013-03-29 23:02:28 UTC (rev 147257)
@@ -73,12 +73,23 @@
m_coreLoader-cancel();
}
+void WebResourceLoader::detachFromCoreLoader()
+{
+m_coreLoader = 0;
+}
+
void WebResourceLoader::willSendRequest(const ResourceRequest proposedRequest, const
[webkit-changes] [147258] branches/chromium/1453/Source/WebCore/platform/leveldb/ LevelDBDatabase.cpp
Title: [147258] branches/chromium/1453/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
Revision 147258
Author dgro...@chromium.org
Date 2013-03-29 16:24:25 -0700 (Fri, 29 Mar 2013)
Log Message
Merge 146950 IndexedDB: Histogram cause of LevelDB write errors
IndexedDB: Histogram cause of LevelDB write errors
https://bugs.webkit.org/show_bug.cgi?id=113350
Reviewed by Tony Chang.
Add histogram for source of LevelDB errors on Write in addition to
Open.
No new tests - no good way to test histogram code.
* platform/leveldb/LevelDBDatabase.cpp:
(WebCore::histogramLevelDBError):
(WebCore):
(WebCore::LevelDBDatabase::open):
(WebCore::LevelDBDatabase::write):
TBR=dgro...@chromium.org
Review URL: https://codereview.chromium.org/13171005
Modified Paths
branches/chromium/1453/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
Diff
Modified: branches/chromium/1453/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp (147257 => 147258)
--- branches/chromium/1453/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp 2013-03-29 23:02:28 UTC (rev 147257)
+++ branches/chromium/1453/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp 2013-03-29 23:24:25 UTC (rev 147258)
@@ -159,6 +159,26 @@
#endif
}
+static void histogramLevelDBError(const char* histogramName, const leveldb::Status s)
+{
+ASSERT(!s.ok());
+enum {
+LevelDBNotFound,
+LevelDBCorruption,
+LevelDBIOError,
+LevelDBOther,
+LevelDBMaxError
+};
+int levelDBError = LevelDBOther;
+if (s.IsNotFound())
+levelDBError = LevelDBNotFound;
+else if (s.IsCorruption())
+levelDBError = LevelDBCorruption;
+else if (s.IsIOError())
+levelDBError = LevelDBIOError;
+HistogramSupport::histogramEnumeration(histogramName, levelDBError, LevelDBMaxError);
+}
+
PassOwnPtrLevelDBDatabase LevelDBDatabase::open(const String fileName, const LevelDBComparator* comparator)
{
OwnPtrComparatorAdapter comparatorAdapter = adoptPtr(new ComparatorAdapter(comparator));
@@ -167,22 +187,7 @@
const leveldb::Status s = openDB(comparatorAdapter.get(), leveldb::IDBEnv(), fileName, db);
if (!s.ok()) {
-enum {
-LevelDBNotFound,
-LevelDBCorruption,
-LevelDBIOError,
-LevelDBOther,
-LevelDBMaxError
-};
-int levelDBError = LevelDBOther;
-if (s.IsNotFound())
-levelDBError = LevelDBNotFound;
-else if (s.IsCorruption())
-levelDBError = LevelDBCorruption;
-else if (s.IsIOError())
-levelDBError = LevelDBIOError;
-HistogramSupport::histogramEnumeration(WebCore.IndexedDB.LevelDBOpenErrors, levelDBError, LevelDBMaxError);
-
+histogramLevelDBError(WebCore.IndexedDB.LevelDBOpenErrors, s);
histogramFreeSpace(Failure, fileName);
LOG_ERROR(Failed to open LevelDB database from %s: %s, fileName.ascii().data(), s.ToString().c_str());
@@ -276,6 +281,7 @@
const leveldb::Status s = m_db-Write(writeOptions, writeBatch.m_writeBatch.get());
if (s.ok())
return true;
+histogramLevelDBError(WebCore.IndexedDB.LevelDBWriteErrors, s);
LOG_ERROR(LevelDB write failed: %s, s.ToString().c_str());
return false;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147260] trunk
Title: [147260] trunk
Revision 147260
Author a...@apple.com
Date 2013-03-29 16:30:44 -0700 (Fri, 29 Mar 2013)
Log Message
Expose FeatureObserver data to WebKit clients
https://bugs.webkit.org/show_bug.cgi?id=113613
Reviewed by Sam Weinig.
FeatureObserver used to depend on chromium-only HistogramSupport, which is not
really usable on Mac at least.
Instead of adding parallel feature reporting machinery, I'm adding a way to
generically relay the data from FeatureObserver to port code.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadWithDocumentLoader):
(WebCore::FrameLoader::commitProvisionalLoad):
(WebCore::FrameLoader::reportMemoryUsage):
* loader/FrameLoader.h:
(WebCore::FrameLoader::previousURL):
Exposed m_previousURL, renaming it to follow WebKit style.
* page/FeatureObserver.cpp:
(WebCore::FeatureObserver::~FeatureObserver):
(WebCore::FeatureObserver::updateMeasurements):
* page/FeatureObserver.h:
(WebCore::FeatureObserver::accumulatedFeatureBits):
Exposed the data to clients, and made reporting through HistogramSupport
chromium only for clarity.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/FrameLoader.cpp
trunk/Source/WebCore/loader/FrameLoader.h
trunk/Source/WebCore/page/FeatureObserver.cpp
trunk/Source/WebCore/page/FeatureObserver.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/APIClientTraits.cpp
trunk/Source/WebKit2/Shared/APIClientTraits.h
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
trunk/Tools/ChangeLog
trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (147259 => 147260)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 23:28:34 UTC (rev 147259)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 23:30:44 UTC (rev 147260)
@@ -1,3 +1,32 @@
+2013-03-29 Alexey Proskuryakov a...@apple.com
+
+Expose FeatureObserver data to WebKit clients
+https://bugs.webkit.org/show_bug.cgi?id=113613
+
+Reviewed by Sam Weinig.
+
+FeatureObserver used to depend on chromium-only HistogramSupport, which is not
+really usable on Mac at least.
+
+Instead of adding parallel feature reporting machinery, I'm adding a way to
+generically relay the data from FeatureObserver to port code.
+
+* loader/FrameLoader.cpp:
+(WebCore::FrameLoader::loadWithDocumentLoader):
+(WebCore::FrameLoader::commitProvisionalLoad):
+(WebCore::FrameLoader::reportMemoryUsage):
+* loader/FrameLoader.h:
+(WebCore::FrameLoader::previousURL):
+Exposed m_previousURL, renaming it to follow WebKit style.
+
+* page/FeatureObserver.cpp:
+(WebCore::FeatureObserver::~FeatureObserver):
+(WebCore::FeatureObserver::updateMeasurements):
+* page/FeatureObserver.h:
+(WebCore::FeatureObserver::accumulatedFeatureBits):
+Exposed the data to clients, and made reporting through HistogramSupport
+chromium only for clarity.
+
2013-03-29 Bem Jones-Bey bjone...@adobe.com
[CSS Exclusions] shape outside segments not properly calculated for ellipses
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (147259 => 147260)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2013-03-29 23:28:34 UTC (rev 147259)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2013-03-29 23:30:44 UTC (rev 147260)
@@ -1355,7 +1355,7 @@
return;
if (m_frame-document())
-m_previousUrl = m_frame-document()-url();
+m_previousURL = m_frame-document()-url();
policyChecker()-setLoadType(type);
RefPtrFormState formState = prpFormState;
@@ -1718,7 +1718,7 @@
if (pdl m_documentLoader) {
// Check if the destination page is allowed to access the previous page's timing information.
RefPtrSecurityOrigin securityOrigin = SecurityOrigin::create(pdl-request().url());
-m_documentLoader-timing()-setHasSameOriginAsPreviousDocument(securityOrigin-canRequest(m_previousUrl));
+m_documentLoader-timing()-setHasSameOriginAsPreviousDocument(securityOrigin-canRequest(m_previousURL));
}
// Call clientRedirectCancelledOrFinished() here so that the frame load delegate is notified that the redirect's
@@ -3353,7 +3353,7 @@
info.addMember(m_openedFrames, openedFrames);
info.addMember(m_outgoingReferrer, outgoingReferrer);
info.addMember(m_networkingContext, networkingContext);
-info.addMember(m_previousUrl, previousUrl);
+info.addMember(m_previousURL, previousURL);
[webkit-changes] [147262] tags/Safari-537.35.4/Source/WebKit2
Title: [147262] tags/Safari-537.35.4/Source/WebKit2
Revision 147262
Author lforsch...@apple.com
Date 2013-03-29 16:41:54 -0700 (Fri, 29 Mar 2013)
Log Message
Merged r147257. rdar://problem/13531679
Modified Paths
tags/Safari-537.35.4/Source/WebKit2/ChangeLog
tags/Safari-537.35.4/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp
tags/Safari-537.35.4/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
tags/Safari-537.35.4/Source/WebKit2/WebProcess/Network/WebResourceLoader.h
Diff
Modified: tags/Safari-537.35.4/Source/WebKit2/ChangeLog (147261 => 147262)
--- tags/Safari-537.35.4/Source/WebKit2/ChangeLog 2013-03-29 23:32:46 UTC (rev 147261)
+++ tags/Safari-537.35.4/Source/WebKit2/ChangeLog 2013-03-29 23:41:54 UTC (rev 147262)
@@ -1,5 +1,32 @@
2013-03-29 Lucas Forschler lforsch...@apple.com
+Merge r147257
+
+2013-03-29 Brady Eidson beid...@apple.com
+
+Crash when willSendRequest causes the ResourceLoader to be cancelled.
+rdar://problem/13531679 and https://bugs.webkit.org/show_bug.cgi?id=113616
+
+Reviewed by Alexey Proskuryakov.
+
+These callbacks to the WebCore ResourceLoader can cause the WebResourceLoader to be destroyed.
+A RefPtr protector fixes that.
+
+Additionally we can invalidate the WebResourceLoader to avoid unnecessary callbacks to the NetworkProcess.
+
+* WebProcess/Network/WebResourceLoadScheduler.cpp:
+(WebKit::WebResourceLoadScheduler::remove): Call detachFromCoreLoader() on a removed WebResourceLoader.
+
+* WebProcess/Network/WebResourceLoader.cpp:
+(WebKit::WebResourceLoader::detachFromCoreLoader): Clear out the ResourceLoader pointer.
+(WebKit::WebResourceLoader::willSendRequest): Protect this, and don't message back to the NetworkProcess if its not needed.
+(WebKit::WebResourceLoader::canAuthenticateAgainstProtectionSpace): Ditto
+(WebKit::WebResourceLoader::didReceiveResource): Paranoid hardening - Protect this before delivering the data to the WebCore
+ ResourceLoader, and null check it before delivering the didFinishLoader call.
+* WebProcess/Network/WebResourceLoader.h:
+
+2013-03-29 Lucas Forschler lforsch...@apple.com
+
Merge r147179
2013-03-28 Brady Eidson beid...@apple.com
Modified: tags/Safari-537.35.4/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (147261 => 147262)
--- tags/Safari-537.35.4/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2013-03-29 23:32:46 UTC (rev 147261)
+++ tags/Safari-537.35.4/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2013-03-29 23:41:54 UTC (rev 147262)
@@ -155,8 +155,12 @@
// If a resource load was actually started within the NetworkProcess then the NetworkProcess handles clearing out the identifier.
WebProcess::shared().networkConnection()-connection()-send(Messages::NetworkConnectionToWebProcess::RemoveLoadIdentifier(identifier), 0);
-ASSERT(m_webResourceLoaders.contains(identifier));
-m_webResourceLoaders.remove(identifier);
+RefPtrWebResourceLoader loader = m_webResourceLoaders.take(identifier);
+ASSERT(loader);
+
+// It's possible that this WebResourceLoader might be just about to message back to the NetworkProcess (e.g. ContinueWillSendRequest)
+// but there's no point in doing so anymore.
+loader-detachFromCoreLoader();
}
void WebResourceLoadScheduler::crossOriginRedirectReceived(ResourceLoader*, const KURL)
Modified: tags/Safari-537.35.4/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (147261 => 147262)
--- tags/Safari-537.35.4/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2013-03-29 23:32:46 UTC (rev 147261)
+++ tags/Safari-537.35.4/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2013-03-29 23:41:54 UTC (rev 147262)
@@ -73,12 +73,23 @@
m_coreLoader-cancel();
}
+void WebResourceLoader::detachFromCoreLoader()
+{
+m_coreLoader = 0;
+}
+
void WebResourceLoader::willSendRequest(const ResourceRequest proposedRequest, const ResourceResponse redirectResponse)
{
LOG(Network, (WebProcess) WebResourceLoader::willSendRequest to '%s', proposedRequest.url().string().utf8().data());
+
+RefPtrWebResourceLoader protector(this);
ResourceRequest newRequest = proposedRequest;
m_coreLoader-willSendRequest(newRequest, redirectResponse);
+
+if (!m_coreLoader)
+return;
+
send(Messages::NetworkResourceLoader::ContinueWillSendRequest(newRequest));
}
@@ -120,16 +131,27 @@
return;
}
+RefPtrWebResourceLoader protector(this);
+
// Only send data to the didReceiveData callback if it exists.
if (buffer-size())
m_coreLoader-didReceiveBuffer(buffer.get(), buffer-size(), DataPayloadWholeResource);
+if (!m_coreLoader)
+return;
+
m_coreLoader-didFinishLoading(finishTime);
}
[webkit-changes] [147263] trunk/Source/WebCore
Title: [147263] trunk/Source/WebCore
Revision 147263
Author aes...@apple.com
Date 2013-03-29 17:04:17 -0700 (Fri, 29 Mar 2013)
Log Message
Let cached resources from file: schemes expire immediately
https://bugs.webkit.org/show_bug.cgi?id=113626
Reviewed by Brady Eidson
When a CachedResource was loaded from a file: URL, we would give it an
indefinite freshness lifetime. This means that we would continue to
serve a stale resource from the memory cache even if the file was
changed on disk. With the introduction of main resource caching, this
behavior broke at least one third-party WebKit app (see rdar://problem/13313769).
We should instead let file resources expire immediately. Modern
filesystems implement their own caching, so we should get good
performance for multiple reads of unmodified files without doing our
own caching.
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::freshnessLifetime): file: URLs should have a
0 freshness lifetime.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/cache/CachedResource.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (147262 => 147263)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 23:41:54 UTC (rev 147262)
+++ trunk/Source/WebCore/ChangeLog 2013-03-30 00:04:17 UTC (rev 147263)
@@ -1,3 +1,25 @@
+2013-03-29 Andy Estes aes...@apple.com
+
+Let cached resources from file: schemes expire immediately
+https://bugs.webkit.org/show_bug.cgi?id=113626
+
+Reviewed by Brady Eidson
+
+When a CachedResource was loaded from a file: URL, we would give it an
+indefinite freshness lifetime. This means that we would continue to
+serve a stale resource from the memory cache even if the file was
+changed on disk. With the introduction of main resource caching, this
+behavior broke at least one third-party WebKit app (see rdar://problem/13313769).
+
+We should instead let file resources expire immediately. Modern
+filesystems implement their own caching, so we should get good
+performance for multiple reads of unmodified files without doing our
+own caching.
+
+* loader/cache/CachedResource.cpp:
+(WebCore::CachedResource::freshnessLifetime): file: URLs should have a
+0 freshness lifetime.
+
2013-03-29 Ojan Vafai o...@chromium.org
Flexitems no longer default min-width to min-content
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (147262 => 147263)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2013-03-29 23:41:54 UTC (rev 147262)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2013-03-30 00:04:17 UTC (rev 147263)
@@ -432,7 +432,14 @@
double CachedResource::freshnessLifetime() const
{
-// Cache non-http resources liberally
+// Let file: resources expire immediately so that we don't serve a stale
+// resource when a file has changed underneath us. Modern filesystems
+// implement their own caches, so we should still get good performance if
+// the resource hasn't changed.
+if (m_response.url().protocolIs(file))
+return 0;
+
+// Cache other non-http resources liberally.
if (!m_response.url().protocolIsInHTTPFamily())
return std::numeric_limitsdouble::max();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147264] branches/dfgFourthTier
Title: [147264] branches/dfgFourthTier
Revision 147264
Author fpi...@apple.com
Date 2013-03-29 17:19:18 -0700 (Fri, 29 Mar 2013)
Log Message
fourthTier: Check in a known-good build of LLVM into WebKitLibraries, and have a story for updating it
https://bugs.webkit.org/show_bug.cgi?id=113452
Rubber stamped by Mark Hahnenberg.
Tools:
* Scripts/copy-webkitlibraries-to-product-directory:
* Scripts/export-llvm-build:
WebKitLibraries:
* LLVMIncludesMountainLion.tar.bz2: Added.
* LLVMLibrariesMountainLion.tar.bz2: Added.
Modified Paths
branches/dfgFourthTier/Tools/ChangeLog
branches/dfgFourthTier/Tools/Scripts/copy-webkitlibraries-to-product-directory
branches/dfgFourthTier/Tools/Scripts/export-llvm-build
branches/dfgFourthTier/WebKitLibraries/ChangeLog
Added Paths
branches/dfgFourthTier/WebKitLibraries/LLVMIncludesMountainLion.tar.bz2
branches/dfgFourthTier/WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2
Diff
Modified: branches/dfgFourthTier/Tools/ChangeLog (147263 => 147264)
--- branches/dfgFourthTier/Tools/ChangeLog 2013-03-30 00:04:17 UTC (rev 147263)
+++ branches/dfgFourthTier/Tools/ChangeLog 2013-03-30 00:19:18 UTC (rev 147264)
@@ -1,5 +1,15 @@
2013-03-29 Filip Pizlo fpi...@apple.com
+fourthTier: Check in a known-good build of LLVM into WebKitLibraries, and have a story for updating it
+https://bugs.webkit.org/show_bug.cgi?id=113452
+
+Rubber stamped by Mark Hahnenberg.
+
+* Scripts/copy-webkitlibraries-to-product-directory:
+* Scripts/export-llvm-build:
+
+2013-03-29 Filip Pizlo fpi...@apple.com
+
fourthTier: FTL JIT should be able run some simple function
https://bugs.webkit.org/show_bug.cgi?id=113481
Modified: branches/dfgFourthTier/Tools/Scripts/copy-webkitlibraries-to-product-directory (147263 => 147264)
--- branches/dfgFourthTier/Tools/Scripts/copy-webkitlibraries-to-product-directory 2013-03-30 00:04:17 UTC (rev 147263)
+++ branches/dfgFourthTier/Tools/Scripts/copy-webkitlibraries-to-product-directory 2013-03-30 00:19:18 UTC (rev 147264)
@@ -54,14 +54,19 @@
# Determine where to get LLVM binaries and headers.
my $majorDarwinVersion = (split /\./, `uname -r`)[0];
my $llvmLibraryPackage;
-if ($majorDarwinVersion == 11) {
-$llvmLibraryPackage = WebKitLibraries/LLVMLion.tar.bz2;
+my $llvmIncludePackage;
+if (defined($ENV{LLVM_LIBRARY_PACKAGE}) defined($ENV{LLVM_INCLUDE_PACKAGE})) {
+$llvmLibraryPackage = $ENV{LLVM_LIBRARY_PACKAGE};
+$llvmIncludePackage = $ENV{LLVM_INCLUDE_PACKAGE};
+} elsif ($majorDarwinVersion == 11) {
+$llvmLibraryPackage = WebKitLibraries/LLVMLibrariesLion.tar.bz2;
+$llvmIncludePackage = WebKitLibraries/LLVMIncludesLion.tar.bz2;
} elsif ($majorDarwinVersion == 12) {
-$llvmLibraryPackage = WebKitLibraries/LLVMMountainLion.tar.bz2;
-} elsif (defined($ENV{LLVM_LIBRARY_PACKAGE})) {
-$llvmLibraryPackage = $ENV{LLVM_LIBRARY_PACKAGE};
+$llvmLibraryPackage = WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2;
+$llvmIncludePackage = WebKitLibraries/LLVMIncludesMountainLion.tar.bz2;
} else {
print Don't know where to find LLVM!\n;
+print Try defining LLVM_LIBRARY_PACKAGE and LLVM_INCLUDE_PACKAGE.\n;
exit 1;
}
@@ -96,9 +101,4 @@
dittoHeaders(WebKitLibraries/WebKitSystemInterface.h, $productDir/usr/local/include/WebKitSystemInterface.h);
dittoHeaders(WebKitLibraries/WebCoreSQLite3, $productDir/WebCoreSQLite3);
-
-if (defined($ENV{LLVM_INCLUDE_PACKAGE})) {
-unpackIfNecessary($productDir/usr/local/include, $productDir/usr/local/include/llvm-c/Core.h, $ENV{LLVM_INCLUDE_PACKAGE}, 0);
-} else {
-unpackIfNecessary($productDir/usr/local/include, $productDir/usr/local/include/llvm-c/Core.h, WebKitLibraries/LLVMIncludes.tar.bz2, 0);
-}
+unpackIfNecessary($productDir/usr/local/include, $productDir/usr/local/include/llvm-c/Core.h, $llvmIncludePackage, 0);
Modified: branches/dfgFourthTier/Tools/Scripts/export-llvm-build (147263 => 147264)
--- branches/dfgFourthTier/Tools/Scripts/export-llvm-build 2013-03-30 00:04:17 UTC (rev 147263)
+++ branches/dfgFourthTier/Tools/Scripts/export-llvm-build 2013-03-30 00:19:18 UTC (rev 147264)
@@ -60,7 +60,7 @@
usage
when '--library-package'
$libraryPackage = Pathname.new(arg)
-when '--include-path'
+when '--include-package'
$includePackage = Pathname.new(arg)
when '--llvm-build'
$llvmBuild = arg
Modified: branches/dfgFourthTier/WebKitLibraries/ChangeLog (147263 => 147264)
--- branches/dfgFourthTier/WebKitLibraries/ChangeLog 2013-03-30 00:04:17 UTC (rev 147263)
+++ branches/dfgFourthTier/WebKitLibraries/ChangeLog 2013-03-30 00:19:18 UTC (rev 147264)
@@ -1,3 +1,13 @@
+2013-03-29 Filip Pizlo fpi...@apple.com
+
+fourthTier: Check in a known-good build of LLVM into WebKitLibraries, and have a story for updating it
+https://bugs.webkit.org/show_bug.cgi?id=113452
+
+Rubber stamped by Mark Hahnenberg.
+
+*
[webkit-changes] [147265] trunk/Source/WebCore
Title: [147265] trunk/Source/WebCore Revision 147265 Author commit-qu...@webkit.org Date 2013-03-29 17:51:57 -0700 (Fri, 29 Mar 2013) Log Message When releasing a CGImage, we should also remove it from the subimage cache. https://bugs.webkit.org/show_bug.cgi?id=102453 Patch by Yongjun Zhang yongjun_zh...@apple.com on 2013-03-29 Reviewed by Simon Fraser. When we release an image(CGImageRef) from BitmapImage's cachedFrames, if the image was already cached in subimage cache, it's ref count won't drop to 0 and the image won't be deleted. Usually, the subimage cache will clear the whole cache in a timer with 1 sec delay. However, if WebCore has to paint another subimage (not necessarily from the same CGImageRef) before this timer fires, we will restart the timer and images inside the cache will stay longer than they should. This patch does two things: - move SubimageCacheWithTimer and related helper struct into a separate file. - remove the image from subimage cache when we releasing the CGImageRef, this prevent subimage cache holding the image after we released it. No new tests, manually verified the CGImageRef is also removed from subimage cache when we releasing the image from FrameData::clear. * WebCore.vcproj/WebCore.vcproj: * WebCore.xcodeproj/project.pbxproj: * platform/graphics/cg/BitmapImageCG.cpp: (WebCore::FrameData::clear): remove the image from subimage cache before we releasing it. * platform/graphics/cg/GraphicsContextCG.cpp: (WebCore): (WebCore::GraphicsContext::drawNativeImage): * platform/graphics/cg/SubimageCacheWithTimer.cpp: Added. (WebCore): (SubimageRequest): (WebCore::SubimageRequest::SubimageRequest): (WebCore::SubimageCacheAdder::hash): (SubimageCacheAdder): (WebCore::SubimageCacheAdder::equal): (WebCore::SubimageCacheAdder::translate): (WebCore::SubimageCacheWithTimer::SubimageCacheWithTimer): (WebCore::SubimageCacheWithTimer::invalidateCacheTimerFired): (WebCore::SubimageCacheWithTimer::getSubimage): (WebCore::SubimageCacheWithTimer::clearImage): (WebCore::subimageCache): * platform/graphics/cg/SubimageCacheWithTimer.h: Added. (WebCore): (SubimageCacheWithTimer): Added a data member m_images to record which image and its subimages are cached. (SubimageCacheEntry): (SubimageCacheEntryTraits): (WebCore::SubimageCacheWithTimer::SubimageCacheEntryTraits::isEmptyValue): (WebCore::SubimageCacheWithTimer::SubimageCacheEntryTraits::constructDeletedValue): (WebCore::SubimageCacheWithTimer::SubimageCacheEntryTraits::isDeletedValue): (WebCore::SubimageCacheWithTimer::SubimageCacheHash::hash): (WebCore::SubimageCacheWithTimer::SubimageCacheHash::equal): (SubimageCacheHash): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp Added Paths trunk/Source/WebCore/platform/graphics/cg/SubimageCacheWithTimer.cpp trunk/Source/WebCore/platform/graphics/cg/SubimageCacheWithTimer.h Diff Modified: trunk/Source/WebCore/ChangeLog (147264 => 147265) --- trunk/Source/WebCore/ChangeLog 2013-03-30 00:19:18 UTC (rev 147264) +++ trunk/Source/WebCore/ChangeLog 2013-03-30 00:51:57 UTC (rev 147265) @@ -1,3 +1,56 @@ +2013-03-29 Yongjun Zhang yongjun_zh...@apple.com + +When releasing a CGImage, we should also remove it from the subimage cache. +https://bugs.webkit.org/show_bug.cgi?id=102453 + +Reviewed by Simon Fraser. + +When we release an image(CGImageRef) from BitmapImage's cachedFrames, if the image was already +cached in subimage cache, it's ref count won't drop to 0 and the image won't be deleted. Usually, +the subimage cache will clear the whole cache in a timer with 1 sec delay. However, if WebCore has +to paint another subimage (not necessarily from the same CGImageRef) before this timer fires, we +will restart the timer and images inside the cache will stay longer than they should. + +This patch does two things: +- move SubimageCacheWithTimer and related helper struct into a separate file. +- remove the image from subimage cache when we releasing the CGImageRef, this prevent subimage +cache holding the image after we released it. + +No new tests, manually verified the CGImageRef is also removed from subimage cache +when we releasing the image from FrameData::clear. + +* WebCore.vcproj/WebCore.vcproj: +* WebCore.xcodeproj/project.pbxproj: +* platform/graphics/cg/BitmapImageCG.cpp: +(WebCore::FrameData::clear): remove the image from subimage cache before we releasing it. +* platform/graphics/cg/GraphicsContextCG.cpp: +(WebCore): +(WebCore::GraphicsContext::drawNativeImage): +* platform/graphics/cg/SubimageCacheWithTimer.cpp: Added. +(WebCore): +
[webkit-changes] [147266] trunk/Source/WebCore
Title: [147266] trunk/Source/WebCore Revision 147266 Author roger_f...@apple.com Date 2013-03-29 18:49:00 -0700 (Fri, 29 Mar 2013) Log Message Unreviewed. AppleWin VS2010 build fix. * WebCore.vcxproj/WebCore.vcxproj: * WebCore.vcxproj/WebCore.vcxproj.filters: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters Diff Modified: trunk/Source/WebCore/ChangeLog (147265 => 147266) --- trunk/Source/WebCore/ChangeLog 2013-03-30 00:51:57 UTC (rev 147265) +++ trunk/Source/WebCore/ChangeLog 2013-03-30 01:49:00 UTC (rev 147266) @@ -1,3 +1,10 @@ +2013-03-29 Roger Fong roger_f...@apple.com + +Unreviewed. AppleWin VS2010 build fix. + +* WebCore.vcxproj/WebCore.vcxproj: +* WebCore.vcxproj/WebCore.vcxproj.filters: + 2013-03-29 Yongjun Zhang yongjun_zh...@apple.com When releasing a CGImage, we should also remove it from the subimage cache. Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (147265 => 147266) --- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-03-30 00:51:57 UTC (rev 147265) +++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-03-30 01:49:00 UTC (rev 147266) @@ -1,4 +1,4 @@ -?xml version=1.0 encoding=utf-8? +?xml version=1.0 encoding=utf-8? Project DefaultTargets=Build ToolsVersion=4.0 xmlns=http://schemas.microsoft.com/developer/msbuild/2003 ItemGroup Label=ProjectConfigurations ProjectConfiguration Include=DebugSuffix|Win32 @@ -4099,6 +4099,7 @@ ClCompile Include=..\platform\FileStream.cpp / ClCompile Include=..\platform\FileSystem.cpp / ClCompile Include=..\platform\graphics\ca\win\PlatformCAFiltersWin.cpp / +ClCompile Include=..\platform\graphics\cg\SubimageCacheWithTimer.cpp / ClCompile Include=..\platform\HistogramSupport.cpp / ClCompile Include=..\platform\KillRingNone.cpp / ClCompile Include=..\platform\KURL.cpp / @@ -11574,6 +11575,7 @@ ClInclude Include=..\platform\FileStreamClient.h / ClInclude Include=..\platform\FileSystem.h / ClInclude Include=..\platform\FloatConversion.h / +ClInclude Include=..\platform\graphics\cg\SubimageCacheWithTimer.h / ClInclude Include=..\platform\HistogramSupport.h / ClInclude Include=..\platform\HostWindow.h / ClInclude Include=..\platform\KillRing.h / @@ -13627,4 +13629,4 @@ Import Project=$(VCTargetsPath)\Microsoft.Cpp.targets / ImportGroup Label=ExtensionTargets /ImportGroup -/Project +/Project \ No newline at end of file Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (147265 => 147266) --- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-03-30 00:51:57 UTC (rev 147265) +++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-03-30 01:49:00 UTC (rev 147266) @@ -1,4 +1,4 @@ -?xml version=1.0 encoding=utf-8? +?xml version=1.0 encoding=utf-8? Project ToolsVersion=4.0 xmlns=http://schemas.microsoft.com/developer/msbuild/2003 ItemGroup Filter Include=DerivedSources @@ -6862,6 +6862,9 @@ ClCompile Include=..\platform\network\curl\CookieJarCurl.cpp Filterplatform\network\curl/Filter /ClCompile +ClCompile Include=..\platform\graphics\cg\SubimageCacheWithTimer.cpp + Filterplatform\graphics\cg/Filter +/ClCompile /ItemGroup ItemGroup ClInclude Include=$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\CSSGrammar.h @@ -14393,6 +14396,9 @@ ClInclude Include=..\platform\image-decoders\ImageDecoder.h Filterplatform\image-decoders/Filter /ClInclude +ClInclude Include=..\platform\graphics\cg\SubimageCacheWithTimer.h + Filterplatform\graphics\cg/Filter +/ClInclude /ItemGroup ItemGroup None Include=..\css\CSSGrammar.y.in @@ -15342,4 +15348,4 @@ Filterrendering/Filter /CustomBuildStep /ItemGroup -/Project +/Project \ No newline at end of file ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147267] trunk/Source/WebCore
Title: [147267] trunk/Source/WebCore
Revision 147267
Author commit-qu...@webkit.org
Date 2013-03-29 19:08:40 -0700 (Fri, 29 Mar 2013)
Log Message
Unreviewed, rolling out r147263.
http://trac.webkit.org/changeset/147263
https://bugs.webkit.org/show_bug.cgi?id=113632
Breaks test fast/loader/display-image-unset-allows-cached-
image-load.html (Requested by mlam on #webkit).
Patch by Sheriff Bot webkit.review@gmail.com on 2013-03-29
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::freshnessLifetime):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/cache/CachedResource.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (147266 => 147267)
--- trunk/Source/WebCore/ChangeLog 2013-03-30 01:49:00 UTC (rev 147266)
+++ trunk/Source/WebCore/ChangeLog 2013-03-30 02:08:40 UTC (rev 147267)
@@ -1,3 +1,15 @@
+2013-03-29 Sheriff Bot webkit.review@gmail.com
+
+Unreviewed, rolling out r147263.
+http://trac.webkit.org/changeset/147263
+https://bugs.webkit.org/show_bug.cgi?id=113632
+
+Breaks test fast/loader/display-image-unset-allows-cached-
+image-load.html (Requested by mlam on #webkit).
+
+* loader/cache/CachedResource.cpp:
+(WebCore::CachedResource::freshnessLifetime):
+
2013-03-29 Roger Fong roger_f...@apple.com
Unreviewed. AppleWin VS2010 build fix.
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (147266 => 147267)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2013-03-30 01:49:00 UTC (rev 147266)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2013-03-30 02:08:40 UTC (rev 147267)
@@ -432,14 +432,7 @@
double CachedResource::freshnessLifetime() const
{
-// Let file: resources expire immediately so that we don't serve a stale
-// resource when a file has changed underneath us. Modern filesystems
-// implement their own caches, so we should still get good performance if
-// the resource hasn't changed.
-if (m_response.url().protocolIs(file))
-return 0;
-
-// Cache other non-http resources liberally.
+// Cache non-http resources liberally
if (!m_response.url().protocolIsInHTTPFamily())
return std::numeric_limitsdouble::max();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147268] trunk/Source/WebKit2
Title: [147268] trunk/Source/WebKit2
Revision 147268
Author commit-qu...@webkit.org
Date 2013-03-29 19:54:34 -0700 (Fri, 29 Mar 2013)
Log Message
[EFL] Unreviewed build fix after r147251
https://bugs.webkit.org/show_bug.cgi?id=113631
Unreviewed build fix.
Add NETWORK_PROCESS guard.
Patch by Seokju Kwon seokju.k...@gmail.com on 2013-03-29
* UIProcess/WebResourceCacheManagerProxy.cpp:
(WebKit::WebResourceCacheManagerProxy::clearCacheForAllOrigins):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (147267 => 147268)
--- trunk/Source/WebKit2/ChangeLog 2013-03-30 02:08:40 UTC (rev 147267)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-30 02:54:34 UTC (rev 147268)
@@ -1,3 +1,15 @@
+2013-03-29 Seokju Kwon seokju.k...@gmail.com
+
+[EFL] Unreviewed build fix after r147251
+https://bugs.webkit.org/show_bug.cgi?id=113631
+
+Unreviewed build fix.
+
+Add NETWORK_PROCESS guard.
+
+* UIProcess/WebResourceCacheManagerProxy.cpp:
+(WebKit::WebResourceCacheManagerProxy::clearCacheForAllOrigins):
+
2013-03-29 Brady Eidson beid...@apple.com
Crash when willSendRequest causes the ResourceLoader to be cancelled.
Modified: trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp (147267 => 147268)
--- trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp 2013-03-30 02:08:40 UTC (rev 147267)
+++ trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp 2013-03-30 02:54:34 UTC (rev 147268)
@@ -28,13 +28,16 @@
#include ImmutableArray.h
#include ImmutableDictionary.h
-#include NetworkProcessMessages.h
#include SecurityOriginData.h
#include WebContext.h
#include WebResourceCacheManagerMessages.h
#include WebResourceCacheManagerProxyMessages.h
#include WebSecurityOrigin.h
+#if ENABLE(NETWORK_PROCESS)
+#include NetworkProcessMessages.h
+#endif
+
using namespace WebCore;
namespace WebKit {
@@ -115,7 +118,9 @@
void WebResourceCacheManagerProxy::clearCacheForAllOrigins(ResourceCachesToClear cachesToClear)
{
+#if ENABLE(NETWORK_PROCESS)
context()-sendToNetworkingProcessRelaunchingIfNecessary(Messages::NetworkProcess::ClearCacheForAllOrigins(cachesToClear));
+#endif
// FIXME (Multi-WebProcess): rdar://problem/12239765 There is no need to relaunch all processes. One process to take care of persistent cache is enough.
context()-sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebResourceCacheManager::ClearCacheForAllOrigins(cachesToClear));
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147269] branches/dfgFourthTier/Source/JavaScriptCore
Title: [147269] branches/dfgFourthTier/Source/_javascript_Core
Revision 147269
Author fpi...@apple.com
Date 2013-03-29 21:15:55 -0700 (Fri, 29 Mar 2013)
Log Message
fourthTier: FTL JIT should be able run some simple function
https://bugs.webkit.org/show_bug.cgi?id=113481
Reviewed by Geoffrey Garen.
I forgot to make a couple of the requested review changes, so I'm making
them now!
* ftl/FTLCompile.cpp:
(JSC::FTL::compile):
* ftl/FTLJITCode.h:
Modified Paths
branches/dfgFourthTier/Source/_javascript_Core/ChangeLog
branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLCompile.cpp
branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLJITCode.h
Diff
Modified: branches/dfgFourthTier/Source/_javascript_Core/ChangeLog (147268 => 147269)
--- branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-03-30 02:54:34 UTC (rev 147268)
+++ branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-03-30 04:15:55 UTC (rev 147269)
@@ -5,6 +5,20 @@
Reviewed by Geoffrey Garen.
+I forgot to make a couple of the requested review changes, so I'm making
+them now!
+
+* ftl/FTLCompile.cpp:
+(JSC::FTL::compile):
+* ftl/FTLJITCode.h:
+
+2013-03-29 Filip Pizlo fpi...@apple.com
+
+fourthTier: FTL JIT should be able run some simple function
+https://bugs.webkit.org/show_bug.cgi?id=113481
+
+Reviewed by Geoffrey Garen.
+
This is the initial version of the FTL JIT (Fourth Tier LLVM JIT).
It includes a lowering from the DFG IR to LLVM IR (FTL::lowerDFGToLLVM)
and a backend step that invokes the LLVM and wraps the resulting
Modified: branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLCompile.cpp (147268 => 147269)
--- branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLCompile.cpp 2013-03-30 02:54:34 UTC (rev 147268)
+++ branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLCompile.cpp 2013-03-30 04:15:55 UTC (rev 147269)
@@ -54,7 +54,7 @@
LLVMExecutionEngineRef engine;
char* error = 0;
-if (LLVMCreateJITCompilerForModule(engine, state.module, 2, error) != 0) {
+if (LLVMCreateJITCompilerForModule(engine, state.module, 2, error)) {
dataLog(FATAL: Could not create LLVM execution engine: , error, \n);
CRASH();
}
Modified: branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLJITCode.h (147268 => 147269)
--- branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLJITCode.h 2013-03-30 02:54:34 UTC (rev 147268)
+++ branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLJITCode.h 2013-03-30 04:15:55 UTC (rev 147269)
@@ -30,8 +30,8 @@
#if ENABLE(FTL_JIT)
+#include FTLLLVMHeaders.h
#include JITCode.h
-#include FTLLLVMHeaders.h
namespace JSC { namespace FTL {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147270] branches/dfgFourthTier/Source/JavaScriptCore
Title: [147270] branches/dfgFourthTier/Source/_javascript_Core Revision 147270 Author fpi...@apple.com Date 2013-03-29 21:41:04 -0700 (Fri, 29 Mar 2013) Log Message fourthTier: Change DO_NOT_INCLUDE_LLVM_CPP_HEADERS to LLVM_DO_NOT_INCLUDE_CPP_HEADERS https://bugs.webkit.org/show_bug.cgi?id=113634 Reviewed by Dan Bernstein. * ftl/FTLLLVMHeaders.h: Modified Paths branches/dfgFourthTier/Source/_javascript_Core/ChangeLog branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLLLVMHeaders.h Diff Modified: branches/dfgFourthTier/Source/_javascript_Core/ChangeLog (147269 => 147270) --- branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-03-30 04:15:55 UTC (rev 147269) +++ branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-03-30 04:41:04 UTC (rev 147270) @@ -1,5 +1,14 @@ 2013-03-29 Filip Pizlo fpi...@apple.com +fourthTier: Change DO_NOT_INCLUDE_LLVM_CPP_HEADERS to LLVM_DO_NOT_INCLUDE_CPP_HEADERS +https://bugs.webkit.org/show_bug.cgi?id=113634 + +Reviewed by Dan Bernstein. + +* ftl/FTLLLVMHeaders.h: + +2013-03-29 Filip Pizlo fpi...@apple.com + fourthTier: FTL JIT should be able run some simple function https://bugs.webkit.org/show_bug.cgi?id=113481 Modified: branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLLLVMHeaders.h (147269 => 147270) --- branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLLLVMHeaders.h 2013-03-30 04:15:55 UTC (rev 147269) +++ branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLLLVMHeaders.h 2013-03-30 04:41:04 UTC (rev 147270) @@ -32,7 +32,7 @@ #define __STDC_LIMIT_MACROS #define __STDC_CONSTANT_MACROS -#define DO_NOT_INCLUDE_LLVM_CPP_HEADERS +#define LLVM_DO_NOT_INCLUDE_CPP_HEADERS #include llvm-c/Analysis.h #include llvm-c/ExecutionEngine.h ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147271] branches/dfgFourthTier/Source/JavaScriptCore
Title: [147271] branches/dfgFourthTier/Source/_javascript_Core
Revision 147271
Author fpi...@apple.com
Date 2013-03-29 21:51:31 -0700 (Fri, 29 Mar 2013)
Log Message
Unreviewed, release mode build fix.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::lowInt32):
(JSC::FTL::LowerDFGToLLVM::lowCell):
(JSC::FTL::LowerDFGToLLVM::lowBoolean):
(JSC::FTL::LowerDFGToLLVM::lowJSValue):
Modified Paths
branches/dfgFourthTier/Source/_javascript_Core/ChangeLog
branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp
Diff
Modified: branches/dfgFourthTier/Source/_javascript_Core/ChangeLog (147270 => 147271)
--- branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-03-30 04:41:04 UTC (rev 147270)
+++ branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-03-30 04:51:31 UTC (rev 147271)
@@ -1,5 +1,15 @@
2013-03-29 Filip Pizlo fpi...@apple.com
+Unreviewed, release mode build fix.
+
+* ftl/FTLLowerDFGToLLVM.cpp:
+(JSC::FTL::LowerDFGToLLVM::lowInt32):
+(JSC::FTL::LowerDFGToLLVM::lowCell):
+(JSC::FTL::LowerDFGToLLVM::lowBoolean):
+(JSC::FTL::LowerDFGToLLVM::lowJSValue):
+
+2013-03-29 Filip Pizlo fpi...@apple.com
+
fourthTier: Change DO_NOT_INCLUDE_LLVM_CPP_HEADERS to LLVM_DO_NOT_INCLUDE_CPP_HEADERS
https://bugs.webkit.org/show_bug.cgi?id=113634
Modified: branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp (147270 => 147271)
--- branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2013-03-30 04:41:04 UTC (rev 147270)
+++ branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2013-03-30 04:51:31 UTC (rev 147271)
@@ -30,6 +30,7 @@
#include DFGAbstractState.h
#include FTLOutput.h
+#include Operations.h
namespace JSC { namespace FTL {
@@ -442,7 +443,7 @@
LValue lowInt32(Edge edge, OperandSpeculationMode mode = AutomaticOperandSpeculation)
{
-ASSERT(mode == ManualOperandSpeculation || (edge.useKind() == Int32Use || edge.useKind() == KnownInt32Use));
+ASSERT_UNUSED(mode, mode == ManualOperandSpeculation || (edge.useKind() == Int32Use || edge.useKind() == KnownInt32Use));
if (LValue result = m_int32Values.get(edge.node()))
return result;
@@ -461,7 +462,7 @@
LValue lowCell(Edge edge, OperandSpeculationMode mode = AutomaticOperandSpeculation)
{
-ASSERT(mode == ManualOperandSpeculation || isCell(edge.useKind()));
+ASSERT_UNUSED(mode, mode == ManualOperandSpeculation || isCell(edge.useKind()));
if (LValue uncheckedResult = m_jsValueValues.get(edge.node())) {
FTL_TYPE_CHECK(uncheckedResult, edge, SpecCell, checkNotCell(uncheckedResult));
@@ -475,7 +476,7 @@
LValue lowBoolean(Edge edge, OperandSpeculationMode mode = AutomaticOperandSpeculation)
{
-ASSERT(mode == ManualOperandSpeculation || edge.useKind() == BooleanUse);
+ASSERT_UNUSED(mode, mode == ManualOperandSpeculation || edge.useKind() == BooleanUse);
if (LValue unboxedResult = m_jsValueValues.get(edge.node())) {
FTL_TYPE_CHECK(unboxedResult, edge, SpecBoolean, checkNotBoolean(unboxedResult));
@@ -489,7 +490,7 @@
LValue lowJSValue(Edge edge, OperandSpeculationMode mode = AutomaticOperandSpeculation)
{
-ASSERT(mode == ManualOperandSpeculation || edge.useKind() == UntypedUse);
+ASSERT_UNUSED(mode, mode == ManualOperandSpeculation || edge.useKind() == UntypedUse);
if (LValue result = m_jsValueValues.get(edge.node()))
return result;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147272] branches/chromium/1453
Title: [147272] branches/chromium/1453
Revision 147272
Author pfeld...@chromium.org
Date 2013-03-29 22:12:00 -0700 (Fri, 29 Mar 2013)
Log Message
Merge 147028 REGRESSION (r146588): Cannot correctly display Chi...
BUG=223503
REGRESSION (r146588): Cannot correctly display Chinese SNS Renren
https://bugs.webkit.org/show_bug.cgi?id=113142
Patch by Sergey Ryazanov se...@chromium.org on 2013-03-27
Reviewed by Pavel Feldman.
Source/WebCore:
Changed CSS grammar to be equivalent to pre-r146588.
CSS error reporting disabled to prevent message overflow.
* css/CSSGrammar.y.in:
* css/CSSParser.cpp:
(WebCore::CSSParser::isLoggingErrors):
LayoutTests:
* TestExpectations:
* fast/css/parsing-error-recovery.html:
TBR=commit-qu...@webkit.org
Review URL: https://codereview.chromium.org/13382002
Modified Paths
branches/chromium/1453/LayoutTests/TestExpectations
branches/chromium/1453/LayoutTests/fast/css/parsing-error-recovery.html
branches/chromium/1453/Source/WebCore/css/CSSGrammar.y.in
branches/chromium/1453/Source/WebCore/css/CSSParser.cpp
Diff
Modified: branches/chromium/1453/LayoutTests/TestExpectations (147271 => 147272)
--- branches/chromium/1453/LayoutTests/TestExpectations 2013-03-30 04:51:31 UTC (rev 147271)
+++ branches/chromium/1453/LayoutTests/TestExpectations 2013-03-30 05:12:00 UTC (rev 147272)
@@ -7,3 +7,6 @@
# pending implementation completion and feature enabling
webkit.org/b/109570 media/track/regions-webvtt [ Skip ]
+
+# pending CSS grammar refactoring
+webkit.org/b/113401 inspector/console/console-css-warnings.html [ Skip ]
Modified: branches/chromium/1453/LayoutTests/fast/css/parsing-error-recovery.html (147271 => 147272)
--- branches/chromium/1453/LayoutTests/fast/css/parsing-error-recovery.html 2013-03-30 04:51:31 UTC (rev 147271)
+++ branches/chromium/1453/LayoutTests/fast/css/parsing-error-recovery.html 2013-03-30 05:12:00 UTC (rev 147272)
@@ -41,6 +41,13 @@
display:none;
}
+.malformed3 {
+;*display:_expression_(function(){})
+}
+#test5 {
+display:none;
+}
+
/* Successfully parsed */
#last {
display:block;
@@ -52,6 +59,7 @@
div class=to_be_hidden id=test2FAIL: Test 2/div
div class=to_be_hidden id=test3FAIL: Test 3/div
div class=to_be_hidden id=test4FAIL: Test 4/div
+ div class=to_be_hidden id=test5FAIL: Test 5/div
div class=to_be_shown id=lastPASS/div
/body
/html
Modified: branches/chromium/1453/Source/WebCore/css/CSSGrammar.y.in (147271 => 147272)
--- branches/chromium/1453/Source/WebCore/css/CSSGrammar.y.in 2013-03-30 04:51:31 UTC (rev 147271)
+++ branches/chromium/1453/Source/WebCore/css/CSSGrammar.y.in 2013-03-30 05:12:00 UTC (rev 147272)
@@ -2033,12 +2033,9 @@
;
errors:
-error {
-$$ = parser-currentLocation();
+error error_location {
+$$ = $2;
}
- | errors error {
-$$ = $1;
-}
;
error_location: {
Modified: branches/chromium/1453/Source/WebCore/css/CSSParser.cpp (147271 => 147272)
--- branches/chromium/1453/Source/WebCore/css/CSSParser.cpp 2013-03-30 04:51:31 UTC (rev 147271)
+++ branches/chromium/1453/Source/WebCore/css/CSSParser.cpp 2013-03-30 05:12:00 UTC (rev 147272)
@@ -11298,7 +11298,8 @@
bool CSSParser::isLoggingErrors()
{
-return m_logErrors;
+// FIXME: return logging back (https://bugs.webkit.org/show_bug.cgi?id=113401).
+return false;
}
void CSSParser::logError(const String message, int lineNumber)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [147273] branches/chromium/1453/Source/WebCore/inspector/front-end/ timelinePanel.css
Title: [147273] branches/chromium/1453/Source/WebCore/inspector/front-end/timelinePanel.css
Revision 147273
Author pfeld...@chromium.org
Date 2013-03-29 22:20:26 -0700 (Fri, 29 Mar 2013)
Log Message
Merge 146849 Web Inspector: [Timeline] Records sidebar is clipped.
BUG=222683
Web Inspector: [Timeline] Records sidebar is clipped.
https://bugs.webkit.org/show_bug.cgi?id=113177
Reviewed by Pavel Feldman.
Analysis: depending on CSS injection order sidebar rule that overwrites
bottom property may win.
Fix: make timeline-specific rule important.
* inspector/front-end/timelinePanel.css:
(.timeline .sidebar): Make bottom value important.
TBR=eus...@chromium.org
Review URL: https://codereview.chromium.org/13383002
Modified Paths
branches/chromium/1453/Source/WebCore/inspector/front-end/timelinePanel.css
Diff
Modified: branches/chromium/1453/Source/WebCore/inspector/front-end/timelinePanel.css (147272 => 147273)
--- branches/chromium/1453/Source/WebCore/inspector/front-end/timelinePanel.css 2013-03-30 05:12:00 UTC (rev 147272)
+++ branches/chromium/1453/Source/WebCore/inspector/front-end/timelinePanel.css 2013-03-30 05:20:26 UTC (rev 147273)
@@ -42,7 +42,7 @@
.timeline .sidebar {
overflow-y: hidden;
min-height: 100%;
-bottom: auto;
+bottom: auto !important;
}
.timeline.split-view-vertical .split-view-resizer {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
