WebKit roll 100904:100924

Also disable failing DevToolsSanityTest.TestScriptsTabIsPopulatedOnInspectedPageRefresh

BUG=104986
TBR=adamk

Review URL: http://codereview.chromium.org/8616001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110969 0039d316-1c4b-4281-b951-d872f2087c98
parent ae136434
...@@ -5,7 +5,7 @@ vars = { ...@@ -5,7 +5,7 @@ vars = {
"sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s", "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk",
"webkit_revision": "100904", "webkit_revision": "100924",
"chromium_git": "http://git.chromium.org/git", "chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281", "swig_revision": "69281",
"nacl_revision": "7169", "nacl_revision": "7169",
......
...@@ -443,7 +443,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) { ...@@ -443,7 +443,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) {
// hadn't been shown by the moment inspected paged refreshed. // hadn't been shown by the moment inspected paged refreshed.
// @see http://crbug.com/26312 // @see http://crbug.com/26312
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
TestScriptsTabIsPopulatedOnInspectedPageRefresh) { FAILS_TestScriptsTabIsPopulatedOnInspectedPageRefresh) {
// Clear inspector settings to ensure that Elements will be // Clear inspector settings to ensure that Elements will be
// current panel when DevTools window is open. // current panel when DevTools window is open.
content::GetContentClient()->browser()->ClearInspectorSettings( content::GetContentClient()->browser()->ClearInspectorSettings(
......
...@@ -6,5 +6,3 @@ ...@@ -6,5 +6,3 @@
// until the changes can be landed upstream. // until the changes can be landed upstream.
// PLEASE DO NOT LEAVE ENTRIES IN THIS FILE FOR MORE THAN 24 HRS. // PLEASE DO NOT LEAVE ENTRIES IN THIS FILE FOR MORE THAN 24 HRS.
BUGWK72651 LINUX DEBUG : inspector/styles/show-user-agent-styles.html = CRASH PASS TIMEOUT
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment