summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS4
-rw-r--r--WEBKIT_MERGE_REVISION2
-rw-r--r--webkit/build/WebCore/WebCore.vcproj8
-rw-r--r--webkit/glue/editor_client_impl.cc12
-rw-r--r--webkit/glue/webframe_impl.cc11
-rw-r--r--webkit/glue/webframeloaderclient_impl.cc2
-rw-r--r--webkit/glue/webframeloaderclient_impl.h3
-rw-r--r--webkit/glue/webtextinput_impl.cc2
-rw-r--r--webkit/glue/webview_impl.cc2
9 files changed, 28 insertions, 18 deletions
diff --git a/DEPS b/DEPS
index f64c050..58f389d 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "40722",
+ "webkit_revision": "40785",
}
@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@167",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@9423",
+ "/trunk/deps/third_party/WebKit@9424",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@9252",
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index c47a677..f80c27a 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@40722 \ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@40785 \ No newline at end of file
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 3bdc497..74c0ee4 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -4865,6 +4865,10 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerContextProxy.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerLocation.cpp"
>
</File>
@@ -4881,6 +4885,10 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerObjectProxy.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\dom\WorkerRunLoop.cpp"
>
</File>
diff --git a/webkit/glue/editor_client_impl.cc b/webkit/glue/editor_client_impl.cc
index 3d4e96f..2f2214e 100644
--- a/webkit/glue/editor_client_impl.cc
+++ b/webkit/glue/editor_client_impl.cc
@@ -230,18 +230,18 @@ bool EditorClientImpl::shouldDeleteRange(WebCore::Range* range) {
return true;
}
-bool EditorClientImpl::shouldChangeSelectedRange(WebCore::Range* fromRange,
- WebCore::Range* toRange,
+bool EditorClientImpl::shouldChangeSelectedRange(WebCore::Range* from_range,
+ WebCore::Range* to_range,
WebCore::EAffinity affinity,
- bool stillSelecting) {
+ bool still_selecting) {
if (use_editor_delegate_) {
WebViewDelegate* d = web_view_->delegate();
if (d) {
return d->ShouldChangeSelectedRange(web_view_,
- Describe(fromRange),
- Describe(toRange),
+ Describe(from_range),
+ Describe(to_range),
Describe(affinity),
- stillSelecting);
+ still_selecting);
}
}
return true;
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 7df51c5..5cf992f 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -827,7 +827,7 @@ bool WebFrameImpl::Find(const FindInPageRequest& request,
(new_selection.start() == new_selection.end())) {
active_match_ = NULL;
} else {
- active_match_ = new_selection.toRange();
+ active_match_ = new_selection.toNormalizedRange();
curr_selection_rect = active_match_->boundingBox();
}
@@ -1179,7 +1179,8 @@ void WebFrameImpl::SetFindEndstateFocusAndSelection() {
// don't focus anything.
Selection selection(frame()->selection()->selection());
if (selection.isNone() || (selection.start() == selection.end()) ||
- active_match_->boundingBox() != selection.toRange()->boundingBox())
+ active_match_->boundingBox() !=
+ selection.toNormalizedRange()->boundingBox())
return;
// We will be setting focus ourselves, so we want the view to forget its
@@ -1307,8 +1308,8 @@ void WebFrameImpl::Paste() {
void WebFrameImpl::Replace(const std::wstring& wtext) {
String text = webkit_glue::StdWStringToString(wtext);
- RefPtr<DocumentFragment> fragment =
- createFragmentFromText(frame()->selection()->toRange().get(), text);
+ RefPtr<DocumentFragment> fragment = createFragmentFromText(
+ frame()->selection()->toNormalizedRange().get(), text);
WebCore::applyCommand(WebCore::ReplaceSelectionCommand::create(
frame()->document(), fragment.get(), false, true, true));
}
@@ -1350,7 +1351,7 @@ void WebFrameImpl::ClearSelection() {
}
std::string WebFrameImpl::GetSelection(bool as_html) {
- RefPtr<Range> range = frame()->selection()->toRange();
+ RefPtr<Range> range = frame()->selection()->toNormalizedRange();
if (!range.get())
return std::string();
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index d68bea5..aaf3500 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -1112,7 +1112,7 @@ void WebFrameLoaderClient::finishedLoading(DocumentLoader* dl) {
void WebFrameLoaderClient::updateGlobalHistory() {
}
-void WebFrameLoaderClient::updateGlobalHistoryForRedirectWithoutHistoryItem() {
+void WebFrameLoaderClient::updateGlobalHistoryRedirectLinks() {
}
bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem*) const {
diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h
index 68b6d05..a84b937 100644
--- a/webkit/glue/webframeloaderclient_impl.h
+++ b/webkit/glue/webframeloaderclient_impl.h
@@ -120,7 +120,8 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
virtual void finishedLoading(WebCore::DocumentLoader*);
virtual void updateGlobalHistory();
- virtual void updateGlobalHistoryForRedirectWithoutHistoryItem();
+ virtual void updateGlobalHistoryRedirectLinks();
+
virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;
virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
diff --git a/webkit/glue/webtextinput_impl.cc b/webkit/glue/webtextinput_impl.cc
index 015da9c..3155863 100644
--- a/webkit/glue/webtextinput_impl.cc
+++ b/webkit/glue/webtextinput_impl.cc
@@ -118,7 +118,7 @@ void WebTextInputImpl::MarkedRange(std::string* range_str) {
void WebTextInputImpl::SelectedRange(std::string* range_str) {
WTF::RefPtr<WebCore::Range> range
- = GetFrame()->selection()->toRange();
+ = GetFrame()->selection()->toNormalizedRange();
// Range::toString() returns a string different from what test expects.
// So we need to construct the string ourselves.
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index 64de3d2..c2165ea 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -628,7 +628,7 @@ bool WebViewImpl::SendContextMenuEvent(const WebKeyboardEvent& event) {
if (!renderer)
return false;
- RefPtr<Range> selection = main_frame->selection()->toRange();
+ RefPtr<Range> selection = main_frame->selection()->toNormalizedRange();
IntRect first_rect = main_frame->firstRectForRange(selection.get());
int x = right_aligned ? first_rect.right() : first_rect.x();
generated by cgit v1.1 at 2025-03-13 09:19:54 +0000