summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-30 04:26:24 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-30 04:26:24 +0000
commit1fc13aae9f6326f44f7db26954aa60df84eb8677 (patch)
tree2944c9ec4f1489b50d8e5ee84c90e1fb2e06b7ef /webkit
parent1988cb16ee6798bbdafaf62bbbd017eb1f49ed65 (diff)
downloadchromium_src-1fc13aae9f6326f44f7db26954aa60df84eb8677.zip
chromium_src-1fc13aae9f6326f44f7db26954aa60df84eb8677.tar.gz
chromium_src-1fc13aae9f6326f44f7db26954aa60df84eb8677.tar.bz2
WebKit Update 46536:46570
webkit 46548 adds new layout tests LayoutTests/http/tests/loadig/redirect-methods.html webkit 46558 adds new pure virtual method InspectorClient::inspectorWindowObjectCleared() Added it as NOTIMPLEMENTED() in WebInspectorClient. webkit 46561 adds new layout tests LayoutTests/fast/lists/ol-start-parting.html webkit 46567 fixed /editing/style/remove-underline-{from-stylesheet,in-bold}. TBR=tony BUG=none TEST=none Review URL: http://codereview.chromium.org/159624 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22039 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.pngbin3919 -> 0 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-in-bold-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-in-bold-expected.pngbin3772 -> 0 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.pngbin3372 -> 0 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.txt87
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-in-bold-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-in-bold-expected.pngbin3314 -> 0 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-in-bold-expected.txt88
-rw-r--r--webkit/glue/inspector_client_impl.cc4
-rw-r--r--webkit/glue/inspector_client_impl.h2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
13 files changed, 10 insertions, 179 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.checksum
deleted file mode 100644
index 2cc1a7d..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-8cfefa408f908b25a13325a3c1f5acc9 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.png
deleted file mode 100644
index 411730d..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.png
+++ /dev/null
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-in-bold-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-in-bold-expected.checksum
deleted file mode 100644
index 09e3445..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-in-bold-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-9f13cc3c9466c3bdbc7a1f9fe8d32325 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-in-bold-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-in-bold-expected.png
deleted file mode 100644
index e7ad6f5..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/style/remove-underline-in-bold-expected.png
+++ /dev/null
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.checksum
deleted file mode 100644
index 2196afc..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-0627ad2097ecec01f90816415a9a66c1 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.png
deleted file mode 100644
index b479ce1..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.png
+++ /dev/null
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.txt
deleted file mode 100644
index e60f18a..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-from-stylesheet-expected.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document toDOMRange:range from 2 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 2 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document toDOMRange:range from 3 of #text > DIV > BODY > HTML > #document to 3 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 3 of #text > DIV > BODY > HTML > #document to 3 of #text > DIV > BODY > HTML > #document toDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document toDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 5 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 5 of #text > DIV > BODY > HTML > #document toDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document toDOMRange:range from 7 of #text > DIV > BODY > HTML > #document to 7 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > DIV > BODY > HTML > #document to 7 of #text > DIV > BODY > HTML > #document toDOMRange:range from 8 of #text > DIV > BODY > HTML > #document to 8 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > DIV > BODY > HTML > #document to 8 of #text > DIV > BODY > HTML > #document toDOMRange:range from 9 of #text > DIV > BODY > HTML > #document to 9 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 9 of #text > DIV > BODY > HTML > #document to 9 of #text > DIV > BODY > HTML > #document toDOMRange:range from 10 of #text > DIV > BODY > HTML > #document to 10 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 10 of #text > DIV > BODY > HTML > #document to 10 of #text > DIV > BODY > HTML > #document toDOMRange:range from 11 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 11 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document toDOMRange:range from 12 of #text > DIV > BODY > HTML > #document to 12 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 12 of #text > DIV > BODY > HTML > #document to 12 of #text > DIV > BODY > HTML > #document toDOMRange:range from 13 of #text > DIV > BODY > HTML > #document to 13 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 13 of #text > DIV > BODY > HTML > #document to 13 of #text > DIV > BODY > HTML > #document toDOMRange:range from 14 of #text > DIV > BODY > HTML > #document to 14 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 14 of #text > DIV > BODY > HTML > #document to 14 of #text > DIV > BODY > HTML > #document toDOMRange:range from 15 of #text > DIV > BODY > HTML > #document to 15 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 15 of #text > DIV > BODY > HTML > #document to 15 of #text > DIV > BODY > HTML > #document toDOMRange:range from 16 of #text > DIV > BODY > HTML > #document to 16 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 16 of #text > DIV > BODY > HTML > #document to 16 of #text > DIV > BODY > HTML > #document toDOMRange:range from 17 of #text > DIV > BODY > HTML > #document to 17 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 17 of #text > DIV > BODY > HTML > #document to 17 of #text > DIV > BODY > HTML > #document toDOMRange:range from 18 of #text > DIV > BODY > HTML > #document to 18 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 18 of #text > DIV > BODY > HTML > #document to 18 of #text > DIV > BODY > HTML > #document toDOMRange:range from 19 of #text > DIV > BODY > HTML > #document to 19 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 19 of #text > DIV > BODY > HTML > #document to 19 of #text > DIV > BODY > HTML > #document toDOMRange:range from 20 of #text > DIV > BODY > HTML > #document to 20 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
- RenderInline {SPAN} at (0,0) size 78x27
- RenderText {#text} at (14,14) size 78x27
- text run at (14,14) width 78: "xxxxxx "
- RenderText {#text} at (92,14) size 72x27
- text run at (92,14) width 72: "xxxxxx"
- RenderInline {SPAN} at (0,0) size 78x27
- RenderText {#text} at (164,14) size 78x27
- text run at (164,14) width 78: " xxxxxx"
- RenderInline {SPAN} at (0,0) size 0x27
-selection start: position 0 of child 1 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 6 of child 1 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-in-bold-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-in-bold-expected.checksum
deleted file mode 100644
index e60c952..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-in-bold-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-aef77fc521442e3728976a338d965eb8 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-in-bold-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-in-bold-expected.png
deleted file mode 100644
index 9ff2a63..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-in-bold-expected.png
+++ /dev/null
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-in-bold-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-in-bold-expected.txt
deleted file mode 100644
index ab3c029..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/remove-underline-in-bold-expected.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > B > SPAN > DIV > BODY > HTML > #document to 1 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > B > SPAN > DIV > BODY > HTML > #document to 1 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 2 of #text > B > SPAN > DIV > BODY > HTML > #document to 2 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 2 of #text > B > SPAN > DIV > BODY > HTML > #document to 2 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 3 of #text > B > SPAN > DIV > BODY > HTML > #document to 3 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 3 of #text > B > SPAN > DIV > BODY > HTML > #document to 3 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 4 of #text > B > SPAN > DIV > BODY > HTML > #document to 4 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > B > SPAN > DIV > BODY > HTML > #document to 4 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 5 of #text > B > SPAN > DIV > BODY > HTML > #document to 5 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > B > SPAN > DIV > BODY > HTML > #document to 5 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 6 of #text > B > SPAN > DIV > BODY > HTML > #document to 6 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > B > SPAN > DIV > BODY > HTML > #document to 6 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 7 of #text > B > SPAN > DIV > BODY > HTML > #document to 7 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > B > SPAN > DIV > BODY > HTML > #document to 7 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 8 of #text > B > SPAN > DIV > BODY > HTML > #document to 8 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > B > SPAN > DIV > BODY > HTML > #document to 8 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 9 of #text > B > SPAN > DIV > BODY > HTML > #document to 9 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 9 of #text > B > SPAN > DIV > BODY > HTML > #document to 9 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 10 of #text > B > SPAN > DIV > BODY > HTML > #document to 10 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 10 of #text > B > SPAN > DIV > BODY > HTML > #document to 10 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 11 of #text > B > SPAN > DIV > BODY > HTML > #document to 11 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 11 of #text > B > SPAN > DIV > BODY > HTML > #document to 11 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 12 of #text > B > SPAN > DIV > BODY > HTML > #document to 12 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 12 of #text > B > SPAN > DIV > BODY > HTML > #document to 12 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 13 of #text > B > SPAN > DIV > BODY > HTML > #document to 13 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 13 of #text > B > SPAN > DIV > BODY > HTML > #document to 13 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 14 of #text > B > SPAN > DIV > BODY > HTML > #document to 14 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 14 of #text > B > SPAN > DIV > BODY > HTML > #document to 14 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 15 of #text > B > SPAN > DIV > BODY > HTML > #document to 15 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 15 of #text > B > SPAN > DIV > BODY > HTML > #document to 15 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 16 of #text > B > SPAN > DIV > BODY > HTML > #document to 16 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 16 of #text > B > SPAN > DIV > BODY > HTML > #document to 16 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 17 of #text > B > SPAN > DIV > BODY > HTML > #document to 17 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 17 of #text > B > SPAN > DIV > BODY > HTML > #document to 17 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 18 of #text > B > SPAN > DIV > BODY > HTML > #document to 18 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 18 of #text > B > SPAN > DIV > BODY > HTML > #document to 18 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 19 of #text > B > SPAN > DIV > BODY > HTML > #document to 19 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 19 of #text > B > SPAN > DIV > BODY > HTML > #document to 19 of #text > B > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 20 of #text > B > SPAN > DIV > BODY > HTML > #document to 20 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > B > DIV > BODY > HTML > #document to 6 of #text > B > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 784x55 [border: (2px solid #FF0000)]
- RenderInline {B} at (0,0) size 78x26
- RenderText {#text} at (14,14) size 78x26
- text run at (14,14) width 78: "xxxxxx "
- RenderInline {B} at (0,0) size 72x26
- RenderText {#text} at (92,14) size 72x26
- text run at (92,14) width 72: "xxxxxx"
- RenderInline {B} at (0,0) size 78x26
- RenderText {#text} at (164,14) size 78x26
- text run at (164,14) width 78: " xxxxxx"
- RenderInline {SPAN} at (0,0) size 0x26
-selection start: position 0 of child 0 {#text} of child 1 {B} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 6 of child 0 {#text} of child 1 {B} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/glue/inspector_client_impl.cc b/webkit/glue/inspector_client_impl.cc
index 493a646..6fb6579 100644
--- a/webkit/glue/inspector_client_impl.cc
+++ b/webkit/glue/inspector_client_impl.cc
@@ -213,6 +213,10 @@ void WebInspectorClient::removeSetting(const String& key) {
SaveSettings();
}
+void WebInspectorClient::inspectorWindowObjectCleared() {
+ NOTIMPLEMENTED();
+}
+
void WebInspectorClient::LoadSettings() {
if (settings_)
return;
diff --git a/webkit/glue/inspector_client_impl.h b/webkit/glue/inspector_client_impl.h
index d4e2cd1..1d0940a 100644
--- a/webkit/glue/inspector_client_impl.h
+++ b/webkit/glue/inspector_client_impl.h
@@ -46,6 +46,8 @@ public:
const WebCore::InspectorController::Setting&);
virtual void removeSetting(const WebCore::String& key);
+ virtual void inspectorWindowObjectCleared();
+
private:
~WebInspectorClient();
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index a483840..7649c83 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3081,3 +3081,7 @@ BUG17974 : LayoutTests/fast/css/remove-shorthand.html = FAIL
BUG17974 WIN LINUX: LayoutTests/svg/css/getComputedStyle-basic.xhtml = FAIL
BUG17974 WIN MAC: LayoutTests/svg/custom/svg-fonts-in-html.html = FAIL
BUG17974 WIN: LyoutTests/transtions/cancel-transitions.html = FAIL
+
+// Test failure from WebKit merge 46536 to 46570
+BUG18050 : LayoutTests/http/loading/redirect-methods.html = FAIL
+BUG18051 : LayoutTests/fast/lists/ol-start-parsing.html = FAIL