diff options
| -rw-r--r-- | content/browser/renderer_host/render_view_host.cc | 2 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_view_host.h | 3 | ||||
| -rw-r--r-- | content/renderer/render_view.cc | 7 |
3 files changed, 7 insertions, 5 deletions
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc index af7823a..3f12fc2 100644 --- a/content/browser/renderer_host/render_view_host.cc +++ b/content/browser/renderer_host/render_view_host.cc @@ -69,7 +69,7 @@ base::i18n::TextDirection WebTextDirectionToChromeTextDirection( case WebKit::WebTextDirectionLeftToRight: return base::i18n::LEFT_TO_RIGHT; case WebKit::WebTextDirectionRightToLeft: - return base::i18n::LEFT_TO_RIGHT; + return base::i18n::RIGHT_TO_LEFT; default: NOTREACHED(); return base::i18n::UNKNOWN_DIRECTION; diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h index e2874f9..c6a8010 100644 --- a/content/browser/renderer_host/render_view_host.h +++ b/content/browser/renderer_host/render_view_host.h @@ -412,7 +412,8 @@ class RenderViewHost : public RenderWidgetHost { void OnMsgNavigate(const IPC::Message& msg); void OnMsgUpdateState(int32 page_id, const std::string& state); - void OnMsgUpdateTitle(int32 page_id, const string16& title, + void OnMsgUpdateTitle(int32 page_id, + const string16& title, WebKit::WebTextDirection title_direction); void OnMsgUpdateEncoding(const std::string& encoding); void OnMsgUpdateTargetURL(int32 page_id, const GURL& url); diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index d5cedec..368cc33 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -1179,7 +1179,8 @@ void RenderView::UpdateURL(WebFrame* frame) { } // Tell the embedding application that the title of the active page has changed -void RenderView::UpdateTitle(WebFrame* frame, const string16& title, +void RenderView::UpdateTitle(WebFrame* frame, + const string16& title, WebTextDirection title_direction) { // Ignore all but top level navigations. if (frame->parent()) @@ -2606,8 +2607,8 @@ void RenderView::didNavigateWithinPage( didCommitProvisionalLoad(frame, is_new_navigation); - UpdateTitle(frame, frame->view()->mainFrame()->dataSource()->pageTitle(), - frame->view()->mainFrame()->dataSource()->pageTitleDirection()); + WebDataSource* datasource = frame->view()->mainFrame()->dataSource(); + UpdateTitle(frame, datasource->pageTitle(), datasource->pageTitleDirection()); } void RenderView::didUpdateCurrentHistoryItem(WebFrame* frame) { |