The Blink Rename
Identifiers in Blink now largely follow the standard Chrome style
conventions, with several additional rules:
- web-exposed methods remain namedLikeThis() for consistency with
Javascript bindings.
- method names are never named_in_hacker_case()
- enumerator names are kNamedLikeThis.
This commit was generated by the following process.
1. Running //tools/clang/rewrite_to_chrome_style across the codebase.
2. Apply manual fixes.
3. git cl format
BUG=578344
[email protected]
[email protected]
Change-Id: Ide5d397d3c6a5d973fd0a6f81dccf82561d4bb71
Reviewed-on: https://chromium-review.googlesource.com/472192
Reviewed-by: Blink Reformat <[email protected]>
Cr-Commit-Position: refs/heads/master@{#463139}diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 141f8115..ff49586 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -160,12 +160,12 @@
void OnLockMouseACK(bool succeeded) override {
if (succeeded)
- webwidget_->didAcquirePointerLock();
+ webwidget_->DidAcquirePointerLock();
else
- webwidget_->didNotAcquirePointerLock();
+ webwidget_->DidNotAcquirePointerLock();
}
- void OnMouseLockLost() override { webwidget_->didLosePointerLock(); }
+ void OnMouseLockLost() override { webwidget_->DidLosePointerLock(); }
bool HandleMouseLockedInputEvent(const blink::WebMouseEvent& event) override {
// The WebWidget handles mouse lock in Blink's handleInputEvent().
@@ -190,8 +190,8 @@
for (const auto& meta_data_item : drop_meta_data) {
if (meta_data_item.kind == DropData::Kind::STRING) {
WebDragData::Item item;
- item.storageType = WebDragData::Item::StorageTypeString;
- item.stringType = WebString::fromUTF16(meta_data_item.mime_type);
+ item.storage_type = WebDragData::Item::kStorageTypeString;
+ item.string_type = WebString::FromUTF16(meta_data_item.mime_type);
// Have to pass a dummy URL here instead of an empty URL because the
// DropData received by browser_plugins goes through a round trip:
// DropData::MetaData --> WebDragData-->DropData. In the end, DropData
@@ -199,7 +199,7 @@
// WebDragData is empty.
if (base::EqualsASCII(meta_data_item.mime_type,
ui::Clipboard::kMimeTypeURIList)) {
- item.stringData = WebString::fromUTF8("about:dragdrop-placeholder");
+ item.string_data = WebString::FromUTF8("about:dragdrop-placeholder");
}
item_list.push_back(item);
continue;
@@ -211,24 +211,24 @@
if ((meta_data_item.kind == DropData::Kind::FILENAME) &&
!meta_data_item.filename.empty()) {
WebDragData::Item item;
- item.storageType = WebDragData::Item::StorageTypeFilename;
- item.filenameData = blink::FilePathToWebString(meta_data_item.filename);
+ item.storage_type = WebDragData::Item::kStorageTypeFilename;
+ item.filename_data = blink::FilePathToWebString(meta_data_item.filename);
item_list.push_back(item);
continue;
}
if (meta_data_item.kind == DropData::Kind::FILESYSTEMFILE) {
WebDragData::Item item;
- item.storageType = WebDragData::Item::StorageTypeFileSystemFile;
- item.fileSystemURL = meta_data_item.file_system_url;
+ item.storage_type = WebDragData::Item::kStorageTypeFileSystemFile;
+ item.file_system_url = meta_data_item.file_system_url;
item_list.push_back(item);
continue;
}
}
WebDragData result;
- result.initialize();
- result.setItems(item_list);
+ result.Initialize();
+ result.SetItems(item_list);
return result;
}
@@ -242,27 +242,27 @@
if (!drop_data.text.is_null()) {
WebDragData::Item item;
- item.storageType = WebDragData::Item::StorageTypeString;
- item.stringType = WebString::fromUTF8(ui::Clipboard::kMimeTypeText);
- item.stringData = WebString::fromUTF16(drop_data.text.string());
+ item.storage_type = WebDragData::Item::kStorageTypeString;
+ item.string_type = WebString::FromUTF8(ui::Clipboard::kMimeTypeText);
+ item.string_data = WebString::FromUTF16(drop_data.text.string());
item_list.push_back(item);
}
if (!drop_data.url.is_empty()) {
WebDragData::Item item;
- item.storageType = WebDragData::Item::StorageTypeString;
- item.stringType = WebString::fromUTF8(ui::Clipboard::kMimeTypeURIList);
- item.stringData = WebString::fromUTF8(drop_data.url.spec());
- item.title = WebString::fromUTF16(drop_data.url_title);
+ item.storage_type = WebDragData::Item::kStorageTypeString;
+ item.string_type = WebString::FromUTF8(ui::Clipboard::kMimeTypeURIList);
+ item.string_data = WebString::FromUTF8(drop_data.url.spec());
+ item.title = WebString::FromUTF16(drop_data.url_title);
item_list.push_back(item);
}
if (!drop_data.html.is_null()) {
WebDragData::Item item;
- item.storageType = WebDragData::Item::StorageTypeString;
- item.stringType = WebString::fromUTF8(ui::Clipboard::kMimeTypeHTML);
- item.stringData = WebString::fromUTF16(drop_data.html.string());
- item.baseURL = drop_data.html_base_url;
+ item.storage_type = WebDragData::Item::kStorageTypeString;
+ item.string_type = WebString::FromUTF8(ui::Clipboard::kMimeTypeHTML);
+ item.string_data = WebString::FromUTF16(drop_data.html.string());
+ item.base_url = drop_data.html_base_url;
item_list.push_back(item);
}
@@ -271,9 +271,9 @@
it != drop_data.filenames.end();
++it) {
WebDragData::Item item;
- item.storageType = WebDragData::Item::StorageTypeFilename;
- item.filenameData = blink::FilePathToWebString(it->path);
- item.displayNameData =
+ item.storage_type = WebDragData::Item::kStorageTypeFilename;
+ item.filename_data = blink::FilePathToWebString(it->path);
+ item.display_name_data =
blink::FilePathToWebString(base::FilePath(it->display_name));
item_list.push_back(item);
}
@@ -283,10 +283,10 @@
it != drop_data.file_system_files.end();
++it) {
WebDragData::Item item;
- item.storageType = WebDragData::Item::StorageTypeFileSystemFile;
- item.fileSystemURL = it->url;
- item.fileSystemFileSize = it->size;
- item.fileSystemId = blink::WebString::fromASCII(it->filesystem_id);
+ item.storage_type = WebDragData::Item::kStorageTypeFileSystemFile;
+ item.file_system_url = it->url;
+ item.file_system_file_size = it->size;
+ item.file_system_id = blink::WebString::FromASCII(it->filesystem_id);
item_list.push_back(item);
}
@@ -295,16 +295,16 @@
it != drop_data.custom_data.end();
++it) {
WebDragData::Item item;
- item.storageType = WebDragData::Item::StorageTypeString;
- item.stringType = WebString::fromUTF16(it->first);
- item.stringData = WebString::fromUTF16(it->second);
+ item.storage_type = WebDragData::Item::kStorageTypeString;
+ item.string_type = WebString::FromUTF16(it->first);
+ item.string_data = WebString::FromUTF16(it->second);
item_list.push_back(item);
}
WebDragData result;
- result.initialize();
- result.setItems(item_list);
- result.setFilesystemId(WebString::fromUTF16(drop_data.filesystem_id));
+ result.Initialize();
+ result.SetItems(item_list);
+ result.SetFilesystemId(WebString::FromUTF16(drop_data.filesystem_id));
return result;
}
@@ -350,7 +350,7 @@
is_hidden_(hidden),
compositor_never_visible_(never_visible),
is_fullscreen_granted_(false),
- display_mode_(blink::WebDisplayModeUndefined),
+ display_mode_(blink::kWebDisplayModeUndefined),
ime_event_guard_(nullptr),
closing_(false),
host_closing_(false),
@@ -463,10 +463,10 @@
scoped_refptr<RenderWidget> widget(
g_create_render_widget
? g_create_render_widget(widget_routing_id, compositor_deps,
- blink::WebPopupTypeNone, screen_info, false,
+ blink::kWebPopupTypeNone, screen_info, false,
hidden, false)
: new RenderWidget(widget_routing_id, compositor_deps,
- blink::WebPopupTypeNone, screen_info, false,
+ blink::kWebPopupTypeNone, screen_info, false,
hidden, false));
widget->for_oopif_ = true;
// Init increments the reference count on |widget|, keeping it alive after
@@ -483,21 +483,21 @@
blink::WebFrameWidget* RenderWidget::CreateWebFrameWidget(
RenderWidget* render_widget,
blink::WebLocalFrame* frame) {
- if (!frame->parent()) {
+ if (!frame->Parent()) {
// TODO(dcheng): The main frame widget currently has a special case.
// Eliminate this once WebView is no longer a WebWidget.
- return blink::WebFrameWidget::create(render_widget, frame->view(), frame);
+ return blink::WebFrameWidget::Create(render_widget, frame->View(), frame);
}
- return blink::WebFrameWidget::create(render_widget, frame);
+ return blink::WebFrameWidget::Create(render_widget, frame);
}
// static
blink::WebWidget* RenderWidget::CreateWebWidget(RenderWidget* render_widget) {
switch (render_widget->popup_type_) {
- case blink::WebPopupTypeNone: // Nothing to create.
+ case blink::kWebPopupTypeNone: // Nothing to create.
break;
- case blink::WebPopupTypePage:
- return WebPagePopup::create(render_widget);
+ case blink::kWebPopupTypePage:
+ return WebPagePopup::Create(render_widget);
default:
NOTREACHED();
}
@@ -671,7 +671,7 @@
// method returns true when the RenderWidget is for an OOPIF, i.e., IME events
// will be processed regardless of page focus. We should revisit this after
// page focus for OOPIFs has been fully resolved (https://crbug.com/689777).
- return GetWebWidget() && GetWebWidget()->isWebFrameWidget() &&
+ return GetWebWidget() && GetWebWidget()->IsWebFrameWidget() &&
(has_focus_ || for_oopif_);
}
@@ -791,7 +791,7 @@
std::unique_ptr<cc::SwapPromiseMonitor> latency_info_swap_promise_monitor =
compositor_->CreateLatencyInfoSwapPromiseMonitor(&swap_latency_info);
// Force this SwapPromiseMonitor to trigger and insert a SwapPromise.
- compositor_->setNeedsBeginFrame();
+ compositor_->SetNeedsBeginFrame();
}
}
@@ -819,12 +819,12 @@
void RenderWidget::OnCursorVisibilityChange(bool is_visible) {
if (GetWebWidget())
- GetWebWidget()->setCursorVisibilityState(is_visible);
+ GetWebWidget()->SetCursorVisibilityState(is_visible);
}
void RenderWidget::OnMouseCaptureLost() {
if (GetWebWidget())
- GetWebWidget()->mouseCaptureLost();
+ GetWebWidget()->MouseCaptureLost();
}
void RenderWidget::OnSetEditCommandsForNextKeyEvent(
@@ -836,7 +836,7 @@
has_focus_ = enable;
if (GetWebWidget())
- GetWebWidget()->setFocus(enable);
+ GetWebWidget()->SetFocus(enable);
for (auto& observer : render_frames_)
observer.RenderWidgetSetFocus(enable);
@@ -846,7 +846,7 @@
RenderWidgetCompositor* rwc = compositor();
if (!rwc)
return;
- rwc->setNeedsBeginFrame();
+ rwc->SetNeedsBeginFrame();
}
///////////////////////////////////////////////////////////////////////////////
@@ -858,7 +858,7 @@
const gfx::Vector2dF& elastic_overscroll_delta,
float page_scale,
float top_controls_delta) {
- GetWebWidget()->applyViewportDeltas(inner_delta, outer_delta,
+ GetWebWidget()->ApplyViewportDeltas(inner_delta, outer_delta,
elastic_overscroll_delta, page_scale,
top_controls_delta);
}
@@ -866,7 +866,7 @@
void RenderWidget::RecordWheelAndTouchScrollingCount(
bool has_scrolled_by_wheel,
bool has_scrolled_by_touch) {
- GetWebWidget()->recordWheelAndTouchScrollingCount(has_scrolled_by_wheel,
+ GetWebWidget()->RecordWheelAndTouchScrollingCount(has_scrolled_by_wheel,
has_scrolled_by_touch);
}
@@ -879,7 +879,7 @@
input_handler_manager->ProcessRafAlignedInputOnMainThread(
routing_id_, ui::EventTimeStampFromSeconds(frame_time_sec));
- GetWebWidget()->beginFrame(frame_time_sec);
+ GetWebWidget()->BeginFrame(frame_time_sec);
}
void RenderWidget::RequestNewCompositorFrameSink(
@@ -936,12 +936,12 @@
}
void RenderWidget::RequestScheduleAnimation() {
- scheduleAnimation();
+ ScheduleAnimation();
}
void RenderWidget::UpdateVisualState() {
- GetWebWidget()->updateAllLifecyclePhases();
- GetWebWidget()->setSuppressFrameRequestsWorkaroundFor704763Only(false);
+ GetWebWidget()->UpdateAllLifecyclePhases();
+ GetWebWidget()->SetSuppressFrameRequestsWorkaroundFor704763Only(false);
if (time_to_first_active_paint_recorded_)
return;
@@ -959,7 +959,7 @@
void RenderWidget::WillBeginCompositorFrame() {
TRACE_EVENT0("gpu", "RenderWidget::willBeginCompositorFrame");
- GetWebWidget()->setSuppressFrameRequestsWorkaroundFor704763Only(true);
+ GetWebWidget()->SetSuppressFrameRequestsWorkaroundFor704763Only(true);
// The UpdateTextInputState can result in further layout and possibly
// enable GPU acceleration so they need to be called before any painting
@@ -1093,9 +1093,9 @@
blink::WebTextInputInfo new_info;
if (auto* controller = GetInputMethodController())
- new_info = controller->textInputInfo();
+ new_info = controller->TextInputInfo();
const ui::TextInputMode new_mode =
- ConvertWebTextInputMode(new_info.inputMode);
+ ConvertWebTextInputMode(new_info.input_mode);
bool new_can_compose_inline = CanComposeInline();
@@ -1109,11 +1109,11 @@
params.type = new_type;
params.mode = new_mode;
params.flags = new_info.flags;
- params.value = new_info.value.utf8();
- params.selection_start = new_info.selectionStart;
- params.selection_end = new_info.selectionEnd;
- params.composition_start = new_info.compositionStart;
- params.composition_end = new_info.compositionEnd;
+ params.value = new_info.value.Utf8();
+ params.selection_start = new_info.selection_start;
+ params.selection_end = new_info.selection_end;
+ params.composition_start = new_info.composition_start;
+ params.composition_end = new_info.composition_end;
params.can_compose_inline = new_can_compose_inline;
// TODO(changwan): change instances of show_ime_if_needed to
// show_virtual_keyboard.
@@ -1133,7 +1133,7 @@
possible_drag_event_info_.event_source =
ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH;
possible_drag_event_info_.event_location =
- gfx::Point(event.globalX, event.globalY);
+ gfx::Point(event.global_x, event.global_y);
return false;
}
@@ -1145,7 +1145,7 @@
possible_drag_event_info_.event_source =
ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE;
possible_drag_event_info_.event_location =
- gfx::Point(event.positionInScreen().x, event.positionInScreen().y);
+ gfx::Point(event.PositionInScreen().x, event.PositionInScreen().y);
if (owner_delegate_)
return owner_delegate_->RenderWidgetWillHandleMouseEvent(event);
@@ -1163,7 +1163,7 @@
}
void RenderWidget::ResizeWebWidget() {
- GetWebWidget()->resize(GetSizeForWebWidget());
+ GetWebWidget()->Resize(GetSizeForWebWidget());
}
gfx::Size RenderWidget::GetSizeForWebWidget() const {
@@ -1196,7 +1196,7 @@
return;
if (compositor_) {
- compositor_->setViewportSize(params.physical_backing_size);
+ compositor_->SetViewportSize(params.physical_backing_size);
compositor_->setBottomControlsHeight(params.bottom_controls_height);
compositor_->SetRasterColorSpace(
screen_info_.icc_profile.GetParametricColorSpace());
@@ -1225,7 +1225,7 @@
visual_viewport_size = visible_viewport_size_;
}
- GetWebWidget()->resizeVisualViewport(visual_viewport_size);
+ GetWebWidget()->ResizeVisualViewport(visual_viewport_size);
// When resizing, we want to wait to paint before ACK'ing the resize. This
// ensures that we only resize as fast as we can paint. We only need to
@@ -1271,10 +1271,10 @@
void RenderWidget::AutoResizeCompositor() {
physical_backing_size_ = gfx::ScaleToCeiledSize(size_, device_scale_factor_);
if (compositor_)
- compositor_->setViewportSize(physical_backing_size_);
+ compositor_->SetViewportSize(physical_backing_size_);
}
-blink::WebLayerTreeView* RenderWidget::initializeLayerTreeView() {
+blink::WebLayerTreeView* RenderWidget::InitializeLayerTreeView() {
DCHECK(!host_closing_);
compositor_ = RenderWidgetCompositor::Create(this, compositor_deps_);
@@ -1287,7 +1287,7 @@
std::move(animation_host));
compositor_->SetIsForOopif(for_oopif_);
- compositor_->setViewportSize(physical_backing_size_);
+ compositor_->SetViewportSize(physical_backing_size_);
OnDeviceScaleFactorChanged();
compositor_->SetRasterColorSpace(screen_info_.icc_profile.GetColorSpace());
compositor_->SetContentSourceId(current_content_source_id_);
@@ -1332,11 +1332,11 @@
// Always send this notification to prevent new layer tree views from
// being created, even if one hasn't been created yet.
if (blink::WebWidget* widget = GetWebWidget())
- widget->willCloseLayerTreeView();
+ widget->WillCloseLayerTreeView();
}
-void RenderWidget::didMeaningfulLayout(blink::WebMeaningfulLayout layout_type) {
- if (layout_type == blink::WebMeaningfulLayout::VisuallyNonEmpty) {
+void RenderWidget::DidMeaningfulLayout(blink::WebMeaningfulLayout layout_type) {
+ if (layout_type == blink::WebMeaningfulLayout::kVisuallyNonEmpty) {
QueueMessage(new ViewHostMsg_DidFirstVisuallyNonEmptyPaint(routing_id_),
MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE);
}
@@ -1383,11 +1383,11 @@
// or B) request a commit which is not needed because there are not pending
// updates. If B) then the frame will be aborted early and the swap promises
// will be broken (see EarlyOut_NoUpdates).
- compositor_->setNeedsBeginFrame();
+ compositor_->SetNeedsBeginFrame();
}
}
-void RenderWidget::didChangeCursor(const WebCursorInfo& cursor_info) {
+void RenderWidget::DidChangeCursor(const WebCursorInfo& cursor_info) {
// TODO(darin): Eliminate this temporary.
WebCursor cursor;
InitializeCursorFromWebCursorInfo(&cursor, cursor_info);
@@ -1405,7 +1405,7 @@
// This method provides us with the information about how to display the newly
// created RenderWidget (i.e., as a blocked popup or as a new tab).
//
-void RenderWidget::show(WebNavigationPolicy policy) {
+void RenderWidget::Show(WebNavigationPolicy policy) {
DCHECK(!did_show_) << "received extraneous Show call";
DCHECK(routing_id_ != MSG_ROUTING_NONE);
DCHECK(!show_callback_.is_null());
@@ -1435,7 +1435,7 @@
observer.WidgetWillClose();
}
-void RenderWidget::closeWidgetSoon() {
+void RenderWidget::CloseWidgetSoon() {
DCHECK(content::RenderThread::Get());
if (is_swapped_out_) {
// This widget is currently swapped out, and the active widget is in a
@@ -1475,7 +1475,7 @@
WillCloseLayerTreeView();
compositor_.reset();
if (webwidget_internal_) {
- webwidget_internal_->close();
+ webwidget_internal_->Close();
webwidget_internal_ = nullptr;
}
}
@@ -1506,7 +1506,7 @@
(window_rect->y - popup_view_origin_for_emulation_.y()) * scale;
}
-WebRect RenderWidget::windowRect() {
+WebRect RenderWidget::WindowRect() {
WebRect rect;
if (pending_window_rect_count_) {
// NOTE(mbelshe): If there is a pending_window_rect_, then getting
@@ -1523,18 +1523,18 @@
return rect;
}
-WebRect RenderWidget::viewRect() {
+WebRect RenderWidget::ViewRect() {
WebRect rect = view_screen_rect_;
ScreenRectToEmulatedIfNeeded(&rect);
return rect;
}
-void RenderWidget::setToolTipText(const blink::WebString& text,
+void RenderWidget::SetToolTipText(const blink::WebString& text,
WebTextDirection hint) {
- Send(new ViewHostMsg_SetTooltipText(routing_id_, text.utf16(), hint));
+ Send(new ViewHostMsg_SetTooltipText(routing_id_, text.Utf16(), hint));
}
-void RenderWidget::setWindowRect(const WebRect& rect_in_screen) {
+void RenderWidget::SetWindowRect(const WebRect& rect_in_screen) {
WebRect window_rect = rect_in_screen;
EmulatedToScreenRectIfNeeded(&window_rect);
@@ -1556,9 +1556,9 @@
// Popups don't get size updates back from the browser so just store the set
// values.
- if (popup_type_ != blink::WebPopupTypeNone) {
- window_screen_rect_ = rect;
- view_screen_rect_ = rect;
+ if (popup_type_ != blink::kWebPopupTypeNone) {
+ window_screen_rect_ = rect;
+ view_screen_rect_ = rect;
}
}
@@ -1580,8 +1580,8 @@
ImeEventGuard guard(this);
blink::WebInputMethodController* controller = GetInputMethodController();
if (!controller ||
- !controller->setComposition(
- WebString::fromUTF16(text),
+ !controller->SetComposition(
+ WebString::FromUTF16(text),
WebVector<WebCompositionUnderline>(underlines),
replacement_range.IsValid()
? WebRange(replacement_range.start(), replacement_range.length())
@@ -1613,8 +1613,8 @@
ImeEventGuard guard(this);
input_handler_->set_handling_input_event(true);
if (auto* controller = GetInputMethodController()) {
- controller->commitText(
- WebString::fromUTF16(text),
+ controller->CommitText(
+ WebString::FromUTF16(text),
WebVector<WebCompositionUnderline>(underlines),
replacement_range.IsValid()
? WebRange(replacement_range.start(), replacement_range.length())
@@ -1642,9 +1642,9 @@
ImeEventGuard guard(this);
input_handler_->set_handling_input_event(true);
if (auto* controller = GetInputMethodController()) {
- controller->finishComposingText(
- keep_selection ? WebInputMethodController::KeepSelection
- : WebInputMethodController::DoNotKeepSelection);
+ controller->FinishComposingText(
+ keep_selection ? WebInputMethodController::kKeepSelection
+ : WebInputMethodController::kDoNotKeepSelection);
}
input_handler_->set_handling_input_event(false);
UpdateCompositionInfo(false /* not an immediate request */);
@@ -1656,7 +1656,7 @@
if (IsUseZoomForDSFEnabled())
compositor_->SetPaintedDeviceScaleFactor(GetOriginalDeviceScaleFactor());
else
- compositor_->setDeviceScaleFactor(device_scale_factor_);
+ compositor_->SetDeviceScaleFactor(device_scale_factor_);
}
void RenderWidget::OnRepaint(gfx::Size size_to_paint) {
@@ -1685,7 +1685,7 @@
void RenderWidget::OnSetTextDirection(WebTextDirection direction) {
if (!GetWebWidget())
return;
- GetWebWidget()->setTextDirection(direction);
+ GetWebWidget()->SetTextDirection(direction);
}
void RenderWidget::OnUpdateScreenRects(const gfx::Rect& view_screen_rect,
@@ -1709,10 +1709,10 @@
void RenderWidget::OnSetViewportIntersection(
const gfx::Rect& viewport_intersection) {
- if (GetWebWidget() && GetWebWidget()->isWebFrameWidget()) {
- DCHECK(popup_type_ == WebPopupType::WebPopupTypeNone);
+ if (GetWebWidget() && GetWebWidget()->IsWebFrameWidget()) {
+ DCHECK(popup_type_ == WebPopupType::kWebPopupTypeNone);
static_cast<WebFrameWidget*>(GetWebWidget())
- ->setRemoteViewportIntersection(viewport_intersection);
+ ->SetRemoteViewportIntersection(viewport_intersection);
}
}
@@ -1725,10 +1725,11 @@
if (!GetWebWidget())
return;
- DCHECK(GetWebWidget()->isWebFrameWidget());
- WebDragOperation operation = static_cast<WebFrameWidget*>(GetWebWidget())->
- dragTargetDragEnter(DropMetaDataToWebDragData(drop_meta_data),
- client_point, screen_point, ops, key_modifiers);
+ DCHECK(GetWebWidget()->IsWebFrameWidget());
+ WebDragOperation operation =
+ static_cast<WebFrameWidget*>(GetWebWidget())
+ ->DragTargetDragEnter(DropMetaDataToWebDragData(drop_meta_data),
+ client_point, screen_point, ops, key_modifiers);
Send(new DragHostMsg_UpdateDragCursor(routing_id(), operation));
}
@@ -1740,11 +1741,11 @@
if (!GetWebWidget())
return;
- DCHECK(GetWebWidget()->isWebFrameWidget());
+ DCHECK(GetWebWidget()->IsWebFrameWidget());
WebDragOperation operation =
- static_cast<WebFrameWidget*>(GetWebWidget())->dragTargetDragOver(
- ConvertWindowPointToViewport(client_point),
- screen_point, ops, key_modifiers);
+ static_cast<WebFrameWidget*>(GetWebWidget())
+ ->DragTargetDragOver(ConvertWindowPointToViewport(client_point),
+ screen_point, ops, key_modifiers);
Send(new DragHostMsg_UpdateDragCursor(routing_id(), operation));
}
@@ -1753,9 +1754,9 @@
const gfx::Point& screen_point) {
if (!GetWebWidget())
return;
- DCHECK(GetWebWidget()->isWebFrameWidget());
+ DCHECK(GetWebWidget()->IsWebFrameWidget());
static_cast<WebFrameWidget*>(GetWebWidget())
- ->dragTargetDragLeave(ConvertWindowPointToViewport(client_point),
+ ->DragTargetDragLeave(ConvertWindowPointToViewport(client_point),
screen_point);
}
@@ -1766,11 +1767,11 @@
if (!GetWebWidget())
return;
- DCHECK(GetWebWidget()->isWebFrameWidget());
- static_cast<WebFrameWidget*>(GetWebWidget())->dragTargetDrop(
- DropDataToWebDragData(drop_data),
- ConvertWindowPointToViewport(client_point),
- screen_point, key_modifiers);
+ DCHECK(GetWebWidget()->IsWebFrameWidget());
+ static_cast<WebFrameWidget*>(GetWebWidget())
+ ->DragTargetDrop(DropDataToWebDragData(drop_data),
+ ConvertWindowPointToViewport(client_point), screen_point,
+ key_modifiers);
}
void RenderWidget::OnDragSourceEnded(const gfx::Point& client_point,
@@ -1779,18 +1780,19 @@
if (!GetWebWidget())
return;
- static_cast<WebFrameWidget*>(GetWebWidget())->dragSourceEndedAt(
- ConvertWindowPointToViewport(client_point), screen_point, op);
+ static_cast<WebFrameWidget*>(GetWebWidget())
+ ->DragSourceEndedAt(ConvertWindowPointToViewport(client_point),
+ screen_point, op);
}
void RenderWidget::OnDragSourceSystemDragEnded() {
if (!GetWebWidget())
return;
- static_cast<WebFrameWidget*>(GetWebWidget())->dragSourceSystemDragEnded();
+ static_cast<WebFrameWidget*>(GetWebWidget())->DragSourceSystemDragEnded();
}
-void RenderWidget::showVirtualKeyboardOnElementFocus() {
+void RenderWidget::ShowVirtualKeyboardOnElementFocus() {
#if defined(OS_CHROMEOS)
// On ChromeOS, virtual keyboard is triggered only when users leave the
// mouse button or the finger and a text input element is focused at that
@@ -1813,7 +1815,7 @@
return focused_pepper_plugin_->text_input_type();
#endif
if (auto* controller = GetInputMethodController())
- return ConvertWebTextInputType(controller->textInputType());
+ return ConvertWebTextInputType(controller->TextInputType());
return ui::TEXT_INPUT_TYPE_NONE;
}
@@ -1843,7 +1845,7 @@
routing_id(), composition_range_, composition_character_bounds_));
}
-void RenderWidget::convertViewportToWindow(blink::WebRect* rect) {
+void RenderWidget::ConvertViewportToWindow(blink::WebRect* rect) {
if (IsUseZoomForDSFEnabled()) {
float reverse = 1 / GetOriginalDeviceScaleFactor();
// TODO(oshima): We may need to allow pixel precision here as the the
@@ -1857,7 +1859,7 @@
}
}
-void RenderWidget::convertWindowToViewport(blink::WebFloatRect* rect) {
+void RenderWidget::ConvertWindowToViewport(blink::WebFloatRect* rect) {
if (IsUseZoomForDSFEnabled()) {
rect->x *= GetOriginalDeviceScaleFactor();
rect->y *= GetOriginalDeviceScaleFactor();
@@ -1917,9 +1919,9 @@
return;
if (is_fullscreen_granted_) {
- GetWebWidget()->didEnterFullscreen();
+ GetWebWidget()->DidEnterFullscreen();
} else {
- GetWebWidget()->didExitFullscreen();
+ GetWebWidget()->DidExitFullscreen();
}
}
@@ -1967,7 +1969,7 @@
// use the caret position as an empty range for now. It will be updated
// after Pepper API equips features related to surrounding text retrieval.
blink::WebRect caret(focused_pepper_plugin_->GetCaretBounds());
- convertViewportToWindow(&caret);
+ ConvertViewportToWindow(&caret);
*focus = caret;
*anchor = caret;
return;
@@ -1975,9 +1977,9 @@
#endif
WebRect focus_webrect;
WebRect anchor_webrect;
- GetWebWidget()->selectionBounds(focus_webrect, anchor_webrect);
- convertViewportToWindow(&focus_webrect);
- convertViewportToWindow(&anchor_webrect);
+ GetWebWidget()->SelectionBounds(focus_webrect, anchor_webrect);
+ ConvertViewportToWindow(&focus_webrect);
+ ConvertViewportToWindow(&anchor_webrect);
*focus = focus_webrect;
*anchor = anchor_webrect;
}
@@ -2000,7 +2002,7 @@
// directly by the compositor, in which case explicit IPC selection
// notifications should be suppressed.
bool send_ipc =
- !blink::WebRuntimeFeatures::isCompositedSelectionUpdateEnabled();
+ !blink::WebRuntimeFeatures::IsCompositedSelectionUpdateEnabled();
#endif
if (send_ipc) {
ViewHostMsg_SelectionBounds_Params params;
@@ -2009,9 +2011,9 @@
selection_focus_rect_ != params.focus_rect) {
selection_anchor_rect_ = params.anchor_rect;
selection_focus_rect_ = params.focus_rect;
- GetWebWidget()->selectionTextDirection(params.focus_dir,
+ GetWebWidget()->SelectionTextDirection(params.focus_dir,
params.anchor_dir);
- params.is_anchor_first = GetWebWidget()->isSelectionAnchorFirst();
+ params.is_anchor_first = GetWebWidget()->IsSelectionAnchorFirst();
Send(new ViewHostMsg_SelectionBoundsChanged(routing_id_, params));
}
}
@@ -2021,14 +2023,14 @@
void RenderWidget::DidAutoResize(const gfx::Size& new_size) {
WebRect new_size_in_window(0, 0, new_size.width(), new_size.height());
- convertViewportToWindow(&new_size_in_window);
+ ConvertViewportToWindow(&new_size_in_window);
if (size_.width() != new_size_in_window.width ||
size_.height() != new_size_in_window.height) {
size_ = gfx::Size(new_size_in_window.width, new_size_in_window.height);
if (resizing_mode_selector_->is_synchronous_mode()) {
- gfx::Rect new_pos(windowRect().x, windowRect().y,
- size_.width(), size_.height());
+ gfx::Rect new_pos(WindowRect().x, WindowRect().y, size_.width(),
+ size_.height());
view_screen_rect_ = new_pos;
window_screen_rect_ = new_pos;
}
@@ -2053,11 +2055,11 @@
if (!GetWebWidget())
return;
blink::WebVector<blink::WebRect> bounds_from_blink;
- if (!GetWebWidget()->getCompositionCharacterBounds(bounds_from_blink))
+ if (!GetWebWidget()->GetCompositionCharacterBounds(bounds_from_blink))
return;
for (size_t i = 0; i < bounds_from_blink.size(); ++i) {
- convertViewportToWindow(&bounds_from_blink[i]);
+ ConvertViewportToWindow(&bounds_from_blink[i]);
bounds->push_back(bounds_from_blink[i]);
}
}
@@ -2067,13 +2069,13 @@
if (focused_pepper_plugin_)
return;
#endif
- WebRange web_range = GetWebWidget()->compositionRange();
- if (web_range.isNull()) {
+ WebRange web_range = GetWebWidget()->CompositionRange();
+ if (web_range.IsNull()) {
*range = gfx::Range::InvalidRange();
return;
}
- range->set_start(web_range.startOffset());
- range->set_end(web_range.endOffset());
+ range->set_start(web_range.StartOffset());
+ range->set_end(web_range.EndOffset());
}
bool RenderWidget::ShouldUpdateCompositionInfo(
@@ -2100,50 +2102,48 @@
return true;
}
-blink::WebScreenInfo RenderWidget::screenInfo() {
+blink::WebScreenInfo RenderWidget::GetScreenInfo() {
blink::WebScreenInfo web_screen_info;
- web_screen_info.deviceScaleFactor = screen_info_.device_scale_factor;
- web_screen_info.iccProfile = screen_info_.icc_profile;
+ web_screen_info.device_scale_factor = screen_info_.device_scale_factor;
+ web_screen_info.icc_profile = screen_info_.icc_profile;
web_screen_info.depth = screen_info_.depth;
- web_screen_info.depthPerComponent = screen_info_.depth_per_component;
- web_screen_info.isMonochrome = screen_info_.is_monochrome;
+ web_screen_info.depth_per_component = screen_info_.depth_per_component;
+ web_screen_info.is_monochrome = screen_info_.is_monochrome;
web_screen_info.rect = blink::WebRect(screen_info_.rect);
- web_screen_info.availableRect = blink::WebRect(screen_info_.available_rect);
+ web_screen_info.available_rect = blink::WebRect(screen_info_.available_rect);
switch (screen_info_.orientation_type) {
case SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY:
- web_screen_info.orientationType =
- blink::WebScreenOrientationPortraitPrimary;
+ web_screen_info.orientation_type =
+ blink::kWebScreenOrientationPortraitPrimary;
break;
case SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY:
- web_screen_info.orientationType =
- blink::WebScreenOrientationPortraitSecondary;
+ web_screen_info.orientation_type =
+ blink::kWebScreenOrientationPortraitSecondary;
break;
case SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY:
- web_screen_info.orientationType =
- blink::WebScreenOrientationLandscapePrimary;
+ web_screen_info.orientation_type =
+ blink::kWebScreenOrientationLandscapePrimary;
break;
case SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY:
- web_screen_info.orientationType =
- blink::WebScreenOrientationLandscapeSecondary;
+ web_screen_info.orientation_type =
+ blink::kWebScreenOrientationLandscapeSecondary;
break;
default:
- web_screen_info.orientationType =
- blink::WebScreenOrientationUndefined;
+ web_screen_info.orientation_type = blink::kWebScreenOrientationUndefined;
break;
}
- web_screen_info.orientationAngle = screen_info_.orientation_angle;
+ web_screen_info.orientation_angle = screen_info_.orientation_angle;
return web_screen_info;
}
#if defined(OS_ANDROID)
-void RenderWidget::showUnhandledTapUIIfNeeded(
- const WebPoint& tapped_position,
- const WebNode& tapped_node,
- bool page_changed) {
+void RenderWidget::ShowUnhandledTapUIIfNeeded(const WebPoint& tapped_position,
+ const WebNode& tapped_node,
+ bool page_changed) {
DCHECK(input_handler_->handling_input_event());
- bool should_trigger = !page_changed && tapped_node.isTextNode() &&
- !tapped_node.isContentEditable() &&
- !tapped_node.isInsideFocusableElementOrARIAWidget();
+ bool should_trigger = !page_changed && tapped_node.IsTextNode() &&
+ !tapped_node.IsContentEditable() &&
+ !tapped_node.IsInsideFocusableElementOrARIAWidget();
if (should_trigger) {
Send(new ViewHostMsg_ShowUnhandledTapUIIfNeeded(routing_id_,
tapped_position.x, tapped_position.y));
@@ -2151,18 +2151,17 @@
}
#endif
-void RenderWidget::didHandleGestureEvent(
- const WebGestureEvent& event,
- bool event_cancelled) {
+void RenderWidget::DidHandleGestureEvent(const WebGestureEvent& event,
+ bool event_cancelled) {
#if defined(OS_ANDROID) || defined(USE_AURA)
if (event_cancelled)
return;
- if (event.type() == WebInputEvent::GestureTap) {
+ if (event.GetType() == WebInputEvent::kGestureTap) {
ShowVirtualKeyboard();
- } else if (event.type() == WebInputEvent::GestureLongPress) {
+ } else if (event.GetType() == WebInputEvent::kGestureLongPress) {
DCHECK(GetWebWidget());
blink::WebInputMethodController* controller = GetInputMethodController();
- if (!controller || controller->textInputInfo().value.isEmpty())
+ if (!controller || controller->TextInputInfo().value.IsEmpty())
UpdateTextInputState();
else
ShowVirtualKeyboard();
@@ -2170,22 +2169,22 @@
// TODO(ananta): Piggyback off existing IPCs to communicate this information,
// crbug/420130.
#if defined(OS_WIN)
- if (event.type() != blink::WebGestureEvent::GestureTap)
+ if (event.GetType() != blink::WebGestureEvent::kGestureTap)
return;
// TODO(estade): hit test the event against focused node to make sure
// the tap actually hit the focused node.
blink::WebInputMethodController* controller = GetInputMethodController();
blink::WebTextInputType text_input_type =
- controller ? controller->textInputType() : blink::WebTextInputTypeNone;
+ controller ? controller->TextInputType() : blink::kWebTextInputTypeNone;
Send(new ViewHostMsg_FocusedNodeTouched(
- routing_id_, text_input_type != blink::WebTextInputTypeNone));
+ routing_id_, text_input_type != blink::kWebTextInputTypeNone));
#endif
#endif
}
-void RenderWidget::didOverscroll(
+void RenderWidget::DidOverscroll(
const blink::WebFloatSize& overscrollDelta,
const blink::WebFloatSize& accumulatedOverscroll,
const blink::WebFloatPoint& position,
@@ -2203,7 +2202,7 @@
void RenderWidget::StartCompositor() {
if (!is_hidden())
- compositor_->setVisible(true);
+ compositor_->SetVisible(true);
}
RenderWidgetCompositor* RenderWidget::compositor() const {
@@ -2214,17 +2213,16 @@
input_handler_->set_handling_input_event(handling_input_event);
}
-void RenderWidget::hasTouchEventHandlers(bool has_handlers) {
+void RenderWidget::HasTouchEventHandlers(bool has_handlers) {
if (render_widget_scheduling_state_)
render_widget_scheduling_state_->SetHasTouchHandler(has_handlers);
Send(new ViewHostMsg_HasTouchEventHandlers(routing_id_, has_handlers));
}
-void RenderWidget::setTouchAction(
- blink::WebTouchAction web_touch_action) {
+void RenderWidget::SetTouchAction(blink::WebTouchAction web_touch_action) {
// Ignore setTouchAction calls that result from synthetic touch events (eg.
// when blink is emulating touch with mouse).
- if (input_handler_->handling_event_type() != WebInputEvent::TouchStart)
+ if (input_handler_->handling_event_type() != WebInputEvent::kTouchStart)
return;
content::TouchAction content_touch_action =
@@ -2263,35 +2261,35 @@
gfx::Point RenderWidget::ConvertWindowPointToViewport(
const gfx::Point& point) {
blink::WebFloatRect point_in_viewport(point.x(), point.y(), 0, 0);
- convertWindowToViewport(&point_in_viewport);
+ ConvertWindowToViewport(&point_in_viewport);
return gfx::Point(point_in_viewport.x, point_in_viewport.y);
}
-bool RenderWidget::requestPointerLock() {
+bool RenderWidget::RequestPointerLock() {
return mouse_lock_dispatcher_->LockMouse(webwidget_mouse_lock_target_.get());
}
-void RenderWidget::requestPointerUnlock() {
+void RenderWidget::RequestPointerUnlock() {
mouse_lock_dispatcher_->UnlockMouse(webwidget_mouse_lock_target_.get());
}
-bool RenderWidget::isPointerLocked() {
+bool RenderWidget::IsPointerLocked() {
return mouse_lock_dispatcher_->IsMouseLockedTo(
webwidget_mouse_lock_target_.get());
}
-void RenderWidget::startDragging(blink::WebReferrerPolicy policy,
+void RenderWidget::StartDragging(blink::WebReferrerPolicy policy,
const WebDragData& data,
WebDragOperationsMask mask,
const WebImage& image,
const WebPoint& webImageOffset) {
blink::WebRect offset_in_window(webImageOffset.x, webImageOffset.y, 0, 0);
- convertViewportToWindow(&offset_in_window);
+ ConvertViewportToWindow(&offset_in_window);
DropData drop_data(DropDataBuilder::Build(data));
drop_data.referrer_policy = policy;
gfx::Vector2d imageOffset(offset_in_window.x, offset_in_window.y);
Send(new DragHostMsg_StartDragging(routing_id(), drop_data, mask,
- image.getSkBitmap(), imageOffset,
+ image.GetSkBitmap(), imageOffset,
possible_drag_event_info_));
}
@@ -2310,7 +2308,7 @@
blink::WebInputMethodController* RenderWidget::GetInputMethodController()
const {
- if (!GetWebWidget()->isWebFrameWidget()) {
+ if (!GetWebWidget()->IsWebFrameWidget()) {
// TODO(ekaramad): We should not get here in response to IME IPC or updates
// when the RenderWidget is swapped out. We should top sending IPCs from the
// browser side (https://crbug.com/669219).
@@ -2319,7 +2317,7 @@
return nullptr;
}
return static_cast<blink::WebFrameWidget*>(GetWebWidget())
- ->getActiveWebInputMethodController();
+ ->GetActiveWebInputMethodController();
}
} // namespace content
