Chromium side of WebKit merge to 40846

Darin: primary
Brett: FYI
Review URL: http://codereview.chromium.org/21243

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9712 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 62 insertions, 16 deletions

diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index 657f59f..54696d3 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -54,6 +54,8 @@ inputs = [
     '$DERIVED_DIR/V8CDATASection.cpp',
     '$DERIVED_DIR/V8CharacterData.cpp',
     '$DERIVED_DIR/V8Clipboard.cpp',
+    '$DERIVED_DIR/V8ClientRect.cpp',
+    '$DERIVED_DIR/V8ClientRectList.cpp',
     '$DERIVED_DIR/V8Comment.cpp',
     '$DERIVED_DIR/V8Console.cpp',
     '$DERIVED_DIR/V8Counter.cpp',
diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj
index 2df370f..40de847 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -292,6 +292,22 @@
 				>
 			</File>
 			<File
+				RelativePath="$(IntDir)\DerivedSources\V8ClientRect.cpp"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\V8ClientRect.h"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\V8ClientRectList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\V8ClientRectList.h"
+				>
+			</File>
+			<File
 				RelativePath="$(IntDir)\DerivedSources\V8Clipboard.cpp"
 				>
 			</File>
@@ -2729,11 +2745,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\port\bindings\v8\V8WorkerCustom.cpp"
+			RelativePath="..\..\port\bindings\v8\V8WorkerContextCustom.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\port\bindings\v8\V8WorkerContextCustom.cpp"
+			RelativePath="..\..\port\bindings\v8\V8WorkerCustom.cpp"
 			>
 		</File>
 		<File
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index aec04d0..ca0623c 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -109,6 +109,8 @@ input_files = [
     '$WEBCORE_DIR/dom/ChildNodeList.cpp',
     '$WEBCORE_DIR/dom/ClassNames.cpp',
     '$WEBCORE_DIR/dom/ClassNodeList.cpp',
+    '$WEBCORE_DIR/dom/ClientRect.cpp',
+    '$WEBCORE_DIR/dom/ClientRectList.cpp',
     '$WEBCORE_DIR/dom/Clipboard.cpp',
     '$WEBCORE_DIR/dom/ClipboardEvent.cpp',
     '$WEBCORE_DIR/dom/Comment.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 74c0ee4..a31e744 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -4297,6 +4297,22 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\ClientRect.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\ClientRect.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\ClientRectList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\ClientRectList.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\Clipboard.cpp"
 				>
 			</File>
@@ -5189,14 +5205,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\editing\Selection.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\editing\Selection.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\editing\SelectionController.cpp"
 				>
 			</File>
@@ -5293,6 +5301,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\editing\VisibleSelection.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\editing\VisibleSelection.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\editing\WrapContentsInDummySpanCommand.cpp"
 				>
 			</File>
diff --git a/webkit/glue/context_menu_client_impl.cc b/webkit/glue/context_menu_client_impl.cc
index dea8840..584cbe0 100644
--- a/webkit/glue/context_menu_client_impl.cc
+++ b/webkit/glue/context_menu_client_impl.cc
@@ -76,9 +76,9 @@ std::wstring GetMisspelledWord(const WebCore::ContextMenu* default_menu,
   WebCore::VisiblePosition pos(inner_node->renderer()->positionForPoint(
       hit_test_result.localPoint()));
 
-  WebCore::Selection selection;
+  WebCore::VisibleSelection selection;
   if (pos.isNotNull()) {
-    selection = WebCore::Selection(pos);
+    selection = WebCore::VisibleSelection(pos);
     selection.expandUsingGranularity(WebCore::WordGranularity);
   }
       
@@ -96,7 +96,7 @@ std::wstring GetMisspelledWord(const WebCore::ContextMenu* default_menu,
   // If misspelled word is empty, then that portion should not be selected.
   // Set the selection to that position only, and do not expand.
   if (misspelled_word_string.empty()) {
-    selection = WebCore::Selection(pos);
+    selection = WebCore::VisibleSelection(pos);
     selected_frame->selection()->setSelection(selection);
   }
 
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index e44bb9c..b8b70db 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -176,7 +176,7 @@ using WebCore::RenderObject;
 using WebCore::ResourceError;
 using WebCore::ResourceHandle;
 using WebCore::ResourceRequest;
-using WebCore::Selection;
+using WebCore::VisibleSelection;
 using WebCore::SharedBuffer;
 using WebCore::String;
 using WebCore::SubstituteData;
@@ -814,7 +814,7 @@ bool WebFrameImpl::Find(const FindInPageRequest& request,
     main_frame_impl->active_match_frame_ = this;
 
     // We found something, so we can now query the selection for its position.
-    Selection new_selection(frame()->selection()->selection());
+    VisibleSelection new_selection(frame()->selection()->selection());
     IntRect curr_selection_rect;
 
     // If we thought we found something, but it couldn't be selected (perhaps
@@ -1176,7 +1176,7 @@ void WebFrameImpl::SetFindEndstateFocusAndSelection() {
       active_match_.get()) {
     // If the user has changed the selection since the match was found, we
     // don't focus anything.
-    Selection selection(frame()->selection()->selection());
+    VisibleSelection selection(frame()->selection()->selection());
     if (selection.isNone() || (selection.start() == selection.end()) ||
         active_match_->boundingBox() !=
             selection.toNormalizedRange()->boundingBox())
diff --git a/webkit/port/DerivedSources.make b/webkit/port/DerivedSources.make
index 71e7eee..61ef1d2 100644
--- a/webkit/port/DerivedSources.make
+++ b/webkit/port/DerivedSources.make
@@ -621,6 +621,8 @@ all : \
     V8Attr.h \
     V8BarInfo.h \
     V8CanvasPixelArray.h \
+    V8ClientRect.h \
+    V8ClientRectList.h \
     V8CDATASection.h \
     V8CSSCharsetRule.h \
     V8CSSFontFaceRule.h \
diff --git a/webkit/port/bindings/scripts/CodeGeneratorV8.pm b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
index 497be8e..afd977c 100644
--- a/webkit/port/bindings/scripts/CodeGeneratorV8.pm
+++ b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
@@ -1577,6 +1577,8 @@ sub IsRefPtrType
     my $type = shift;
     return 1 if $type eq "Attr";
     return 1 if $type eq "CanvasGradient";
+    return 1 if $type eq "ClientRect";
+    return 1 if $type eq "ClientRectList";
     return 1 if $type eq "CDATASection";
     return 1 if $type eq "Comment";
     return 1 if $type eq "CSSRule";
diff --git a/webkit/port/bindings/v8/v8_index.cpp b/webkit/port/bindings/v8/v8_index.cpp
index 6be992c..a82479a 100644
--- a/webkit/port/bindings/v8/v8_index.cpp
+++ b/webkit/port/bindings/v8/v8_index.cpp
@@ -41,6 +41,8 @@
 #include "V8CanvasPixelArray.h"
 #include "V8CDATASection.h"
 #include "V8CharacterData.h"
+#include "V8ClientRect.h"
+#include "V8ClientRectList.h"
 #include "V8Clipboard.h"
 #include "V8Comment.h"
 #include "V8Console.h"
diff --git a/webkit/port/bindings/v8/v8_index.h b/webkit/port/bindings/v8/v8_index.h
index f77557f..1d5db7f 100644
--- a/webkit/port/bindings/v8/v8_index.h
+++ b/webkit/port/bindings/v8/v8_index.h
@@ -244,6 +244,8 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
   V(CANVASGRADIENT, CanvasGradient)                                     \
   V(CANVASPATTERN, CanvasPattern)                                       \
   V(CANVASRENDERINGCONTEXT2D, CanvasRenderingContext2D)                 \
+  V(CLIENTRECT, ClientRect)                                             \
+  V(CLIENTRECTLIST, ClientRectList)                                     \
   V(CLIPBOARD, Clipboard)                                               \
   V(CONSOLE, Console)                                                   \
   V(COUNTER, Counter)                                                   \
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index aa143ff..cebfd55 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -54,6 +54,8 @@
 #include "CanvasRenderingContext2D.h"
 #include "CanvasStyle.h"
 #include "CharacterData.h"
+#include "ClientRect.h"
+#include "ClientRectList.h"
 #include "Clipboard.h"
 #include "Console.h"
 #include "Counter.h"