diff options
Diffstat (limited to 'content/browser')
218 files changed, 1873 insertions, 1873 deletions
diff --git a/content/browser/accessibility/accessibility_win_browsertest.cc b/content/browser/accessibility/accessibility_win_browsertest.cc index 6d06995..8131513 100644 --- a/content/browser/accessibility/accessibility_win_browsertest.cc +++ b/content/browser/accessibility/accessibility_win_browsertest.cc @@ -149,7 +149,7 @@ void AccessibilityWinBrowserTest::LoadInitialAccessibilityTreeFromHtml( const std::string& html) { AccessibilityNotificationWaiter waiter( shell(), AccessibilityModeComplete, - WebKit::WebAXEventLoadComplete); + blink::WebAXEventLoadComplete); GURL html_data_url("data:text/html," + html); NavigateToURL(shell(), html_data_url); waiter.WaitForNotification(); @@ -504,7 +504,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, scoped_ptr<AccessibilityNotificationWaiter> waiter( new AccessibilityNotificationWaiter( shell(), AccessibilityModeComplete, - WebKit::WebAXEventFocus)); + blink::WebAXEventFocus)); ExecuteScript(L"document.body.children[0].focus()"); waiter->WaitForNotification(); @@ -516,7 +516,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, // Set the active descendant of the radio group waiter.reset(new AccessibilityNotificationWaiter( shell(), AccessibilityModeComplete, - WebKit::WebAXEventFocus)); + blink::WebAXEventFocus)); ExecuteScript( L"document.body.children[0].setAttribute('aria-activedescendant', 'li')"); waiter->WaitForNotification(); @@ -549,7 +549,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, scoped_ptr<AccessibilityNotificationWaiter> waiter( new AccessibilityNotificationWaiter( shell(), AccessibilityModeComplete, - WebKit::WebAXEventCheckedStateChanged)); + blink::WebAXEventCheckedStateChanged)); ExecuteScript(L"document.body.children[0].checked=true"); waiter->WaitForNotification(); @@ -577,7 +577,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, new AccessibilityNotificationWaiter( shell(), AccessibilityModeComplete, - WebKit::WebAXEventChildrenChanged)); + blink::WebAXEventChildrenChanged)); ExecuteScript(L"document.body.innerHTML='<b>new text</b>'"); waiter->WaitForNotification(); @@ -602,7 +602,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, scoped_ptr<AccessibilityNotificationWaiter> waiter( new AccessibilityNotificationWaiter( shell(), AccessibilityModeComplete, - WebKit::WebAXEventChildrenChanged)); + blink::WebAXEventChildrenChanged)); ExecuteScript(L"document.body.children[0].style.visibility='visible'"); waiter->WaitForNotification(); @@ -635,7 +635,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, scoped_ptr<AccessibilityNotificationWaiter> waiter( new AccessibilityNotificationWaiter( shell(), AccessibilityModeComplete, - WebKit::WebAXEventFocus)); + blink::WebAXEventFocus)); ExecuteScript(L"document.body.children[0].focus()"); waiter->WaitForNotification(); @@ -649,7 +649,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, waiter.reset( new AccessibilityNotificationWaiter( shell(), AccessibilityModeComplete, - WebKit::WebAXEventBlur)); + blink::WebAXEventBlur)); base::win::ScopedComPtr<IAccessible> document_accessible( GetRendererAccessible()); ASSERT_NE(document_accessible.get(), reinterpret_cast<IAccessible*>(NULL)); @@ -685,7 +685,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, scoped_ptr<AccessibilityNotificationWaiter> waiter( new AccessibilityNotificationWaiter( shell(), AccessibilityModeComplete, - WebKit::WebAXEventValueChanged)); + blink::WebAXEventValueChanged)); ExecuteScript(L"document.body.children[0].value='new value'"); waiter->WaitForNotification(); diff --git a/content/browser/accessibility/browser_accessibility.cc b/content/browser/accessibility/browser_accessibility.cc index a7f6f3e..ca644f3 100644 --- a/content/browser/accessibility/browser_accessibility.cc +++ b/content/browser/accessibility/browser_accessibility.cc @@ -44,7 +44,7 @@ BrowserAccessibility::~BrowserAccessibility() { } bool BrowserAccessibility::PlatformIsLeaf() const { - return role_ == WebKit::WebAXRoleStaticText || child_count() == 0; + return role_ == blink::WebAXRoleStaticText || child_count() == 0; } uint32 BrowserAccessibility::PlatformChildCount() const { @@ -151,8 +151,8 @@ gfx::Rect BrowserAccessibility::GetLocalBoundsRect() const { // nested web area. BrowserAccessibility* parent = parent_; bool need_to_offset_web_area = - (role_ == WebKit::WebAXRoleWebArea || - role_ == WebKit::WebAXRoleRootWebArea); + (role_ == blink::WebAXRoleWebArea || + role_ == blink::WebAXRoleRootWebArea); while (parent) { if (need_to_offset_web_area && parent->location().width() > 0 && @@ -163,13 +163,13 @@ gfx::Rect BrowserAccessibility::GetLocalBoundsRect() const { // On some platforms, we don't want to take the root scroll offsets // into account. - if (parent->role() == WebKit::WebAXRoleRootWebArea && + if (parent->role() == blink::WebAXRoleRootWebArea && !manager()->UseRootScrollOffsetsWhenComputingBounds()) { break; } - if (parent->role() == WebKit::WebAXRoleWebArea || - parent->role() == WebKit::WebAXRoleRootWebArea) { + if (parent->role() == blink::WebAXRoleWebArea || + parent->role() == blink::WebAXRoleRootWebArea) { int sx = 0; int sy = 0; if (parent->GetIntAttribute(AccessibilityNodeData::ATTR_SCROLL_X, &sx) && @@ -196,7 +196,7 @@ gfx::Rect BrowserAccessibility::GetGlobalBoundsRect() const { gfx::Rect BrowserAccessibility::GetLocalBoundsForRange(int start, int len) const { - DCHECK_EQ(role_, WebKit::WebAXRoleStaticText); + DCHECK_EQ(role_, blink::WebAXRoleStaticText); int end = start + len; int child_start = 0; int child_end = 0; @@ -204,7 +204,7 @@ gfx::Rect BrowserAccessibility::GetLocalBoundsForRange(int start, int len) gfx::Rect bounds; for (size_t i = 0; i < children_.size() && child_end < start + len; ++i) { BrowserAccessibility* child = children_[i]; - DCHECK_EQ(child->role(), WebKit::WebAXRoleInlineTextBox); + DCHECK_EQ(child->role(), blink::WebAXRoleInlineTextBox); std::string child_text; child->GetStringAttribute(AccessibilityNodeData::ATTR_VALUE, &child_text); int child_len = static_cast<int>(child_text.size()); @@ -232,28 +232,28 @@ gfx::Rect BrowserAccessibility::GetLocalBoundsForRange(int start, int len) gfx::Rect child_overlap_rect; switch (text_direction) { - case WebKit::WebAXTextDirectionLR: { + case blink::WebAXTextDirectionLR: { int left = child_rect.x() + start_pixel_offset; int right = child_rect.x() + end_pixel_offset; child_overlap_rect = gfx::Rect(left, child_rect.y(), right - left, child_rect.height()); break; } - case WebKit::WebAXTextDirectionRL: { + case blink::WebAXTextDirectionRL: { int right = child_rect.right() - start_pixel_offset; int left = child_rect.right() - end_pixel_offset; child_overlap_rect = gfx::Rect(left, child_rect.y(), right - left, child_rect.height()); break; } - case WebKit::WebAXTextDirectionTB: { + case blink::WebAXTextDirectionTB: { int top = child_rect.y() + start_pixel_offset; int bottom = child_rect.y() + end_pixel_offset; child_overlap_rect = gfx::Rect(child_rect.x(), top, child_rect.width(), bottom - top); break; } - case WebKit::WebAXTextDirectionBT: { + case blink::WebAXTextDirectionBT: { int bottom = child_rect.bottom() - start_pixel_offset; int top = child_rect.bottom() - end_pixel_offset; child_overlap_rect = gfx::Rect(child_rect.x(), top, @@ -310,7 +310,7 @@ void BrowserAccessibility::Destroy() { PostInitialize(); manager_->NotifyAccessibilityEvent( - WebKit::WebAXEventHide, this); + blink::WebAXEventHide, this); instance_active_ = false; manager_->RemoveNode(this); @@ -555,24 +555,24 @@ bool BrowserAccessibility::GetAriaTristate( return false; // Not set } -bool BrowserAccessibility::HasState(WebKit::WebAXState state_enum) const { +bool BrowserAccessibility::HasState(blink::WebAXState state_enum) const { return (state_ >> state_enum) & 1; } bool BrowserAccessibility::IsEditableText() const { // These roles don't have readonly set, but they're not editable text. - if (role_ == WebKit::WebAXRoleScrollArea || - role_ == WebKit::WebAXRoleColumn || - role_ == WebKit::WebAXRoleTableHeaderContainer) { + if (role_ == blink::WebAXRoleScrollArea || + role_ == blink::WebAXRoleColumn || + role_ == blink::WebAXRoleTableHeaderContainer) { return false; } // Note: WebAXStateReadonly being false means it's either a text control, // or contenteditable. We also check for editable text roles to cover // another element that has role=textbox set on it. - return (!HasState(WebKit::WebAXStateReadonly) || - role_ == WebKit::WebAXRoleTextField || - role_ == WebKit::WebAXRoleTextArea); + return (!HasState(blink::WebAXStateReadonly) || + role_ == blink::WebAXRoleTextField || + role_ == blink::WebAXRoleTextArea); } std::string BrowserAccessibility::GetTextRecursive() const { diff --git a/content/browser/accessibility/browser_accessibility.h b/content/browser/accessibility/browser_accessibility.h index 1644d66..1f858f1 100644 --- a/content/browser/accessibility/browser_accessibility.h +++ b/content/browser/accessibility/browser_accessibility.h @@ -254,7 +254,7 @@ class CONTENT_EXPORT BrowserAccessibility { bool* is_mixed) const; // Returns true if the bit corresponding to the given state enum is 1. - bool HasState(WebKit::WebAXState state_enum) const; + bool HasState(blink::WebAXState state_enum) const; // Returns true if this node is an editable text field of any kind. bool IsEditableText() const; diff --git a/content/browser/accessibility/browser_accessibility_android.cc b/content/browser/accessibility/browser_accessibility_android.cc index 2227c38..6fe3afb 100644 --- a/content/browser/accessibility/browser_accessibility_android.cc +++ b/content/browser/accessibility/browser_accessibility_android.cc @@ -30,8 +30,8 @@ bool BrowserAccessibilityAndroid::PlatformIsLeaf() const { // Iframes are always allowed to contain children. if (IsIframe() || - role() == WebKit::WebAXRoleRootWebArea || - role() == WebKit::WebAXRoleWebArea) { + role() == blink::WebAXRoleRootWebArea || + role() == blink::WebAXRoleWebArea) { return false; } @@ -41,11 +41,11 @@ bool BrowserAccessibilityAndroid::PlatformIsLeaf() const { // Headings with text can drop their children. string16 name = GetText(); - if (role() == WebKit::WebAXRoleHeading && !name.empty()) + if (role() == blink::WebAXRoleHeading && !name.empty()) return true; // Focusable nodes with text can drop their children. - if (HasState(WebKit::WebAXStateFocusable) && !name.empty()) + if (HasState(blink::WebAXStateFocusable) && !name.empty()) return true; // Nodes with only static text as children can drop their children. @@ -60,18 +60,18 @@ bool BrowserAccessibilityAndroid::IsCheckable() const { bool is_aria_pressed_defined; bool is_mixed; GetAriaTristate("aria-pressed", &is_aria_pressed_defined, &is_mixed); - if (role() == WebKit::WebAXRoleCheckBox || - role() == WebKit::WebAXRoleRadioButton || + if (role() == blink::WebAXRoleCheckBox || + role() == blink::WebAXRoleRadioButton || is_aria_pressed_defined) { checkable = true; } - if (HasState(WebKit::WebAXStateChecked)) + if (HasState(blink::WebAXStateChecked)) checkable = true; return checkable; } bool BrowserAccessibilityAndroid::IsChecked() const { - return HasState(WebKit::WebAXStateChecked); + return HasState(blink::WebAXStateChecked); } bool BrowserAccessibilityAndroid::IsClickable() const { @@ -79,13 +79,13 @@ bool BrowserAccessibilityAndroid::IsClickable() const { } bool BrowserAccessibilityAndroid::IsEnabled() const { - return HasState(WebKit::WebAXStateEnabled); + return HasState(blink::WebAXStateEnabled); } bool BrowserAccessibilityAndroid::IsFocusable() const { - bool focusable = HasState(WebKit::WebAXStateFocusable); + bool focusable = HasState(blink::WebAXStateFocusable); if (IsIframe() || - role() == WebKit::WebAXRoleWebArea) { + role() == blink::WebAXRoleWebArea) { focusable = false; } return focusable; @@ -96,7 +96,7 @@ bool BrowserAccessibilityAndroid::IsFocused() const { } bool BrowserAccessibilityAndroid::IsPassword() const { - return HasState(WebKit::WebAXStateProtected); + return HasState(blink::WebAXStateProtected); } bool BrowserAccessibilityAndroid::IsScrollable() const { @@ -105,59 +105,59 @@ bool BrowserAccessibilityAndroid::IsScrollable() const { } bool BrowserAccessibilityAndroid::IsSelected() const { - return HasState(WebKit::WebAXStateSelected); + return HasState(blink::WebAXStateSelected); } bool BrowserAccessibilityAndroid::IsVisibleToUser() const { - return !HasState(WebKit::WebAXStateInvisible); + return !HasState(blink::WebAXStateInvisible); } const char* BrowserAccessibilityAndroid::GetClassName() const { const char* class_name = NULL; switch(role()) { - case WebKit::WebAXRoleEditableText: - case WebKit::WebAXRoleSpinButton: - case WebKit::WebAXRoleTextArea: - case WebKit::WebAXRoleTextField: + case blink::WebAXRoleEditableText: + case blink::WebAXRoleSpinButton: + case blink::WebAXRoleTextArea: + case blink::WebAXRoleTextField: class_name = "android.widget.EditText"; break; - case WebKit::WebAXRoleSlider: + case blink::WebAXRoleSlider: class_name = "android.widget.SeekBar"; break; - case WebKit::WebAXRoleComboBox: + case blink::WebAXRoleComboBox: class_name = "android.widget.Spinner"; break; - case WebKit::WebAXRoleButton: - case WebKit::WebAXRoleMenuButton: - case WebKit::WebAXRolePopUpButton: + case blink::WebAXRoleButton: + case blink::WebAXRoleMenuButton: + case blink::WebAXRolePopUpButton: class_name = "android.widget.Button"; break; - case WebKit::WebAXRoleCheckBox: + case blink::WebAXRoleCheckBox: class_name = "android.widget.CheckBox"; break; - case WebKit::WebAXRoleRadioButton: + case blink::WebAXRoleRadioButton: class_name = "android.widget.RadioButton"; break; - case WebKit::WebAXRoleToggleButton: + case blink::WebAXRoleToggleButton: class_name = "android.widget.ToggleButton"; break; - case WebKit::WebAXRoleCanvas: - case WebKit::WebAXRoleImage: + case blink::WebAXRoleCanvas: + case blink::WebAXRoleImage: class_name = "android.widget.Image"; break; - case WebKit::WebAXRoleProgressIndicator: + case blink::WebAXRoleProgressIndicator: class_name = "android.widget.ProgressBar"; break; - case WebKit::WebAXRoleTabList: + case blink::WebAXRoleTabList: class_name = "android.widget.TabWidget"; break; - case WebKit::WebAXRoleGrid: - case WebKit::WebAXRoleTable: + case blink::WebAXRoleGrid: + case blink::WebAXRoleTable: class_name = "android.widget.GridView"; break; - case WebKit::WebAXRoleList: - case WebKit::WebAXRoleListBox: + case blink::WebAXRoleList: + case blink::WebAXRoleListBox: class_name = "android.widget.ListView"; break; default: @@ -170,7 +170,7 @@ const char* BrowserAccessibilityAndroid::GetClassName() const { string16 BrowserAccessibilityAndroid::GetText() const { if (IsIframe() || - role() == WebKit::WebAXRoleWebArea) { + role() == blink::WebAXRoleWebArea) { return string16(); } @@ -192,13 +192,13 @@ string16 BrowserAccessibilityAndroid::GetText() const { } switch(role()) { - case WebKit::WebAXRoleImageMapLink: - case WebKit::WebAXRoleLink: + case blink::WebAXRoleImageMapLink: + case blink::WebAXRoleLink: if (!text.empty()) text += ASCIIToUTF16(" "); text += ASCIIToUTF16("Link"); break; - case WebKit::WebAXRoleHeading: + case blink::WebAXRoleHeading: // Only append "heading" if this node already has text. if (!text.empty()) text += ASCIIToUTF16(" Heading"); @@ -211,12 +211,12 @@ string16 BrowserAccessibilityAndroid::GetText() const { int BrowserAccessibilityAndroid::GetItemIndex() const { int index = 0; switch(role()) { - case WebKit::WebAXRoleListItem: - case WebKit::WebAXRoleListBoxOption: + case blink::WebAXRoleListItem: + case blink::WebAXRoleListBoxOption: index = index_in_parent(); break; - case WebKit::WebAXRoleSlider: - case WebKit::WebAXRoleProgressIndicator: { + case blink::WebAXRoleSlider: + case blink::WebAXRoleProgressIndicator: { float value_for_range; if (GetFloatAttribute( AccessibilityNodeData::ATTR_VALUE_FOR_RANGE, &value_for_range)) { @@ -231,12 +231,12 @@ int BrowserAccessibilityAndroid::GetItemIndex() const { int BrowserAccessibilityAndroid::GetItemCount() const { int count = 0; switch(role()) { - case WebKit::WebAXRoleList: - case WebKit::WebAXRoleListBox: + case blink::WebAXRoleList: + case blink::WebAXRoleListBox: count = PlatformChildCount(); break; - case WebKit::WebAXRoleSlider: - case WebKit::WebAXRoleProgressIndicator: { + case blink::WebAXRoleSlider: + case blink::WebAXRoleProgressIndicator: { float max_value_for_range; if (GetFloatAttribute(AccessibilityNodeData::ATTR_MAX_VALUE_FOR_RANGE, &max_value_for_range)) { @@ -341,7 +341,7 @@ int BrowserAccessibilityAndroid::GetEditableTextLength() const { bool BrowserAccessibilityAndroid::HasFocusableChild() const { for (uint32 i = 0; i < PlatformChildCount(); i++) { BrowserAccessibility* child = PlatformGetChild(i); - if (child->HasState(WebKit::WebAXStateFocusable)) + if (child->HasState(blink::WebAXStateFocusable)) return true; if (static_cast<BrowserAccessibilityAndroid*>(child)->HasFocusableChild()) return true; @@ -352,7 +352,7 @@ bool BrowserAccessibilityAndroid::HasFocusableChild() const { bool BrowserAccessibilityAndroid::HasOnlyStaticTextChildren() const { for (uint32 i = 0; i < PlatformChildCount(); i++) { BrowserAccessibility* child = PlatformGetChild(i); - if (child->role() != WebKit::WebAXRoleStaticText) + if (child->role() != blink::WebAXRoleStaticText) return false; } return true; @@ -374,8 +374,8 @@ void BrowserAccessibilityAndroid::PostInitialize() { } } - if (role_ == WebKit::WebAXRoleAlert && first_time_) - manager_->NotifyAccessibilityEvent(WebKit::WebAXEventAlert, this); + if (role_ == blink::WebAXRoleAlert && first_time_) + manager_->NotifyAccessibilityEvent(blink::WebAXEventAlert, this); string16 live; if (GetString16Attribute( @@ -394,7 +394,7 @@ void BrowserAccessibilityAndroid::NotifyLiveRegionUpdate(string16& aria_live) { string16 text = GetText(); if (cached_text_ != text) { if (!text.empty()) { - manager_->NotifyAccessibilityEvent(WebKit::WebAXEventShow, + manager_->NotifyAccessibilityEvent(blink::WebAXEventShow, this); } cached_text_ = text; diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h index d690d81..9ac751f 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.h +++ b/content/browser/accessibility/browser_accessibility_cocoa.h @@ -40,7 +40,7 @@ // Convenience method to get the internal, cross-platform role // from browserAccessibility_. -- (WebKit::WebAXRole)internalRole; +- (blink::WebAXRole)internalRole; // Return the method name for the given attribute. For testing only. - (NSString*)methodNameForAttribute:(NSString*)attribute; diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm index 2b4e0dc..4b88bc6 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm @@ -40,129 +40,129 @@ NSString* NSStringForStringAttribute( } struct MapEntry { - WebKit::WebAXRole webKitValue; + blink::WebAXRole webKitValue; NSString* nativeValue; }; -typedef std::map<WebKit::WebAXRole, NSString*> RoleMap; +typedef std::map<blink::WebAXRole, NSString*> RoleMap; // GetState checks the bitmask used in AccessibilityNodeData to check // if the given state was set on the accessibility object. -bool GetState(BrowserAccessibility* accessibility, WebKit::WebAXState state) { +bool GetState(BrowserAccessibility* accessibility, blink::WebAXState state) { return ((accessibility->state() >> state) & 1); } RoleMap BuildRoleMap() { const MapEntry roles[] = { - { WebKit::WebAXRoleAlert, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleAlertDialog, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleAnnotation, NSAccessibilityUnknownRole }, - { WebKit::WebAXRoleApplication, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleArticle, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleBrowser, NSAccessibilityBrowserRole }, - { WebKit::WebAXRoleBusyIndicator, NSAccessibilityBusyIndicatorRole }, - { WebKit::WebAXRoleButton, NSAccessibilityButtonRole }, - { WebKit::WebAXRoleCanvas, NSAccessibilityImageRole }, - { WebKit::WebAXRoleCell, @"AXCell" }, - { WebKit::WebAXRoleCheckBox, NSAccessibilityCheckBoxRole }, - { WebKit::WebAXRoleColorWell, NSAccessibilityColorWellRole }, - { WebKit::WebAXRoleComboBox, NSAccessibilityComboBoxRole }, - { WebKit::WebAXRoleColumn, NSAccessibilityColumnRole }, - { WebKit::WebAXRoleColumnHeader, @"AXCell" }, - { WebKit::WebAXRoleDefinition, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleDescriptionListDetail, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleDescriptionListTerm, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleDialog, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleDirectory, NSAccessibilityListRole }, - { WebKit::WebAXRoleDisclosureTriangle, + { blink::WebAXRoleAlert, NSAccessibilityGroupRole }, + { blink::WebAXRoleAlertDialog, NSAccessibilityGroupRole }, + { blink::WebAXRoleAnnotation, NSAccessibilityUnknownRole }, + { blink::WebAXRoleApplication, NSAccessibilityGroupRole }, + { blink::WebAXRoleArticle, NSAccessibilityGroupRole }, + { blink::WebAXRoleBrowser, NSAccessibilityBrowserRole }, + { blink::WebAXRoleBusyIndicator, NSAccessibilityBusyIndicatorRole }, + { blink::WebAXRoleButton, NSAccessibilityButtonRole }, + { blink::WebAXRoleCanvas, NSAccessibilityImageRole }, + { blink::WebAXRoleCell, @"AXCell" }, + { blink::WebAXRoleCheckBox, NSAccessibilityCheckBoxRole }, + { blink::WebAXRoleColorWell, NSAccessibilityColorWellRole }, + { blink::WebAXRoleComboBox, NSAccessibilityComboBoxRole }, + { blink::WebAXRoleColumn, NSAccessibilityColumnRole }, + { blink::WebAXRoleColumnHeader, @"AXCell" }, + { blink::WebAXRoleDefinition, NSAccessibilityGroupRole }, + { blink::WebAXRoleDescriptionListDetail, NSAccessibilityGroupRole }, + { blink::WebAXRoleDescriptionListTerm, NSAccessibilityGroupRole }, + { blink::WebAXRoleDialog, NSAccessibilityGroupRole }, + { blink::WebAXRoleDirectory, NSAccessibilityListRole }, + { blink::WebAXRoleDisclosureTriangle, NSAccessibilityDisclosureTriangleRole }, - { WebKit::WebAXRoleDiv, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleDocument, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleDrawer, NSAccessibilityDrawerRole }, - { WebKit::WebAXRoleEditableText, NSAccessibilityTextFieldRole }, - { WebKit::WebAXRoleFooter, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleForm, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleGrid, NSAccessibilityGridRole }, - { WebKit::WebAXRoleGroup, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleGrowArea, NSAccessibilityGrowAreaRole }, - { WebKit::WebAXRoleHeading, @"AXHeading" }, - { WebKit::WebAXRoleHelpTag, NSAccessibilityHelpTagRole }, - { WebKit::WebAXRoleHorizontalRule, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleIgnored, NSAccessibilityUnknownRole }, - { WebKit::WebAXRoleImage, NSAccessibilityImageRole }, - { WebKit::WebAXRoleImageMap, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleImageMapLink, NSAccessibilityLinkRole }, - { WebKit::WebAXRoleIncrementor, NSAccessibilityIncrementorRole }, - { WebKit::WebAXRoleLabel, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleApplication, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleBanner, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleComplementary, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleContentInfo, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleMain, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleNavigation, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleSearch, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleLink, NSAccessibilityLinkRole }, - { WebKit::WebAXRoleList, NSAccessibilityListRole }, - { WebKit::WebAXRoleListItem, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleListMarker, @"AXListMarker" }, - { WebKit::WebAXRoleListBox, NSAccessibilityListRole }, - { WebKit::WebAXRoleListBoxOption, NSAccessibilityStaticTextRole }, - { WebKit::WebAXRoleLog, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleMarquee, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleMath, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleMatte, NSAccessibilityMatteRole }, - { WebKit::WebAXRoleMenu, NSAccessibilityMenuRole }, - { WebKit::WebAXRoleMenuBar, NSAccessibilityMenuBarRole }, - { WebKit::WebAXRoleMenuItem, NSAccessibilityMenuItemRole }, - { WebKit::WebAXRoleMenuButton, NSAccessibilityButtonRole }, - { WebKit::WebAXRoleMenuListOption, NSAccessibilityMenuItemRole }, - { WebKit::WebAXRoleMenuListPopup, NSAccessibilityUnknownRole }, - { WebKit::WebAXRoleNote, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleOutline, NSAccessibilityOutlineRole }, - { WebKit::WebAXRoleParagraph, NSAccessibilityGroupRole }, - { WebKit::WebAXRolePopUpButton, NSAccessibilityPopUpButtonRole }, - { WebKit::WebAXRolePresentational, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleProgressIndicator, + { blink::WebAXRoleDiv, NSAccessibilityGroupRole }, + { blink::WebAXRoleDocument, NSAccessibilityGroupRole }, + { blink::WebAXRoleDrawer, NSAccessibilityDrawerRole }, + { blink::WebAXRoleEditableText, NSAccessibilityTextFieldRole }, + { blink::WebAXRoleFooter, NSAccessibilityGroupRole }, + { blink::WebAXRoleForm, NSAccessibilityGroupRole }, + { blink::WebAXRoleGrid, NSAccessibilityGridRole }, + { blink::WebAXRoleGroup, NSAccessibilityGroupRole }, + { blink::WebAXRoleGrowArea, NSAccessibilityGrowAreaRole }, + { blink::WebAXRoleHeading, @"AXHeading" }, + { blink::WebAXRoleHelpTag, NSAccessibilityHelpTagRole }, + { blink::WebAXRoleHorizontalRule, NSAccessibilityGroupRole }, + { blink::WebAXRoleIgnored, NSAccessibilityUnknownRole }, + { blink::WebAXRoleImage, NSAccessibilityImageRole }, + { blink::WebAXRoleImageMap, NSAccessibilityGroupRole }, + { blink::WebAXRoleImageMapLink, NSAccessibilityLinkRole }, + { blink::WebAXRoleIncrementor, NSAccessibilityIncrementorRole }, + { blink::WebAXRoleLabel, NSAccessibilityGroupRole }, + { blink::WebAXRoleApplication, NSAccessibilityGroupRole }, + { blink::WebAXRoleBanner, NSAccessibilityGroupRole }, + { blink::WebAXRoleComplementary, NSAccessibilityGroupRole }, + { blink::WebAXRoleContentInfo, NSAccessibilityGroupRole }, + { blink::WebAXRoleMain, NSAccessibilityGroupRole }, + { blink::WebAXRoleNavigation, NSAccessibilityGroupRole }, + { blink::WebAXRoleSearch, NSAccessibilityGroupRole }, + { blink::WebAXRoleLink, NSAccessibilityLinkRole }, + { blink::WebAXRoleList, NSAccessibilityListRole }, + { blink::WebAXRoleListItem, NSAccessibilityGroupRole }, + { blink::WebAXRoleListMarker, @"AXListMarker" }, + { blink::WebAXRoleListBox, NSAccessibilityListRole }, + { blink::WebAXRoleListBoxOption, NSAccessibilityStaticTextRole }, + { blink::WebAXRoleLog, NSAccessibilityGroupRole }, + { blink::WebAXRoleMarquee, NSAccessibilityGroupRole }, + { blink::WebAXRoleMath, NSAccessibilityGroupRole }, + { blink::WebAXRoleMatte, NSAccessibilityMatteRole }, + { blink::WebAXRoleMenu, NSAccessibilityMenuRole }, + { blink::WebAXRoleMenuBar, NSAccessibilityMenuBarRole }, + { blink::WebAXRoleMenuItem, NSAccessibilityMenuItemRole }, + { blink::WebAXRoleMenuButton, NSAccessibilityButtonRole }, + { blink::WebAXRoleMenuListOption, NSAccessibilityMenuItemRole }, + { blink::WebAXRoleMenuListPopup, NSAccessibilityUnknownRole }, + { blink::WebAXRoleNote, NSAccessibilityGroupRole }, + { blink::WebAXRoleOutline, NSAccessibilityOutlineRole }, + { blink::WebAXRoleParagraph, NSAccessibilityGroupRole }, + { blink::WebAXRolePopUpButton, NSAccessibilityPopUpButtonRole }, + { blink::WebAXRolePresentational, NSAccessibilityGroupRole }, + { blink::WebAXRoleProgressIndicator, NSAccessibilityProgressIndicatorRole }, - { WebKit::WebAXRoleRadioButton, NSAccessibilityRadioButtonRole }, - { WebKit::WebAXRoleRadioGroup, NSAccessibilityRadioGroupRole }, - { WebKit::WebAXRoleRegion, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleRootWebArea, @"AXWebArea" }, - { WebKit::WebAXRoleRow, NSAccessibilityRowRole }, - { WebKit::WebAXRoleRowHeader, @"AXCell" }, - { WebKit::WebAXRoleRuler, NSAccessibilityRulerRole }, - { WebKit::WebAXRoleRulerMarker, NSAccessibilityRulerMarkerRole }, + { blink::WebAXRoleRadioButton, NSAccessibilityRadioButtonRole }, + { blink::WebAXRoleRadioGroup, NSAccessibilityRadioGroupRole }, + { blink::WebAXRoleRegion, NSAccessibilityGroupRole }, + { blink::WebAXRoleRootWebArea, @"AXWebArea" }, + { blink::WebAXRoleRow, NSAccessibilityRowRole }, + { blink::WebAXRoleRowHeader, @"AXCell" }, + { blink::WebAXRoleRuler, NSAccessibilityRulerRole }, + { blink::WebAXRoleRulerMarker, NSAccessibilityRulerMarkerRole }, // TODO(dtseng): we don't correctly support the attributes for these roles. - // { WebKit::WebAXRoleScrollArea, NSAccessibilityScrollAreaRole }, - { WebKit::WebAXRoleScrollBar, NSAccessibilityScrollBarRole }, - { WebKit::WebAXRoleSheet, NSAccessibilitySheetRole }, - { WebKit::WebAXRoleSlider, NSAccessibilitySliderRole }, - { WebKit::WebAXRoleSliderThumb, NSAccessibilityValueIndicatorRole }, - { WebKit::WebAXRoleSpinButton, NSAccessibilitySliderRole }, - { WebKit::WebAXRoleSplitter, NSAccessibilitySplitterRole }, - { WebKit::WebAXRoleSplitGroup, NSAccessibilitySplitGroupRole }, - { WebKit::WebAXRoleStaticText, NSAccessibilityStaticTextRole }, - { WebKit::WebAXRoleStatus, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleSVGRoot, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleSystemWide, NSAccessibilityUnknownRole }, - { WebKit::WebAXRoleTab, NSAccessibilityRadioButtonRole }, - { WebKit::WebAXRoleTabList, NSAccessibilityTabGroupRole }, - { WebKit::WebAXRoleTabPanel, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleTable, NSAccessibilityTableRole }, - { WebKit::WebAXRoleTableHeaderContainer, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleTextArea, NSAccessibilityTextAreaRole }, - { WebKit::WebAXRoleTextField, NSAccessibilityTextFieldRole }, - { WebKit::WebAXRoleTimer, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleToggleButton, NSAccessibilityButtonRole }, - { WebKit::WebAXRoleToolbar, NSAccessibilityToolbarRole }, - { WebKit::WebAXRoleUserInterfaceTooltip, NSAccessibilityGroupRole }, - { WebKit::WebAXRoleTree, NSAccessibilityOutlineRole }, - { WebKit::WebAXRoleTreeGrid, NSAccessibilityTableRole }, - { WebKit::WebAXRoleTreeItem, NSAccessibilityRowRole }, - { WebKit::WebAXRoleValueIndicator, NSAccessibilityValueIndicatorRole }, - { WebKit::WebAXRoleLink, NSAccessibilityLinkRole }, - { WebKit::WebAXRoleWebArea, @"AXWebArea" }, - { WebKit::WebAXRoleWindow, NSAccessibilityWindowRole }, + // { blink::WebAXRoleScrollArea, NSAccessibilityScrollAreaRole }, + { blink::WebAXRoleScrollBar, NSAccessibilityScrollBarRole }, + { blink::WebAXRoleSheet, NSAccessibilitySheetRole }, + { blink::WebAXRoleSlider, NSAccessibilitySliderRole }, + { blink::WebAXRoleSliderThumb, NSAccessibilityValueIndicatorRole }, + { blink::WebAXRoleSpinButton, NSAccessibilitySliderRole }, + { blink::WebAXRoleSplitter, NSAccessibilitySplitterRole }, + { blink::WebAXRoleSplitGroup, NSAccessibilitySplitGroupRole }, + { blink::WebAXRoleStaticText, NSAccessibilityStaticTextRole }, + { blink::WebAXRoleStatus, NSAccessibilityGroupRole }, + { blink::WebAXRoleSVGRoot, NSAccessibilityGroupRole }, + { blink::WebAXRoleSystemWide, NSAccessibilityUnknownRole }, + { blink::WebAXRoleTab, NSAccessibilityRadioButtonRole }, + { blink::WebAXRoleTabList, NSAccessibilityTabGroupRole }, + { blink::WebAXRoleTabPanel, NSAccessibilityGroupRole }, + { blink::WebAXRoleTable, NSAccessibilityTableRole }, + { blink::WebAXRoleTableHeaderContainer, NSAccessibilityGroupRole }, + { blink::WebAXRoleTextArea, NSAccessibilityTextAreaRole }, + { blink::WebAXRoleTextField, NSAccessibilityTextFieldRole }, + { blink::WebAXRoleTimer, NSAccessibilityGroupRole }, + { blink::WebAXRoleToggleButton, NSAccessibilityButtonRole }, + { blink::WebAXRoleToolbar, NSAccessibilityToolbarRole }, + { blink::WebAXRoleUserInterfaceTooltip, NSAccessibilityGroupRole }, + { blink::WebAXRoleTree, NSAccessibilityOutlineRole }, + { blink::WebAXRoleTreeGrid, NSAccessibilityTableRole }, + { blink::WebAXRoleTreeItem, NSAccessibilityRowRole }, + { blink::WebAXRoleValueIndicator, NSAccessibilityValueIndicatorRole }, + { blink::WebAXRoleLink, NSAccessibilityLinkRole }, + { blink::WebAXRoleWebArea, @"AXWebArea" }, + { blink::WebAXRoleWindow, NSAccessibilityWindowRole }, }; RoleMap role_map; @@ -173,7 +173,7 @@ RoleMap BuildRoleMap() { // A mapping of webkit roles to native roles. NSString* NativeRoleFromAccessibilityNodeDataRole( - const WebKit::WebAXRole& role) { + const blink::WebAXRole& role) { CR_DEFINE_STATIC_LOCAL(RoleMap, web_accessibility_to_native_role, (BuildRoleMap())); RoleMap::iterator it = web_accessibility_to_native_role.find(role); @@ -185,32 +185,32 @@ NSString* NativeRoleFromAccessibilityNodeDataRole( RoleMap BuildSubroleMap() { const MapEntry subroles[] = { - { WebKit::WebAXRoleAlert, @"AXApplicationAlert" }, - { WebKit::WebAXRoleAlertDialog, @"AXApplicationAlertDialog" }, - { WebKit::WebAXRoleArticle, @"AXDocumentArticle" }, - { WebKit::WebAXRoleDefinition, @"AXDefinition" }, - { WebKit::WebAXRoleDescriptionListDetail, @"AXDescription" }, - { WebKit::WebAXRoleDescriptionListTerm, @"AXTerm" }, - { WebKit::WebAXRoleDialog, @"AXApplicationDialog" }, - { WebKit::WebAXRoleDocument, @"AXDocument" }, - { WebKit::WebAXRoleFooter, @"AXLandmarkContentInfo" }, - { WebKit::WebAXRoleApplication, @"AXLandmarkApplication" }, - { WebKit::WebAXRoleBanner, @"AXLandmarkBanner" }, - { WebKit::WebAXRoleComplementary, @"AXLandmarkComplementary" }, - { WebKit::WebAXRoleContentInfo, @"AXLandmarkContentInfo" }, - { WebKit::WebAXRoleMain, @"AXLandmarkMain" }, - { WebKit::WebAXRoleNavigation, @"AXLandmarkNavigation" }, - { WebKit::WebAXRoleSearch, @"AXLandmarkSearch" }, - { WebKit::WebAXRoleLog, @"AXApplicationLog" }, - { WebKit::WebAXRoleMarquee, @"AXApplicationMarquee" }, - { WebKit::WebAXRoleMath, @"AXDocumentMath" }, - { WebKit::WebAXRoleNote, @"AXDocumentNote" }, - { WebKit::WebAXRoleRegion, @"AXDocumentRegion" }, - { WebKit::WebAXRoleStatus, @"AXApplicationStatus" }, - { WebKit::WebAXRoleTabPanel, @"AXTabPanel" }, - { WebKit::WebAXRoleTimer, @"AXApplicationTimer" }, - { WebKit::WebAXRoleUserInterfaceTooltip, @"AXUserInterfaceTooltip" }, - { WebKit::WebAXRoleTreeItem, NSAccessibilityOutlineRowSubrole }, + { blink::WebAXRoleAlert, @"AXApplicationAlert" }, + { blink::WebAXRoleAlertDialog, @"AXApplicationAlertDialog" }, + { blink::WebAXRoleArticle, @"AXDocumentArticle" }, + { blink::WebAXRoleDefinition, @"AXDefinition" }, + { blink::WebAXRoleDescriptionListDetail, @"AXDescription" }, + { blink::WebAXRoleDescriptionListTerm, @"AXTerm" }, + { blink::WebAXRoleDialog, @"AXApplicationDialog" }, + { blink::WebAXRoleDocument, @"AXDocument" }, + { blink::WebAXRoleFooter, @"AXLandmarkContentInfo" }, + { blink::WebAXRoleApplication, @"AXLandmarkApplication" }, + { blink::WebAXRoleBanner, @"AXLandmarkBanner" }, + { blink::WebAXRoleComplementary, @"AXLandmarkComplementary" }, + { blink::WebAXRoleContentInfo, @"AXLandmarkContentInfo" }, + { blink::WebAXRoleMain, @"AXLandmarkMain" }, + { blink::WebAXRoleNavigation, @"AXLandmarkNavigation" }, + { blink::WebAXRoleSearch, @"AXLandmarkSearch" }, + { blink::WebAXRoleLog, @"AXApplicationLog" }, + { blink::WebAXRoleMarquee, @"AXApplicationMarquee" }, + { blink::WebAXRoleMath, @"AXDocumentMath" }, + { blink::WebAXRoleNote, @"AXDocumentNote" }, + { blink::WebAXRoleRegion, @"AXDocumentRegion" }, + { blink::WebAXRoleStatus, @"AXApplicationStatus" }, + { blink::WebAXRoleTabPanel, @"AXTabPanel" }, + { blink::WebAXRoleTimer, @"AXApplicationTimer" }, + { blink::WebAXRoleUserInterfaceTooltip, @"AXUserInterfaceTooltip" }, + { blink::WebAXRoleTreeItem, NSAccessibilityOutlineRowSubrole }, }; RoleMap subrole_map; @@ -221,7 +221,7 @@ RoleMap BuildSubroleMap() { // A mapping of webkit roles to native subroles. NSString* NativeSubroleFromAccessibilityNodeDataRole( - const WebKit::WebAXRole& role) { + const blink::WebAXRole& role) { CR_DEFINE_STATIC_LOCAL(RoleMap, web_accessibility_to_native_subrole, (BuildSubroleMap())); RoleMap::iterator it = web_accessibility_to_native_subrole.find(role); @@ -396,8 +396,8 @@ NSDictionary* attributeToMethodNameMap = nil; } - (NSArray*)columnHeaders { - if ([self internalRole] != WebKit::WebAXRoleTable && - [self internalRole] != WebKit::WebAXRoleGrid) { + if ([self internalRole] != blink::WebAXRoleTable && + [self internalRole] != blink::WebAXRoleGrid) { return nil; } @@ -409,14 +409,14 @@ NSDictionary* attributeToMethodNameMap = nil; int id = uniqueCellIds[i]; BrowserAccessibility* cell = browserAccessibility_->manager()->GetFromRendererID(id); - if (cell && cell->role() == WebKit::WebAXRoleColumnHeader) + if (cell && cell->role() == blink::WebAXRoleColumnHeader) [ret addObject:cell->ToBrowserAccessibilityCocoa()]; } return ret; } - (NSValue*)columnIndexRange { - if ([self internalRole] != WebKit::WebAXRoleCell) + if ([self internalRole] != blink::WebAXRoleCell) return nil; int column = -1; @@ -474,9 +474,9 @@ NSDictionary* attributeToMethodNameMap = nil; } - (NSNumber*)disclosing { - if ([self internalRole] == WebKit::WebAXRoleTreeItem) { + if ([self internalRole] == blink::WebAXRoleTreeItem) { return [NSNumber numberWithBool: - GetState(browserAccessibility_, WebKit::WebAXStateExpanded)]; + GetState(browserAccessibility_, blink::WebAXStateExpanded)]; } else { return nil; } @@ -489,9 +489,9 @@ NSDictionary* attributeToMethodNameMap = nil; } - (NSNumber*)disclosureLevel { - WebKit::WebAXRole role = [self internalRole]; - if (role == WebKit::WebAXRoleRow || - role == WebKit::WebAXRoleTreeItem) { + blink::WebAXRole role = [self internalRole]; + if (role == blink::WebAXRoleRow || + role == blink::WebAXRoleTreeItem) { int level = browserAccessibility_->GetIntAttribute( AccessibilityNodeData::ATTR_HIERARCHICAL_LEVEL); // Mac disclosureLevel is 0-based, but web levels are 1-based. @@ -510,7 +510,7 @@ NSDictionary* attributeToMethodNameMap = nil; - (NSNumber*)enabled { return [NSNumber numberWithBool: - GetState(browserAccessibility_, WebKit::WebAXStateEnabled)]; + GetState(browserAccessibility_, blink::WebAXStateEnabled)]; } - (NSNumber*)focused { @@ -522,14 +522,14 @@ NSDictionary* attributeToMethodNameMap = nil; - (id)header { int headerElementId = -1; - if ([self internalRole] == WebKit::WebAXRoleTable || - [self internalRole] == WebKit::WebAXRoleGrid) { + if ([self internalRole] == blink::WebAXRoleTable || + [self internalRole] == blink::WebAXRoleGrid) { browserAccessibility_->GetIntAttribute( AccessibilityNodeData::ATTR_TABLE_HEADER_ID, &headerElementId); - } else if ([self internalRole] == WebKit::WebAXRoleColumn) { + } else if ([self internalRole] == blink::WebAXRoleColumn) { browserAccessibility_->GetIntAttribute( AccessibilityNodeData::ATTR_TABLE_COLUMN_HEADER_ID, &headerElementId); - } else if ([self internalRole] == WebKit::WebAXRoleRow) { + } else if ([self internalRole] == blink::WebAXRoleRow) { browserAccessibility_->GetIntAttribute( AccessibilityNodeData::ATTR_TABLE_ROW_HEADER_ID, &headerElementId); } @@ -549,11 +549,11 @@ NSDictionary* attributeToMethodNameMap = nil; } - (NSNumber*)index { - if ([self internalRole] == WebKit::WebAXRoleColumn) { + if ([self internalRole] == blink::WebAXRoleColumn) { int columnIndex = browserAccessibility_->GetIntAttribute( AccessibilityNodeData::ATTR_TABLE_COLUMN_INDEX); return [NSNumber numberWithInt:columnIndex]; - } else if ([self internalRole] == WebKit::WebAXRoleRow) { + } else if ([self internalRole] == blink::WebAXRoleRow) { int rowIndex = browserAccessibility_->GetIntAttribute( AccessibilityNodeData::ATTR_TABLE_ROW_INDEX); return [NSNumber numberWithInt:rowIndex]; @@ -605,10 +605,10 @@ NSDictionary* attributeToMethodNameMap = nil; - (NSString*)orientation { // We present a spin button as a vertical slider, with a role description // of "spin button". - if ([self internalRole] == WebKit::WebAXRoleSpinButton) + if ([self internalRole] == blink::WebAXRoleSpinButton) return NSAccessibilityVerticalOrientationValue; - if (GetState(browserAccessibility_, WebKit::WebAXStateVertical)) + if (GetState(browserAccessibility_, blink::WebAXStateVertical)) return NSAccessibilityVerticalOrientationValue; else return NSAccessibilityHorizontalOrientationValue; @@ -646,18 +646,18 @@ NSDictionary* attributeToMethodNameMap = nil; - (NSNumber*)required { return [NSNumber numberWithBool: - GetState(browserAccessibility_, WebKit::WebAXStateRequired)]; + GetState(browserAccessibility_, blink::WebAXStateRequired)]; } // Returns an enum indicating the role from browserAccessibility_. -- (WebKit::WebAXRole)internalRole { - return static_cast<WebKit::WebAXRole>(browserAccessibility_->role()); +- (blink::WebAXRole)internalRole { + return static_cast<blink::WebAXRole>(browserAccessibility_->role()); } // Returns a string indicating the NSAccessibility role of this object. - (NSString*)role { - WebKit::WebAXRole role = [self internalRole]; - if (role == WebKit::WebAXRoleCanvas && + blink::WebAXRole role = [self internalRole]; + if (role == blink::WebAXRoleCanvas && browserAccessibility_->GetBoolAttribute( AccessibilityNodeData::ATTR_CANVAS_HAS_FALLBACK)) { return NSAccessibilityGroupRole; @@ -691,10 +691,10 @@ NSDictionary* attributeToMethodNameMap = nil; [role isEqualToString:NSAccessibilityRadioButtonRole]) { std::string role; if (browserAccessibility_->GetHtmlAttribute("role", &role)) { - WebKit::WebAXRole internalRole = [self internalRole]; - if ((internalRole != WebKit::WebAXRoleGroup && - internalRole != WebKit::WebAXRoleListItem) || - internalRole == WebKit::WebAXRoleTab) { + blink::WebAXRole internalRole = [self internalRole]; + if ((internalRole != blink::WebAXRoleGroup && + internalRole != blink::WebAXRoleListItem) || + internalRole == blink::WebAXRoleTab) { // TODO(dtseng): This is not localized; see crbug/84814. return base::SysUTF8ToNSString(role); } @@ -702,10 +702,10 @@ NSDictionary* attributeToMethodNameMap = nil; } switch([self internalRole]) { - case WebKit::WebAXRoleFooter: + case blink::WebAXRoleFooter: return base::SysUTF16ToNSString(content_client->GetLocalizedString( IDS_AX_ROLE_FOOTER)); - case WebKit::WebAXRoleSpinButton: + case blink::WebAXRoleSpinButton: // This control is similar to what VoiceOver calls a "stepper". return base::SysUTF16ToNSString(content_client->GetLocalizedString( IDS_AX_ROLE_STEPPER)); @@ -717,8 +717,8 @@ NSDictionary* attributeToMethodNameMap = nil; } - (NSArray*)rowHeaders { - if ([self internalRole] != WebKit::WebAXRoleTable && - [self internalRole] != WebKit::WebAXRoleGrid) { + if ([self internalRole] != blink::WebAXRoleTable && + [self internalRole] != blink::WebAXRoleGrid) { return nil; } @@ -730,14 +730,14 @@ NSDictionary* attributeToMethodNameMap = nil; int id = uniqueCellIds[i]; BrowserAccessibility* cell = browserAccessibility_->manager()->GetFromRendererID(id); - if (cell && cell->role() == WebKit::WebAXRoleRowHeader) + if (cell && cell->role() == blink::WebAXRoleRowHeader) [ret addObject:cell->ToBrowserAccessibilityCocoa()]; } return ret; } - (NSValue*)rowIndexRange { - if ([self internalRole] != WebKit::WebAXRoleCell) + if ([self internalRole] != blink::WebAXRoleCell) return nil; int row = -1; @@ -754,13 +754,13 @@ NSDictionary* attributeToMethodNameMap = nil; - (NSArray*)rows { NSMutableArray* ret = [[[NSMutableArray alloc] init] autorelease]; - if ([self internalRole] == WebKit::WebAXRoleTable|| - [self internalRole] == WebKit::WebAXRoleGrid) { + if ([self internalRole] == blink::WebAXRoleTable|| + [self internalRole] == blink::WebAXRoleGrid) { for (BrowserAccessibilityCocoa* child in [self children]) { if ([[child role] isEqualToString:NSAccessibilityRowRole]) [ret addObject:child]; } - } else if ([self internalRole] == WebKit::WebAXRoleColumn) { + } else if ([self internalRole] == blink::WebAXRoleColumn) { const std::vector<int32>& indirectChildIds = browserAccessibility_->GetIntListAttribute( AccessibilityNodeData::ATTR_INDIRECT_CHILD_IDS); @@ -784,16 +784,16 @@ NSDictionary* attributeToMethodNameMap = nil; // Returns a subrole based upon the role. - (NSString*) subrole { - WebKit::WebAXRole browserAccessibilityRole = [self internalRole]; - if (browserAccessibilityRole == WebKit::WebAXRoleTextField && - GetState(browserAccessibility_, WebKit::WebAXStateProtected)) { + blink::WebAXRole browserAccessibilityRole = [self internalRole]; + if (browserAccessibilityRole == blink::WebAXRoleTextField && + GetState(browserAccessibility_, blink::WebAXStateProtected)) { return @"AXSecureTextField"; } NSString* htmlTag = NSStringForStringAttribute( browserAccessibility_, AccessibilityNodeData::ATTR_HTML_TAG); - if (browserAccessibilityRole == WebKit::WebAXRoleList) { + if (browserAccessibilityRole == blink::WebAXRoleList) { if ([htmlTag isEqualToString:@"ul"] || [htmlTag isEqualToString:@"ol"]) { return @"AXContentList"; @@ -809,7 +809,7 @@ NSDictionary* attributeToMethodNameMap = nil; - (NSArray*)tabs { NSMutableArray* tabSubtree = [[[NSMutableArray alloc] init] autorelease]; - if ([self internalRole] == WebKit::WebAXRoleTab) + if ([self internalRole] == blink::WebAXRoleTab) [tabSubtree addObject:self]; for (uint i=0; i < [[self children] count]; ++i) { @@ -864,9 +864,9 @@ NSDictionary* attributeToMethodNameMap = nil; [role isEqualToString:NSAccessibilityRadioButtonRole]) { int value = 0; value = GetState( - browserAccessibility_, WebKit::WebAXStateChecked) ? 1 : 0; + browserAccessibility_, blink::WebAXStateChecked) ? 1 : 0; value = GetState( - browserAccessibility_, WebKit::WebAXStateSelected) ? + browserAccessibility_, blink::WebAXStateSelected) ? 1 : value; @@ -934,7 +934,7 @@ NSDictionary* attributeToMethodNameMap = nil; - (NSNumber*)visited { return [NSNumber numberWithBool: - GetState(browserAccessibility_, WebKit::WebAXStateVisited)]; + GetState(browserAccessibility_, blink::WebAXStateVisited)]; } - (id)window { @@ -1032,8 +1032,8 @@ NSDictionary* attributeToMethodNameMap = nil; if ([attribute isEqualToString: NSAccessibilityCellForColumnAndRowParameterizedAttribute]) { - if ([self internalRole] != WebKit::WebAXRoleTable && - [self internalRole] != WebKit::WebAXRoleGrid) { + if ([self internalRole] != blink::WebAXRoleTable && + [self internalRole] != blink::WebAXRoleGrid) { return nil; } if (![parameter isKindOfClass:[NSArray self]]) @@ -1053,7 +1053,7 @@ NSDictionary* attributeToMethodNameMap = nil; i < browserAccessibility_->PlatformChildCount(); ++i) { BrowserAccessibility* child = browserAccessibility_->PlatformGetChild(i); - if (child->role() != WebKit::WebAXRoleRow) + if (child->role() != blink::WebAXRoleRow) continue; int rowIndex; if (!child->GetIntAttribute( @@ -1068,7 +1068,7 @@ NSDictionary* attributeToMethodNameMap = nil; j < child->PlatformChildCount(); ++j) { BrowserAccessibility* cell = child->PlatformGetChild(j); - if (cell->role() != WebKit::WebAXRoleCell) + if (cell->role() != blink::WebAXRoleCell) continue; int colIndex; if (!cell->GetIntAttribute( @@ -1341,7 +1341,7 @@ NSDictionary* attributeToMethodNameMap = nil; if ([attribute isEqualToString:NSAccessibilityFocusedAttribute]) return GetState(browserAccessibility_, - WebKit::WebAXStateFocusable); + blink::WebAXStateFocusable); if ([attribute isEqualToString:NSAccessibilityValueAttribute]) { return browserAccessibility_->GetBoolAttribute( AccessibilityNodeData::ATTR_CAN_SET_VALUE); diff --git a/content/browser/accessibility/browser_accessibility_gtk.cc b/content/browser/accessibility/browser_accessibility_gtk.cc index acab43b..c89aa2b 100644 --- a/content/browser/accessibility/browser_accessibility_gtk.cc +++ b/content/browser/accessibility/browser_accessibility_gtk.cc @@ -255,11 +255,11 @@ static AtkStateSet* browser_accessibility_ref_state_set(AtkObject* atk_object) { ref_state_set(atk_object); int32 state = obj->state(); - if (state & (1 << WebKit::WebAXStateFocusable)) + if (state & (1 << blink::WebAXStateFocusable)) atk_state_set_add_state(state_set, ATK_STATE_FOCUSABLE); if (obj->manager()->GetFocus(NULL) == obj) atk_state_set_add_state(state_set, ATK_STATE_FOCUSED); - if (state & (1 << WebKit::WebAXStateEnabled)) + if (state & (1 << blink::WebAXStateEnabled)) atk_state_set_add_state(state_set, ATK_STATE_ENABLED); return state_set; @@ -364,9 +364,9 @@ static int GetInterfaceMaskFromObject(BrowserAccessibilityGtk* obj) { interface_mask |= 1 << ATK_COMPONENT_INTERFACE; int role = obj->role(); - if (role == WebKit::WebAXRoleProgressIndicator || - role == WebKit::WebAXRoleScrollBar || - role == WebKit::WebAXRoleSlider) { + if (role == blink::WebAXRoleProgressIndicator || + role == blink::WebAXRoleScrollBar || + role == blink::WebAXRoleSlider) { interface_mask |= 1 << ATK_VALUE_INTERFACE; } @@ -476,37 +476,37 @@ bool BrowserAccessibilityGtk::IsNative() const { void BrowserAccessibilityGtk::InitRoleAndState() { switch(role_) { - case WebKit::WebAXRoleDocument: - case WebKit::WebAXRoleRootWebArea: - case WebKit::WebAXRoleWebArea: + case blink::WebAXRoleDocument: + case blink::WebAXRoleRootWebArea: + case blink::WebAXRoleWebArea: atk_role_ = ATK_ROLE_DOCUMENT_WEB; break; - case WebKit::WebAXRoleGroup: - case WebKit::WebAXRoleDiv: + case blink::WebAXRoleGroup: + case blink::WebAXRoleDiv: atk_role_ = ATK_ROLE_SECTION; break; - case WebKit::WebAXRoleButton: + case blink::WebAXRoleButton: atk_role_ = ATK_ROLE_PUSH_BUTTON; break; - case WebKit::WebAXRoleCheckBox: + case blink::WebAXRoleCheckBox: atk_role_ = ATK_ROLE_CHECK_BOX; break; - case WebKit::WebAXRoleComboBox: + case blink::WebAXRoleComboBox: atk_role_ = ATK_ROLE_COMBO_BOX; break; - case WebKit::WebAXRoleLink: + case blink::WebAXRoleLink: atk_role_ = ATK_ROLE_LINK; break; - case WebKit::WebAXRoleRadioButton: + case blink::WebAXRoleRadioButton: atk_role_ = ATK_ROLE_RADIO_BUTTON; break; - case WebKit::WebAXRoleStaticText: + case blink::WebAXRoleStaticText: atk_role_ = ATK_ROLE_TEXT; break; - case WebKit::WebAXRoleTextArea: + case blink::WebAXRoleTextArea: atk_role_ = ATK_ROLE_ENTRY; break; - case WebKit::WebAXRoleTextField: + case blink::WebAXRoleTextField: atk_role_ = ATK_ROLE_ENTRY; break; default: diff --git a/content/browser/accessibility/browser_accessibility_mac_unittest.mm b/content/browser/accessibility/browser_accessibility_mac_unittest.mm index 5f5d0f2..e1b1a93 100644 --- a/content/browser/accessibility/browser_accessibility_mac_unittest.mm +++ b/content/browser/accessibility/browser_accessibility_mac_unittest.mm @@ -67,7 +67,7 @@ class BrowserAccessibilityTest : public ui::CocoaTest { root.id = 1000; root.location.set_width(500); root.location.set_height(100); - root.role = WebKit::WebAXRoleRootWebArea; + root.role = blink::WebAXRoleRootWebArea; root.AddStringAttribute(AccessibilityNodeData::ATTR_HELP, "HelpText"); root.child_ids.push_back(1001); root.child_ids.push_back(1002); @@ -77,14 +77,14 @@ class BrowserAccessibilityTest : public ui::CocoaTest { child1.SetName("Child1"); child1.location.set_width(250); child1.location.set_height(100); - child1.role = WebKit::WebAXRoleButton; + child1.role = blink::WebAXRoleButton; AccessibilityNodeData child2; child2.id = 1002; child2.location.set_x(250); child2.location.set_width(250); child2.location.set_height(100); - child2.role = WebKit::WebAXRoleHeading; + child2.role = blink::WebAXRoleHeading; delegate_.reset([[MockAccessibilityDelegate alloc] init]); manager_.reset( diff --git a/content/browser/accessibility/browser_accessibility_manager.cc b/content/browser/accessibility/browser_accessibility_manager.cc index 2161fb1..aef3409 100644 --- a/content/browser/accessibility/browser_accessibility_manager.cc +++ b/content/browser/accessibility/browser_accessibility_manager.cc @@ -69,7 +69,7 @@ void BrowserAccessibilityManager::Initialize(const AccessibilityNodeData src) { AccessibilityNodeData BrowserAccessibilityManager::GetEmptyDocument() { AccessibilityNodeData empty_document; empty_document.id = 0; - empty_document.role = WebKit::WebAXRoleRootWebArea; + empty_document.role = blink::WebAXRoleRootWebArea; return empty_document; } @@ -93,7 +93,7 @@ void BrowserAccessibilityManager::GotFocus(bool touch_event_context) { if (!focus_) return; - NotifyAccessibilityEvent(WebKit::WebAXEventFocus, focus_); + NotifyAccessibilityEvent(blink::WebAXEventFocus, focus_); } void BrowserAccessibilityManager::WasHidden() { @@ -102,7 +102,7 @@ void BrowserAccessibilityManager::WasHidden() { void BrowserAccessibilityManager::GotMouseDown() { osk_state_ = OSK_ALLOWED_WITHIN_FOCUSED_OBJECT; - NotifyAccessibilityEvent(WebKit::WebAXEventFocus, focus_); + NotifyAccessibilityEvent(blink::WebAXEventFocus, focus_); } bool BrowserAccessibilityManager::IsOSKAllowed(const gfx::Rect& bounds) { @@ -139,9 +139,9 @@ void BrowserAccessibilityManager::OnAccessibilityEvents( if (!node) continue; - WebKit::WebAXEvent event_type = param.event_type; - if (event_type == WebKit::WebAXEventFocus || - event_type == WebKit::WebAXEventBlur) { + blink::WebAXEvent event_type = param.event_type; + if (event_type == blink::WebAXEventFocus || + event_type == blink::WebAXEventBlur) { SetFocus(node, false); if (osk_state_ != OSK_DISALLOWED_BECAUSE_TAB_HIDDEN && @@ -158,11 +158,11 @@ void BrowserAccessibilityManager::OnAccessibilityEvents( NotifyAccessibilityEvent(event_type, node); // Set initial focus when a page is loaded. - if (event_type == WebKit::WebAXEventLoadComplete) { + if (event_type == blink::WebAXEventLoadComplete) { if (!focus_) SetFocus(root_, false); if (!delegate_ || delegate_->HasFocus()) - NotifyAccessibilityEvent(WebKit::WebAXEventFocus, focus_); + NotifyAccessibilityEvent(blink::WebAXEventFocus, focus_); } } } @@ -333,7 +333,7 @@ bool BrowserAccessibilityManager::UpdateNode(const AccessibilityNodeData& src) { // and this is a serious error. BrowserAccessibility* instance = GetFromRendererID(src.id); if (!instance) { - if (src.role != WebKit::WebAXRoleRootWebArea) + if (src.role != blink::WebAXRoleRootWebArea) return false; instance = CreateNode(NULL, src.id, 0); } @@ -400,7 +400,7 @@ bool BrowserAccessibilityManager::UpdateNode(const AccessibilityNodeData& src) { instance->SwapChildren(new_children); // Handle the case where this node is the new root of the tree. - if (src.role == WebKit::WebAXRoleRootWebArea && + if (src.role == blink::WebAXRoleRootWebArea && (!root_ || root_->renderer_id() != src.id)) { if (root_) root_->Destroy(); @@ -410,9 +410,9 @@ bool BrowserAccessibilityManager::UpdateNode(const AccessibilityNodeData& src) { } // Keep track of what node is focused. - if (src.role != WebKit::WebAXRoleRootWebArea && - src.role != WebKit::WebAXRoleWebArea && - (src.state >> WebKit::WebAXStateFocused & 1)) { + if (src.role != blink::WebAXRoleRootWebArea && + src.role != blink::WebAXRoleWebArea && + (src.state >> blink::WebAXStateFocused & 1)) { SetFocus(instance, false); } return success; diff --git a/content/browser/accessibility/browser_accessibility_manager.h b/content/browser/accessibility/browser_accessibility_manager.h index 00217ca..716ee40 100644 --- a/content/browser/accessibility/browser_accessibility_manager.h +++ b/content/browser/accessibility/browser_accessibility_manager.h @@ -70,7 +70,7 @@ class CONTENT_EXPORT BrowserAccessibilityManager { static AccessibilityNodeData GetEmptyDocument(); virtual void NotifyAccessibilityEvent( - WebKit::WebAXEvent event_type, BrowserAccessibility* node) { } + blink::WebAXEvent event_type, BrowserAccessibility* node) { } // Return a pointer to the root of the tree, does not make a new reference. BrowserAccessibility* GetRoot(); diff --git a/content/browser/accessibility/browser_accessibility_manager_android.cc b/content/browser/accessibility/browser_accessibility_manager_android.cc index 22479fd..a9fd646 100644 --- a/content/browser/accessibility/browser_accessibility_manager_android.cc +++ b/content/browser/accessibility/browser_accessibility_manager_android.cc @@ -76,8 +76,8 @@ BrowserAccessibilityManagerAndroid::~BrowserAccessibilityManagerAndroid() { AccessibilityNodeData BrowserAccessibilityManagerAndroid::GetEmptyDocument() { AccessibilityNodeData empty_document; empty_document.id = 0; - empty_document.role = WebKit::WebAXRoleRootWebArea; - empty_document.state = 1 << WebKit::WebAXStateReadonly; + empty_document.role = blink::WebAXRoleRootWebArea; + empty_document.state = 1 << blink::WebAXStateReadonly; return empty_document; } @@ -93,7 +93,7 @@ void BrowserAccessibilityManagerAndroid::SetContentViewCore( } void BrowserAccessibilityManagerAndroid::NotifyAccessibilityEvent( - WebKit::WebAXEvent event_type, + blink::WebAXEvent event_type, BrowserAccessibility* node) { JNIEnv* env = AttachCurrentThread(); ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); @@ -107,26 +107,26 @@ void BrowserAccessibilityManagerAndroid::NotifyAccessibilityEvent( env, obj.obj(), node->renderer_id()); switch (event_type) { - case WebKit::WebAXEventLoadComplete: + case blink::WebAXEventLoadComplete: Java_BrowserAccessibilityManager_handlePageLoaded( env, obj.obj(), focus_->renderer_id()); break; - case WebKit::WebAXEventFocus: + case blink::WebAXEventFocus: Java_BrowserAccessibilityManager_handleFocusChanged( env, obj.obj(), node->renderer_id()); break; - case WebKit::WebAXEventCheckedStateChanged: + case blink::WebAXEventCheckedStateChanged: Java_BrowserAccessibilityManager_handleCheckStateChanged( env, obj.obj(), node->renderer_id()); break; - case WebKit::WebAXEventScrolledToAnchor: + case blink::WebAXEventScrolledToAnchor: Java_BrowserAccessibilityManager_handleScrolledToAnchor( env, obj.obj(), node->renderer_id()); break; - case WebKit::WebAXEventAlert: + case blink::WebAXEventAlert: // An alert is a special case of live region. Fall through to the // next case to handle it. - case WebKit::WebAXEventShow: { + case blink::WebAXEventShow: { // This event is fired when an object appears in a live region. // Speak its text. BrowserAccessibilityAndroid* android_node = @@ -137,13 +137,13 @@ void BrowserAccessibilityManagerAndroid::NotifyAccessibilityEvent( env, android_node->GetText()).obj()); break; } - case WebKit::WebAXEventSelectedTextChanged: + case blink::WebAXEventSelectedTextChanged: Java_BrowserAccessibilityManager_handleTextSelectionChanged( env, obj.obj(), node->renderer_id()); break; - case WebKit::WebAXEventChildrenChanged: - case WebKit::WebAXEventTextChanged: - case WebKit::WebAXEventValueChanged: + case blink::WebAXEventChildrenChanged: + case blink::WebAXEventTextChanged: + case blink::WebAXEventValueChanged: if (node->IsEditableText()) { Java_BrowserAccessibilityManager_handleEditableTextChanged( env, obj.obj(), node->renderer_id()); diff --git a/content/browser/accessibility/browser_accessibility_manager_android.h b/content/browser/accessibility/browser_accessibility_manager_android.h index e241fa8..1b7bded 100644 --- a/content/browser/accessibility/browser_accessibility_manager_android.h +++ b/content/browser/accessibility/browser_accessibility_manager_android.h @@ -34,7 +34,7 @@ class CONTENT_EXPORT BrowserAccessibilityManagerAndroid // Implementation of BrowserAccessibilityManager. virtual void NotifyAccessibilityEvent( - WebKit::WebAXEvent event_type, BrowserAccessibility* node) OVERRIDE; + blink::WebAXEvent event_type, BrowserAccessibility* node) OVERRIDE; // -------------------------------------------------------------------------- // Methods called from Java via JNI diff --git a/content/browser/accessibility/browser_accessibility_manager_gtk.cc b/content/browser/accessibility/browser_accessibility_manager_gtk.cc index 2b8bbfc..e97f8b2 100644 --- a/content/browser/accessibility/browser_accessibility_manager_gtk.cc +++ b/content/browser/accessibility/browser_accessibility_manager_gtk.cc @@ -38,24 +38,24 @@ BrowserAccessibilityManagerGtk::~BrowserAccessibilityManagerGtk() { AccessibilityNodeData BrowserAccessibilityManagerGtk::GetEmptyDocument() { AccessibilityNodeData empty_document; empty_document.id = 0; - empty_document.role = WebKit::WebAXRoleRootWebArea; + empty_document.role = blink::WebAXRoleRootWebArea; empty_document.state = - 1 << WebKit::WebAXStateReadonly; + 1 << blink::WebAXStateReadonly; return empty_document; } void BrowserAccessibilityManagerGtk::NotifyAccessibilityEvent( - WebKit::WebAXEvent event_type, + blink::WebAXEvent event_type, BrowserAccessibility* node) { if (!node->IsNative()) return; AtkObject* atk_object = node->ToBrowserAccessibilityGtk()->GetAtkObject(); switch (event_type) { - case WebKit::WebAXEventChildrenChanged: + case blink::WebAXEventChildrenChanged: RecursivelySendChildrenChanged(GetRoot()->ToBrowserAccessibilityGtk()); break; - case WebKit::WebAXEventFocus: + case blink::WebAXEventFocus: // Note: the focus-event was deprecated in ATK 2.9.4 // See https://bugzilla.gnome.org/show_bug.cgi?id=649575#c8 g_signal_emit_by_name(atk_object, "focus-event", true); diff --git a/content/browser/accessibility/browser_accessibility_manager_gtk.h b/content/browser/accessibility/browser_accessibility_manager_gtk.h index 4c29d8d..97d99d3 100644 --- a/content/browser/accessibility/browser_accessibility_manager_gtk.h +++ b/content/browser/accessibility/browser_accessibility_manager_gtk.h @@ -28,7 +28,7 @@ class CONTENT_EXPORT BrowserAccessibilityManagerGtk // BrowserAccessibilityManager methods virtual void NotifyAccessibilityEvent( - WebKit::WebAXEvent event_type, BrowserAccessibility* node) OVERRIDE; + blink::WebAXEvent event_type, BrowserAccessibility* node) OVERRIDE; GtkWidget* parent_widget() { return parent_widget_; } diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.h b/content/browser/accessibility/browser_accessibility_manager_mac.h index 70ca419..3b00f05 100644 --- a/content/browser/accessibility/browser_accessibility_manager_mac.h +++ b/content/browser/accessibility/browser_accessibility_manager_mac.h @@ -24,7 +24,7 @@ class CONTENT_EXPORT BrowserAccessibilityManagerMac // Implementation of BrowserAccessibilityManager. virtual void NotifyAccessibilityEvent( - WebKit::WebAXEvent event_type, BrowserAccessibility* node) OVERRIDE; + blink::WebAXEvent event_type, BrowserAccessibility* node) OVERRIDE; NSView* parent_view() { return parent_view_; } diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm index 1abf5fc..8f07f319 100644 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm @@ -31,14 +31,14 @@ BrowserAccessibilityManagerMac::BrowserAccessibilityManagerMac( AccessibilityNodeData BrowserAccessibilityManagerMac::GetEmptyDocument() { AccessibilityNodeData empty_document; empty_document.id = 0; - empty_document.role = WebKit::WebAXRoleRootWebArea; + empty_document.role = blink::WebAXRoleRootWebArea; empty_document.state = - 1 << WebKit::WebAXStateReadonly; + 1 << blink::WebAXStateReadonly; return empty_document; } void BrowserAccessibilityManagerMac::NotifyAccessibilityEvent( - WebKit::WebAXEvent event_type, + blink::WebAXEvent event_type, BrowserAccessibility* node) { if (!node->IsNative()) return; @@ -46,88 +46,88 @@ void BrowserAccessibilityManagerMac::NotifyAccessibilityEvent( // Refer to AXObjectCache.mm (webkit). NSString* event_id = @""; switch (event_type) { - case WebKit::WebAXEventActiveDescendantChanged: - if (node->role() == WebKit::WebAXRoleTree) + case blink::WebAXEventActiveDescendantChanged: + if (node->role() == blink::WebAXRoleTree) event_id = NSAccessibilitySelectedRowsChangedNotification; else event_id = NSAccessibilityFocusedUIElementChangedNotification; break; - case WebKit::WebAXEventAlert: + case blink::WebAXEventAlert: // Not used on Mac. return; - case WebKit::WebAXEventBlur: + case blink::WebAXEventBlur: // A no-op on Mac. return; - case WebKit::WebAXEventCheckedStateChanged: + case blink::WebAXEventCheckedStateChanged: // Not used on Mac. return; - case WebKit::WebAXEventChildrenChanged: + case blink::WebAXEventChildrenChanged: // TODO(dtseng): no clear equivalent on Mac. return; - case WebKit::WebAXEventFocus: + case blink::WebAXEventFocus: event_id = NSAccessibilityFocusedUIElementChangedNotification; break; - case WebKit::WebAXEventLayoutComplete: + case blink::WebAXEventLayoutComplete: event_id = @"AXLayoutComplete"; break; - case WebKit::WebAXEventLiveRegionChanged: + case blink::WebAXEventLiveRegionChanged: event_id = @"AXLiveRegionChanged"; break; - case WebKit::WebAXEventLoadComplete: + case blink::WebAXEventLoadComplete: event_id = @"AXLoadComplete"; break; - case WebKit::WebAXEventMenuListValueChanged: + case blink::WebAXEventMenuListValueChanged: // Not used on Mac. return; - case WebKit::WebAXEventShow: + case blink::WebAXEventShow: // Not used on Mac. return; - case WebKit::WebAXEventHide: + case blink::WebAXEventHide: // Not used on Mac. return; - case WebKit::WebAXEventRowCountChanged: + case blink::WebAXEventRowCountChanged: event_id = NSAccessibilityRowCountChangedNotification; break; - case WebKit::WebAXEventRowCollapsed: + case blink::WebAXEventRowCollapsed: event_id = @"AXRowCollapsed"; break; - case WebKit::WebAXEventRowExpanded: + case blink::WebAXEventRowExpanded: event_id = @"AXRowExpanded"; break; - case WebKit::WebAXEventScrolledToAnchor: + case blink::WebAXEventScrolledToAnchor: // Not used on Mac. return; - case WebKit::WebAXEventSelectedChildrenChanged: + case blink::WebAXEventSelectedChildrenChanged: event_id = NSAccessibilitySelectedChildrenChangedNotification; break; - case WebKit::WebAXEventSelectedTextChanged: + case blink::WebAXEventSelectedTextChanged: event_id = NSAccessibilitySelectedTextChangedNotification; break; - case WebKit::WebAXEventTextInserted: + case blink::WebAXEventTextInserted: // Not used on Mac. return; - case WebKit::WebAXEventTextRemoved: + case blink::WebAXEventTextRemoved: // Not used on Mac. return; - case WebKit::WebAXEventValueChanged: + case blink::WebAXEventValueChanged: event_id = NSAccessibilityValueChangedNotification; break; - case WebKit::WebAXEventAriaAttributeChanged: + case blink::WebAXEventAriaAttributeChanged: // Not used on Mac. return; - case WebKit::WebAXEventAutocorrectionOccured: + case blink::WebAXEventAutocorrectionOccured: // Not used on Mac. return; - case WebKit::WebAXEventInvalidStatusChanged: + case blink::WebAXEventInvalidStatusChanged: // Not used on Mac. return; - case WebKit::WebAXEventLocationChanged: + case blink::WebAXEventLocationChanged: // Not used on Mac. return; - case WebKit::WebAXEventMenuListItemSelected: + case blink::WebAXEventMenuListItemSelected: // Not used on Mac. return; - case WebKit::WebAXEventTextChanged: + case blink::WebAXEventTextChanged: // Not used on Mac. return; default: diff --git a/content/browser/accessibility/browser_accessibility_manager_unittest.cc b/content/browser/accessibility/browser_accessibility_manager_unittest.cc index fbbf3c4..b0d4836 100644 --- a/content/browser/accessibility/browser_accessibility_manager_unittest.cc +++ b/content/browser/accessibility/browser_accessibility_manager_unittest.cc @@ -93,19 +93,19 @@ TEST(BrowserAccessibilityManagerTest, TestNoLeaks) { AccessibilityNodeData button; button.id = 2; button.SetName("Button"); - button.role = WebKit::WebAXRoleButton; + button.role = blink::WebAXRoleButton; button.state = 0; AccessibilityNodeData checkbox; checkbox.id = 3; checkbox.SetName("Checkbox"); - checkbox.role = WebKit::WebAXRoleCheckBox; + checkbox.role = blink::WebAXRoleCheckBox; checkbox.state = 0; AccessibilityNodeData root; root.id = 1; root.SetName("Document"); - root.role = WebKit::WebAXRoleRootWebArea; + root.role = blink::WebAXRoleRootWebArea; root.state = 0; root.child_ids.push_back(2); root.child_ids.push_back(3); @@ -172,25 +172,25 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects) { AccessibilityNodeData tree1_child1; tree1_child1.id = 2; tree1_child1.SetName("Child1"); - tree1_child1.role = WebKit::WebAXRoleButton; + tree1_child1.role = blink::WebAXRoleButton; tree1_child1.state = 0; AccessibilityNodeData tree1_child2; tree1_child2.id = 3; tree1_child2.SetName("Child2"); - tree1_child2.role = WebKit::WebAXRoleButton; + tree1_child2.role = blink::WebAXRoleButton; tree1_child2.state = 0; AccessibilityNodeData tree1_child3; tree1_child3.id = 4; tree1_child3.SetName("Child3"); - tree1_child3.role = WebKit::WebAXRoleButton; + tree1_child3.role = blink::WebAXRoleButton; tree1_child3.state = 0; AccessibilityNodeData tree1_root; tree1_root.id = 1; tree1_root.SetName("Document"); - tree1_root.role = WebKit::WebAXRoleRootWebArea; + tree1_root.role = blink::WebAXRoleRootWebArea; tree1_root.state = 0; tree1_root.child_ids.push_back(2); tree1_root.child_ids.push_back(3); @@ -207,13 +207,13 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects) { AccessibilityNodeData tree2_child0; tree2_child0.id = 5; tree2_child0.SetName("Child0"); - tree2_child0.role = WebKit::WebAXRoleButton; + tree2_child0.role = blink::WebAXRoleButton; tree2_child0.state = 0; AccessibilityNodeData tree2_root; tree2_root.id = 1; tree2_root.SetName("DocumentChanged"); - tree2_root.role = WebKit::WebAXRoleRootWebArea; + tree2_root.role = blink::WebAXRoleRootWebArea; tree2_root.state = 0; tree2_root.child_ids.push_back(5); tree2_root.child_ids.push_back(2); @@ -255,7 +255,7 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects) { std::vector<AccessibilityHostMsg_EventParams> params; params.push_back(AccessibilityHostMsg_EventParams()); AccessibilityHostMsg_EventParams* msg = ¶ms[0]; - msg->event_type = WebKit::WebAXEventChildrenChanged; + msg->event_type = blink::WebAXEventChildrenChanged; msg->nodes.push_back(tree2_root); msg->nodes.push_back(tree2_child0); msg->id = tree2_root.id; @@ -307,46 +307,46 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects2) { AccessibilityNodeData tree1_grandchild1; tree1_grandchild1.id = 4; tree1_grandchild1.SetName("GrandChild1"); - tree1_grandchild1.role = WebKit::WebAXRoleButton; + tree1_grandchild1.role = blink::WebAXRoleButton; tree1_grandchild1.state = 0; AccessibilityNodeData tree1_child1; tree1_child1.id = 3; tree1_child1.SetName("Child1"); - tree1_child1.role = WebKit::WebAXRoleButton; + tree1_child1.role = blink::WebAXRoleButton; tree1_child1.state = 0; tree1_child1.child_ids.push_back(4); AccessibilityNodeData tree1_grandchild2; tree1_grandchild2.id = 6; tree1_grandchild2.SetName("GrandChild1"); - tree1_grandchild2.role = WebKit::WebAXRoleButton; + tree1_grandchild2.role = blink::WebAXRoleButton; tree1_grandchild2.state = 0; AccessibilityNodeData tree1_child2; tree1_child2.id = 5; tree1_child2.SetName("Child2"); - tree1_child2.role = WebKit::WebAXRoleButton; + tree1_child2.role = blink::WebAXRoleButton; tree1_child2.state = 0; tree1_child2.child_ids.push_back(6); AccessibilityNodeData tree1_grandchild3; tree1_grandchild3.id = 8; tree1_grandchild3.SetName("GrandChild3"); - tree1_grandchild3.role = WebKit::WebAXRoleButton; + tree1_grandchild3.role = blink::WebAXRoleButton; tree1_grandchild3.state = 0; AccessibilityNodeData tree1_child3; tree1_child3.id = 7; tree1_child3.SetName("Child3"); - tree1_child3.role = WebKit::WebAXRoleButton; + tree1_child3.role = blink::WebAXRoleButton; tree1_child3.state = 0; tree1_child3.child_ids.push_back(8); AccessibilityNodeData tree1_container; tree1_container.id = 2; tree1_container.SetName("Container"); - tree1_container.role = WebKit::WebAXRoleGroup; + tree1_container.role = blink::WebAXRoleGroup; tree1_container.state = 0; tree1_container.child_ids.push_back(3); tree1_container.child_ids.push_back(5); @@ -355,7 +355,7 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects2) { AccessibilityNodeData tree1_root; tree1_root.id = 1; tree1_root.SetName("Document"); - tree1_root.role = WebKit::WebAXRoleRootWebArea; + tree1_root.role = blink::WebAXRoleRootWebArea; tree1_root.state = 0; tree1_root.child_ids.push_back(2); @@ -374,20 +374,20 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects2) { AccessibilityNodeData tree2_grandchild0; tree2_grandchild0.id = 9; tree2_grandchild0.SetName("GrandChild0"); - tree2_grandchild0.role = WebKit::WebAXRoleButton; + tree2_grandchild0.role = blink::WebAXRoleButton; tree2_grandchild0.state = 0; AccessibilityNodeData tree2_child0; tree2_child0.id = 10; tree2_child0.SetName("Child0"); - tree2_child0.role = WebKit::WebAXRoleButton; + tree2_child0.role = blink::WebAXRoleButton; tree2_child0.state = 0; tree2_child0.child_ids.push_back(9); AccessibilityNodeData tree2_container; tree2_container.id = 2; tree2_container.SetName("Container"); - tree2_container.role = WebKit::WebAXRoleGroup; + tree2_container.role = blink::WebAXRoleGroup; tree2_container.state = 0; tree2_container.child_ids.push_back(10); tree2_container.child_ids.push_back(3); @@ -432,7 +432,7 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects2) { std::vector<AccessibilityHostMsg_EventParams> params; params.push_back(AccessibilityHostMsg_EventParams()); AccessibilityHostMsg_EventParams* msg = ¶ms[0]; - msg->event_type = WebKit::WebAXEventChildrenChanged; + msg->event_type = blink::WebAXEventChildrenChanged; msg->nodes.push_back(tree2_container); msg->nodes.push_back(tree2_child0); msg->nodes.push_back(tree2_grandchild0); @@ -494,7 +494,7 @@ TEST(BrowserAccessibilityManagerTest, TestMoveChildUp) { AccessibilityNodeData tree1_1; tree1_1.id = 1; - tree1_1.role = WebKit::WebAXRoleRootWebArea; + tree1_1.role = blink::WebAXRoleRootWebArea; tree1_1.state = 0; tree1_1.child_ids.push_back(2); tree1_1.child_ids.push_back(3); @@ -539,7 +539,7 @@ TEST(BrowserAccessibilityManagerTest, TestMoveChildUp) { std::vector<AccessibilityHostMsg_EventParams> params; params.push_back(AccessibilityHostMsg_EventParams()); AccessibilityHostMsg_EventParams* msg = ¶ms[0]; - msg->event_type = WebKit::WebAXEventChildrenChanged; + msg->event_type = blink::WebAXEventChildrenChanged; msg->nodes.push_back(tree2_1); msg->nodes.push_back(tree2_4); msg->nodes.push_back(tree2_5); @@ -568,7 +568,7 @@ TEST(BrowserAccessibilityManagerTest, TestFatalError) { AccessibilityNodeData root; root.id = 1; - root.role = WebKit::WebAXRoleRootWebArea; + root.role = blink::WebAXRoleRootWebArea; root.child_ids.push_back(2); root.child_ids.push_back(2); @@ -586,7 +586,7 @@ TEST(BrowserAccessibilityManagerTest, TestFatalError) { AccessibilityNodeData root2; root2.id = 1; - root2.role = WebKit::WebAXRoleRootWebArea; + root2.role = blink::WebAXRoleRootWebArea; root2.child_ids.push_back(2); root2.child_ids.push_back(3); @@ -614,22 +614,22 @@ TEST(BrowserAccessibilityManagerTest, TestFatalError) { TEST(BrowserAccessibilityManagerTest, BoundsForRange) { AccessibilityNodeData root; root.id = 1; - root.role = WebKit::WebAXRoleRootWebArea; + root.role = blink::WebAXRoleRootWebArea; AccessibilityNodeData static_text; static_text.id = 2; static_text.SetValue("Hello, world."); - static_text.role = WebKit::WebAXRoleStaticText; + static_text.role = blink::WebAXRoleStaticText; static_text.location = gfx::Rect(100, 100, 29, 18); root.child_ids.push_back(2); AccessibilityNodeData inline_text1; inline_text1.id = 3; inline_text1.SetValue("Hello, "); - inline_text1.role = WebKit::WebAXRoleInlineTextBox; + inline_text1.role = blink::WebAXRoleInlineTextBox; inline_text1.location = gfx::Rect(100, 100, 29, 9); inline_text1.AddIntAttribute(AccessibilityNodeData::ATTR_TEXT_DIRECTION, - WebKit::WebAXTextDirectionLR); + blink::WebAXTextDirectionLR); std::vector<int32> character_offsets1; character_offsets1.push_back(6); // 0 character_offsets1.push_back(11); // 1 @@ -645,10 +645,10 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRange) { AccessibilityNodeData inline_text2; inline_text2.id = 4; inline_text2.SetValue("world."); - inline_text2.role = WebKit::WebAXRoleInlineTextBox; + inline_text2.role = blink::WebAXRoleInlineTextBox; inline_text2.location = gfx::Rect(100, 109, 28, 9); inline_text2.AddIntAttribute(AccessibilityNodeData::ATTR_TEXT_DIRECTION, - WebKit::WebAXTextDirectionLR); + blink::WebAXTextDirectionLR); std::vector<int32> character_offsets2; character_offsets2.push_back(5); character_offsets2.push_back(10); @@ -705,22 +705,22 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeBiDi) { AccessibilityNodeData root; root.id = 1; - root.role = WebKit::WebAXRoleRootWebArea; + root.role = blink::WebAXRoleRootWebArea; AccessibilityNodeData static_text; static_text.id = 2; static_text.SetValue("123abc"); - static_text.role = WebKit::WebAXRoleStaticText; + static_text.role = blink::WebAXRoleStaticText; static_text.location = gfx::Rect(100, 100, 60, 20); root.child_ids.push_back(2); AccessibilityNodeData inline_text1; inline_text1.id = 3; inline_text1.SetValue("123"); - inline_text1.role = WebKit::WebAXRoleInlineTextBox; + inline_text1.role = blink::WebAXRoleInlineTextBox; inline_text1.location = gfx::Rect(100, 100, 30, 20); inline_text1.AddIntAttribute(AccessibilityNodeData::ATTR_TEXT_DIRECTION, - WebKit::WebAXTextDirectionLR); + blink::WebAXTextDirectionLR); std::vector<int32> character_offsets1; character_offsets1.push_back(10); // 0 character_offsets1.push_back(20); // 1 @@ -732,10 +732,10 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeBiDi) { AccessibilityNodeData inline_text2; inline_text2.id = 4; inline_text2.SetValue("abc"); - inline_text2.role = WebKit::WebAXRoleInlineTextBox; + inline_text2.role = blink::WebAXRoleInlineTextBox; inline_text2.location = gfx::Rect(130, 100, 30, 20); inline_text2.AddIntAttribute(AccessibilityNodeData::ATTR_TEXT_DIRECTION, - WebKit::WebAXTextDirectionRL); + blink::WebAXTextDirectionRL); std::vector<int32> character_offsets2; character_offsets2.push_back(10); character_offsets2.push_back(20); diff --git a/content/browser/accessibility/browser_accessibility_manager_win.cc b/content/browser/accessibility/browser_accessibility_manager_win.cc index 5fc094a..3eb407c 100644 --- a/content/browser/accessibility/browser_accessibility_manager_win.cc +++ b/content/browser/accessibility/browser_accessibility_manager_win.cc @@ -123,11 +123,11 @@ BrowserAccessibilityManagerWin::~BrowserAccessibilityManagerWin() { AccessibilityNodeData BrowserAccessibilityManagerWin::GetEmptyDocument() { AccessibilityNodeData empty_document; empty_document.id = 0; - empty_document.role = WebKit::WebAXRoleRootWebArea; + empty_document.role = blink::WebAXRoleRootWebArea; empty_document.state = - (1 << WebKit::WebAXStateEnabled) | - (1 << WebKit::WebAXStateReadonly) | - (1 << WebKit::WebAXStateBusy); + (1 << blink::WebAXStateEnabled) | + (1 << blink::WebAXStateReadonly) | + (1 << blink::WebAXStateBusy); return empty_document; } @@ -171,79 +171,79 @@ void BrowserAccessibilityManagerWin::RemoveNode(BrowserAccessibility* node) { } void BrowserAccessibilityManagerWin::NotifyAccessibilityEvent( - WebKit::WebAXEvent event_type, + blink::WebAXEvent event_type, BrowserAccessibility* node) { LONG event_id = EVENT_MIN; switch (event_type) { - case WebKit::WebAXEventActiveDescendantChanged: + case blink::WebAXEventActiveDescendantChanged: event_id = IA2_EVENT_ACTIVE_DESCENDANT_CHANGED; break; - case WebKit::WebAXEventAlert: + case blink::WebAXEventAlert: event_id = EVENT_SYSTEM_ALERT; break; - case WebKit::WebAXEventAriaAttributeChanged: + case blink::WebAXEventAriaAttributeChanged: event_id = IA2_EVENT_OBJECT_ATTRIBUTE_CHANGED; break; - case WebKit::WebAXEventAutocorrectionOccured: + case blink::WebAXEventAutocorrectionOccured: event_id = IA2_EVENT_OBJECT_ATTRIBUTE_CHANGED; break; - case WebKit::WebAXEventBlur: + case blink::WebAXEventBlur: // Equivalent to focus on the root. event_id = EVENT_OBJECT_FOCUS; node = GetRoot(); break; - case WebKit::WebAXEventCheckedStateChanged: + case blink::WebAXEventCheckedStateChanged: event_id = EVENT_OBJECT_STATECHANGE; break; - case WebKit::WebAXEventChildrenChanged: + case blink::WebAXEventChildrenChanged: event_id = EVENT_OBJECT_REORDER; break; - case WebKit::WebAXEventFocus: + case blink::WebAXEventFocus: event_id = EVENT_OBJECT_FOCUS; break; - case WebKit::WebAXEventInvalidStatusChanged: + case blink::WebAXEventInvalidStatusChanged: event_id = EVENT_OBJECT_STATECHANGE; break; - case WebKit::WebAXEventLiveRegionChanged: + case blink::WebAXEventLiveRegionChanged: // TODO: try not firing a native notification at all, since // on Windows, each individual item in a live region that changes // already gets its own notification. event_id = EVENT_OBJECT_REORDER; break; - case WebKit::WebAXEventLoadComplete: + case blink::WebAXEventLoadComplete: event_id = IA2_EVENT_DOCUMENT_LOAD_COMPLETE; break; - case WebKit::WebAXEventMenuListItemSelected: + case blink::WebAXEventMenuListItemSelected: event_id = EVENT_OBJECT_FOCUS; break; - case WebKit::WebAXEventMenuListValueChanged: + case blink::WebAXEventMenuListValueChanged: event_id = EVENT_OBJECT_VALUECHANGE; break; - case WebKit::WebAXEventHide: + case blink::WebAXEventHide: event_id = EVENT_OBJECT_HIDE; break; - case WebKit::WebAXEventShow: + case blink::WebAXEventShow: event_id = EVENT_OBJECT_SHOW; break; - case WebKit::WebAXEventScrolledToAnchor: + case blink::WebAXEventScrolledToAnchor: event_id = EVENT_SYSTEM_SCROLLINGSTART; break; - case WebKit::WebAXEventSelectedChildrenChanged: + case blink::WebAXEventSelectedChildrenChanged: event_id = EVENT_OBJECT_SELECTIONWITHIN; break; - case WebKit::WebAXEventSelectedTextChanged: + case blink::WebAXEventSelectedTextChanged: event_id = IA2_EVENT_TEXT_CARET_MOVED; break; - case WebKit::WebAXEventTextChanged: + case blink::WebAXEventTextChanged: event_id = EVENT_OBJECT_NAMECHANGE; break; - case WebKit::WebAXEventTextInserted: + case blink::WebAXEventTextInserted: event_id = IA2_EVENT_TEXT_INSERTED; break; - case WebKit::WebAXEventTextRemoved: + case blink::WebAXEventTextRemoved: event_id = IA2_EVENT_TEXT_REMOVED; break; - case WebKit::WebAXEventValueChanged: + case blink::WebAXEventValueChanged: event_id = EVENT_OBJECT_VALUECHANGE; break; default: @@ -264,7 +264,7 @@ void BrowserAccessibilityManagerWin::NotifyAccessibilityEvent( // If this is a layout complete notification (sent when a container scrolls) // and there is a descendant tracked object, send a notification on it. // TODO(dmazzoni): remove once http://crbug.com/113483 is fixed. - if (event_type == WebKit::WebAXEventLayoutComplete && + if (event_type == blink::WebAXEventLayoutComplete && tracked_scroll_object_ && tracked_scroll_object_->IsDescendantOf(node)) { MaybeCallNotifyWinEvent( diff --git a/content/browser/accessibility/browser_accessibility_manager_win.h b/content/browser/accessibility/browser_accessibility_manager_win.h index 9b37eb3..c1887c4 100644 --- a/content/browser/accessibility/browser_accessibility_manager_win.h +++ b/content/browser/accessibility/browser_accessibility_manager_win.h @@ -47,7 +47,7 @@ class CONTENT_EXPORT BrowserAccessibilityManagerWin virtual void AddNodeToMap(BrowserAccessibility* node); virtual void RemoveNode(BrowserAccessibility* node) OVERRIDE; virtual void NotifyAccessibilityEvent( - WebKit::WebAXEvent event_type, BrowserAccessibility* node) OVERRIDE; + blink::WebAXEvent event_type, BrowserAccessibility* node) OVERRIDE; // Track this object and post a VISIBLE_DATA_CHANGED notification when // its container scrolls. diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc index c6ffa4d..f7a4c95 100644 --- a/content/browser/accessibility/browser_accessibility_win.cc +++ b/content/browser/accessibility/browser_accessibility_win.cc @@ -600,12 +600,12 @@ STDMETHODIMP BrowserAccessibilityWin::get_accSelection(VARIANT* selected) { if (!instance_active_) return E_FAIL; - if (role_ != WebKit::WebAXRoleListBox) + if (role_ != blink::WebAXRoleListBox) return E_NOTIMPL; unsigned long selected_count = 0; for (size_t i = 0; i < children_.size(); ++i) { - if (children_[i]->HasState(WebKit::WebAXStateSelected)) + if (children_[i]->HasState(blink::WebAXStateSelected)) ++selected_count; } @@ -616,7 +616,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accSelection(VARIANT* selected) { if (selected_count == 1) { for (size_t i = 0; i < children_.size(); ++i) { - if (children_[i]->HasState(WebKit::WebAXStateSelected)) { + if (children_[i]->HasState(blink::WebAXStateSelected)) { selected->vt = VT_DISPATCH; selected->pdispVal = children_[i]->ToBrowserAccessibilityWin()->NewReference(); @@ -631,7 +631,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accSelection(VARIANT* selected) { enum_variant->AddRef(); unsigned long index = 0; for (size_t i = 0; i < children_.size(); ++i) { - if (children_[i]->HasState(WebKit::WebAXStateSelected)) { + if (children_[i]->HasState(blink::WebAXStateSelected)) { enum_variant->ItemAt(index)->vt = VT_DISPATCH; enum_variant->ItemAt(index)->pdispVal = children_[i]->ToBrowserAccessibilityWin()->NewReference(); @@ -872,9 +872,9 @@ STDMETHODIMP BrowserAccessibilityWin::get_groupPosition( if (!group_level || !similar_items_in_group || !position_in_group) return E_INVALIDARG; - if (role_ == WebKit::WebAXRoleListBoxOption && + if (role_ == blink::WebAXRoleListBoxOption && parent_ && - parent_->role() == WebKit::WebAXRoleListBox) { + parent_->role() == blink::WebAXRoleListBox) { *group_level = 0; *similar_items_in_group = parent_->PlatformChildCount(); *position_in_group = index_in_parent_ + 1; @@ -1133,7 +1133,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_columnDescription(long column, int cell_id = cell_ids[i * columns + column]; BrowserAccessibilityWin* cell = static_cast<BrowserAccessibilityWin*>( manager_->GetFromRendererID(cell_id)); - if (cell && cell->role_ == WebKit::WebAXRoleColumnHeader) { + if (cell && cell->role_ == blink::WebAXRoleColumnHeader) { string16 cell_name = cell->GetString16Attribute( AccessibilityNodeData::ATTR_NAME); if (cell_name.size() > 0) { @@ -1320,7 +1320,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowDescription(long row, int cell_id = cell_ids[row * columns + i]; BrowserAccessibilityWin* cell = manager_->GetFromRendererID(cell_id)->ToBrowserAccessibilityWin(); - if (cell && cell->role_ == WebKit::WebAXRoleRowHeader) { + if (cell && cell->role_ == blink::WebAXRoleRowHeader) { string16 cell_name = cell->GetString16Attribute( AccessibilityNodeData::ATTR_NAME); if (cell_name.size() > 0) { @@ -1643,7 +1643,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_columnHeaderCells( } BrowserAccessibility* table = parent(); - while (table && table->role() != WebKit::WebAXRoleTable) + while (table && table->role() != blink::WebAXRoleTable) table = table->parent(); if (!table) { NOTREACHED(); @@ -1668,7 +1668,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_columnHeaderCells( int cell_id = cell_ids[i * columns + column]; BrowserAccessibilityWin* cell = manager_->GetFromRendererID(cell_id)->ToBrowserAccessibilityWin(); - if (cell && cell->role_ == WebKit::WebAXRoleColumnHeader) + if (cell && cell->role_ == blink::WebAXRoleColumnHeader) (*n_column_header_cells)++; } @@ -1679,7 +1679,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_columnHeaderCells( int cell_id = cell_ids[i * columns + column]; BrowserAccessibilityWin* cell = manager_->GetFromRendererID(cell_id)->ToBrowserAccessibilityWin(); - if (cell && cell->role_ == WebKit::WebAXRoleColumnHeader) { + if (cell && cell->role_ == blink::WebAXRoleColumnHeader) { (*cell_accessibles)[index] = static_cast<IAccessible*>(cell->NewReference()); ++index; @@ -1742,7 +1742,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowHeaderCells( } BrowserAccessibility* table = parent(); - while (table && table->role() != WebKit::WebAXRoleTable) + while (table && table->role() != blink::WebAXRoleTable) table = table->parent(); if (!table) { NOTREACHED(); @@ -1767,7 +1767,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowHeaderCells( int cell_id = cell_ids[row * columns + i]; BrowserAccessibilityWin* cell = manager_->GetFromRendererID(cell_id)->ToBrowserAccessibilityWin(); - if (cell && cell->role_ == WebKit::WebAXRoleRowHeader) + if (cell && cell->role_ == blink::WebAXRoleRowHeader) (*n_row_header_cells)++; } @@ -1778,7 +1778,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_rowHeaderCells( int cell_id = cell_ids[row * columns + i]; BrowserAccessibilityWin* cell = manager_->GetFromRendererID(cell_id)->ToBrowserAccessibilityWin(); - if (cell && cell->role_ == WebKit::WebAXRoleRowHeader) { + if (cell && cell->role_ == blink::WebAXRoleRowHeader) { (*cell_accessibles)[index] = static_cast<IAccessible*>(cell->NewReference()); ++index; @@ -1867,7 +1867,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_table(IUnknown** table) { GetIntAttribute(AccessibilityNodeData::ATTR_TABLE_CELL_COLUMN_INDEX, &column); BrowserAccessibility* find_table = parent(); - while (find_table && find_table->role() != WebKit::WebAXRoleTable) + while (find_table && find_table->role() != blink::WebAXRoleTable) find_table = find_table->parent(); if (!find_table) { NOTREACHED(); @@ -1903,8 +1903,8 @@ STDMETHODIMP BrowserAccessibilityWin::get_caretOffset(LONG* offset) { return E_INVALIDARG; *offset = 0; - if (role_ == WebKit::WebAXRoleTextField || - role_ == WebKit::WebAXRoleTextArea) { + if (role_ == blink::WebAXRoleTextField || + role_ == blink::WebAXRoleTextArea) { int sel_start = 0; if (GetIntAttribute(AccessibilityNodeData::ATTR_TEXT_SEL_START, &sel_start)) @@ -1922,8 +1922,8 @@ STDMETHODIMP BrowserAccessibilityWin::get_nSelections(LONG* n_selections) { return E_INVALIDARG; *n_selections = 0; - if (role_ == WebKit::WebAXRoleTextField || - role_ == WebKit::WebAXRoleTextArea) { + if (role_ == blink::WebAXRoleTextField || + role_ == blink::WebAXRoleTextArea) { int sel_start = 0; int sel_end = 0; if (GetIntAttribute(AccessibilityNodeData::ATTR_TEXT_SEL_START, @@ -1947,8 +1947,8 @@ STDMETHODIMP BrowserAccessibilityWin::get_selection(LONG selection_index, *start_offset = 0; *end_offset = 0; - if (role_ == WebKit::WebAXRoleTextField || - role_ == WebKit::WebAXRoleTextArea) { + if (role_ == blink::WebAXRoleTextField || + role_ == blink::WebAXRoleTextArea) { int sel_start = 0; int sel_end = 0; if (GetIntAttribute( @@ -2801,9 +2801,9 @@ void BrowserAccessibilityWin::PreInitialize() { IntAttributeToIA2(AccessibilityNodeData::ATTR_HIERARCHICAL_LEVEL, "level"); // Expose the set size and position in set for listbox options. - if (role_ == WebKit::WebAXRoleListBoxOption && + if (role_ == blink::WebAXRoleListBoxOption && parent_ && - parent_->role() == WebKit::WebAXRoleListBox) { + parent_->role() == blink::WebAXRoleListBox) { ia2_attributes_.push_back( L"setsize:" + base::IntToString16(parent_->PlatformChildCount())); ia2_attributes_.push_back( @@ -2842,7 +2842,7 @@ void BrowserAccessibilityWin::PreInitialize() { // Expose table cell index. if (ia_role_ == ROLE_SYSTEM_CELL) { BrowserAccessibility* table = parent(); - while (table && table->role() != WebKit::WebAXRoleTable) + while (table && table->role() != blink::WebAXRoleTable) table = table->parent(); if (table) { const std::vector<int32>& unique_cell_ids = table->GetIntListAttribute( @@ -2912,8 +2912,8 @@ void BrowserAccessibilityWin::PreInitialize() { // If it's a text field, also consider the placeholder. std::string placeholder; - if (role_ == WebKit::WebAXRoleTextField && - HasState(WebKit::WebAXStateFocusable) && + if (role_ == blink::WebAXRoleTextField && + HasState(blink::WebAXStateFocusable) && GetHtmlAttribute("placeholder", &placeholder)) { if (name_.empty() && !title_elem_id) { name_ = placeholder; @@ -2926,8 +2926,8 @@ void BrowserAccessibilityWin::PreInitialize() { SetStringAttribute(AccessibilityNodeData::ATTR_HELP, help); // On Windows, the value of a document should be its url. - if (role_ == WebKit::WebAXRoleRootWebArea || - role_ == WebKit::WebAXRoleWebArea) { + if (role_ == blink::WebAXRoleRootWebArea || + role_ == blink::WebAXRoleWebArea) { GetStringAttribute(AccessibilityNodeData::ATTR_DOC_URL, &value_); } @@ -2935,9 +2935,9 @@ void BrowserAccessibilityWin::PreInitialize() { // WebKit stores the main accessible text in the "value" - swap it so // that it's the "name". if (name_.empty() && - (role_ == WebKit::WebAXRoleListBoxOption || - role_ == WebKit::WebAXRoleStaticText || - role_ == WebKit::WebAXRoleListMarker)) { + (role_ == blink::WebAXRoleListBoxOption || + role_ == blink::WebAXRoleStaticText || + role_ == blink::WebAXRoleListMarker)) { name_.swap(value_); } @@ -2974,7 +2974,7 @@ void BrowserAccessibilityWin::PostInitialize() { hypertext_.clear(); for (unsigned int i = 0; i < PlatformChildCount(); ++i) { BrowserAccessibility* child = PlatformGetChild(i); - if (child->role() == WebKit::WebAXRoleStaticText) { + if (child->role() == blink::WebAXRoleStaticText) { hypertext_ += UTF8ToUTF16(child->name()); } else { hyperlink_offset_to_index_[hypertext_.size()] = hyperlinks_.size(); @@ -2985,15 +2985,15 @@ void BrowserAccessibilityWin::PostInitialize() { DCHECK_EQ(hyperlink_offset_to_index_.size(), hyperlinks_.size()); // Fire an event when an alert first appears. - if (role_ == WebKit::WebAXRoleAlert && first_time_) - manager_->NotifyAccessibilityEvent(WebKit::WebAXEventAlert, this); + if (role_ == blink::WebAXRoleAlert && first_time_) + manager_->NotifyAccessibilityEvent(blink::WebAXEventAlert, this); // Fire events if text has changed. string16 text = TextForIAccessibleText(); if (previous_text_ != text) { if (!previous_text_.empty() && !text.empty()) { manager_->NotifyAccessibilityEvent( - WebKit::WebAXEventShow, this); + blink::WebAXEventShow, this); } // TODO(dmazzoni): Look into HIDE events, too. @@ -3011,7 +3011,7 @@ void BrowserAccessibilityWin::PostInitialize() { // focus for managed descendants is platform-specific. // Fire a focus event if the focused descendant in a multi-select // list box changes. - if (role_ == WebKit::WebAXRoleListBoxOption && + if (role_ == blink::WebAXRoleListBoxOption && (ia_state_ & STATE_SYSTEM_FOCUSABLE) && (ia_state_ & STATE_SYSTEM_SELECTABLE) && (ia_state_ & STATE_SYSTEM_FOCUSED) && @@ -3132,7 +3132,7 @@ string16 BrowserAccessibilityWin::GetValueText() { string16 BrowserAccessibilityWin::TextForIAccessibleText() { if (IsEditableText()) return UTF8ToUTF16(value_); - return (role_ == WebKit::WebAXRoleStaticText) ? + return (role_ == blink::WebAXRoleStaticText) ? UTF8ToUTF16(name_) : hypertext_; } @@ -3182,59 +3182,59 @@ void BrowserAccessibilityWin::InitRoleAndState() { ia2_state_ = IA2_STATE_OPAQUE; ia2_attributes_.clear(); - if (HasState(WebKit::WebAXStateBusy)) + if (HasState(blink::WebAXStateBusy)) ia_state_ |= STATE_SYSTEM_BUSY; - if (HasState(WebKit::WebAXStateChecked)) + if (HasState(blink::WebAXStateChecked)) ia_state_ |= STATE_SYSTEM_CHECKED; - if (HasState(WebKit::WebAXStateCollapsed)) + if (HasState(blink::WebAXStateCollapsed)) ia_state_ |= STATE_SYSTEM_COLLAPSED; - if (HasState(WebKit::WebAXStateExpanded)) + if (HasState(blink::WebAXStateExpanded)) ia_state_ |= STATE_SYSTEM_EXPANDED; - if (HasState(WebKit::WebAXStateFocusable)) + if (HasState(blink::WebAXStateFocusable)) ia_state_ |= STATE_SYSTEM_FOCUSABLE; - if (HasState(WebKit::WebAXStateHaspopup)) + if (HasState(blink::WebAXStateHaspopup)) ia_state_ |= STATE_SYSTEM_HASPOPUP; - if (HasState(WebKit::WebAXStateHovered)) + if (HasState(blink::WebAXStateHovered)) ia_state_ |= STATE_SYSTEM_HOTTRACKED; - if (HasState(WebKit::WebAXStateIndeterminate)) + if (HasState(blink::WebAXStateIndeterminate)) ia_state_ |= STATE_SYSTEM_INDETERMINATE; - if (HasState(WebKit::WebAXStateInvisible)) + if (HasState(blink::WebAXStateInvisible)) ia_state_ |= STATE_SYSTEM_INVISIBLE; - if (HasState(WebKit::WebAXStateLinked)) + if (HasState(blink::WebAXStateLinked)) ia_state_ |= STATE_SYSTEM_LINKED; - if (HasState(WebKit::WebAXStateMultiselectable)) { + if (HasState(blink::WebAXStateMultiselectable)) { ia_state_ |= STATE_SYSTEM_EXTSELECTABLE; ia_state_ |= STATE_SYSTEM_MULTISELECTABLE; } // TODO(ctguil): Support STATE_SYSTEM_EXTSELECTABLE/accSelect. - if (HasState(WebKit::WebAXStateOffscreen)) + if (HasState(blink::WebAXStateOffscreen)) ia_state_ |= STATE_SYSTEM_OFFSCREEN; - if (HasState(WebKit::WebAXStatePressed)) + if (HasState(blink::WebAXStatePressed)) ia_state_ |= STATE_SYSTEM_PRESSED; - if (HasState(WebKit::WebAXStateProtected)) + if (HasState(blink::WebAXStateProtected)) ia_state_ |= STATE_SYSTEM_PROTECTED; - if (HasState(WebKit::WebAXStateRequired)) + if (HasState(blink::WebAXStateRequired)) ia2_state_ |= IA2_STATE_REQUIRED; - if (HasState(WebKit::WebAXStateSelectable)) + if (HasState(blink::WebAXStateSelectable)) ia_state_ |= STATE_SYSTEM_SELECTABLE; - if (HasState(WebKit::WebAXStateSelected)) + if (HasState(blink::WebAXStateSelected)) ia_state_ |= STATE_SYSTEM_SELECTED; - if (HasState(WebKit::WebAXStateVisited)) + if (HasState(blink::WebAXStateVisited)) ia_state_ |= STATE_SYSTEM_TRAVERSED; - if (!HasState(WebKit::WebAXStateEnabled)) + if (!HasState(blink::WebAXStateEnabled)) ia_state_ |= STATE_SYSTEM_UNAVAILABLE; - if (HasState(WebKit::WebAXStateVertical)) { + if (HasState(blink::WebAXStateVertical)) { ia2_state_ |= IA2_STATE_VERTICAL; } else { ia2_state_ |= IA2_STATE_HORIZONTAL; } - if (HasState(WebKit::WebAXStateVisited)) + if (HasState(blink::WebAXStateVisited)) ia_state_ |= STATE_SYSTEM_TRAVERSED; // WebKit marks everything as readonly unless it's editable text, so if it's // not readonly, mark it as editable now. The final computation of the // READONLY state for MSAA is below, after the switch. - if (!HasState(WebKit::WebAXStateReadonly)) + if (!HasState(blink::WebAXStateReadonly)) ia2_state_ |= IA2_STATE_EDITABLE; string16 invalid; @@ -3252,25 +3252,25 @@ void BrowserAccessibilityWin::InitRoleAndState() { ia_role_ = 0; ia2_role_ = 0; switch (role_) { - case WebKit::WebAXRoleAlert: + case blink::WebAXRoleAlert: ia_role_ = ROLE_SYSTEM_ALERT; break; - case WebKit::WebAXRoleAlertDialog: + case blink::WebAXRoleAlertDialog: ia_role_ = ROLE_SYSTEM_DIALOG; break; - case WebKit::WebAXRoleApplication: + case blink::WebAXRoleApplication: ia_role_ = ROLE_SYSTEM_APPLICATION; break; - case WebKit::WebAXRoleArticle: + case blink::WebAXRoleArticle: ia_role_ = ROLE_SYSTEM_GROUPING; ia2_role_ = IA2_ROLE_SECTION; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleBusyIndicator: + case blink::WebAXRoleBusyIndicator: ia_role_ = ROLE_SYSTEM_ANIMATION; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleButton: + case blink::WebAXRoleButton: ia_role_ = ROLE_SYSTEM_PUSHBUTTON; bool is_aria_pressed_defined; bool is_mixed; @@ -3281,7 +3281,7 @@ void BrowserAccessibilityWin::InitRoleAndState() { if (is_mixed) ia_state_ |= STATE_SYSTEM_MIXED; break; - case WebKit::WebAXRoleCanvas: + case blink::WebAXRoleCanvas: if (GetBoolAttribute(AccessibilityNodeData::ATTR_CANVAS_HAS_FALLBACK)) { role_name_ = L"canvas"; ia2_role_ = IA2_ROLE_CANVAS; @@ -3289,78 +3289,78 @@ void BrowserAccessibilityWin::InitRoleAndState() { ia_role_ = ROLE_SYSTEM_GRAPHIC; } break; - case WebKit::WebAXRoleCell: + case blink::WebAXRoleCell: ia_role_ = ROLE_SYSTEM_CELL; break; - case WebKit::WebAXRoleCheckBox: + case blink::WebAXRoleCheckBox: ia_role_ = ROLE_SYSTEM_CHECKBUTTON; break; - case WebKit::WebAXRoleColorWell: + case blink::WebAXRoleColorWell: ia_role_ = ROLE_SYSTEM_CLIENT; ia2_role_ = IA2_ROLE_COLOR_CHOOSER; break; - case WebKit::WebAXRoleColumn: + case blink::WebAXRoleColumn: ia_role_ = ROLE_SYSTEM_COLUMN; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleColumnHeader: + case blink::WebAXRoleColumnHeader: ia_role_ = ROLE_SYSTEM_COLUMNHEADER; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleComboBox: + case blink::WebAXRoleComboBox: ia_role_ = ROLE_SYSTEM_COMBOBOX; break; - case WebKit::WebAXRoleDiv: + case blink::WebAXRoleDiv: role_name_ = L"div"; ia2_role_ = IA2_ROLE_SECTION; break; - case WebKit::WebAXRoleDefinition: + case blink::WebAXRoleDefinition: role_name_ = html_tag; ia2_role_ = IA2_ROLE_PARAGRAPH; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleDescriptionListDetail: + case blink::WebAXRoleDescriptionListDetail: role_name_ = html_tag; ia2_role_ = IA2_ROLE_PARAGRAPH; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleDescriptionListTerm: + case blink::WebAXRoleDescriptionListTerm: ia_role_ = ROLE_SYSTEM_LISTITEM; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleDialog: + case blink::WebAXRoleDialog: ia_role_ = ROLE_SYSTEM_DIALOG; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleDisclosureTriangle: + case blink::WebAXRoleDisclosureTriangle: ia_role_ = ROLE_SYSTEM_OUTLINEBUTTON; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleDocument: - case WebKit::WebAXRoleRootWebArea: - case WebKit::WebAXRoleWebArea: + case blink::WebAXRoleDocument: + case blink::WebAXRoleRootWebArea: + case blink::WebAXRoleWebArea: ia_role_ = ROLE_SYSTEM_DOCUMENT; ia_state_ |= STATE_SYSTEM_READONLY; ia_state_ |= STATE_SYSTEM_FOCUSABLE; break; - case WebKit::WebAXRoleEditableText: + case blink::WebAXRoleEditableText: ia_role_ = ROLE_SYSTEM_TEXT; ia2_state_ |= IA2_STATE_SINGLE_LINE; ia2_state_ |= IA2_STATE_EDITABLE; break; - case WebKit::WebAXRoleForm: + case blink::WebAXRoleForm: role_name_ = L"form"; ia2_role_ = IA2_ROLE_FORM; break; - case WebKit::WebAXRoleFooter: + case blink::WebAXRoleFooter: ia_role_ = IA2_ROLE_FOOTER; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleGrid: + case blink::WebAXRoleGrid: ia_role_ = ROLE_SYSTEM_TABLE; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleGroup: { + case blink::WebAXRoleGroup: { string16 aria_role = GetString16Attribute( AccessibilityNodeData::ATTR_ROLE); if (aria_role == L"group" || html_tag == L"fieldset") { @@ -3377,188 +3377,188 @@ void BrowserAccessibilityWin::InitRoleAndState() { ia_state_ |= STATE_SYSTEM_READONLY; break; } - case WebKit::WebAXRoleGrowArea: + case blink::WebAXRoleGrowArea: ia_role_ = ROLE_SYSTEM_GRIP; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleHeading: + case blink::WebAXRoleHeading: role_name_ = html_tag; ia2_role_ = IA2_ROLE_HEADING; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleHorizontalRule: + case blink::WebAXRoleHorizontalRule: ia_role_ = ROLE_SYSTEM_SEPARATOR; break; - case WebKit::WebAXRoleImage: + case blink::WebAXRoleImage: ia_role_ = ROLE_SYSTEM_GRAPHIC; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleImageMap: + case blink::WebAXRoleImageMap: role_name_ = html_tag; ia2_role_ = IA2_ROLE_IMAGE_MAP; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleImageMapLink: + case blink::WebAXRoleImageMapLink: ia_role_ = ROLE_SYSTEM_LINK; ia_state_ |= STATE_SYSTEM_LINKED; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleLabel: + case blink::WebAXRoleLabel: ia_role_ = ROLE_SYSTEM_TEXT; ia2_role_ = IA2_ROLE_LABEL; break; - case WebKit::WebAXRoleBanner: - case WebKit::WebAXRoleComplementary: - case WebKit::WebAXRoleContentInfo: - case WebKit::WebAXRoleMain: - case WebKit::WebAXRoleNavigation: - case WebKit::WebAXRoleSearch: + case blink::WebAXRoleBanner: + case blink::WebAXRoleComplementary: + case blink::WebAXRoleContentInfo: + case blink::WebAXRoleMain: + case blink::WebAXRoleNavigation: + case blink::WebAXRoleSearch: ia_role_ = ROLE_SYSTEM_GROUPING; ia2_role_ = IA2_ROLE_SECTION; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleLink: + case blink::WebAXRoleLink: ia_role_ = ROLE_SYSTEM_LINK; ia_state_ |= STATE_SYSTEM_LINKED; break; - case WebKit::WebAXRoleList: + case blink::WebAXRoleList: ia_role_ = ROLE_SYSTEM_LIST; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleListBox: + case blink::WebAXRoleListBox: ia_role_ = ROLE_SYSTEM_LIST; break; - case WebKit::WebAXRoleListBoxOption: + case blink::WebAXRoleListBoxOption: ia_role_ = ROLE_SYSTEM_LISTITEM; if (ia_state_ & STATE_SYSTEM_SELECTABLE) { ia_state_ |= STATE_SYSTEM_FOCUSABLE; - if (HasState(WebKit::WebAXStateFocused)) + if (HasState(blink::WebAXStateFocused)) ia_state_ |= STATE_SYSTEM_FOCUSED; } break; - case WebKit::WebAXRoleListItem: + case blink::WebAXRoleListItem: ia_role_ = ROLE_SYSTEM_LISTITEM; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleListMarker: + case blink::WebAXRoleListMarker: ia_role_ = ROLE_SYSTEM_TEXT; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleMath: + case blink::WebAXRoleMath: ia_role_ = ROLE_SYSTEM_EQUATION; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleMenu: - case WebKit::WebAXRoleMenuButton: + case blink::WebAXRoleMenu: + case blink::WebAXRoleMenuButton: ia_role_ = ROLE_SYSTEM_MENUPOPUP; break; - case WebKit::WebAXRoleMenuBar: + case blink::WebAXRoleMenuBar: ia_role_ = ROLE_SYSTEM_MENUBAR; break; - case WebKit::WebAXRoleMenuItem: + case blink::WebAXRoleMenuItem: ia_role_ = ROLE_SYSTEM_MENUITEM; break; - case WebKit::WebAXRoleMenuListPopup: + case blink::WebAXRoleMenuListPopup: ia_role_ = ROLE_SYSTEM_CLIENT; break; - case WebKit::WebAXRoleMenuListOption: + case blink::WebAXRoleMenuListOption: ia_role_ = ROLE_SYSTEM_LISTITEM; if (ia_state_ & STATE_SYSTEM_SELECTABLE) { ia_state_ |= STATE_SYSTEM_FOCUSABLE; - if (HasState(WebKit::WebAXStateFocused)) + if (HasState(blink::WebAXStateFocused)) ia_state_ |= STATE_SYSTEM_FOCUSED; } break; - case WebKit::WebAXRoleNote: + case blink::WebAXRoleNote: ia_role_ = ROLE_SYSTEM_GROUPING; ia2_role_ = IA2_ROLE_NOTE; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleOutline: + case blink::WebAXRoleOutline: ia_role_ = ROLE_SYSTEM_OUTLINE; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleParagraph: + case blink::WebAXRoleParagraph: role_name_ = L"P"; ia2_role_ = IA2_ROLE_PARAGRAPH; break; - case WebKit::WebAXRolePopUpButton: + case blink::WebAXRolePopUpButton: if (html_tag == L"select") { ia_role_ = ROLE_SYSTEM_COMBOBOX; } else { ia_role_ = ROLE_SYSTEM_BUTTONMENU; } break; - case WebKit::WebAXRoleProgressIndicator: + case blink::WebAXRoleProgressIndicator: ia_role_ = ROLE_SYSTEM_PROGRESSBAR; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleRadioButton: + case blink::WebAXRoleRadioButton: ia_role_ = ROLE_SYSTEM_RADIOBUTTON; break; - case WebKit::WebAXRoleRadioGroup: + case blink::WebAXRoleRadioGroup: ia_role_ = ROLE_SYSTEM_GROUPING; ia2_role_ = IA2_ROLE_SECTION; break; - case WebKit::WebAXRoleRegion: + case blink::WebAXRoleRegion: ia_role_ = ROLE_SYSTEM_GROUPING; ia2_role_ = IA2_ROLE_SECTION; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleRow: + case blink::WebAXRoleRow: ia_role_ = ROLE_SYSTEM_ROW; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleRowHeader: + case blink::WebAXRoleRowHeader: ia_role_ = ROLE_SYSTEM_ROWHEADER; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleRuler: + case blink::WebAXRoleRuler: ia_role_ = ROLE_SYSTEM_CLIENT; ia2_role_ = IA2_ROLE_RULER; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleScrollArea: + case blink::WebAXRoleScrollArea: ia_role_ = ROLE_SYSTEM_CLIENT; ia2_role_ = IA2_ROLE_SCROLL_PANE; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleScrollBar: + case blink::WebAXRoleScrollBar: ia_role_ = ROLE_SYSTEM_SCROLLBAR; break; - case WebKit::WebAXRoleSlider: + case blink::WebAXRoleSlider: ia_role_ = ROLE_SYSTEM_SLIDER; break; - case WebKit::WebAXRoleSpinButton: + case blink::WebAXRoleSpinButton: ia_role_ = ROLE_SYSTEM_SPINBUTTON; break; - case WebKit::WebAXRoleSpinButtonPart: + case blink::WebAXRoleSpinButtonPart: ia_role_ = ROLE_SYSTEM_PUSHBUTTON; break; - case WebKit::WebAXRoleSplitGroup: + case blink::WebAXRoleSplitGroup: ia_role_ = ROLE_SYSTEM_CLIENT; ia2_role_ = IA2_ROLE_SPLIT_PANE; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleAnnotation: - case WebKit::WebAXRoleStaticText: + case blink::WebAXRoleAnnotation: + case blink::WebAXRoleStaticText: ia_role_ = ROLE_SYSTEM_TEXT; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleStatus: + case blink::WebAXRoleStatus: ia_role_ = ROLE_SYSTEM_STATUSBAR; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleSplitter: + case blink::WebAXRoleSplitter: ia_role_ = ROLE_SYSTEM_SEPARATOR; break; - case WebKit::WebAXRoleSVGRoot: + case blink::WebAXRoleSVGRoot: ia_role_ = ROLE_SYSTEM_GRAPHIC; break; - case WebKit::WebAXRoleTab: + case blink::WebAXRoleTab: ia_role_ = ROLE_SYSTEM_PAGETAB; break; - case WebKit::WebAXRoleTable: { + case blink::WebAXRoleTable: { string16 aria_role = GetString16Attribute( AccessibilityNodeData::ATTR_ROLE); if (aria_role == L"treegrid") { @@ -3569,77 +3569,77 @@ void BrowserAccessibilityWin::InitRoleAndState() { } break; } - case WebKit::WebAXRoleTableHeaderContainer: + case blink::WebAXRoleTableHeaderContainer: ia_role_ = ROLE_SYSTEM_GROUPING; ia2_role_ = IA2_ROLE_SECTION; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleTabList: + case blink::WebAXRoleTabList: ia_role_ = ROLE_SYSTEM_PAGETABLIST; break; - case WebKit::WebAXRoleTabPanel: + case blink::WebAXRoleTabPanel: ia_role_ = ROLE_SYSTEM_PROPERTYPAGE; break; - case WebKit::WebAXRoleToggleButton: + case blink::WebAXRoleToggleButton: ia_role_ = ROLE_SYSTEM_PUSHBUTTON; ia2_role_ = IA2_ROLE_TOGGLE_BUTTON; break; - case WebKit::WebAXRoleTextArea: + case blink::WebAXRoleTextArea: ia_role_ = ROLE_SYSTEM_TEXT; ia2_state_ |= IA2_STATE_MULTI_LINE; ia2_state_ |= IA2_STATE_EDITABLE; ia2_state_ |= IA2_STATE_SELECTABLE_TEXT; break; - case WebKit::WebAXRoleTextField: + case blink::WebAXRoleTextField: ia_role_ = ROLE_SYSTEM_TEXT; ia2_state_ |= IA2_STATE_SINGLE_LINE; ia2_state_ |= IA2_STATE_EDITABLE; ia2_state_ |= IA2_STATE_SELECTABLE_TEXT; break; - case WebKit::WebAXRoleTimer: + case blink::WebAXRoleTimer: ia_role_ = ROLE_SYSTEM_CLOCK; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleToolbar: + case blink::WebAXRoleToolbar: ia_role_ = ROLE_SYSTEM_TOOLBAR; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleUserInterfaceTooltip: + case blink::WebAXRoleUserInterfaceTooltip: ia_role_ = ROLE_SYSTEM_TOOLTIP; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleTree: + case blink::WebAXRoleTree: ia_role_ = ROLE_SYSTEM_OUTLINE; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleTreeGrid: + case blink::WebAXRoleTreeGrid: ia_role_ = ROLE_SYSTEM_OUTLINE; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleTreeItem: + case blink::WebAXRoleTreeItem: ia_role_ = ROLE_SYSTEM_OUTLINEITEM; ia_state_ |= STATE_SYSTEM_READONLY; break; - case WebKit::WebAXRoleWindow: + case blink::WebAXRoleWindow: ia_role_ = ROLE_SYSTEM_WINDOW; break; // TODO(dmazzoni): figure out the proper MSAA role for all of these. - case WebKit::WebAXRoleBrowser: - case WebKit::WebAXRoleDirectory: - case WebKit::WebAXRoleDrawer: - case WebKit::WebAXRoleHelpTag: - case WebKit::WebAXRoleIgnored: - case WebKit::WebAXRoleIncrementor: - case WebKit::WebAXRoleLog: - case WebKit::WebAXRoleMarquee: - case WebKit::WebAXRoleMatte: - case WebKit::WebAXRolePresentational: - case WebKit::WebAXRoleRulerMarker: - case WebKit::WebAXRoleSheet: - case WebKit::WebAXRoleSliderThumb: - case WebKit::WebAXRoleSystemWide: - case WebKit::WebAXRoleValueIndicator: + case blink::WebAXRoleBrowser: + case blink::WebAXRoleDirectory: + case blink::WebAXRoleDrawer: + case blink::WebAXRoleHelpTag: + case blink::WebAXRoleIgnored: + case blink::WebAXRoleIncrementor: + case blink::WebAXRoleLog: + case blink::WebAXRoleMarquee: + case blink::WebAXRoleMatte: + case blink::WebAXRolePresentational: + case blink::WebAXRoleRulerMarker: + case blink::WebAXRoleSheet: + case blink::WebAXRoleSliderThumb: + case blink::WebAXRoleSystemWide: + case blink::WebAXRoleValueIndicator: default: ia_role_ = ROLE_SYSTEM_CLIENT; break; @@ -3651,11 +3651,11 @@ void BrowserAccessibilityWin::InitRoleAndState() { // aria-readonly attribute and for a few roles (in the switch above). // We clear the READONLY state on focusable controls and on a document. // Everything else, the majority of objects, do not have this state set. - if (HasState(WebKit::WebAXStateFocusable) && + if (HasState(blink::WebAXStateFocusable) && ia_role_ != ROLE_SYSTEM_DOCUMENT) { ia_state_ &= ~(STATE_SYSTEM_READONLY); } - if (!HasState(WebKit::WebAXStateReadonly)) + if (!HasState(blink::WebAXStateReadonly)) ia_state_ &= ~(STATE_SYSTEM_READONLY); if (GetBoolAttribute(AccessibilityNodeData::ATTR_ARIA_READONLY)) ia_state_ |= STATE_SYSTEM_READONLY; diff --git a/content/browser/accessibility/browser_accessibility_win_unittest.cc b/content/browser/accessibility/browser_accessibility_win_unittest.cc index 4c1ceeb..edb572f 100644 --- a/content/browser/accessibility/browser_accessibility_win_unittest.cc +++ b/content/browser/accessibility/browser_accessibility_win_unittest.cc @@ -115,19 +115,19 @@ TEST_F(BrowserAccessibilityTest, TestNoLeaks) { AccessibilityNodeData button; button.id = 2; button.SetName("Button"); - button.role = WebKit::WebAXRoleButton; + button.role = blink::WebAXRoleButton; button.state = 0; AccessibilityNodeData checkbox; checkbox.id = 3; checkbox.SetName("Checkbox"); - checkbox.role = WebKit::WebAXRoleCheckBox; + checkbox.role = blink::WebAXRoleCheckBox; checkbox.state = 0; AccessibilityNodeData root; root.id = 1; root.SetName("Document"); - root.role = WebKit::WebAXRoleRootWebArea; + root.role = blink::WebAXRoleRootWebArea; root.state = 0; root.child_ids.push_back(2); root.child_ids.push_back(3); @@ -183,14 +183,14 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChange) { // BrowserAccessibilityManager. AccessibilityNodeData text; text.id = 2; - text.role = WebKit::WebAXRoleStaticText; + text.role = blink::WebAXRoleStaticText; text.SetName("old text"); text.state = 0; AccessibilityNodeData root; root.id = 1; root.SetName("Document"); - root.role = WebKit::WebAXRoleRootWebArea; + root.role = blink::WebAXRoleRootWebArea; root.state = 0; root.child_ids.push_back(2); @@ -228,11 +228,11 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChange) { // Notify the BrowserAccessibilityManager that the text child has changed. AccessibilityNodeData text2; text2.id = 2; - text2.role = WebKit::WebAXRoleStaticText; + text2.role = blink::WebAXRoleStaticText; text2.SetName("new text"); text2.SetName("old text"); AccessibilityHostMsg_EventParams param; - param.event_type = WebKit::WebAXEventChildrenChanged; + param.event_type = blink::WebAXEventChildrenChanged; param.nodes.push_back(text2); param.id = text2.id; std::vector<AccessibilityHostMsg_EventParams> events; @@ -267,17 +267,17 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChangeNoLeaks) { // BrowserAccessibilityManager. AccessibilityNodeData div; div.id = 2; - div.role = WebKit::WebAXRoleGroup; + div.role = blink::WebAXRoleGroup; div.state = 0; AccessibilityNodeData text3; text3.id = 3; - text3.role = WebKit::WebAXRoleStaticText; + text3.role = blink::WebAXRoleStaticText; text3.state = 0; AccessibilityNodeData text4; text4.id = 4; - text4.role = WebKit::WebAXRoleStaticText; + text4.role = blink::WebAXRoleStaticText; text4.state = 0; div.child_ids.push_back(3); @@ -285,7 +285,7 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChangeNoLeaks) { AccessibilityNodeData root; root.id = 1; - root.role = WebKit::WebAXRoleRootWebArea; + root.role = blink::WebAXRoleRootWebArea; root.state = 0; root.child_ids.push_back(2); @@ -304,7 +304,7 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChangeNoLeaks) { // were removed and ensure that only one BrowserAccessibility instance exists. root.child_ids.clear(); AccessibilityHostMsg_EventParams param; - param.event_type = WebKit::WebAXEventChildrenChanged; + param.event_type = blink::WebAXEventChildrenChanged; param.nodes.push_back(root); param.id = root.id; std::vector<AccessibilityHostMsg_EventParams> events; @@ -323,7 +323,7 @@ TEST_F(BrowserAccessibilityTest, TestTextBoundaries) { AccessibilityNodeData text1; text1.id = 11; - text1.role = WebKit::WebAXRoleTextField; + text1.role = blink::WebAXRoleTextField; text1.state = 0; text1.AddStringAttribute(AccessibilityNodeData::ATTR_VALUE, text1_value); std::vector<int32> line_breaks; @@ -333,7 +333,7 @@ TEST_F(BrowserAccessibilityTest, TestTextBoundaries) { AccessibilityNodeData root; root.id = 1; - root.role = WebKit::WebAXRoleRootWebArea; + root.role = blink::WebAXRoleRootWebArea; root.state = 0; root.child_ids.push_back(11); @@ -420,20 +420,20 @@ TEST_F(BrowserAccessibilityTest, TestSimpleHypertext) { AccessibilityNodeData text1; text1.id = 11; - text1.role = WebKit::WebAXRoleStaticText; - text1.state = 1 << WebKit::WebAXStateReadonly; + text1.role = blink::WebAXRoleStaticText; + text1.state = 1 << blink::WebAXStateReadonly; text1.SetName(text1_name); AccessibilityNodeData text2; text2.id = 12; - text2.role = WebKit::WebAXRoleStaticText; - text2.state = 1 << WebKit::WebAXStateReadonly; + text2.role = blink::WebAXRoleStaticText; + text2.state = 1 << blink::WebAXStateReadonly; text2.SetName(text2_name); AccessibilityNodeData root; root.id = 1; - root.role = WebKit::WebAXRoleRootWebArea; - root.state = 1 << WebKit::WebAXStateReadonly; + root.role = blink::WebAXRoleRootWebArea; + root.state = 1 << blink::WebAXStateReadonly; root.child_ids.push_back(11); root.child_ids.push_back(12); @@ -488,40 +488,40 @@ TEST_F(BrowserAccessibilityTest, TestComplexHypertext) { AccessibilityNodeData text1; text1.id = 11; - text1.role = WebKit::WebAXRoleStaticText; - text1.state = 1 << WebKit::WebAXStateReadonly; + text1.role = blink::WebAXRoleStaticText; + text1.state = 1 << blink::WebAXStateReadonly; text1.SetName(text1_name); AccessibilityNodeData text2; text2.id = 12; - text2.role = WebKit::WebAXRoleStaticText; - text2.state = 1 << WebKit::WebAXStateReadonly; + text2.role = blink::WebAXRoleStaticText; + text2.state = 1 << blink::WebAXStateReadonly; text2.SetName(text2_name); AccessibilityNodeData button1, button1_text; button1.id = 13; button1_text.id = 15; button1_text.SetName(button1_text_name); - button1.role = WebKit::WebAXRoleButton; - button1_text.role = WebKit::WebAXRoleStaticText; - button1.state = 1 << WebKit::WebAXStateReadonly; - button1_text.state = 1 << WebKit::WebAXStateReadonly; + button1.role = blink::WebAXRoleButton; + button1_text.role = blink::WebAXRoleStaticText; + button1.state = 1 << blink::WebAXStateReadonly; + button1_text.state = 1 << blink::WebAXStateReadonly; button1.child_ids.push_back(15); AccessibilityNodeData link1, link1_text; link1.id = 14; link1_text.id = 16; link1_text.SetName(link1_text_name); - link1.role = WebKit::WebAXRoleLink; - link1_text.role = WebKit::WebAXRoleStaticText; - link1.state = 1 << WebKit::WebAXStateReadonly; - link1_text.state = 1 << WebKit::WebAXStateReadonly; + link1.role = blink::WebAXRoleLink; + link1_text.role = blink::WebAXRoleStaticText; + link1.state = 1 << blink::WebAXStateReadonly; + link1_text.state = 1 << blink::WebAXStateReadonly; link1.child_ids.push_back(16); AccessibilityNodeData root; root.id = 1; - root.role = WebKit::WebAXRoleRootWebArea; - root.state = 1 << WebKit::WebAXStateReadonly; + root.role = blink::WebAXRoleRootWebArea; + root.state = 1 << blink::WebAXStateReadonly; root.child_ids.push_back(11); root.child_ids.push_back(13); root.child_ids.push_back(12); @@ -601,9 +601,9 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) { // Try creating an empty document with busy state. Readonly is // set automatically. CountedBrowserAccessibility::reset(); - const int32 busy_state = 1 << WebKit::WebAXStateBusy; - const int32 readonly_state = 1 << WebKit::WebAXStateReadonly; - const int32 enabled_state = 1 << WebKit::WebAXStateEnabled; + const int32 busy_state = 1 << blink::WebAXStateBusy; + const int32 readonly_state = 1 << blink::WebAXStateReadonly; + const int32 enabled_state = 1 << blink::WebAXStateEnabled; scoped_ptr<BrowserAccessibilityManager> manager( new BrowserAccessibilityManagerWin( GetDesktopWindow(), @@ -615,24 +615,24 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) { // Verify the root is as we expect by default. BrowserAccessibility* root = manager->GetRoot(); EXPECT_EQ(0, root->renderer_id()); - EXPECT_EQ(WebKit::WebAXRoleRootWebArea, root->role()); + EXPECT_EQ(blink::WebAXRoleRootWebArea, root->role()); EXPECT_EQ(busy_state | readonly_state | enabled_state, root->state()); // Tree with a child textfield. AccessibilityNodeData tree1_1; tree1_1.id = 1; - tree1_1.role = WebKit::WebAXRoleRootWebArea; + tree1_1.role = blink::WebAXRoleRootWebArea; tree1_1.child_ids.push_back(2); AccessibilityNodeData tree1_2; tree1_2.id = 2; - tree1_2.role = WebKit::WebAXRoleTextField; + tree1_2.role = blink::WebAXRoleTextField; // Process a load complete. std::vector<AccessibilityHostMsg_EventParams> params; params.push_back(AccessibilityHostMsg_EventParams()); AccessibilityHostMsg_EventParams* msg = ¶ms[0]; - msg->event_type = WebKit::WebAXEventLoadComplete; + msg->event_type = blink::WebAXEventLoadComplete; msg->nodes.push_back(tree1_1); msg->nodes.push_back(tree1_2); msg->id = tree1_1.id; @@ -645,18 +645,18 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) { EXPECT_NE(root, manager->GetRoot()); // And the proper child remains. - EXPECT_EQ(WebKit::WebAXRoleTextField, acc1_2->role()); + EXPECT_EQ(blink::WebAXRoleTextField, acc1_2->role()); EXPECT_EQ(2, acc1_2->renderer_id()); // Tree with a child button. AccessibilityNodeData tree2_1; tree2_1.id = 1; - tree2_1.role = WebKit::WebAXRoleRootWebArea; + tree2_1.role = blink::WebAXRoleRootWebArea; tree2_1.child_ids.push_back(3); AccessibilityNodeData tree2_2; tree2_2.id = 3; - tree2_2.role = WebKit::WebAXRoleButton; + tree2_2.role = blink::WebAXRoleButton; msg->nodes.clear(); msg->nodes.push_back(tree2_1); @@ -672,7 +672,7 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) { EXPECT_NE(root, manager->GetRoot()); // And the new child exists. - EXPECT_EQ(WebKit::WebAXRoleButton, acc2_2->role()); + EXPECT_EQ(blink::WebAXRoleButton, acc2_2->role()); EXPECT_EQ(3, acc2_2->renderer_id()); // Ensure we properly cleaned up. diff --git a/content/browser/accessibility/cross_platform_accessibility_browsertest.cc b/content/browser/accessibility/cross_platform_accessibility_browsertest.cc index eb61a1c..f0aa13f 100644 --- a/content/browser/accessibility/cross_platform_accessibility_browsertest.cc +++ b/content/browser/accessibility/cross_platform_accessibility_browsertest.cc @@ -40,7 +40,7 @@ class CrossPlatformAccessibilityBrowserTest : public ContentBrowserTest { const AccessibilityNodeDataTreeNode& GetAccessibilityNodeDataTree( AccessibilityMode accessibility_mode = AccessibilityModeComplete) { AccessibilityNotificationWaiter waiter( - shell(), accessibility_mode, WebKit::WebAXEventLayoutComplete); + shell(), accessibility_mode, blink::WebAXEventLayoutComplete); waiter.WaitForNotification(); return waiter.GetAccessibilityNodeDataTree(); } @@ -152,12 +152,12 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest, EXPECT_STREQ( "Accessibility Test", GetAttr(tree, AccessibilityNodeData::ATTR_NAME).c_str()); - EXPECT_EQ(WebKit::WebAXRoleRootWebArea, tree.role); + EXPECT_EQ(blink::WebAXRoleRootWebArea, tree.role); // Check properites of the BODY element. ASSERT_EQ(1U, tree.children.size()); const AccessibilityNodeDataTreeNode& body = tree.children[0]; - EXPECT_EQ(WebKit::WebAXRoleGroup, body.role); + EXPECT_EQ(blink::WebAXRoleGroup, body.role); EXPECT_STREQ("body", GetAttr(body, AccessibilityNodeData::ATTR_HTML_TAG).c_str()); EXPECT_STREQ("block", @@ -167,7 +167,7 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest, ASSERT_EQ(2U, body.children.size()); const AccessibilityNodeDataTreeNode& button = body.children[0]; - EXPECT_EQ(WebKit::WebAXRoleButton, button.role); + EXPECT_EQ(blink::WebAXRoleButton, button.role); EXPECT_STREQ( "input", GetAttr(button, AccessibilityNodeData::ATTR_HTML_TAG).c_str()); EXPECT_STREQ( @@ -183,7 +183,7 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest, EXPECT_STREQ("push", button.html_attributes[1].second.c_str()); const AccessibilityNodeDataTreeNode& checkbox = body.children[1]; - EXPECT_EQ(WebKit::WebAXRoleCheckBox, checkbox.role); + EXPECT_EQ(blink::WebAXRoleCheckBox, checkbox.role); EXPECT_STREQ( "input", GetAttr(checkbox, AccessibilityNodeData::ATTR_HTML_TAG).c_str()); EXPECT_STREQ( @@ -211,7 +211,7 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest, const AccessibilityNodeDataTreeNode& body = tree.children[0]; ASSERT_EQ(1U, body.children.size()); const AccessibilityNodeDataTreeNode& text = body.children[0]; - EXPECT_EQ(WebKit::WebAXRoleTextField, text.role); + EXPECT_EQ(blink::WebAXRoleTextField, text.role); EXPECT_STREQ( "input", GetAttr(text, AccessibilityNodeData::ATTR_HTML_TAG).c_str()); EXPECT_EQ(0, GetIntAttr(text, AccessibilityNodeData::ATTR_TEXT_SEL_START)); @@ -242,7 +242,7 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest, const AccessibilityNodeDataTreeNode& body = tree.children[0]; ASSERT_EQ(1U, body.children.size()); const AccessibilityNodeDataTreeNode& text = body.children[0]; - EXPECT_EQ(WebKit::WebAXRoleTextField, text.role); + EXPECT_EQ(blink::WebAXRoleTextField, text.role); EXPECT_STREQ( "input", GetAttr(text, AccessibilityNodeData::ATTR_HTML_TAG).c_str()); EXPECT_EQ(0, GetIntAttr(text, AccessibilityNodeData::ATTR_TEXT_SEL_START)); @@ -269,15 +269,15 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest, const AccessibilityNodeDataTreeNode& tree = GetAccessibilityNodeDataTree(); ASSERT_EQ(1U, tree.children.size()); const AccessibilityNodeDataTreeNode& table = tree.children[0]; - EXPECT_EQ(WebKit::WebAXRoleTable, table.role); + EXPECT_EQ(blink::WebAXRoleTable, table.role); const AccessibilityNodeDataTreeNode& row = table.children[0]; - EXPECT_EQ(WebKit::WebAXRoleRow, row.role); + EXPECT_EQ(blink::WebAXRoleRow, row.role); const AccessibilityNodeDataTreeNode& cell1 = row.children[0]; - EXPECT_EQ(WebKit::WebAXRoleCell, cell1.role); + EXPECT_EQ(blink::WebAXRoleCell, cell1.role); const AccessibilityNodeDataTreeNode& cell2 = row.children[1]; - EXPECT_EQ(WebKit::WebAXRoleCell, cell2.role); + EXPECT_EQ(blink::WebAXRoleCell, cell2.role); const AccessibilityNodeDataTreeNode& column1 = table.children[1]; - EXPECT_EQ(WebKit::WebAXRoleColumn, column1.role); + EXPECT_EQ(blink::WebAXRoleColumn, column1.role); EXPECT_EQ(0U, column1.children.size()); EXPECT_EQ(1U, column1.intlist_attributes.size()); EXPECT_EQ(AccessibilityNodeData::ATTR_INDIRECT_CHILD_IDS, @@ -287,7 +287,7 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest, EXPECT_EQ(1U, column1_indirect_child_ids.size()); EXPECT_EQ(cell1.id, column1_indirect_child_ids[0]); const AccessibilityNodeDataTreeNode& column2 = table.children[2]; - EXPECT_EQ(WebKit::WebAXRoleColumn, column2.role); + EXPECT_EQ(blink::WebAXRoleColumn, column2.role); EXPECT_EQ(0U, column2.children.size()); EXPECT_EQ(AccessibilityNodeData::ATTR_INDIRECT_CHILD_IDS, column2.intlist_attributes[0].first); @@ -340,7 +340,7 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest, ASSERT_EQ(3U, body.children.size()); const AccessibilityNodeDataTreeNode& button1 = body.children[0]; - EXPECT_EQ(WebKit::WebAXRoleButton, button1.role); + EXPECT_EQ(blink::WebAXRoleButton, button1.role); EXPECT_STREQ( "Button 1", GetAttr(button1, AccessibilityNodeData::ATTR_NAME).c_str()); @@ -351,23 +351,23 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest, ASSERT_EQ(1U, iframe.children.size()); const AccessibilityNodeDataTreeNode& scroll_area = iframe.children[0]; - EXPECT_EQ(WebKit::WebAXRoleScrollArea, scroll_area.role); + EXPECT_EQ(blink::WebAXRoleScrollArea, scroll_area.role); ASSERT_EQ(1U, scroll_area.children.size()); const AccessibilityNodeDataTreeNode& sub_document = scroll_area.children[0]; - EXPECT_EQ(WebKit::WebAXRoleWebArea, sub_document.role); + EXPECT_EQ(blink::WebAXRoleWebArea, sub_document.role); ASSERT_EQ(1U, sub_document.children.size()); const AccessibilityNodeDataTreeNode& sub_body = sub_document.children[0]; ASSERT_EQ(1U, sub_body.children.size()); const AccessibilityNodeDataTreeNode& button2 = sub_body.children[0]; - EXPECT_EQ(WebKit::WebAXRoleButton, button2.role); + EXPECT_EQ(blink::WebAXRoleButton, button2.role); EXPECT_STREQ("Button 2", GetAttr(button2, AccessibilityNodeData::ATTR_NAME).c_str()); const AccessibilityNodeDataTreeNode& button3 = body.children[2]; - EXPECT_EQ(WebKit::WebAXRoleButton, button3.role); + EXPECT_EQ(blink::WebAXRoleButton, button3.role); EXPECT_STREQ("Button 3", GetAttr(button3, AccessibilityNodeData::ATTR_NAME).c_str()); } @@ -413,13 +413,13 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest, const AccessibilityNodeDataTreeNode& tree = GetAccessibilityNodeDataTree(); const AccessibilityNodeDataTreeNode& table = tree.children[0]; - EXPECT_EQ(WebKit::WebAXRoleTable, table.role); + EXPECT_EQ(blink::WebAXRoleTable, table.role); ASSERT_GE(table.children.size(), 5U); - EXPECT_EQ(WebKit::WebAXRoleRow, table.children[0].role); - EXPECT_EQ(WebKit::WebAXRoleRow, table.children[1].role); - EXPECT_EQ(WebKit::WebAXRoleColumn, table.children[2].role); - EXPECT_EQ(WebKit::WebAXRoleColumn, table.children[3].role); - EXPECT_EQ(WebKit::WebAXRoleColumn, table.children[4].role); + EXPECT_EQ(blink::WebAXRoleRow, table.children[0].role); + EXPECT_EQ(blink::WebAXRoleRow, table.children[1].role); + EXPECT_EQ(blink::WebAXRoleColumn, table.children[2].role); + EXPECT_EQ(blink::WebAXRoleColumn, table.children[3].role); + EXPECT_EQ(blink::WebAXRoleColumn, table.children[4].role); EXPECT_EQ(3, GetIntAttr(table, AccessibilityNodeData::ATTR_TABLE_COLUMN_COUNT)); EXPECT_EQ(2, GetIntAttr(table, AccessibilityNodeData::ATTR_TABLE_ROW_COUNT)); diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc index cfad08d..d2d1134 100644 --- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc +++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc @@ -166,7 +166,7 @@ void DumpAccessibilityTreeTest::RunTest( html_file.BaseName().MaybeAsASCII().c_str()); AccessibilityNotificationWaiter waiter( shell(), AccessibilityModeComplete, - WebKit::WebAXEventLoadComplete); + blink::WebAXEventLoadComplete); NavigateToURL(shell(), url); waiter.WaitForNotification(); diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc index 0bb07e1..ba493a9 100644 --- a/content/browser/android/content_view_core_impl.cc +++ b/content/browser/android/content_view_core_impl.cc @@ -63,8 +63,8 @@ using base::android::ConvertUTF16ToJavaString; using base::android::ConvertUTF8ToJavaString; using base::android::ScopedJavaGlobalRef; using base::android::ScopedJavaLocalRef; -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; +using blink::WebGestureEvent; +using blink::WebInputEvent; // Describes the type and enabled state of a select popup item. // Keep in sync with the value defined in SelectPopupDialog.java @@ -887,8 +887,8 @@ jboolean ContentViewCoreImpl::SendTouchEvent(JNIEnv* env, jobjectArray pts) { RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid(); if (rwhv) { - using WebKit::WebTouchEvent; - WebKit::WebTouchEvent event; + using blink::WebTouchEvent; + blink::WebTouchEvent event; TouchPoint::BuildWebTouchEvent(env, type, time_ms, GetDpiScale(), pts, event); rwhv->SendTouchEvent(event); @@ -922,9 +922,9 @@ jboolean ContentViewCoreImpl::SendMouseMoveEvent(JNIEnv* env, if (!rwhv) return false; - WebKit::WebMouseEvent event = WebMouseEventBuilder::Build( + blink::WebMouseEvent event = WebMouseEventBuilder::Build( WebInputEvent::MouseMove, - WebKit::WebMouseEvent::ButtonNone, + blink::WebMouseEvent::ButtonNone, time_ms / 1000.0, x / GetDpiScale(), y / GetDpiScale(), 0, 1); rwhv->SendMouseEvent(event); @@ -949,7 +949,7 @@ jboolean ContentViewCoreImpl::SendMouseWheelEvent(JNIEnv* env, } else { return false; } - WebKit::WebMouseWheelEvent event = WebMouseWheelEventBuilder::Build( + blink::WebMouseWheelEvent event = WebMouseWheelEventBuilder::Build( direction, time_ms / 1000.0, x / GetDpiScale(), y / GetDpiScale()); rwhv->SendMouseWheelEvent(event); @@ -963,7 +963,7 @@ WebGestureEvent ContentViewCoreImpl::MakeGestureEvent( } void ContentViewCoreImpl::SendGestureEvent( - const WebKit::WebGestureEvent& event) { + const blink::WebGestureEvent& event) { RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid(); if (rwhv) rwhv->SendGestureEvent(event); @@ -1251,7 +1251,7 @@ void ContentViewCoreImpl::AddJavascriptInterface( java_bridge->AsWeakPtr()); java_bridge->AddNamedObject(ConvertJavaStringToUTF16(env, name), bound_object); - WebKit::WebBindings::releaseObject(bound_object); + blink::WebBindings::releaseObject(bound_object); } void ContentViewCoreImpl::RemoveJavascriptInterface(JNIEnv* env, diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h index 3c9848f..4d304d1 100644 --- a/content/browser/android/content_view_core_impl.h +++ b/content/browser/android/content_view_core_impl.h @@ -334,8 +334,8 @@ class ContentViewCoreImpl : public ContentViewCore, float GetTouchPaddingDip(); - WebKit::WebGestureEvent MakeGestureEvent( - WebKit::WebInputEvent::Type type, long time_ms, float x, float y) const; + blink::WebGestureEvent MakeGestureEvent( + blink::WebInputEvent::Type type, long time_ms, float x, float y) const; void SendBeginFrame(base::TimeTicks frame_time); @@ -344,7 +344,7 @@ class ContentViewCoreImpl : public ContentViewCore, void DeleteScaledSnapshotTexture(); - void SendGestureEvent(const WebKit::WebGestureEvent& event); + void SendGestureEvent(const blink::WebGestureEvent& event); // Checks if there there is a corresponding renderer process and updates // |tab_crashed_| accordingly. diff --git a/content/browser/android/content_view_statics.cc b/content/browser/android/content_view_statics.cc index 66af865..917da58 100644 --- a/content/browser/android/content_view_statics.cc +++ b/content/browser/android/content_view_statics.cc @@ -24,7 +24,7 @@ namespace { // TODO(pliard): http://crbug.com/235909. Move WebKit shared timer toggling // functionality out of ContentViewStatistics and not be build on top of -// WebKit::Platform::SuspendSharedTimer. +// blink::Platform::SuspendSharedTimer. // TODO(pliard): http://crbug.com/235912. Add unit tests for WebKit shared timer // toggling. diff --git a/content/browser/android/in_process/synchronous_compositor_impl.cc b/content/browser/android/in_process/synchronous_compositor_impl.cc index c02aa87..d6c818d 100644 --- a/content/browser/android/in_process/synchronous_compositor_impl.cc +++ b/content/browser/android/in_process/synchronous_compositor_impl.cc @@ -59,7 +59,7 @@ class VideoContextProvider return gl_in_process_context_->GetSurfaceTexture(stream_id); } - virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE { + virtual blink::WebGraphicsContext3D* Context3d() OVERRIDE { return context_provider_->Context3d(); } @@ -109,7 +109,7 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory { const gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu; - WebKit::WebGraphicsContext3D::Attributes attributes; + blink::WebGraphicsContext3D::Attributes attributes; attributes.antialias = false; attributes.shareResources = true; attributes.noAutomaticFlushes = true; @@ -409,7 +409,7 @@ void SynchronousCompositorImpl::SetContinuousInvalidate(bool enable) { } InputEventAckState SynchronousCompositorImpl::HandleInputEvent( - const WebKit::WebInputEvent& input_event) { + const blink::WebInputEvent& input_event) { DCHECK(CalledOnValidThread()); return g_factory.Get().synchronous_input_event_filter()->HandleInputEvent( contents_->GetRoutingID(), input_event); diff --git a/content/browser/android/in_process/synchronous_compositor_impl.h b/content/browser/android/in_process/synchronous_compositor_impl.h index 4d61c37..f23d920 100644 --- a/content/browser/android/in_process/synchronous_compositor_impl.h +++ b/content/browser/android/in_process/synchronous_compositor_impl.h @@ -19,7 +19,7 @@ class InputHandler; struct DidOverscrollParams; } -namespace WebKit { +namespace blink { class WebInputEvent; } @@ -43,7 +43,7 @@ class SynchronousCompositorImpl // is implicitly that of the in-process renderer. static SynchronousCompositorImpl* FromRoutingID(int routing_id); - InputEventAckState HandleInputEvent(const WebKit::WebInputEvent& input_event); + InputEventAckState HandleInputEvent(const blink::WebInputEvent& input_event); // SynchronousCompositor virtual void SetClient(SynchronousCompositorClient* compositor_client) diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.cc b/content/browser/android/in_process/synchronous_compositor_output_surface.cc index 54ea181..2d37659 100644 --- a/content/browser/android/in_process/synchronous_compositor_output_surface.cc +++ b/content/browser/android/in_process/synchronous_compositor_output_surface.cc @@ -36,7 +36,7 @@ CreateWebGraphicsContext3D(scoped_refptr<gfx::GLSurface> surface) { const gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu; - WebKit::WebGraphicsContext3D::Attributes attributes; + blink::WebGraphicsContext3D::Attributes attributes; attributes.antialias = false; attributes.shareResources = true; attributes.noAutomaticFlushes = true; diff --git a/content/browser/android/in_process/synchronous_input_event_filter.cc b/content/browser/android/in_process/synchronous_input_event_filter.cc index 34144da..5b086fb 100644 --- a/content/browser/android/in_process/synchronous_input_event_filter.cc +++ b/content/browser/android/in_process/synchronous_input_event_filter.cc @@ -10,7 +10,7 @@ #include "content/public/browser/browser_thread.h" #include "ui/events/latency_info.h" -using WebKit::WebInputEvent; +using blink::WebInputEvent; namespace content { @@ -22,7 +22,7 @@ SynchronousInputEventFilter::~SynchronousInputEventFilter() { InputEventAckState SynchronousInputEventFilter::HandleInputEvent( int routing_id, - const WebKit::WebInputEvent& input_event) { + const blink::WebInputEvent& input_event) { // The handler will be empty both before renderer initialization and after // renderer destruction. It's possible that this will be reached in such a // state. While not good, it should also not be fatal. diff --git a/content/browser/android/in_process/synchronous_input_event_filter.h b/content/browser/android/in_process/synchronous_input_event_filter.h index 18601c2..7d43bb0 100644 --- a/content/browser/android/in_process/synchronous_input_event_filter.h +++ b/content/browser/android/in_process/synchronous_input_event_filter.h @@ -12,7 +12,7 @@ #include "content/renderer/gpu/input_handler_manager_client.h" #include "ui/gfx/vector2d_f.h" -namespace WebKit { +namespace blink { class WebInputEvent; } @@ -29,7 +29,7 @@ class SynchronousInputEventFilter : public InputHandlerManagerClient { virtual ~SynchronousInputEventFilter(); InputEventAckState HandleInputEvent(int routing_id, - const WebKit::WebInputEvent& input_event); + const blink::WebInputEvent& input_event); // InputHandlerManagerClient implementation. virtual void SetBoundHandler(const Handler& handler) OVERRIDE; diff --git a/content/browser/android/touch_point.cc b/content/browser/android/touch_point.cc index 1a10e6e..6701989 100644 --- a/content/browser/android/touch_point.cc +++ b/content/browser/android/touch_point.cc @@ -10,15 +10,15 @@ #include "jni/TouchPoint_jni.h" -using WebKit::WebTouchEvent; -using WebKit::WebTouchPoint; +using blink::WebTouchEvent; +using blink::WebTouchPoint; namespace { void MaybeAddTouchPoint(JNIEnv* env, jobject pt, float dpi_scale, - WebKit::WebTouchEvent& event) { + blink::WebTouchEvent& event) { WebTouchPoint::State state = static_cast<WebTouchPoint::State>( Java_TouchPoint_getState(env, pt)); if (state == WebTouchPoint::StateUndefined) @@ -32,7 +32,7 @@ void MaybeAddTouchPoint(JNIEnv* env, // Record the current number of points in the WebTouchEvent const int idx = event.touchesLength; - DCHECK_LT(idx, WebKit::WebTouchEvent::touchesLengthCap); + DCHECK_LT(idx, blink::WebTouchEvent::touchesLengthCap); WebTouchPoint wtp; wtp.id = Java_TouchPoint_getId(env, pt); @@ -72,7 +72,7 @@ void TouchPoint::BuildWebTouchEvent(JNIEnv* env, jlong time_ms, float dpi_scale, jobjectArray pts, - WebKit::WebTouchEvent& event) { + blink::WebTouchEvent& event) { event.type = static_cast<WebTouchEvent::Type>(type); event.timeStampSeconds = static_cast<double>(time_ms) / base::Time::kMillisecondsPerSecond; @@ -91,16 +91,16 @@ void TouchPoint::BuildWebTouchEvent(JNIEnv* env, static void RegisterConstants(JNIEnv* env) { Java_TouchPoint_initializeConstants( env, - WebKit::WebTouchEvent::TouchStart, - WebKit::WebTouchEvent::TouchMove, - WebKit::WebTouchEvent::TouchEnd, - WebKit::WebTouchEvent::TouchCancel, - WebKit::WebTouchPoint::StateUndefined, - WebKit::WebTouchPoint::StateReleased, - WebKit::WebTouchPoint::StatePressed, - WebKit::WebTouchPoint::StateMoved, - WebKit::WebTouchPoint::StateStationary, - WebKit::WebTouchPoint::StateCancelled); + blink::WebTouchEvent::TouchStart, + blink::WebTouchEvent::TouchMove, + blink::WebTouchEvent::TouchEnd, + blink::WebTouchEvent::TouchCancel, + blink::WebTouchPoint::StateUndefined, + blink::WebTouchPoint::StateReleased, + blink::WebTouchPoint::StatePressed, + blink::WebTouchPoint::StateMoved, + blink::WebTouchPoint::StateStationary, + blink::WebTouchPoint::StateCancelled); } bool RegisterTouchPoint(JNIEnv* env) { diff --git a/content/browser/android/touch_point.h b/content/browser/android/touch_point.h index 8e9971ba..d7caac0 100644 --- a/content/browser/android/touch_point.h +++ b/content/browser/android/touch_point.h @@ -12,7 +12,7 @@ namespace content { // This class provides a helper method to convert a java object array of touch -// events (in physical pixdels) into a WebKit::WebTouchEvent (in dip). +// events (in physical pixdels) into a blink::WebTouchEvent (in dip). class TouchPoint { public: static void BuildWebTouchEvent(JNIEnv* env, @@ -20,7 +20,7 @@ class TouchPoint { jlong time_ms, float dpi_scale, jobjectArray pts, - WebKit::WebTouchEvent& event); + blink::WebTouchEvent& event); }; bool RegisterTouchPoint(JNIEnv* env); diff --git a/content/browser/android/vibration_message_filter.cc b/content/browser/android/vibration_message_filter.cc index 6792db1..b91e963 100644 --- a/content/browser/android/vibration_message_filter.cc +++ b/content/browser/android/vibration_message_filter.cc @@ -48,7 +48,7 @@ void VibrationMessageFilter::OnVibrate(int64 milliseconds) { // trust any values passed from the renderer. milliseconds = std::max(kMinimumVibrationDurationMs, std::min(milliseconds, - base::checked_numeric_cast<int64>(WebKit::kVibrationDurationMax))); + base::checked_numeric_cast<int64>(blink::kVibrationDurationMax))); if (j_vibration_message_filter_.is_null()) { j_vibration_message_filter_.Reset( diff --git a/content/browser/aura/gpu_process_transport_factory.cc b/content/browser/aura/gpu_process_transport_factory.cc index 1fb8ae6..f958ae9 100644 --- a/content/browser/aura/gpu_process_transport_factory.cc +++ b/content/browser/aura/gpu_process_transport_factory.cc @@ -55,7 +55,7 @@ struct GpuProcessTransportFactory::PerCompositorData { class OwnedTexture : public ui::Texture, ImageTransportFactoryObserver { public: - OwnedTexture(WebKit::WebGraphicsContext3D* host_context, + OwnedTexture(blink::WebGraphicsContext3D* host_context, const gfx::Size& size, float device_scale_factor, unsigned int texture_id) @@ -72,7 +72,7 @@ class OwnedTexture : public ui::Texture, ImageTransportFactoryObserver { return texture_id_; } - virtual WebKit::WebGraphicsContext3D* HostContext3D() OVERRIDE { + virtual blink::WebGraphicsContext3D* HostContext3D() OVERRIDE { return host_context_; } @@ -98,7 +98,7 @@ class OwnedTexture : public ui::Texture, ImageTransportFactoryObserver { // The OnLostResources() callback will happen before this context // pointer is destroyed. - WebKit::WebGraphicsContext3D* host_context_; + blink::WebGraphicsContext3D* host_context_; unsigned texture_id_; DISALLOW_COPY_AND_ASSIGN(OwnedTexture); @@ -107,7 +107,7 @@ class OwnedTexture : public ui::Texture, ImageTransportFactoryObserver { class ImageTransportClientTexture : public OwnedTexture { public: ImageTransportClientTexture( - WebKit::WebGraphicsContext3D* host_context, + blink::WebGraphicsContext3D* host_context, float device_scale_factor) : OwnedTexture(host_context, gfx::Size(0, 0), @@ -497,7 +497,7 @@ GpuProcessTransportFactory::CreateContextCommon( int surface_id) { if (!GpuDataManagerImpl::GetInstance()->CanUseGpuBrowserCompositor()) return scoped_ptr<WebGraphicsContext3DCommandBufferImpl>(); - WebKit::WebGraphicsContext3D::Attributes attrs; + blink::WebGraphicsContext3D::Attributes attrs; attrs.shareResources = true; attrs.depth = false; attrs.stencil = false; diff --git a/content/browser/aura/image_transport_factory.h b/content/browser/aura/image_transport_factory.h index bfe7057c..fecb442 100644 --- a/content/browser/aura/image_transport_factory.h +++ b/content/browser/aura/image_transport_factory.h @@ -21,7 +21,7 @@ class ContextFactory; class Texture; } -namespace WebKit { +namespace blink { class WebGraphicsContext3D; } diff --git a/content/browser/aura/image_transport_factory_browsertest.cc b/content/browser/aura/image_transport_factory_browsertest.cc index d669462..cb25082 100644 --- a/content/browser/aura/image_transport_factory_browsertest.cc +++ b/content/browser/aura/image_transport_factory_browsertest.cc @@ -47,7 +47,7 @@ IN_PROC_BROWSER_TEST_F(ImageTransportFactoryBrowserTest, TestLostContext) { EXPECT_CALL(observer, OnLostResources()) .WillOnce(testing::InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit)); - WebKit::WebGraphicsContext3D* context = texture->HostContext3D(); + blink::WebGraphicsContext3D* context = texture->HostContext3D(); context->loseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET_ARB, GL_INNOCENT_CONTEXT_RESET_ARB); diff --git a/content/browser/aura/no_transport_image_transport_factory.cc b/content/browser/aura/no_transport_image_transport_factory.cc index 5764805..cf7cde5 100644 --- a/content/browser/aura/no_transport_image_transport_factory.cc +++ b/content/browser/aura/no_transport_image_transport_factory.cc @@ -22,7 +22,7 @@ class FakeTexture : public ui::Texture { texture_(context_provider_->Context3d()->createTexture()) {} virtual unsigned int PrepareTexture() OVERRIDE { return texture_; } - virtual WebKit::WebGraphicsContext3D* HostContext3D() OVERRIDE { + virtual blink::WebGraphicsContext3D* HostContext3D() OVERRIDE { return context_provider_->Context3d(); } diff --git a/content/browser/browser_plugin/browser_plugin_embedder.cc b/content/browser/browser_plugin/browser_plugin_embedder.cc index 5c175d3..16cef0a 100644 --- a/content/browser/browser_plugin/browser_plugin_embedder.cc +++ b/content/browser/browser_plugin/browser_plugin_embedder.cc @@ -110,7 +110,7 @@ bool BrowserPluginEmbedder::OnMessageReceived(const IPC::Message& message) { } void BrowserPluginEmbedder::DragSourceEndedAt(int client_x, int client_y, - int screen_x, int screen_y, WebKit::WebDragOperation operation) { + int screen_x, int screen_y, blink::WebDragOperation operation) { if (guest_started_drag_.get()) { gfx::Point guest_offset = guest_started_drag_->GetScreenCoordinates(gfx::Point()); diff --git a/content/browser/browser_plugin/browser_plugin_embedder.h b/content/browser/browser_plugin/browser_plugin_embedder.h index 5261063..c2c2a50 100644 --- a/content/browser/browser_plugin/browser_plugin_embedder.h +++ b/content/browser/browser_plugin/browser_plugin_embedder.h @@ -72,7 +72,7 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver { virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; void DragSourceEndedAt(int client_x, int client_y, int screen_x, - int screen_y, WebKit::WebDragOperation operation); + int screen_y, blink::WebDragOperation operation); void DragSourceMovedTo(int client_x, int client_y, int screen_x, int screen_y); diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc index 9164153..4c01545 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.cc +++ b/content/browser/browser_plugin/browser_plugin_guest.cc @@ -942,7 +942,7 @@ void BrowserPluginGuest::SendMessageToEmbedder(IPC::Message* msg) { } void BrowserPluginGuest::DragSourceEndedAt(int client_x, int client_y, - int screen_x, int screen_y, WebKit::WebDragOperation operation) { + int screen_x, int screen_y, blink::WebDragOperation operation) { web_contents()->GetRenderViewHost()->DragSourceEndedAt(client_x, client_y, screen_x, screen_y, operation); } @@ -958,9 +958,9 @@ void BrowserPluginGuest::EndSystemDrag() { GetWebContents()->GetRenderViewHost()); guest_rvh->DragSourceSystemDragEnded(); // Issue a MouseUp event to get out of a selection state. - WebKit::WebMouseEvent mouse_event; - mouse_event.type = WebKit::WebInputEvent::MouseUp; - mouse_event.button = WebKit::WebMouseEvent::ButtonLeft; + blink::WebMouseEvent mouse_event; + mouse_event.type = blink::WebInputEvent::MouseUp; + mouse_event.button = blink::WebMouseEvent::ButtonLeft; guest_rvh->ForwardMouseEvent(mouse_event); } @@ -1220,29 +1220,29 @@ void BrowserPluginGuest::OnCompositorFrameACK( } void BrowserPluginGuest::OnDragStatusUpdate(int instance_id, - WebKit::WebDragStatus drag_status, + blink::WebDragStatus drag_status, const DropData& drop_data, - WebKit::WebDragOperationsMask mask, + blink::WebDragOperationsMask mask, const gfx::Point& location) { RenderViewHost* host = GetWebContents()->GetRenderViewHost(); switch (drag_status) { - case WebKit::WebDragStatusEnter: + case blink::WebDragStatusEnter: embedder_web_contents_->GetBrowserPluginEmbedder()->DragEnteredGuest( this); host->DragTargetDragEnter(drop_data, location, location, mask, 0); break; - case WebKit::WebDragStatusOver: + case blink::WebDragStatusOver: host->DragTargetDragOver(location, location, mask, 0); break; - case WebKit::WebDragStatusLeave: + case blink::WebDragStatusLeave: embedder_web_contents_->GetBrowserPluginEmbedder()->DragLeftGuest(this); host->DragTargetDragLeave(); break; - case WebKit::WebDragStatusDrop: + case blink::WebDragStatusDrop: host->DragTargetDrop(location, location, 0); EndSystemDrag(); break; - case WebKit::WebDragStatusUnknown: + case blink::WebDragStatusUnknown: NOTREACHED(); } } @@ -1255,7 +1255,7 @@ void BrowserPluginGuest::OnExecuteEditCommand(int instance_id, void BrowserPluginGuest::OnHandleInputEvent( int instance_id, const gfx::Rect& guest_window_rect, - const WebKit::WebInputEvent* event) { + const blink::WebInputEvent* event) { guest_window_rect_ = guest_window_rect; // If the embedder's RWHV is destroyed then that means that the embedder's // window has been closed but the embedder's WebContents has not yet been @@ -1270,19 +1270,19 @@ void BrowserPluginGuest::OnHandleInputEvent( RenderViewHostImpl* guest_rvh = static_cast<RenderViewHostImpl*>( GetWebContents()->GetRenderViewHost()); - if (WebKit::WebInputEvent::isMouseEventType(event->type)) { + if (blink::WebInputEvent::isMouseEventType(event->type)) { guest_rvh->ForwardMouseEvent( - *static_cast<const WebKit::WebMouseEvent*>(event)); + *static_cast<const blink::WebMouseEvent*>(event)); return; } - if (event->type == WebKit::WebInputEvent::MouseWheel) { + if (event->type == blink::WebInputEvent::MouseWheel) { guest_rvh->ForwardWheelEvent( - *static_cast<const WebKit::WebMouseWheelEvent*>(event)); + *static_cast<const blink::WebMouseWheelEvent*>(event)); return; } - if (WebKit::WebInputEvent::isKeyboardEventType(event->type)) { + if (blink::WebInputEvent::isKeyboardEventType(event->type)) { RenderViewHostImpl* embedder_rvh = static_cast<RenderViewHostImpl*>( embedder_web_contents_->GetRenderViewHost()); if (!embedder_rvh->GetLastKeyboardEvent()) @@ -1293,16 +1293,16 @@ void BrowserPluginGuest::OnHandleInputEvent( return; } - if (WebKit::WebInputEvent::isTouchEventType(event->type)) { + if (blink::WebInputEvent::isTouchEventType(event->type)) { guest_rvh->ForwardTouchEventWithLatencyInfo( - *static_cast<const WebKit::WebTouchEvent*>(event), + *static_cast<const blink::WebTouchEvent*>(event), ui::LatencyInfo()); return; } - if (WebKit::WebInputEvent::isGestureEventType(event->type)) { + if (blink::WebInputEvent::isGestureEventType(event->type)) { guest_rvh->ForwardGestureEvent( - *static_cast<const WebKit::WebGestureEvent*>(event)); + *static_cast<const blink::WebGestureEvent*>(event)); return; } } diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h index 5b23a54..9ccf861 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.h +++ b/content/browser/browser_plugin/browser_plugin_guest.h @@ -53,7 +53,7 @@ namespace cc { class CompositorFrameAck; } -namespace WebKit { +namespace blink { class WebInputEvent; } @@ -282,7 +282,7 @@ class CONTENT_EXPORT BrowserPluginGuest gfx::Rect ToGuestRect(const gfx::Rect& rect); void DragSourceEndedAt(int client_x, int client_y, int screen_x, - int screen_y, WebKit::WebDragOperation operation); + int screen_y, blink::WebDragOperation operation); void DragSourceMovedTo(int client_x, int client_y, int screen_x, int screen_y); @@ -369,9 +369,9 @@ class CONTENT_EXPORT BrowserPluginGuest // drag-message to the guest. This routes the drag-message to the guest // renderer. void OnDragStatusUpdate(int instance_id, - WebKit::WebDragStatus drag_status, + blink::WebDragStatus drag_status, const DropData& drop_data, - WebKit::WebDragOperationsMask drag_mask, + blink::WebDragOperationsMask drag_mask, const gfx::Point& location); // Instructs the guest to execute an edit command decoded in the embedder. void OnExecuteEditCommand(int instance_id, @@ -379,7 +379,7 @@ class CONTENT_EXPORT BrowserPluginGuest // Overriden in tests. virtual void OnHandleInputEvent(int instance_id, const gfx::Rect& guest_window_rect, - const WebKit::WebInputEvent* event); + const blink::WebInputEvent* event); void OnLockMouse(bool user_gesture, bool last_unlocked_by_target, bool privileged); @@ -439,7 +439,7 @@ class CONTENT_EXPORT BrowserPluginGuest void OnDragStopped(); void OnHandleInputEventAck( - WebKit::WebInputEvent::Type event_type, + blink::WebInputEvent::Type event_type, InputEventAckState ack_result); void OnHasTouchEventHandlers(bool accept); void OnSetCursor(const WebCursor& cursor); diff --git a/content/browser/browser_plugin/browser_plugin_guest_manager.cc b/content/browser/browser_plugin/browser_plugin_guest_manager.cc index 7e2ad44..82d0565 100644 --- a/content/browser/browser_plugin/browser_plugin_guest_manager.cc +++ b/content/browser/browser_plugin/browser_plugin_guest_manager.cc @@ -245,9 +245,9 @@ void BrowserPluginGuestManager::DidSendScreenRects( bool BrowserPluginGuestManager::UnlockMouseIfNecessary( WebContentsImpl* embedder_web_contents, const NativeWebKeyboardEvent& event) { - if ((event.type != WebKit::WebInputEvent::RawKeyDown) || + if ((event.type != blink::WebInputEvent::RawKeyDown) || (event.windowsKeyCode != ui::VKEY_ESCAPE) || - (event.modifiers & WebKit::WebInputEvent::InputModifiers)) { + (event.modifiers & blink::WebInputEvent::InputModifiers)) { return false; } diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc index 4906415..d4b9a3f 100644 --- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc +++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc @@ -38,8 +38,8 @@ #include "net/test/spawned_test_server/spawned_test_server.h" #include "third_party/WebKit/public/web/WebInputEvent.h" -using WebKit::WebInputEvent; -using WebKit::WebMouseEvent; +using blink::WebInputEvent; +using blink::WebMouseEvent; using content::BrowserPluginEmbedder; using content::BrowserPluginGuest; using content::BrowserPluginHostFactory; @@ -396,7 +396,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, AdvanceFocus) { StartBrowserPluginTest(kEmbedderURL, kGuestURL, false, std::string()); SimulateMouseClick(test_embedder()->web_contents(), 0, - WebKit::WebMouseEvent::ButtonLeft); + blink::WebMouseEvent::ButtonLeft); BrowserPluginHostTest::SimulateTabKeyPress(test_embedder()->web_contents()); // Wait until we focus into the guest. test_guest()->WaitForFocus(); @@ -633,9 +633,9 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, MAYBE_AcceptDragEvents) { expected_title); rvh->DragTargetDragEnter(drop_data, gfx::Point(start_x, start_y), - gfx::Point(start_x, start_y), WebKit::WebDragOperationEvery, 0); + gfx::Point(start_x, start_y), blink::WebDragOperationEvery, 0); rvh->DragTargetDragOver(gfx::Point(end_x, end_y), gfx::Point(end_x, end_y), - WebKit::WebDragOperationEvery, 0); + blink::WebDragOperationEvery, 0); rvh->DragTargetDrop(gfx::Point(end_x, end_y), gfx::Point(end_x, end_y), 0); string16 actual_title = title_watcher.WaitAndGetTitle(); diff --git a/content/browser/browser_plugin/test_browser_plugin_guest.cc b/content/browser/browser_plugin/test_browser_plugin_guest.cc index 7f10cfd..24a2341 100644 --- a/content/browser/browser_plugin/test_browser_plugin_guest.cc +++ b/content/browser/browser_plugin/test_browser_plugin_guest.cc @@ -92,7 +92,7 @@ void TestBrowserPluginGuest::RenderProcessGone(base::TerminationStatus status) { void TestBrowserPluginGuest::OnHandleInputEvent( int instance_id, const gfx::Rect& guest_window_rect, - const WebKit::WebInputEvent* event) { + const blink::WebInputEvent* event) { BrowserPluginGuest::OnHandleInputEvent(instance_id, guest_window_rect, event); diff --git a/content/browser/browser_plugin/test_browser_plugin_guest.h b/content/browser/browser_plugin/test_browser_plugin_guest.h index dd89528..53f7f8c 100644 --- a/content/browser/browser_plugin/test_browser_plugin_guest.h +++ b/content/browser/browser_plugin/test_browser_plugin_guest.h @@ -31,7 +31,7 @@ class TestBrowserPluginGuest : public BrowserPluginGuest { virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; virtual void OnHandleInputEvent(int instance_id, const gfx::Rect& guest_window_rect, - const WebKit::WebInputEvent* event) OVERRIDE; + const blink::WebInputEvent* event) OVERRIDE; virtual void OnSetFocus(int instance_id, bool focused) OVERRIDE; virtual void OnTakeFocus(bool reverse) OVERRIDE; virtual void SetDamageBuffer( diff --git a/content/browser/devtools/renderer_overrides_handler.cc b/content/browser/devtools/renderer_overrides_handler.cc index 8d0177b..56f9123 100644 --- a/content/browser/devtools/renderer_overrides_handler.cc +++ b/content/browser/devtools/renderer_overrides_handler.cc @@ -45,9 +45,9 @@ #include "url/gurl.h" #include "webkit/browser/quota/quota_manager.h" -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; -using WebKit::WebMouseEvent; +using blink::WebGestureEvent; +using blink::WebInputEvent; +using blink::WebMouseEvent; namespace content { @@ -825,7 +825,7 @@ RendererOverridesHandler::InputDispatchMouseEvent( } RenderViewHost* host = agent_->GetRenderViewHost(); - WebKit::WebMouseEvent mouse_event; + blink::WebMouseEvent mouse_event; ParseGenericInputParams(params, &mouse_event); std::string type; @@ -890,7 +890,7 @@ RendererOverridesHandler::InputDispatchGestureEvent( RenderViewHostImpl* host = static_cast<RenderViewHostImpl*>( agent_->GetRenderViewHost()); - WebKit::WebGestureEvent event; + blink::WebGestureEvent event; ParseGenericInputParams(params, &event); std::string type; diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc index f38f9cd..2fc68df 100644 --- a/content/browser/download/save_package.cc +++ b/content/browser/download/save_package.cc @@ -46,7 +46,7 @@ #include "third_party/WebKit/public/web/WebPageSerializerClient.h" using base::Time; -using WebKit::WebPageSerializerClient; +using blink::WebPageSerializerClient; namespace content { namespace { diff --git a/content/browser/frame_host/interstitial_page_impl.cc b/content/browser/frame_host/interstitial_page_impl.cc index 4bcee69..2516621 100644 --- a/content/browser/frame_host/interstitial_page_impl.cc +++ b/content/browser/frame_host/interstitial_page_impl.cc @@ -41,8 +41,8 @@ #include "net/base/escape.h" #include "net/url_request/url_request_context_getter.h" -using WebKit::WebDragOperation; -using WebKit::WebDragOperationsMask; +using blink::WebDragOperation; +using blink::WebDragOperationsMask; namespace content { namespace { @@ -697,7 +697,7 @@ void InterstitialPageImpl::CreateNewWindow( } void InterstitialPageImpl::CreateNewWidget(int route_id, - WebKit::WebPopupType popup_type) { + blink::WebPopupType popup_type) { NOTREACHED() << "InterstitialPage does not support showing drop-downs yet."; } diff --git a/content/browser/frame_host/interstitial_page_impl.h b/content/browser/frame_host/interstitial_page_impl.h index 66c0ca9..347a014 100644 --- a/content/browser/frame_host/interstitial_page_impl.h +++ b/content/browser/frame_host/interstitial_page_impl.h @@ -121,7 +121,7 @@ class CONTENT_EXPORT InterstitialPageImpl const ViewHostMsg_CreateWindow_Params& params, SessionStorageNamespace* session_storage_namespace) OVERRIDE; virtual void CreateNewWidget(int route_id, - WebKit::WebPopupType popup_type) OVERRIDE; + blink::WebPopupType popup_type) OVERRIDE; virtual void CreateNewFullscreenWidget(int route_id) OVERRIDE; virtual void ShowCreatedWindow(int route_id, WindowOpenDisposition disposition, diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc index 9fa4140..4126c97 100644 --- a/content/browser/frame_host/navigation_controller_impl_unittest.cc +++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc @@ -499,7 +499,7 @@ TEST_F(NavigationControllerTest, LoadURLWithParams) { NavigationController::LoadURLParams load_params(GURL("http://foo")); load_params.referrer = - Referrer(GURL("http://referrer"), WebKit::WebReferrerPolicyDefault); + Referrer(GURL("http://referrer"), blink::WebReferrerPolicyDefault); load_params.transition_type = PAGE_TRANSITION_GENERATED; load_params.extra_headers = "content-type: text/plain"; load_params.load_type = NavigationController::LOAD_TYPE_DEFAULT; diff --git a/content/browser/frame_host/navigation_entry_impl_unittest.cc b/content/browser/frame_host/navigation_entry_impl_unittest.cc index 6486fde..cb742e4 100644 --- a/content/browser/frame_host/navigation_entry_impl_unittest.cc +++ b/content/browser/frame_host/navigation_entry_impl_unittest.cc @@ -27,7 +27,7 @@ class NavigationEntryTest : public testing::Test { entry2_.reset(new NavigationEntryImpl( instance_, 3, GURL("test:url"), - Referrer(GURL("from"), WebKit::WebReferrerPolicyDefault), + Referrer(GURL("from"), blink::WebReferrerPolicyDefault), ASCIIToUTF16("title"), PAGE_TRANSITION_TYPED, false)); @@ -132,7 +132,7 @@ TEST_F(NavigationEntryTest, NavigationEntryAccessors) { EXPECT_EQ(GURL(), entry1_->GetReferrer().url); EXPECT_EQ(GURL("from"), entry2_->GetReferrer().url); entry2_->SetReferrer( - Referrer(GURL("from2"), WebKit::WebReferrerPolicyDefault)); + Referrer(GURL("from2"), blink::WebReferrerPolicyDefault)); EXPECT_EQ(GURL("from2"), entry2_->GetReferrer().url); // Title diff --git a/content/browser/frame_host/render_view_host_manager_unittest.cc b/content/browser/frame_host/render_view_host_manager_unittest.cc index f55de8a..1027a52 100644 --- a/content/browser/frame_host/render_view_host_manager_unittest.cc +++ b/content/browser/frame_host/render_view_host_manager_unittest.cc @@ -260,7 +260,7 @@ TEST_F(RenderViewHostManagerTest, FilterMessagesWhileSwappedOut) { // Send an update title message and make sure it works. const string16 ntp_title = ASCIIToUTF16("NTP Title"); - WebKit::WebTextDirection direction = WebKit::WebTextDirectionLeftToRight; + blink::WebTextDirection direction = blink::WebTextDirectionLeftToRight; EXPECT_TRUE(ntp_rvh->OnMessageReceived( ViewHostMsg_UpdateTitle(rvh()->GetRoutingID(), 0, ntp_title, direction))); EXPECT_EQ(ntp_title, contents()->GetTitle()); @@ -624,7 +624,7 @@ TEST_F(RenderViewHostManagerTest, Navigate) { const GURL kUrl2("http://www.google.com/foo"); NavigationEntryImpl entry2( NULL /* instance */, -1 /* page_id */, kUrl2, - Referrer(kUrl1, WebKit::WebReferrerPolicyDefault), + Referrer(kUrl1, blink::WebReferrerPolicyDefault), string16() /* title */, PAGE_TRANSITION_LINK, true /* is_renderer_init */); host = manager.Navigate(entry2); @@ -644,7 +644,7 @@ TEST_F(RenderViewHostManagerTest, Navigate) { const GURL kUrl3("http://webkit.org/"); NavigationEntryImpl entry3( NULL /* instance */, -1 /* page_id */, kUrl3, - Referrer(kUrl2, WebKit::WebReferrerPolicyDefault), + Referrer(kUrl2, blink::WebReferrerPolicyDefault), string16() /* title */, PAGE_TRANSITION_LINK, false /* is_renderer_init */); host = manager.Navigate(entry3); @@ -1217,7 +1217,7 @@ TEST_F(RenderViewHostManagerTest, NoSwapOnGuestNavigations) { const GURL kUrl2("http://www.chromium.org"); NavigationEntryImpl entry2( NULL /* instance */, -1 /* page_id */, kUrl2, - Referrer(kUrl1, WebKit::WebReferrerPolicyDefault), + Referrer(kUrl1, blink::WebReferrerPolicyDefault), string16() /* title */, PAGE_TRANSITION_LINK, true /* is_renderer_init */); host = manager.Navigate(entry2); diff --git a/content/browser/gamepad/gamepad_data_fetcher.h b/content/browser/gamepad/gamepad_data_fetcher.h index e5e009d..17887d5 100644 --- a/content/browser/gamepad/gamepad_data_fetcher.h +++ b/content/browser/gamepad/gamepad_data_fetcher.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_GAMEPAD_GAMEPAD_DATA_FETCHER_H_ #define CONTENT_BROWSER_GAMEPAD_GAMEPAD_DATA_FETCHER_H_ -namespace WebKit { +namespace blink { class WebGamepads; } @@ -16,7 +16,7 @@ namespace content { class GamepadDataFetcher { public: virtual ~GamepadDataFetcher() {} - virtual void GetGamepadData(WebKit::WebGamepads* pads, + virtual void GetGamepadData(blink::WebGamepads* pads, bool devices_changed_hint) = 0; virtual void PauseHint(bool paused) {} }; diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher.cc b/content/browser/gamepad/gamepad_platform_data_fetcher.cc index b4499d6..d889526 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher.cc +++ b/content/browser/gamepad/gamepad_platform_data_fetcher.cc @@ -11,7 +11,7 @@ namespace content { GamepadDataFetcherEmpty::GamepadDataFetcherEmpty() { } -void GamepadDataFetcherEmpty::GetGamepadData(WebKit::WebGamepads* pads, +void GamepadDataFetcherEmpty::GetGamepadData(blink::WebGamepads* pads, bool devices_changed_hint) { pads->length = 0; } diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher.h b/content/browser/gamepad/gamepad_platform_data_fetcher.h index f073a53..625e72c 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher.h +++ b/content/browser/gamepad/gamepad_platform_data_fetcher.h @@ -40,7 +40,7 @@ class GamepadDataFetcherEmpty : public GamepadDataFetcher { public: GamepadDataFetcherEmpty(); - virtual void GetGamepadData(WebKit::WebGamepads* pads, + virtual void GetGamepadData(blink::WebGamepads* pads, bool devices_changed_hint) OVERRIDE; private: diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc index c82997e..ba048ae 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc +++ b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc @@ -52,7 +52,7 @@ bool IsGamepad(udev_device* dev, int* index, std::string* path) { if (!base::StringToInt(str, &tmp_idx)) return false; if (tmp_idx < 0 || - tmp_idx >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) { + tmp_idx >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) { return false; } *index = tmp_idx; @@ -64,8 +64,8 @@ bool IsGamepad(udev_device* dev, int* index, std::string* path) { namespace content { -using WebKit::WebGamepad; -using WebKit::WebGamepads; +using blink::WebGamepad; +using blink::WebGamepads; GamepadPlatformDataFetcherLinux::GamepadPlatformDataFetcherLinux() { for (size_t i = 0; i < arraysize(device_fds_); ++i) diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.h b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.h index 916eda3..f95e52f 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.h +++ b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.h @@ -28,7 +28,7 @@ class GamepadPlatformDataFetcherLinux : public GamepadDataFetcher { virtual ~GamepadPlatformDataFetcherLinux(); // GamepadDataFetcher implementation. - virtual void GetGamepadData(WebKit::WebGamepads* pads, + virtual void GetGamepadData(blink::WebGamepads* pads, bool devices_changed_hint) OVERRIDE; private: @@ -37,14 +37,14 @@ class GamepadPlatformDataFetcherLinux : public GamepadDataFetcher { void ReadDeviceData(size_t index); // File descriptors for the /dev/input/js* devices. -1 if not in use. - int device_fds_[WebKit::WebGamepads::itemsLengthCap]; + int device_fds_[blink::WebGamepads::itemsLengthCap]; // Functions to map from device data to standard layout, if available. May // be null if no mapping is available. - GamepadStandardMappingFunction mappers_[WebKit::WebGamepads::itemsLengthCap]; + GamepadStandardMappingFunction mappers_[blink::WebGamepads::itemsLengthCap]; // Data that's returned to the consumer. - WebKit::WebGamepads data_; + blink::WebGamepads data_; scoped_ptr<UdevLinux> udev_; diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.h b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.h index 3b22b693..54e1944 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.h +++ b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.h @@ -32,7 +32,7 @@ class GamepadPlatformDataFetcherMac : public GamepadDataFetcher, public: GamepadPlatformDataFetcherMac(); virtual ~GamepadPlatformDataFetcherMac(); - virtual void GetGamepadData(WebKit::WebGamepads* pads, + virtual void GetGamepadData(blink::WebGamepads* pads, bool devices_changed_hint) OVERRIDE; virtual void PauseHint(bool paused) OVERRIDE; @@ -73,7 +73,7 @@ class GamepadPlatformDataFetcherMac : public GamepadDataFetcher, scoped_ptr<XboxDataFetcher> xbox_fetcher_; - WebKit::WebGamepads data_; + blink::WebGamepads data_; // Side-band data that's not passed to the consumer, but we need to maintain // to update data_. @@ -82,10 +82,10 @@ class GamepadPlatformDataFetcherMac : public GamepadDataFetcher, union { struct { IOHIDDeviceRef device_ref; - IOHIDElementRef button_elements[WebKit::WebGamepad::buttonsLengthCap]; - IOHIDElementRef axis_elements[WebKit::WebGamepad::buttonsLengthCap]; - CFIndex axis_minimums[WebKit::WebGamepad::axesLengthCap]; - CFIndex axis_maximums[WebKit::WebGamepad::axesLengthCap]; + IOHIDElementRef button_elements[blink::WebGamepad::buttonsLengthCap]; + IOHIDElementRef axis_elements[blink::WebGamepad::buttonsLengthCap]; + CFIndex axis_minimums[blink::WebGamepad::axesLengthCap]; + CFIndex axis_maximums[blink::WebGamepad::axesLengthCap]; // Function to map from device data to standard layout, if available. // May be null if no mapping is available. GamepadStandardMappingFunction mapper; @@ -96,7 +96,7 @@ class GamepadPlatformDataFetcherMac : public GamepadDataFetcher, } xbox; }; }; - AssociatedData associated_[WebKit::WebGamepads::itemsLengthCap]; + AssociatedData associated_[blink::WebGamepads::itemsLengthCap]; DISALLOW_COPY_AND_ASSIGN(GamepadPlatformDataFetcherMac); }; diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm index 8ed59ac..69d0c63 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm +++ b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm @@ -14,8 +14,8 @@ #import <Foundation/Foundation.h> #include <IOKit/hid/IOHIDKeys.h> -using WebKit::WebGamepad; -using WebKit::WebGamepads; +using blink::WebGamepad; +using blink::WebGamepads; namespace content { @@ -266,7 +266,7 @@ void GamepadPlatformDataFetcherMac::DeviceAdd(IOHIDDeviceRef device) { const size_t kOutputLengthBytes = sizeof(data_.items[slot].id); memset(&data_.items[slot].id, 0, kOutputLengthBytes); [as16 getBytes:data_.items[slot].id - length:kOutputLengthBytes - sizeof(WebKit::WebUChar)]; + length:kOutputLengthBytes - sizeof(blink::WebUChar)]; base::ScopedCFTypeRef<CFArrayRef> elements( IOHIDDeviceCopyMatchingElements(device, NULL, kIOHIDOptionsTypeNone)); @@ -359,7 +359,7 @@ void GamepadPlatformDataFetcherMac::XboxDeviceAdd(XboxController* device) { const size_t kOutputLengthBytes = sizeof(data_.items[slot].id); memset(&data_.items[slot].id, 0, kOutputLengthBytes); [as16 getBytes:data_.items[slot].id - length:kOutputLengthBytes - sizeof(WebKit::WebUChar)]; + length:kOutputLengthBytes - sizeof(blink::WebUChar)]; associated_[slot].is_xbox = true; associated_[slot].xbox.device = device; diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc b/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc index 91ebdf5..757355c 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc +++ b/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc @@ -22,7 +22,7 @@ namespace content { -using namespace WebKit; +using namespace blink; namespace { diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_win.h b/content/browser/gamepad/gamepad_platform_data_fetcher_win.h index 7551ee9..c894143 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher_win.h +++ b/content/browser/gamepad/gamepad_platform_data_fetcher_win.h @@ -31,13 +31,13 @@ class GamepadPlatformDataFetcherWin : public GamepadDataFetcher { public: GamepadPlatformDataFetcherWin(); virtual ~GamepadPlatformDataFetcherWin(); - virtual void GetGamepadData(WebKit::WebGamepads* pads, + virtual void GetGamepadData(blink::WebGamepads* pads, bool devices_changed_hint) OVERRIDE; private: // XInput-specific implementation for GetGamepadData. - bool GetXInputGamepadData(WebKit::WebGamepads* pads, + bool GetXInputGamepadData(blink::WebGamepads* pads, bool devices_changed_hint); - bool GetDirectInputGamepadData(WebKit::WebGamepads* pads, + bool GetDirectInputGamepadData(blink::WebGamepads* pads, bool devices_changed_hint); // The three function types we use from xinput1_3.dll. @@ -54,11 +54,11 @@ class GamepadPlatformDataFetcherWin : public GamepadDataFetcher { bool GetXInputDllFunctions(); // Scan for connected XInput and DirectInput gamepads. - void EnumerateDevices(WebKit::WebGamepads* pads); - bool GetXInputPadConnectivity(int i, WebKit::WebGamepad* pad) const; + void EnumerateDevices(blink::WebGamepads* pads); + bool GetXInputPadConnectivity(int i, blink::WebGamepad* pad) const; - void GetXInputPadData(int i, WebKit::WebGamepad* pad); - void GetDirectInputPadData(int i, WebKit::WebGamepad* pad); + void GetXInputPadData(int i, blink::WebGamepad* pad); + void GetDirectInputPadData(int i, blink::WebGamepad* pad); int FirstAvailableGamepadId() const; bool HasXInputGamepad(int index) const; @@ -90,7 +90,7 @@ class GamepadPlatformDataFetcherWin : public GamepadDataFetcher { IDirectInputDevice8* directinput_gamepad; GamepadStandardMappingFunction mapper; }; - PadState pad_state_[WebKit::WebGamepads::itemsLengthCap]; + PadState pad_state_[blink::WebGamepads::itemsLengthCap]; DISALLOW_COPY_AND_ASSIGN(GamepadPlatformDataFetcherWin); }; diff --git a/content/browser/gamepad/gamepad_provider.cc b/content/browser/gamepad/gamepad_provider.cc index 7e8e6de..55a5f30 100644 --- a/content/browser/gamepad/gamepad_provider.cc +++ b/content/browser/gamepad/gamepad_provider.cc @@ -158,7 +158,7 @@ void GamepadProvider::DoPoll() { ANNOTATE_BENIGN_RACE_SIZED( &hwbuf->buffer, - sizeof(WebKit::WebGamepads), + sizeof(blink::WebGamepads), "Racey reads are discarded"); { diff --git a/content/browser/gamepad/gamepad_provider_unittest.cc b/content/browser/gamepad/gamepad_provider_unittest.cc index 0e5785c..398edca 100644 --- a/content/browser/gamepad/gamepad_provider_unittest.cc +++ b/content/browser/gamepad/gamepad_provider_unittest.cc @@ -15,7 +15,7 @@ namespace content { namespace { -using WebKit::WebGamepads; +using blink::WebGamepads; // Helper class to generate and record user gesture callbacks. class UserGestureListener { diff --git a/content/browser/gamepad/gamepad_standard_mappings.h b/content/browser/gamepad/gamepad_standard_mappings.h index 6f5d72f..6b533ca 100644 --- a/content/browser/gamepad/gamepad_standard_mappings.h +++ b/content/browser/gamepad/gamepad_standard_mappings.h @@ -7,15 +7,15 @@ #include "base/strings/string_piece.h" -namespace WebKit { +namespace blink { class WebGamepad; } namespace content { typedef void (*GamepadStandardMappingFunction)( - const WebKit::WebGamepad& original, - WebKit::WebGamepad* mapped); + const blink::WebGamepad& original, + blink::WebGamepad* mapped); GamepadStandardMappingFunction GetGamepadStandardMappingFunction( const base::StringPiece& vendor_id, diff --git a/content/browser/gamepad/gamepad_standard_mappings_linux.cc b/content/browser/gamepad/gamepad_standard_mappings_linux.cc index e9e7094..712e753 100644 --- a/content/browser/gamepad/gamepad_standard_mappings_linux.cc +++ b/content/browser/gamepad/gamepad_standard_mappings_linux.cc @@ -23,8 +23,8 @@ float AxisPositiveAsButton(float input) { } void MapperXInputStyleGamepad( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { *mapped = input; mapped->buttons[kButtonLeftTrigger] = AxisToButton(input.axes[2]); mapped->buttons[kButtonRightTrigger] = AxisToButton(input.axes[5]); @@ -44,8 +44,8 @@ void MapperXInputStyleGamepad( } void MapperLakeviewResearch( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { *mapped = input; mapped->buttons[kButtonPrimary] = input.buttons[2]; mapped->buttons[kButtonTertiary] = input.buttons[3]; @@ -65,8 +65,8 @@ void MapperLakeviewResearch( } void MapperPlaystationSixAxis( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { *mapped = input; mapped->buttons[kButtonPrimary] = input.buttons[14]; mapped->buttons[kButtonSecondary] = input.buttons[13]; @@ -91,8 +91,8 @@ void MapperPlaystationSixAxis( } void MapperXGEAR( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { *mapped = input; mapped->buttons[kButtonPrimary] = input.buttons[2]; mapped->buttons[kButtonSecondary] = input.buttons[1]; @@ -114,8 +114,8 @@ void MapperXGEAR( void MapperDragonRiseGeneric( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { *mapped = input; mapped->buttons[kButtonDpadUp] = AxisNegativeAsButton(input.axes[6]); mapped->buttons[kButtonDpadDown] = AxisPositiveAsButton(input.axes[6]); diff --git a/content/browser/gamepad/gamepad_standard_mappings_mac.mm b/content/browser/gamepad/gamepad_standard_mappings_mac.mm index 0ffb35f..2696c53 100644 --- a/content/browser/gamepad/gamepad_standard_mappings_mac.mm +++ b/content/browser/gamepad/gamepad_standard_mappings_mac.mm @@ -14,7 +14,7 @@ float AxisToButton(float input) { return (input + 1.f) / 2.f; } -void DpadFromAxis(WebKit::WebGamepad* mapped, float dir) { +void DpadFromAxis(blink::WebGamepad* mapped, float dir) { // Dpad is mapped as a direction on one axis, where -1 is up and it // increases clockwise to 1, which is up + left. It's set to a large (> 1.f) // number when nothing is depressed, except on start up, sometimes it's 0.0 @@ -34,8 +34,8 @@ void DpadFromAxis(WebKit::WebGamepad* mapped, float dir) { } void MapperXbox360Gamepad( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { *mapped = input; mapped->buttons[kButtonLeftTrigger] = AxisToButton(input.axes[2]); mapped->buttons[kButtonRightTrigger] = AxisToButton(input.axes[5]); @@ -55,8 +55,8 @@ void MapperXbox360Gamepad( } void MapperPlaystationSixAxis( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { *mapped = input; mapped->buttons[kButtonPrimary] = input.buttons[14]; mapped->buttons[kButtonSecondary] = input.buttons[13]; @@ -82,8 +82,8 @@ void MapperPlaystationSixAxis( } void MapperDirectInputStyle( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { *mapped = input; mapped->buttons[kButtonPrimary] = input.buttons[1]; mapped->buttons[kButtonSecondary] = input.buttons[2]; @@ -95,8 +95,8 @@ void MapperDirectInputStyle( } void MapperMacallyIShock( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { enum IShockButtons { kButtonC = kNumButtons, kButtonD, @@ -135,8 +135,8 @@ void MapperMacallyIShock( } void MapperXGEAR( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { *mapped = input; mapped->buttons[kButtonPrimary] = input.buttons[2]; mapped->buttons[kButtonTertiary] = input.buttons[3]; @@ -153,8 +153,8 @@ void MapperXGEAR( } void MapperSmartJoyPLUS( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { *mapped = input; mapped->buttons[kButtonPrimary] = input.buttons[2]; mapped->buttons[kButtonTertiary] = input.buttons[3]; @@ -172,8 +172,8 @@ void MapperSmartJoyPLUS( } void MapperDragonRiseGeneric( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { *mapped = input; DpadFromAxis(mapped, input.axes[9]); mapped->axes[kAxisLeftStickX] = input.axes[0]; diff --git a/content/browser/gamepad/gamepad_standard_mappings_win.cc b/content/browser/gamepad/gamepad_standard_mappings_win.cc index fa57c03..07adb9b 100644 --- a/content/browser/gamepad/gamepad_standard_mappings_win.cc +++ b/content/browser/gamepad/gamepad_standard_mappings_win.cc @@ -24,8 +24,8 @@ float AxisPositiveAsButton(long value) { } void MapperDragonRiseGeneric( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { *mapped = input; mapped->buttons[0] = input.buttons[1]; mapped->buttons[1] = input.buttons[2]; @@ -43,8 +43,8 @@ void MapperDragonRiseGeneric( } void MapperLogitechDualAction( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { *mapped = input; mapped->buttons[0] = input.buttons[1]; mapped->buttons[1] = input.buttons[2]; @@ -62,8 +62,8 @@ void MapperLogitechDualAction( } void MapperLogitechPrecision( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { *mapped = input; mapped->buttons[0] = input.buttons[1]; mapped->buttons[1] = input.buttons[2]; @@ -79,8 +79,8 @@ void MapperLogitechPrecision( } void Mapper2Axes8Keys( - const WebKit::WebGamepad& input, - WebKit::WebGamepad* mapped) { + const blink::WebGamepad& input, + blink::WebGamepad* mapped) { *mapped = input; mapped->buttons[kButtonLeftTrigger] = 0; // Not present mapped->buttons[kButtonRightTrigger] = 0; // Not present diff --git a/content/browser/gamepad/gamepad_test_helpers.cc b/content/browser/gamepad/gamepad_test_helpers.cc index e4db14c..8837c8e 100644 --- a/content/browser/gamepad/gamepad_test_helpers.cc +++ b/content/browser/gamepad/gamepad_test_helpers.cc @@ -9,7 +9,7 @@ namespace content { MockGamepadDataFetcher::MockGamepadDataFetcher( - const WebKit::WebGamepads& test_data) + const blink::WebGamepads& test_data) : test_data_(test_data), read_data_(false, false) { } @@ -17,7 +17,7 @@ MockGamepadDataFetcher::MockGamepadDataFetcher( MockGamepadDataFetcher::~MockGamepadDataFetcher() { } -void MockGamepadDataFetcher::GetGamepadData(WebKit::WebGamepads* pads, +void MockGamepadDataFetcher::GetGamepadData(blink::WebGamepads* pads, bool devices_changed_hint) { { base::AutoLock lock(lock_); @@ -30,7 +30,7 @@ void MockGamepadDataFetcher::WaitForDataRead() { return read_data_.Wait(); } -void MockGamepadDataFetcher::SetTestData(const WebKit::WebGamepads& new_data) { +void MockGamepadDataFetcher::SetTestData(const blink::WebGamepads& new_data) { base::AutoLock lock(lock_); test_data_ = new_data; } @@ -42,7 +42,7 @@ GamepadTestHelper::~GamepadTestHelper() { } GamepadServiceTestConstructor::GamepadServiceTestConstructor( - const WebKit::WebGamepads& test_data) { + const blink::WebGamepads& test_data) { data_fetcher_ = new MockGamepadDataFetcher(test_data); gamepad_service_ = new GamepadService(scoped_ptr<GamepadDataFetcher>(data_fetcher_)); diff --git a/content/browser/gamepad/gamepad_test_helpers.h b/content/browser/gamepad/gamepad_test_helpers.h index 3b43f77..2aad5753 100644 --- a/content/browser/gamepad/gamepad_test_helpers.h +++ b/content/browser/gamepad/gamepad_test_helpers.h @@ -21,12 +21,12 @@ class MockGamepadDataFetcher : public GamepadDataFetcher { public: // Initializes the fetcher with the given gamepad data, which will be // returned when the provider queries us. - explicit MockGamepadDataFetcher(const WebKit::WebGamepads& test_data); + explicit MockGamepadDataFetcher(const blink::WebGamepads& test_data); virtual ~MockGamepadDataFetcher(); // GamepadDataFetcher. - virtual void GetGamepadData(WebKit::WebGamepads* pads, + virtual void GetGamepadData(blink::WebGamepads* pads, bool devices_changed_hint) OVERRIDE; // Blocks the current thread until the GamepadProvider reads from this @@ -34,11 +34,11 @@ class MockGamepadDataFetcher : public GamepadDataFetcher { void WaitForDataRead(); // Updates the test data. - void SetTestData(const WebKit::WebGamepads& new_data); + void SetTestData(const blink::WebGamepads& new_data); private: base::Lock lock_; - WebKit::WebGamepads test_data_; + blink::WebGamepads test_data_; base::WaitableEvent read_data_; DISALLOW_COPY_AND_ASSIGN(MockGamepadDataFetcher); @@ -63,7 +63,7 @@ class GamepadTestHelper { // global singleton for the gamepad service. class GamepadServiceTestConstructor : public GamepadTestHelper { public: - explicit GamepadServiceTestConstructor(const WebKit::WebGamepads& test_data); + explicit GamepadServiceTestConstructor(const blink::WebGamepads& test_data); virtual ~GamepadServiceTestConstructor(); GamepadService* gamepad_service() { return gamepad_service_; } diff --git a/content/browser/gpu/gpu_ipc_browsertests.cc b/content/browser/gpu/gpu_ipc_browsertests.cc index f066fe6..a67a9be 100644 --- a/content/browser/gpu/gpu_ipc_browsertests.cc +++ b/content/browser/gpu/gpu_ipc_browsertests.cc @@ -35,7 +35,7 @@ class ContextTestBase : public content::ContentBrowserTest { context_.reset( WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext( gpu_channel_host.get(), - WebKit::WebGraphicsContext3D::Attributes(), + blink::WebGraphicsContext3D::Attributes(), GURL())); CHECK(context_.get()); context_->makeContextCurrent(); @@ -120,7 +120,7 @@ class BrowserGpuChannelHostFactoryTest : public ContextTestBase { return make_scoped_ptr( WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext( GetGpuChannel(), - WebKit::WebGraphicsContext3D::Attributes(), + blink::WebGraphicsContext3D::Attributes(), GURL())); } }; diff --git a/content/browser/indexed_db/indexed_db_backing_store.cc b/content/browser/indexed_db/indexed_db_backing_store.cc index e67319d..7f5c58b 100644 --- a/content/browser/indexed_db/indexed_db_backing_store.cc +++ b/content/browser/indexed_db/indexed_db_backing_store.cc @@ -223,7 +223,7 @@ WARN_UNUSED_RESULT static bool IsSchemaKnown(LevelDBDatabase* db, bool* known) { } const uint32 latest_known_data_version = - WebKit::kSerializedScriptValueVersion; + blink::kSerializedScriptValueVersion; int64 db_data_version = 0; ok = GetInt(db, DataVersionKey::Encode(), &db_data_version, &found); if (!ok) @@ -246,7 +246,7 @@ WARN_UNUSED_RESULT static bool SetUpMetadata( LevelDBDatabase* db, const std::string& origin_identifier) { const uint32 latest_known_data_version = - WebKit::kSerializedScriptValueVersion; + blink::kSerializedScriptValueVersion; const std::string schema_version_key = SchemaVersionKey::Encode(); const std::string data_version_key = DataVersionKey::Encode(); @@ -302,7 +302,7 @@ WARN_UNUSED_RESULT static bool SetUpMetadata( if (db_schema_version < 2) { db_schema_version = 2; PutInt(transaction.get(), schema_version_key, db_schema_version); - db_data_version = WebKit::kSerializedScriptValueVersion; + db_data_version = blink::kSerializedScriptValueVersion; PutInt(transaction.get(), data_version_key, db_data_version); } } @@ -424,10 +424,10 @@ enum IndexedDBBackingStoreOpenResult { scoped_refptr<IndexedDBBackingStore> IndexedDBBackingStore::Open( const GURL& origin_url, const base::FilePath& path_base, - WebKit::WebIDBCallbacks::DataLoss* data_loss, + blink::WebIDBCallbacks::DataLoss* data_loss, std::string* data_loss_message, bool* disk_full) { - *data_loss = WebKit::WebIDBCallbacks::DataLossNone; + *data_loss = blink::WebIDBCallbacks::DataLossNone; DefaultLevelDBFactory leveldb_factory; return IndexedDBBackingStore::Open(origin_url, path_base, @@ -477,13 +477,13 @@ static bool IsPathTooLong(const base::FilePath& leveldb_dir) { scoped_refptr<IndexedDBBackingStore> IndexedDBBackingStore::Open( const GURL& origin_url, const base::FilePath& path_base, - WebKit::WebIDBCallbacks::DataLoss* data_loss, + blink::WebIDBCallbacks::DataLoss* data_loss, std::string* data_loss_message, bool* is_disk_full, LevelDBFactory* leveldb_factory) { IDB_TRACE("IndexedDBBackingStore::Open"); DCHECK(!path_base.empty()); - *data_loss = WebKit::WebIDBCallbacks::DataLossNone; + *data_loss = blink::WebIDBCallbacks::DataLossNone; *data_loss_message = ""; *is_disk_full = false; @@ -516,7 +516,7 @@ scoped_refptr<IndexedDBBackingStore> IndexedDBBackingStore::Open( if (leveldb_env::IndicatesDiskFull(status)) { *is_disk_full = true; } else if (leveldb_env::IsCorruption(status)) { - *data_loss = WebKit::WebIDBCallbacks::DataLossTotal; + *data_loss = blink::WebIDBCallbacks::DataLossTotal; *data_loss_message = leveldb_env::GetCorruptionMessage(status); } } @@ -530,14 +530,14 @@ scoped_refptr<IndexedDBBackingStore> IndexedDBBackingStore::Open( HistogramOpenStatus( INDEXED_DB_BACKING_STORE_OPEN_FAILED_IO_ERROR_CHECKING_SCHEMA); db.reset(); - *data_loss = WebKit::WebIDBCallbacks::DataLossTotal; + *data_loss = blink::WebIDBCallbacks::DataLossTotal; *data_loss_message = "I/O error checking schema"; } else if (!is_schema_known) { LOG(ERROR) << "IndexedDB backing store had unknown schema, treating it " "as failure to open"; HistogramOpenStatus(INDEXED_DB_BACKING_STORE_OPEN_FAILED_UNKNOWN_SCHEMA); db.reset(); - *data_loss = WebKit::WebIDBCallbacks::DataLossTotal; + *data_loss = blink::WebIDBCallbacks::DataLossTotal; *data_loss_message = "Unknown schema"; } } @@ -965,7 +965,7 @@ bool IndexedDBBackingStore::GetObjectStores( // (2) Later, null vs. string vs. array was stored in the key_path itself. // So this check is only relevant for string-type key_paths. if (!has_key_path && - (key_path.type() == WebKit::WebIDBKeyPathTypeString && + (key_path.type() == blink::WebIDBKeyPathTypeString && !key_path.string().empty())) { INTERNAL_CONSISTENCY_ERROR(GET_OBJECT_STORES); break; @@ -1324,7 +1324,7 @@ bool IndexedDBBackingStore::GetKeyGeneratorCurrentNumber( return false; } scoped_ptr<IndexedDBKey> user_key = data_key.user_key(); - if (user_key->type() == WebKit::WebIDBKeyTypeNumber) { + if (user_key->type() == blink::WebIDBKeyTypeNumber) { int64 n = static_cast<int64>(user_key->number()); if (n > max_numeric_key) max_numeric_key = n; diff --git a/content/browser/indexed_db/indexed_db_backing_store.h b/content/browser/indexed_db/indexed_db_backing_store.h index 4665480..738a046 100644 --- a/content/browser/indexed_db/indexed_db_backing_store.h +++ b/content/browser/indexed_db/indexed_db_backing_store.h @@ -53,14 +53,14 @@ class CONTENT_EXPORT IndexedDBBackingStore static scoped_refptr<IndexedDBBackingStore> Open( const GURL& origin_url, const base::FilePath& path_base, - WebKit::WebIDBCallbacks::DataLoss* data_loss, + blink::WebIDBCallbacks::DataLoss* data_loss, std::string* data_loss_message, bool* disk_full); static scoped_refptr<IndexedDBBackingStore> Open( const GURL& origin_url, const base::FilePath& path_base, - WebKit::WebIDBCallbacks::DataLoss* data_loss, + blink::WebIDBCallbacks::DataLoss* data_loss, std::string* data_loss_message, bool* disk_full, LevelDBFactory* factory); diff --git a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc index 7b5fc62..396189e 100644 --- a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc +++ b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc @@ -26,7 +26,7 @@ class IndexedDBBackingStoreTest : public testing::Test { m_value1 = "value1"; m_value2 = "value2"; m_value3 = "value3"; - m_key1 = IndexedDBKey(99, WebKit::WebIDBKeyTypeNumber); + m_key1 = IndexedDBKey(99, blink::WebIDBKeyTypeNumber); m_key2 = IndexedDBKey(ASCIIToUTF16("key2")); m_key3 = IndexedDBKey(ASCIIToUTF16("key3")); } diff --git a/content/browser/indexed_db/indexed_db_callbacks.cc b/content/browser/indexed_db/indexed_db_callbacks.cc index ccfef79..90ef3dc 100644 --- a/content/browser/indexed_db/indexed_db_callbacks.cc +++ b/content/browser/indexed_db/indexed_db_callbacks.cc @@ -14,7 +14,7 @@ #include "content/common/indexed_db/indexed_db_messages.h" #include "webkit/browser/quota/quota_manager.h" -using WebKit::WebIDBCallbacks; +using blink::WebIDBCallbacks; namespace content { diff --git a/content/browser/indexed_db/indexed_db_callbacks.h b/content/browser/indexed_db/indexed_db_callbacks.h index 23a6b58..6ff6756 100644 --- a/content/browser/indexed_db/indexed_db_callbacks.h +++ b/content/browser/indexed_db/indexed_db_callbacks.h @@ -62,7 +62,7 @@ class CONTENT_EXPORT IndexedDBCallbacks int64 old_version, scoped_ptr<IndexedDBConnection> connection, const content::IndexedDBDatabaseMetadata& metadata, - WebKit::WebIDBCallbacks::DataLoss data_loss, + blink::WebIDBCallbacks::DataLoss data_loss, std::string data_loss_message); virtual void OnSuccess(scoped_ptr<IndexedDBConnection> connection, const content::IndexedDBDatabaseMetadata& metadata); diff --git a/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc b/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc index 11e4491..c697145 100644 --- a/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc +++ b/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc @@ -66,8 +66,8 @@ TEST(IndexedDBIOErrorTest, CleanUpTest) { ASSERT_TRUE(temp_directory.CreateUniqueTempDir()); const base::FilePath path = temp_directory.path(); MockLevelDBFactory mock_leveldb_factory; - WebKit::WebIDBCallbacks::DataLoss data_loss = - WebKit::WebIDBCallbacks::DataLossNone; + blink::WebIDBCallbacks::DataLoss data_loss = + blink::WebIDBCallbacks::DataLossNone; std::string data_loss_message; bool disk_full = false; scoped_refptr<IndexedDBBackingStore> backing_store = @@ -116,8 +116,8 @@ TEST(IndexedDBNonRecoverableIOErrorTest, NuancedCleanupTest) { base::ScopedTempDir temp_directory; ASSERT_TRUE(temp_directory.CreateUniqueTempDir()); const base::FilePath path = temp_directory.path(); - WebKit::WebIDBCallbacks::DataLoss data_loss = - WebKit::WebIDBCallbacks::DataLossNone; + blink::WebIDBCallbacks::DataLoss data_loss = + blink::WebIDBCallbacks::DataLossNone; std::string data_loss_reason; bool disk_full = false; diff --git a/content/browser/indexed_db/indexed_db_connection.cc b/content/browser/indexed_db/indexed_db_connection.cc index 51a6f1f..811398953 100644 --- a/content/browser/indexed_db/indexed_db_connection.cc +++ b/content/browser/indexed_db/indexed_db_connection.cc @@ -34,4 +34,4 @@ bool IndexedDBConnection::IsConnected() { return database_.get() != NULL; } -} // namespace WebKit +} // namespace blink diff --git a/content/browser/indexed_db/indexed_db_database.cc b/content/browser/indexed_db/indexed_db_database.cc index 8183f3a..dfc0d2c 100644 --- a/content/browser/indexed_db/indexed_db_database.cc +++ b/content/browser/indexed_db/indexed_db_database.cc @@ -24,7 +24,7 @@ #include "third_party/WebKit/public/platform/WebIDBDatabaseException.h" using base::Int64ToString16; -using WebKit::WebIDBKeyTypeNumber; +using blink::WebIDBKeyTypeNumber; namespace content { @@ -323,7 +323,7 @@ void IndexedDBDatabase::CreateObjectStoreOperation( object_store_metadata.key_path, object_store_metadata.auto_increment)) { transaction->Abort(IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionUnknownError, + blink::WebIDBDatabaseExceptionUnknownError, ASCIIToUTF16("Internal error creating object store '") + object_store_metadata.name + ASCIIToUTF16("'."))); return; @@ -401,7 +401,7 @@ void IndexedDBDatabase::CreateIndexOperation( string16 error_string = ASCIIToUTF16("Internal error creating index '") + index_metadata.name + ASCIIToUTF16("'."); transaction->Abort(IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionUnknownError, error_string)); + blink::WebIDBDatabaseExceptionUnknownError, error_string)); return; } } @@ -455,7 +455,7 @@ void IndexedDBDatabase::DeleteIndexOperation( string16 error_string = ASCIIToUTF16("Internal error deleting index '") + index_metadata.name + ASCIIToUTF16("'."); transaction->Abort(IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionUnknownError, error_string)); + blink::WebIDBDatabaseExceptionUnknownError, error_string)); } } @@ -588,7 +588,7 @@ void IndexedDBDatabase::GetOperation( &value); if (!ok) { callbacks->OnError( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError, "Internal error in GetRecord.")); return; } @@ -618,7 +618,7 @@ void IndexedDBDatabase::GetOperation( &primary_key); if (!ok) { callbacks->OnError( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError, "Internal error in GetPrimaryKeyViaIndex.")); return; } @@ -641,7 +641,7 @@ void IndexedDBDatabase::GetOperation( &value); if (!ok) { callbacks->OnError( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError, "Internal error in GetRecord.")); return; } @@ -761,7 +761,7 @@ void IndexedDBDatabase::PutOperation(scoped_ptr<PutOperationParams> params, key_was_generated = true; if (!auto_inc_key->IsValid()) { params->callbacks->OnError( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionConstraintError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionConstraintError, "Maximum key generator value reached.")); return; } @@ -784,13 +784,13 @@ void IndexedDBDatabase::PutOperation(scoped_ptr<PutOperationParams> params, &found); if (!ok) { params->callbacks->OnError( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError, "Internal error checking key existence.")); return; } if (found) { params->callbacks->OnError( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionConstraintError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionConstraintError, "Key already exists in the object store.")); return; } @@ -812,13 +812,13 @@ void IndexedDBDatabase::PutOperation(scoped_ptr<PutOperationParams> params, &obeys_constraints); if (!backing_store_success) { params->callbacks->OnError(IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionUnknownError, + blink::WebIDBDatabaseExceptionUnknownError, "Internal error: backing store error updating index keys.")); return; } if (!obeys_constraints) { params->callbacks->OnError(IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionConstraintError, error_message)); + blink::WebIDBDatabaseExceptionConstraintError, error_message)); return; } @@ -833,7 +833,7 @@ void IndexedDBDatabase::PutOperation(scoped_ptr<PutOperationParams> params, &record_identifier); if (!backing_store_success) { params->callbacks->OnError(IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionUnknownError, + blink::WebIDBDatabaseExceptionUnknownError, "Internal error: backing store error performing put/add.")); return; } @@ -858,7 +858,7 @@ void IndexedDBDatabase::PutOperation(scoped_ptr<PutOperationParams> params, !key_was_generated); if (!ok) { params->callbacks->OnError( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError, "Internal error updating key generator.")); return; } @@ -891,13 +891,13 @@ void IndexedDBDatabase::SetIndexKeys(int64 transaction_id, &found); if (!ok) { transaction->Abort( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError, "Internal error setting index keys.")); return; } if (!found) { transaction->Abort(IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionUnknownError, + blink::WebIDBDatabaseExceptionUnknownError, "Internal error setting index keys for object store.")); return; } @@ -922,13 +922,13 @@ void IndexedDBDatabase::SetIndexKeys(int64 transaction_id, &obeys_constraints); if (!backing_store_success) { transaction->Abort(IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionUnknownError, + blink::WebIDBDatabaseExceptionUnknownError, "Internal error: backing store error updating index keys.")); return; } if (!obeys_constraints) { transaction->Abort(IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionConstraintError, error_message)); + blink::WebIDBDatabaseExceptionConstraintError, error_message)); return; } @@ -1175,7 +1175,7 @@ void IndexedDBDatabase::DeleteRangeOperation( object_store_id, backing_store_cursor->record_identifier())) { callbacks->OnError( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError, "Internal error deleting data in range")); return; } @@ -1209,7 +1209,7 @@ void IndexedDBDatabase::ClearOperation( if (!backing_store_->ClearObjectStore( transaction->BackingStoreTransaction(), id(), object_store_id)) { callbacks->OnError( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError, "Internal error clearing object store")); return; } @@ -1229,7 +1229,7 @@ void IndexedDBDatabase::DeleteObjectStoreOperation( ASCIIToUTF16("Internal error deleting object store '") + object_store_metadata.name + ASCIIToUTF16("'."); transaction->Abort(IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionUnknownError, error_string)); + blink::WebIDBDatabaseExceptionUnknownError, error_string)); } } @@ -1237,7 +1237,7 @@ void IndexedDBDatabase::VersionChangeOperation( int64 version, scoped_refptr<IndexedDBCallbacks> callbacks, scoped_ptr<IndexedDBConnection> connection, - WebKit::WebIDBCallbacks::DataLoss data_loss, + blink::WebIDBCallbacks::DataLoss data_loss, std::string data_loss_message, IndexedDBTransaction* transaction) { IDB_TRACE("IndexedDBDatabase::VersionChangeOperation"); @@ -1249,7 +1249,7 @@ void IndexedDBDatabase::VersionChangeOperation( id(), metadata_.int_version)) { IndexedDBDatabaseError error( - WebKit::WebIDBDatabaseExceptionUnknownError, + blink::WebIDBDatabaseExceptionUnknownError, ASCIIToUTF16( "Internal error writing data to stable storage when " "updating version.")); @@ -1288,7 +1288,7 @@ void IndexedDBDatabase::TransactionFinishedAndAbortFired( if (transaction->mode() == indexed_db::TRANSACTION_VERSION_CHANGE) { if (pending_second_half_open_) { pending_second_half_open_->Callbacks()->OnError( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionAbortError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionAbortError, "Version change transaction was aborted in " "upgradeneeded event handler.")); pending_second_half_open_.reset(); @@ -1421,8 +1421,8 @@ void IndexedDBDatabase::OpenConnection( scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks, int64 transaction_id, int64 version) { - const WebKit::WebIDBCallbacks::DataLoss kDataLoss = - WebKit::WebIDBCallbacks::DataLossNone; + const blink::WebIDBCallbacks::DataLoss kDataLoss = + blink::WebIDBCallbacks::DataLossNone; OpenConnection( callbacks, database_callbacks, transaction_id, version, kDataLoss, ""); } @@ -1432,7 +1432,7 @@ void IndexedDBDatabase::OpenConnection( scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks, int64 transaction_id, int64 version, - WebKit::WebIDBCallbacks::DataLoss data_loss, + blink::WebIDBCallbacks::DataLoss data_loss, std::string data_loss_message) { DCHECK(backing_store_); @@ -1442,7 +1442,7 @@ void IndexedDBDatabase::OpenConnection( // The backing store only detects data loss when it is first opened. The // presence of existing connections means we didn't even check for data loss // so there'd better not be any. - DCHECK_NE(WebKit::WebIDBCallbacks::DataLossTotal, data_loss); + DCHECK_NE(blink::WebIDBCallbacks::DataLossTotal, data_loss); pending_open_calls_.push_back(new PendingOpenCall( callbacks, database_callbacks, transaction_id, version)); return; @@ -1464,7 +1464,7 @@ void IndexedDBDatabase::OpenConnection( ASCIIToUTF16("Internal error opening database with version ") + Int64ToString16(version); callbacks->OnError(IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionUnknownError, message)); + blink::WebIDBDatabaseExceptionUnknownError, message)); return; } } @@ -1511,7 +1511,7 @@ void IndexedDBDatabase::OpenConnection( } if (version < metadata_.int_version) { callbacks->OnError(IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionVersionError, + blink::WebIDBDatabaseExceptionVersionError, ASCIIToUTF16("The requested version (") + Int64ToString16(version) + ASCIIToUTF16(") is less than the existing version (") + Int64ToString16(metadata_.int_version) + ASCIIToUTF16(")."))); @@ -1527,13 +1527,13 @@ void IndexedDBDatabase::RunVersionChangeTransaction( scoped_ptr<IndexedDBConnection> connection, int64 transaction_id, int64 requested_version, - WebKit::WebIDBCallbacks::DataLoss data_loss, + blink::WebIDBCallbacks::DataLoss data_loss, std::string data_loss_message) { DCHECK(callbacks); DCHECK(connections_.count(connection.get())); if (ConnectionCount() > 1) { - DCHECK_NE(WebKit::WebIDBCallbacks::DataLossTotal, data_loss); + DCHECK_NE(blink::WebIDBCallbacks::DataLossTotal, data_loss); // Front end ensures the event is not fired at connections that have // close_pending set. for (ConnectionSet::const_iterator it = connections_.begin(); @@ -1567,8 +1567,8 @@ void IndexedDBDatabase::RunVersionChangeTransactionFinal( scoped_ptr<IndexedDBConnection> connection, int64 transaction_id, int64 requested_version) { - const WebKit::WebIDBCallbacks::DataLoss kDataLoss = - WebKit::WebIDBCallbacks::DataLossNone; + const blink::WebIDBCallbacks::DataLoss kDataLoss = + blink::WebIDBCallbacks::DataLossNone; RunVersionChangeTransactionFinal(callbacks, connection.Pass(), transaction_id, @@ -1582,7 +1582,7 @@ void IndexedDBDatabase::RunVersionChangeTransactionFinal( scoped_ptr<IndexedDBConnection> connection, int64 transaction_id, int64 requested_version, - WebKit::WebIDBCallbacks::DataLoss data_loss, + blink::WebIDBCallbacks::DataLoss data_loss, std::string data_loss_message) { std::vector<int64> object_store_ids; @@ -1641,7 +1641,7 @@ void IndexedDBDatabase::DeleteDatabaseFinal( DCHECK(backing_store_); if (!backing_store_->DeleteDatabase(metadata_.name)) { callbacks->OnError( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError, "Internal error deleting database.")); return; } @@ -1669,7 +1669,7 @@ void IndexedDBDatabase::Close(IndexedDBConnection* connection, bool forced) { ++it) { if (it->second->connection() == connection->callbacks()) it->second->Abort( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError, "Connection is closing.")); } } @@ -1678,7 +1678,7 @@ void IndexedDBDatabase::Close(IndexedDBConnection* connection, bool forced) { if (pending_second_half_open_ && pending_second_half_open_->Connection() == connection) { pending_second_half_open_->Callbacks()->OnError( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionAbortError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionAbortError, "The connection was closed.")); pending_second_half_open_.reset(); } diff --git a/content/browser/indexed_db/indexed_db_database.h b/content/browser/indexed_db/indexed_db_database.h index a87531c..6d18766 100644 --- a/content/browser/indexed_db/indexed_db_database.h +++ b/content/browser/indexed_db/indexed_db_database.h @@ -81,7 +81,7 @@ class CONTENT_EXPORT IndexedDBDatabase scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks, int64 transaction_id, int64 version, - WebKit::WebIDBCallbacks::DataLoss data_loss, + blink::WebIDBCallbacks::DataLoss data_loss, std::string data_loss_message); void DeleteDatabase(scoped_refptr<IndexedDBCallbacks> callbacks); const IndexedDBDatabaseMetadata& metadata() const { return metadata_; } @@ -195,7 +195,7 @@ class CONTENT_EXPORT IndexedDBDatabase void VersionChangeOperation(int64 version, scoped_refptr<IndexedDBCallbacks> callbacks, scoped_ptr<IndexedDBConnection> connection, - WebKit::WebIDBCallbacks::DataLoss data_loss, + blink::WebIDBCallbacks::DataLoss data_loss, std::string data_loss_message, IndexedDBTransaction* transaction); void VersionChangeAbortOperation(const string16& previous_version, @@ -255,7 +255,7 @@ class CONTENT_EXPORT IndexedDBDatabase scoped_ptr<IndexedDBConnection> connection, int64 transaction_id, int64 requested_version, - WebKit::WebIDBCallbacks::DataLoss data_loss, + blink::WebIDBCallbacks::DataLoss data_loss, std::string data_loss_message); void RunVersionChangeTransactionFinal( scoped_refptr<IndexedDBCallbacks> callbacks, @@ -267,7 +267,7 @@ class CONTENT_EXPORT IndexedDBDatabase scoped_ptr<IndexedDBConnection> connection, int64 transaction_id, int64 requested_version, - WebKit::WebIDBCallbacks::DataLoss data_loss, + blink::WebIDBCallbacks::DataLoss data_loss, std::string data_loss_message); void ProcessPendingCalls(); diff --git a/content/browser/indexed_db/indexed_db_dispatcher_host.cc b/content/browser/indexed_db/indexed_db_dispatcher_host.cc index 1f8f895..5613a7c 100644 --- a/content/browser/indexed_db/indexed_db_dispatcher_host.cc +++ b/content/browser/indexed_db/indexed_db_dispatcher_host.cc @@ -27,7 +27,7 @@ #include "webkit/common/database/database_identifier.h" using webkit_database::DatabaseUtil; -using WebKit::WebIDBKey; +using blink::WebIDBKey; namespace content { @@ -366,7 +366,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::CloseAll() { if (connection && connection->IsConnected()) { connection->database()->Abort( transaction_id, - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError)); + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError)); } } DCHECK(transaction_database_map_.empty()); @@ -440,7 +440,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnCreateObjectStore( database_url_map_[params.ipc_database_id])) { connection->database()->Abort( host_transaction_id, - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionQuotaError)); + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionQuotaError)); } } @@ -570,7 +570,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnSetIndexKeys( connection->database()->Abort( host_transaction_id, IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionUnknownError, + blink::WebIDBDatabaseExceptionUnknownError, "Malformed IPC message: index_ids.size() != index_keys.size()")); return; } @@ -708,7 +708,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnCommit( transaction_url_map_[host_transaction_id], transaction_size)) { connection->database()->Abort( host_transaction_id, - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionQuotaError)); + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionQuotaError)); return; } @@ -736,7 +736,7 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnCreateIndex( database_url_map_[params.ipc_database_id])) { connection->database()->Abort( host_transaction_id, - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionQuotaError)); + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionQuotaError)); } } diff --git a/content/browser/indexed_db/indexed_db_factory.cc b/content/browser/indexed_db/indexed_db_factory.cc index 4143a8a..0fbce75 100644 --- a/content/browser/indexed_db/indexed_db_factory.cc +++ b/content/browser/indexed_db/indexed_db_factory.cc @@ -109,7 +109,7 @@ void IndexedDBFactory::GetDatabaseNames( const base::FilePath& data_directory) { IDB_TRACE("IndexedDBFactory::GetDatabaseNames"); // TODO(dgrogan): Plumb data_loss back to script eventually? - WebKit::WebIDBCallbacks::DataLoss data_loss; + blink::WebIDBCallbacks::DataLoss data_loss; std::string data_loss_message; bool disk_full; scoped_refptr<IndexedDBBackingStore> backing_store = @@ -120,7 +120,7 @@ void IndexedDBFactory::GetDatabaseNames( &disk_full); if (!backing_store) { callbacks->OnError( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError, "Internal error opening backing store for " "indexedDB.webkitGetDatabaseNames.")); return; @@ -145,7 +145,7 @@ void IndexedDBFactory::DeleteDatabase( } // TODO(dgrogan): Plumb data_loss back to script eventually? - WebKit::WebIDBCallbacks::DataLoss data_loss; + blink::WebIDBCallbacks::DataLoss data_loss; std::string data_loss_message; bool disk_full = false; scoped_refptr<IndexedDBBackingStore> backing_store = @@ -156,7 +156,7 @@ void IndexedDBFactory::DeleteDatabase( &disk_full); if (!backing_store) { callbacks->OnError( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError, ASCIIToUTF16( "Internal error opening backing store " "for indexedDB.deleteDatabase."))); @@ -167,7 +167,7 @@ void IndexedDBFactory::DeleteDatabase( IndexedDBDatabase::Create(name, backing_store, this, unique_identifier); if (!database) { callbacks->OnError(IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionUnknownError, + blink::WebIDBDatabaseExceptionUnknownError, ASCIIToUTF16( "Internal error creating database backend for " "indexedDB.deleteDatabase."))); @@ -194,7 +194,7 @@ bool IndexedDBFactory::IsBackingStoreOpenForTesting(const GURL& origin_url) scoped_refptr<IndexedDBBackingStore> IndexedDBFactory::OpenBackingStore( const GURL& origin_url, const base::FilePath& data_directory, - WebKit::WebIDBCallbacks::DataLoss* data_loss, + blink::WebIDBCallbacks::DataLoss* data_loss, std::string* data_loss_message, bool* disk_full) { const bool open_in_memory = data_directory.empty(); @@ -244,8 +244,8 @@ void IndexedDBFactory::Open( scoped_refptr<IndexedDBDatabase> database; IndexedDBDatabase::Identifier unique_identifier(origin_url, name); IndexedDBDatabaseMap::iterator it = database_map_.find(unique_identifier); - WebKit::WebIDBCallbacks::DataLoss data_loss = - WebKit::WebIDBCallbacks::DataLossNone; + blink::WebIDBCallbacks::DataLoss data_loss = + blink::WebIDBCallbacks::DataLossNone; std::string data_loss_message; bool disk_full = false; if (it == database_map_.end()) { @@ -258,14 +258,14 @@ void IndexedDBFactory::Open( if (!backing_store) { if (disk_full) { callbacks->OnError( - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionQuotaError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionQuotaError, ASCIIToUTF16( "Encountered full disk while opening " "backing store for indexedDB.open."))); return; } callbacks->OnError(IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionUnknownError, + blink::WebIDBDatabaseExceptionUnknownError, ASCIIToUTF16( "Internal error opening backing store for indexedDB.open."))); return; @@ -275,7 +275,7 @@ void IndexedDBFactory::Open( IndexedDBDatabase::Create(name, backing_store, this, unique_identifier); if (!database) { callbacks->OnError(IndexedDBDatabaseError( - WebKit::WebIDBDatabaseExceptionUnknownError, + blink::WebIDBDatabaseExceptionUnknownError, ASCIIToUTF16( "Internal error creating database backend for indexedDB.open."))); return; diff --git a/content/browser/indexed_db/indexed_db_factory.h b/content/browser/indexed_db/indexed_db_factory.h index c10b251..5e4a7e7 100644 --- a/content/browser/indexed_db/indexed_db_factory.h +++ b/content/browser/indexed_db/indexed_db_factory.h @@ -68,7 +68,7 @@ class CONTENT_EXPORT IndexedDBFactory virtual scoped_refptr<IndexedDBBackingStore> OpenBackingStore( const GURL& origin_url, const base::FilePath& data_directory, - WebKit::WebIDBCallbacks::DataLoss* data_loss, + blink::WebIDBCallbacks::DataLoss* data_loss, std::string* data_loss_reason, bool* disk_full); diff --git a/content/browser/indexed_db/indexed_db_factory_unittest.cc b/content/browser/indexed_db/indexed_db_factory_unittest.cc index f04906e..d8cf6fe 100644 --- a/content/browser/indexed_db/indexed_db_factory_unittest.cc +++ b/content/browser/indexed_db/indexed_db_factory_unittest.cc @@ -40,8 +40,8 @@ class MockIDBFactory : public IndexedDBFactory { scoped_refptr<IndexedDBBackingStore> TestOpenBackingStore( const GURL& origin, const base::FilePath& data_directory) { - WebKit::WebIDBCallbacks::DataLoss data_loss = - WebKit::WebIDBCallbacks::DataLossNone; + blink::WebIDBCallbacks::DataLoss data_loss = + blink::WebIDBCallbacks::DataLossNone; std::string data_loss_message; bool disk_full; scoped_refptr<IndexedDBBackingStore> backing_store = @@ -50,7 +50,7 @@ class MockIDBFactory : public IndexedDBFactory { &data_loss, &data_loss_message, &disk_full); - EXPECT_EQ(WebKit::WebIDBCallbacks::DataLossNone, data_loss); + EXPECT_EQ(blink::WebIDBCallbacks::DataLossNone, data_loss); return backing_store; } @@ -187,7 +187,7 @@ class DiskFullFactory : public IndexedDBFactory { virtual scoped_refptr<IndexedDBBackingStore> OpenBackingStore( const GURL& origin_url, const base::FilePath& data_directory, - WebKit::WebIDBCallbacks::DataLoss* data_loss, + blink::WebIDBCallbacks::DataLoss* data_loss, std::string* data_loss_message, bool* disk_full) OVERRIDE { *disk_full = true; @@ -201,7 +201,7 @@ class LookingForQuotaErrorMockCallbacks : public IndexedDBCallbacks { : IndexedDBCallbacks(NULL, 0, 0), error_called_(false) {} virtual void OnError(const IndexedDBDatabaseError& error) OVERRIDE { error_called_ = true; - EXPECT_EQ(WebKit::WebIDBDatabaseExceptionQuotaError, error.code()); + EXPECT_EQ(blink::WebIDBDatabaseExceptionQuotaError, error.code()); } private: diff --git a/content/browser/indexed_db/indexed_db_internals_ui.cc b/content/browser/indexed_db/indexed_db_internals_ui.cc index 230b788..b5e888f 100644 --- a/content/browser/indexed_db/indexed_db_internals_ui.cc +++ b/content/browser/indexed_db/indexed_db_internals_ui.cc @@ -280,7 +280,7 @@ void IndexedDBInternalsUI::OnDownloadDataReady( const GURL referrer(web_ui()->GetWebContents()->GetLastCommittedURL()); dl_params->set_referrer( - content::Referrer(referrer, WebKit::WebReferrerPolicyDefault)); + content::Referrer(referrer, blink::WebReferrerPolicyDefault)); // This is how to watch for the download to finish: first wait for it // to start, then attach a DownloadItem::Observer to observe the diff --git a/content/browser/indexed_db/indexed_db_leveldb_coding.cc b/content/browser/indexed_db/indexed_db_leveldb_coding.cc index 38799fc..b9ce26c 100644 --- a/content/browser/indexed_db/indexed_db_leveldb_coding.cc +++ b/content/browser/indexed_db/indexed_db_leveldb_coding.cc @@ -147,18 +147,18 @@ using base::StringPiece; -using WebKit::WebIDBKeyType; -using WebKit::WebIDBKeyTypeArray; -using WebKit::WebIDBKeyTypeDate; -using WebKit::WebIDBKeyTypeInvalid; -using WebKit::WebIDBKeyTypeMin; -using WebKit::WebIDBKeyTypeNull; -using WebKit::WebIDBKeyTypeNumber; -using WebKit::WebIDBKeyTypeString; -using WebKit::WebIDBKeyPathType; -using WebKit::WebIDBKeyPathTypeArray; -using WebKit::WebIDBKeyPathTypeNull; -using WebKit::WebIDBKeyPathTypeString; +using blink::WebIDBKeyType; +using blink::WebIDBKeyTypeArray; +using blink::WebIDBKeyTypeDate; +using blink::WebIDBKeyTypeInvalid; +using blink::WebIDBKeyTypeMin; +using blink::WebIDBKeyTypeNull; +using blink::WebIDBKeyTypeNumber; +using blink::WebIDBKeyTypeString; +using blink::WebIDBKeyPathType; +using blink::WebIDBKeyPathTypeArray; +using blink::WebIDBKeyPathTypeNull; +using blink::WebIDBKeyPathTypeString; namespace content { diff --git a/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc b/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc index 01f1260..e5e4927 100644 --- a/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc +++ b/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc @@ -16,8 +16,8 @@ #include "testing/gtest/include/gtest/gtest.h" using base::StringPiece; -using WebKit::WebIDBKeyTypeDate; -using WebKit::WebIDBKeyTypeNumber; +using blink::WebIDBKeyTypeDate; +using blink::WebIDBKeyTypeNumber; namespace content { diff --git a/content/browser/indexed_db/indexed_db_transaction.cc b/content/browser/indexed_db/indexed_db_transaction.cc index 276b1a9..8566a38 100644 --- a/content/browser/indexed_db/indexed_db_transaction.cc +++ b/content/browser/indexed_db/indexed_db_transaction.cc @@ -114,7 +114,7 @@ void IndexedDBTransaction::EnsureTasksRunning() { } void IndexedDBTransaction::Abort() { - Abort(IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError, + Abort(IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError, "Internal error (unknown cause)")); } @@ -253,7 +253,7 @@ void IndexedDBTransaction::Commit() { } else { callbacks_->OnAbort( id_, - IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError, + IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError, "Internal error committing transaction.")); database_->TransactionFinishedAndAbortFired(this); database_->TransactionCommitFailed(); diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index 2a40e11..ecd4237 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -158,13 +158,13 @@ void SetReferrerForRequest(net::URLRequest* request, const Referrer& referrer) { net::URLRequest::ReferrerPolicy net_referrer_policy = net::URLRequest::CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE; switch (referrer.policy) { - case WebKit::WebReferrerPolicyDefault: + case blink::WebReferrerPolicyDefault: net_referrer_policy = net::URLRequest::CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE; break; - case WebKit::WebReferrerPolicyAlways: - case WebKit::WebReferrerPolicyNever: - case WebKit::WebReferrerPolicyOrigin: + case blink::WebReferrerPolicyAlways: + case blink::WebReferrerPolicyNever: + case blink::WebReferrerPolicyOrigin: net_referrer_policy = net::URLRequest::NEVER_CLEAR_REFERRER; break; } @@ -1225,7 +1225,7 @@ ResourceRequestInfoImpl* ResourceDispatcherHostImpl::CreateRequestInfo( false, // is_stream download, // allow_download false, // has_user_gesture - WebKit::WebReferrerPolicyDefault, + blink::WebReferrerPolicyDefault, context, base::WeakPtr<ResourceMessageFilter>(), // filter true); // is_async diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc index a2a34d8..07062ef 100644 --- a/content/browser/loader/resource_dispatcher_host_unittest.cc +++ b/content/browser/loader/resource_dispatcher_host_unittest.cc @@ -99,7 +99,7 @@ static ResourceHostMsg_Request CreateResourceRequest( request.method = std::string(method); request.url = url; request.first_party_for_cookies = url; // bypass third-party cookie blocking - request.referrer_policy = WebKit::WebReferrerPolicyDefault; + request.referrer_policy = blink::WebReferrerPolicyDefault; request.load_flags = 0; request.origin_pid = 0; request.resource_type = type; diff --git a/content/browser/loader/resource_request_info_impl.cc b/content/browser/loader/resource_request_info_impl.cc index 5af13db..29a80e6 100644 --- a/content/browser/loader/resource_request_info_impl.cc +++ b/content/browser/loader/resource_request_info_impl.cc @@ -47,7 +47,7 @@ void ResourceRequestInfo::AllocateForTesting( false, // is_stream true, // allow_download false, // has_user_gesture - WebKit::WebReferrerPolicyDefault, // referrer_policy + blink::WebReferrerPolicyDefault, // referrer_policy context, // context base::WeakPtr<ResourceMessageFilter>(), // filter is_async); // is_async @@ -99,7 +99,7 @@ ResourceRequestInfoImpl::ResourceRequestInfoImpl( bool is_stream, bool allow_download, bool has_user_gesture, - WebKit::WebReferrerPolicy referrer_policy, + blink::WebReferrerPolicy referrer_policy, ResourceContext* context, base::WeakPtr<ResourceMessageFilter> filter, bool is_async) @@ -170,7 +170,7 @@ ResourceType::Type ResourceRequestInfoImpl::GetResourceType() const { return resource_type_; } -WebKit::WebReferrerPolicy ResourceRequestInfoImpl::GetReferrerPolicy() const { +blink::WebReferrerPolicy ResourceRequestInfoImpl::GetReferrerPolicy() const { return referrer_policy_; } diff --git a/content/browser/loader/resource_request_info_impl.h b/content/browser/loader/resource_request_info_impl.h index 6947315a..3da351a 100644 --- a/content/browser/loader/resource_request_info_impl.h +++ b/content/browser/loader/resource_request_info_impl.h @@ -53,7 +53,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo, bool is_stream, bool allow_download, bool has_user_gesture, - WebKit::WebReferrerPolicy referrer_policy, + blink::WebReferrerPolicy referrer_policy, ResourceContext* context, base::WeakPtr<ResourceMessageFilter> filter, bool is_async); @@ -70,7 +70,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo, virtual bool ParentIsMainFrame() const OVERRIDE; virtual int64 GetParentFrameID() const OVERRIDE; virtual ResourceType::Type GetResourceType() const OVERRIDE; - virtual WebKit::WebReferrerPolicy GetReferrerPolicy() const OVERRIDE; + virtual blink::WebReferrerPolicy GetReferrerPolicy() const OVERRIDE; virtual PageTransition GetPageTransition() const OVERRIDE; virtual bool HasUserGesture() const OVERRIDE; virtual bool WasIgnoredByHandler() const OVERRIDE; @@ -153,7 +153,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo, ResourceType::Type resource_type_; PageTransition transition_type_; int memory_cost_; - WebKit::WebReferrerPolicy referrer_policy_; + blink::WebReferrerPolicy referrer_policy_; ResourceContext* context_; // The filter might be deleted without deleting this object if the process // exits during a transfer. diff --git a/content/browser/loader/resource_scheduler_unittest.cc b/content/browser/loader/resource_scheduler_unittest.cc index 079a031..9474778 100644 --- a/content/browser/loader/resource_scheduler_unittest.cc +++ b/content/browser/loader/resource_scheduler_unittest.cc @@ -157,7 +157,7 @@ class ResourceSchedulerTest : public testing::Test { false, // is_stream true, // allow_download false, // has_user_gesture - WebKit::WebReferrerPolicyDefault, // referrer_policy + blink::WebReferrerPolicyDefault, // referrer_policy NULL, // context base::WeakPtr<ResourceMessageFilter>(), // filter true); // is_async diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc index 11c3fae..6174acf0 100644 --- a/content/browser/plugin_browsertest.cc +++ b/content/browser/plugin_browsertest.cc @@ -168,7 +168,7 @@ IN_PROC_BROWSER_TEST_F(PluginTest, TitleWatcher title_watcher(shell()->web_contents(), expected_title); title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); SimulateMouseClick(shell()->web_contents(), 0, - WebKit::WebMouseEvent::ButtonLeft); + blink::WebMouseEvent::ButtonLeft); EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); } #endif diff --git a/content/browser/renderer_host/basic_mouse_wheel_smooth_scroll_gesture.cc b/content/browser/renderer_host/basic_mouse_wheel_smooth_scroll_gesture.cc index e456337..f43e077 100644 --- a/content/browser/renderer_host/basic_mouse_wheel_smooth_scroll_gesture.cc +++ b/content/browser/renderer_host/basic_mouse_wheel_smooth_scroll_gesture.cc @@ -31,8 +31,8 @@ bool BasicMouseWheelSmoothScrollGesture::ForwardInputEvents( RenderWidgetHostImpl::From(host)->GetSyntheticGestureMessageInterval()); - WebKit::WebMouseWheelEvent event; - event.type = WebKit::WebInputEvent::MouseWheel; + blink::WebMouseWheelEvent event; + event.type = blink::WebInputEvent::MouseWheel; event.hasPreciseScrollingDeltas = 0; event.deltaY = scroll_down_ ? -position_delta : position_delta; // TODO(vollick): find a proper way to access diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc index 3687a41..3189e9f 100644 --- a/content/browser/renderer_host/compositor_impl_android.cc +++ b/content/browser/renderer_host/compositor_impl_android.cc @@ -272,15 +272,15 @@ void CompositorImpl::DeleteUIResource(cc::UIResourceId resource_id) { ui_resource_map_.erase(it); } -WebKit::WebGLId CompositorImpl::GenerateTexture(gfx::JavaBitmap& bitmap) { +blink::WebGLId CompositorImpl::GenerateTexture(gfx::JavaBitmap& bitmap) { unsigned int texture_id = BuildBasicTexture(); - WebKit::WebGraphicsContext3D* context = + blink::WebGraphicsContext3D* context = ImageTransportFactoryAndroid::GetInstance()->GetContext3D(); if (texture_id == 0 || context->isContextLost() || !context->makeContextCurrent()) return 0; - WebKit::WebGLId format = GetGLFormatForBitmap(bitmap); - WebKit::WebGLId type = GetGLTypeForBitmap(bitmap); + blink::WebGLId format = GetGLFormatForBitmap(bitmap); + blink::WebGLId type = GetGLTypeForBitmap(bitmap); context->texImage2D(GL_TEXTURE_2D, 0, @@ -295,11 +295,11 @@ WebKit::WebGLId CompositorImpl::GenerateTexture(gfx::JavaBitmap& bitmap) { return texture_id; } -WebKit::WebGLId CompositorImpl::GenerateCompressedTexture(gfx::Size& size, +blink::WebGLId CompositorImpl::GenerateCompressedTexture(gfx::Size& size, int data_size, void* data) { unsigned int texture_id = BuildBasicTexture(); - WebKit::WebGraphicsContext3D* context = + blink::WebGraphicsContext3D* context = ImageTransportFactoryAndroid::GetInstance()->GetContext3D(); if (texture_id == 0 || context->isContextLost() || !context->makeContextCurrent()) @@ -316,8 +316,8 @@ WebKit::WebGLId CompositorImpl::GenerateCompressedTexture(gfx::Size& size, return texture_id; } -void CompositorImpl::DeleteTexture(WebKit::WebGLId texture_id) { - WebKit::WebGraphicsContext3D* context = +void CompositorImpl::DeleteTexture(blink::WebGLId texture_id) { + blink::WebGraphicsContext3D* context = ImageTransportFactoryAndroid::GetInstance()->GetContext3D(); if (context->isContextLost() || !context->makeContextCurrent()) return; @@ -325,12 +325,12 @@ void CompositorImpl::DeleteTexture(WebKit::WebGLId texture_id) { context->shallowFlushCHROMIUM(); } -bool CompositorImpl::CopyTextureToBitmap(WebKit::WebGLId texture_id, +bool CompositorImpl::CopyTextureToBitmap(blink::WebGLId texture_id, gfx::JavaBitmap& bitmap) { return CopyTextureToBitmap(texture_id, gfx::Rect(bitmap.size()), bitmap); } -bool CompositorImpl::CopyTextureToBitmap(WebKit::WebGLId texture_id, +bool CompositorImpl::CopyTextureToBitmap(blink::WebGLId texture_id, const gfx::Rect& sub_rect, gfx::JavaBitmap& bitmap) { // The sub_rect should match the bitmap size. @@ -346,7 +346,7 @@ bool CompositorImpl::CopyTextureToBitmap(WebKit::WebGLId texture_id, static scoped_ptr<WebGraphicsContext3DCommandBufferImpl> CreateGpuProcessViewContext( - const WebKit::WebGraphicsContext3D::Attributes attributes, + const blink::WebGraphicsContext3D::Attributes attributes, int surface_id, base::WeakPtr<CompositorImpl> compositor_impl) { BrowserGpuChannelHostFactory* factory = @@ -384,7 +384,7 @@ CreateGpuProcessViewContext( scoped_ptr<cc::OutputSurface> CompositorImpl::CreateOutputSurface( bool fallback) { - WebKit::WebGraphicsContext3D::Attributes attrs; + blink::WebGraphicsContext3D::Attributes attrs; attrs.shareResources = true; attrs.noAutomaticFlushes = true; @@ -439,12 +439,12 @@ void CompositorImpl::OnViewContextSwapBuffersAborted() { client_->OnSwapBuffersCompleted(); } -WebKit::WebGLId CompositorImpl::BuildBasicTexture() { - WebKit::WebGraphicsContext3D* context = +blink::WebGLId CompositorImpl::BuildBasicTexture() { + blink::WebGraphicsContext3D* context = ImageTransportFactoryAndroid::GetInstance()->GetContext3D(); if (context->isContextLost() || !context->makeContextCurrent()) return 0; - WebKit::WebGLId texture_id = context->createTexture(); + blink::WebGLId texture_id = context->createTexture(); context->bindTexture(GL_TEXTURE_2D, texture_id); context->texParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); context->texParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); @@ -453,7 +453,7 @@ WebKit::WebGLId CompositorImpl::BuildBasicTexture() { return texture_id; } -WebKit::WGC3Denum CompositorImpl::GetGLFormatForBitmap( +blink::WGC3Denum CompositorImpl::GetGLFormatForBitmap( gfx::JavaBitmap& bitmap) { switch (bitmap.format()) { case ANDROID_BITMAP_FORMAT_A_8: @@ -471,7 +471,7 @@ WebKit::WGC3Denum CompositorImpl::GetGLFormatForBitmap( } } -WebKit::WGC3Denum CompositorImpl::GetGLTypeForBitmap(gfx::JavaBitmap& bitmap) { +blink::WGC3Denum CompositorImpl::GetGLTypeForBitmap(gfx::JavaBitmap& bitmap) { switch (bitmap.format()) { case ANDROID_BITMAP_FORMAT_A_8: return GL_UNSIGNED_BYTE; diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h index ece532d..95546000 100644 --- a/content/browser/renderer_host/compositor_impl_android.h +++ b/content/browser/renderer_host/compositor_impl_android.h @@ -62,13 +62,13 @@ class CONTENT_EXPORT CompositorImpl virtual cc::UIResourceId GenerateUIResource( const cc::UIResourceBitmap& bitmap) OVERRIDE; virtual void DeleteUIResource(cc::UIResourceId resource_id) OVERRIDE; - virtual WebKit::WebGLId GenerateTexture(gfx::JavaBitmap& bitmap) OVERRIDE; - virtual WebKit::WebGLId GenerateCompressedTexture( + virtual blink::WebGLId GenerateTexture(gfx::JavaBitmap& bitmap) OVERRIDE; + virtual blink::WebGLId GenerateCompressedTexture( gfx::Size& size, int data_size, void* data) OVERRIDE; - virtual void DeleteTexture(WebKit::WebGLId texture_id) OVERRIDE; - virtual bool CopyTextureToBitmap(WebKit::WebGLId texture_id, + virtual void DeleteTexture(blink::WebGLId texture_id) OVERRIDE; + virtual bool CopyTextureToBitmap(blink::WebGLId texture_id, gfx::JavaBitmap& bitmap) OVERRIDE; - virtual bool CopyTextureToBitmap(WebKit::WebGLId texture_id, + virtual bool CopyTextureToBitmap(blink::WebGLId texture_id, const gfx::Rect& sub_rect, gfx::JavaBitmap& bitmap) OVERRIDE; @@ -103,9 +103,9 @@ class CONTENT_EXPORT CompositorImpl virtual void OnLostResources() OVERRIDE; private: - WebKit::WebGLId BuildBasicTexture(); - WebKit::WGC3Denum GetGLFormatForBitmap(gfx::JavaBitmap& bitmap); - WebKit::WGC3Denum GetGLTypeForBitmap(gfx::JavaBitmap& bitmap); + blink::WebGLId BuildBasicTexture(); + blink::WGC3Denum GetGLFormatForBitmap(gfx::JavaBitmap& bitmap); + blink::WGC3Denum GetGLTypeForBitmap(gfx::JavaBitmap& bitmap); scoped_refptr<cc::Layer> root_layer_; scoped_ptr<cc::LayerTreeHost> host_; diff --git a/content/browser/renderer_host/gtk_im_context_wrapper.cc b/content/browser/renderer_host/gtk_im_context_wrapper.cc index e79faba..7ce6558 100644 --- a/content/browser/renderer_host/gtk_im_context_wrapper.cc +++ b/content/browser/renderer_host/gtk_im_context_wrapper.cc @@ -41,11 +41,11 @@ const int kCompositionEventKeyCode = 229; } // namespace // ui::CompositionUnderline should be identical to -// WebKit::WebCompositionUnderline, so that we can do reinterpret_cast safely. +// blink::WebCompositionUnderline, so that we can do reinterpret_cast safely. // TODO(suzhe): remove it after migrating all code in chrome to use // ui::CompositionUnderline. COMPILE_ASSERT(sizeof(ui::CompositionUnderline) == - sizeof(WebKit::WebCompositionUnderline), + sizeof(blink::WebCompositionUnderline), ui_CompositionUnderline__WebKit_WebCompositionUnderline_diff); GtkIMContextWrapper::GtkIMContextWrapper(RenderWidgetHostViewGtk* host_view) @@ -402,7 +402,7 @@ void GtkIMContextWrapper::ProcessUnfilteredKeyPressEvent( // isSystemKey will be set to true if this key event has Alt modifier, // see WebInputEventFactory::keyboardEvent() for details. if (wke->text[0]) { - wke->type = WebKit::WebInputEvent::Char; + wke->type = blink::WebInputEvent::Char; wke->skip_in_browser = true; host_view_->ForwardKeyboardEvent(*wke); } @@ -455,8 +455,8 @@ void GtkIMContextWrapper::ProcessInputMethodResult(const GdkEventKey* event, is_composing_text_ = true; // TODO(suzhe): convert both renderer_host and renderer to use // ui::CompositionText. - const std::vector<WebKit::WebCompositionUnderline>& underlines = - reinterpret_cast<const std::vector<WebKit::WebCompositionUnderline>&>( + const std::vector<blink::WebCompositionUnderline>& underlines = + reinterpret_cast<const std::vector<blink::WebCompositionUnderline>&>( composition_.underlines); host->ImeSetComposition(composition_.text, underlines, composition_.selection.start(), @@ -500,11 +500,11 @@ void GtkIMContextWrapper::HandleCommit(const string16& text) { // In this case, the text must be committed directly. if (!is_in_key_event_handler_ && host_view_->GetRenderWidgetHost()) { // Workaround http://crbug.com/45478 by sending fake key down/up events. - SendFakeCompositionKeyEvent(WebKit::WebInputEvent::RawKeyDown); + SendFakeCompositionKeyEvent(blink::WebInputEvent::RawKeyDown); RenderWidgetHostImpl::From( host_view_->GetRenderWidgetHost())->ImeConfirmComposition( text, gfx::Range::InvalidRange(), false); - SendFakeCompositionKeyEvent(WebKit::WebInputEvent::KeyUp); + SendFakeCompositionKeyEvent(blink::WebInputEvent::KeyUp); } } @@ -545,17 +545,17 @@ void GtkIMContextWrapper::HandlePreeditChanged(const gchar* text, if (!is_in_key_event_handler_ && is_composing_text_ && host_view_->GetRenderWidgetHost()) { // Workaround http://crbug.com/45478 by sending fake key down/up events. - SendFakeCompositionKeyEvent(WebKit::WebInputEvent::RawKeyDown); + SendFakeCompositionKeyEvent(blink::WebInputEvent::RawKeyDown); // TODO(suzhe): convert both renderer_host and renderer to use // ui::CompositionText. - const std::vector<WebKit::WebCompositionUnderline>& underlines = - reinterpret_cast<const std::vector<WebKit::WebCompositionUnderline>&>( + const std::vector<blink::WebCompositionUnderline>& underlines = + reinterpret_cast<const std::vector<blink::WebCompositionUnderline>&>( composition_.underlines); RenderWidgetHostImpl::From( host_view_->GetRenderWidgetHost())->ImeSetComposition( composition_.text, underlines, composition_.selection.start(), composition_.selection.end()); - SendFakeCompositionKeyEvent(WebKit::WebInputEvent::KeyUp); + SendFakeCompositionKeyEvent(blink::WebInputEvent::KeyUp); } } @@ -613,7 +613,7 @@ void GtkIMContextWrapper::HandleHostViewUnrealize() { } void GtkIMContextWrapper::SendFakeCompositionKeyEvent( - WebKit::WebInputEvent::Type type) { + blink::WebInputEvent::Type type) { NativeWebKeyboardEvent fake_event; fake_event.windowsKeyCode = kCompositionEventKeyCode; fake_event.skip_in_browser = true; diff --git a/content/browser/renderer_host/gtk_im_context_wrapper.h b/content/browser/renderer_host/gtk_im_context_wrapper.h index 9f13551..1647df1 100644 --- a/content/browser/renderer_host/gtk_im_context_wrapper.h +++ b/content/browser/renderer_host/gtk_im_context_wrapper.h @@ -101,7 +101,7 @@ class GtkIMContextWrapper { // Sends a fake composition key event with specified event type. A composition // key event is a key event with special key code 229. - void SendFakeCompositionKeyEvent(WebKit::WebInputEvent::Type type); + void SendFakeCompositionKeyEvent(blink::WebInputEvent::Type type); // Signal handlers of GtkIMContext object. static void HandleCommitThunk(GtkIMContext* context, gchar* text, diff --git a/content/browser/renderer_host/gtk_key_bindings_handler.cc b/content/browser/renderer_host/gtk_key_bindings_handler.cc index 5a05eeb..3830364 100644 --- a/content/browser/renderer_host/gtk_key_bindings_handler.cc +++ b/content/browser/renderer_host/gtk_key_bindings_handler.cc @@ -29,7 +29,7 @@ GtkKeyBindingsHandler::~GtkKeyBindingsHandler() { bool GtkKeyBindingsHandler::Match(const NativeWebKeyboardEvent& wke, EditCommands* edit_commands) { - if (wke.type == WebKit::WebInputEvent::Char || !wke.os_event) + if (wke.type == blink::WebInputEvent::Char || !wke.os_event) return false; edit_commands_.clear(); diff --git a/content/browser/renderer_host/gtk_window_utils.cc b/content/browser/renderer_host/gtk_window_utils.cc index f05cdca..b176323 100644 --- a/content/browser/renderer_host/gtk_window_utils.cc +++ b/content/browser/renderer_host/gtk_window_utils.cc @@ -45,7 +45,7 @@ gfx::Rect GetWorkArea(Window window) { property[start_index + 2], property[start_index + 3]); } -WebKit::WebScreenInfo GetScreenInfo(XDisplay* display, int screenNumber) { +blink::WebScreenInfo GetScreenInfo(XDisplay* display, int screenNumber) { // XDisplayWidth() and XDisplayHeight() return cached values. To ensure that // we return the correct dimensions after the screen is resized, query the // root window's geometry each time. @@ -56,11 +56,11 @@ WebKit::WebScreenInfo GetScreenInfo(XDisplay* display, int screenNumber) { XGetGeometry( display, root, &root_ret, &x, &y, &width, &height, &border, &depth); - WebKit::WebScreenInfo results; + blink::WebScreenInfo results; results.depthPerComponent = 8; // Assume 8bpp, which is usually right. results.depth = depth; results.isMonochrome = depth == 1; - results.rect = WebKit::WebRect(x, y, width, height); + results.rect = blink::WebRect(x, y, width, height); results.availableRect = results.rect; return results; } @@ -68,7 +68,7 @@ WebKit::WebScreenInfo GetScreenInfo(XDisplay* display, int screenNumber) { } // namespace void GetScreenInfoFromNativeWindow( - GdkWindow* gdk_window, WebKit::WebScreenInfo* results) { + GdkWindow* gdk_window, blink::WebScreenInfo* results) { GdkScreen* screen = gdk_window_get_screen(gdk_window); *results = GetScreenInfo(gdk_x11_drawable_get_xdisplay(gdk_window), gdk_x11_screen_get_screen_number(screen)); @@ -76,7 +76,7 @@ void GetScreenInfoFromNativeWindow( int monitor_number = gdk_screen_get_monitor_at_window(screen, gdk_window); GdkRectangle monitor_rect; gdk_screen_get_monitor_geometry(screen, monitor_number, &monitor_rect); - results->rect = WebKit::WebRect(monitor_rect.x, monitor_rect.y, + results->rect = blink::WebRect(monitor_rect.x, monitor_rect.y, monitor_rect.width, monitor_rect.height); gfx::Rect available_rect = results->rect; diff --git a/content/browser/renderer_host/gtk_window_utils.h b/content/browser/renderer_host/gtk_window_utils.h index ed0cfe1..93f1d68 100644 --- a/content/browser/renderer_host/gtk_window_utils.h +++ b/content/browser/renderer_host/gtk_window_utils.h @@ -9,14 +9,14 @@ typedef struct _GdkDrawable GdkWindow; -namespace WebKit { +namespace blink { struct WebScreenInfo; } namespace content { CONTENT_EXPORT void GetScreenInfoFromNativeWindow( - GdkWindow* gdk_window, WebKit::WebScreenInfo* results); + GdkWindow* gdk_window, blink::WebScreenInfo* results); } // namespace content diff --git a/content/browser/renderer_host/image_transport_factory_android.cc b/content/browser/renderer_host/image_transport_factory_android.cc index 1c5d891..380cc7a 100644 --- a/content/browser/renderer_host/image_transport_factory_android.cc +++ b/content/browser/renderer_host/image_transport_factory_android.cc @@ -20,7 +20,7 @@ base::LazyInstance<ObserverList<ImageTransportFactoryAndroidObserver> >::Leaky g_factory_observers = LAZY_INSTANCE_INITIALIZER; class GLContextLostListener - : public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback { + : public blink::WebGraphicsContext3D::WebGraphicsContextLostCallback { public: // WebGraphicsContextLostCallback implementation. virtual void onContextLost() OVERRIDE; @@ -43,7 +43,7 @@ class CmdBufferImageTransportFactory : public ImageTransportFactoryAndroid { virtual void DeleteTexture(uint32_t id) OVERRIDE; virtual void AcquireTexture( uint32 texture_id, const signed char* mailbox_name) OVERRIDE; - virtual WebKit::WebGraphicsContext3D* GetContext3D() OVERRIDE { + virtual blink::WebGraphicsContext3D* GetContext3D() OVERRIDE { return context_.get(); } virtual GLHelper* GetGLHelper() OVERRIDE; @@ -62,7 +62,7 @@ CmdBufferImageTransportFactory::CmdBufferImageTransportFactory() { CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE)); DCHECK(gpu_channel_host); - WebKit::WebGraphicsContext3D::Attributes attrs; + blink::WebGraphicsContext3D::Attributes attrs; attrs.shareResources = true; GURL url("chrome://gpu/ImageTransportFactoryAndroid"); base::WeakPtr<WebGraphicsContext3DSwapBuffersClient> swap_client; diff --git a/content/browser/renderer_host/image_transport_factory_android.h b/content/browser/renderer_host/image_transport_factory_android.h index 22dc09e..e6d5f9b 100644 --- a/content/browser/renderer_host/image_transport_factory_android.h +++ b/content/browser/renderer_host/image_transport_factory_android.h @@ -12,7 +12,7 @@ namespace gfx { class GLShareGroup; } -namespace WebKit { +namespace blink { class WebGraphicsContext3D; } @@ -39,7 +39,7 @@ class ImageTransportFactoryAndroid { virtual void AcquireTexture( uint32 texture_id, const signed char* mailbox_name) = 0; - virtual WebKit::WebGraphicsContext3D* GetContext3D() = 0; + virtual blink::WebGraphicsContext3D* GetContext3D() = 0; virtual GLHelper* GetGLHelper() = 0; static void AddObserver(ImageTransportFactoryAndroidObserver* observer); diff --git a/content/browser/renderer_host/ime_adapter_android.cc b/content/browser/renderer_host/ime_adapter_android.cc index abda01f..9e7fe47 100644 --- a/content/browser/renderer_host/ime_adapter_android.cc +++ b/content/browser/renderer_host/ime_adapter_android.cc @@ -40,11 +40,11 @@ NativeWebKeyboardEvent NativeWebKeyboardEventFromKeyEvent( int key_code, bool is_system_key, int unicode_char) { - WebKit::WebInputEvent::Type type = WebKit::WebInputEvent::Undefined; + blink::WebInputEvent::Type type = blink::WebInputEvent::Undefined; if (action == AKEY_EVENT_ACTION_DOWN) - type = WebKit::WebInputEvent::RawKeyDown; + type = blink::WebInputEvent::RawKeyDown; else if (action == AKEY_EVENT_ACTION_UP) - type = WebKit::WebInputEvent::KeyUp; + type = blink::WebInputEvent::KeyUp; return NativeWebKeyboardEvent(java_key_event, type, modifiers, time_ms, key_code, unicode_char, is_system_key); } @@ -56,14 +56,14 @@ bool RegisterImeAdapter(JNIEnv* env) { return false; Java_ImeAdapter_initializeWebInputEvents(env, - WebKit::WebInputEvent::RawKeyDown, - WebKit::WebInputEvent::KeyUp, - WebKit::WebInputEvent::Char, - WebKit::WebInputEvent::ShiftKey, - WebKit::WebInputEvent::AltKey, - WebKit::WebInputEvent::ControlKey, - WebKit::WebInputEvent::CapsLockOn, - WebKit::WebInputEvent::NumLockOn); + blink::WebInputEvent::RawKeyDown, + blink::WebInputEvent::KeyUp, + blink::WebInputEvent::Char, + blink::WebInputEvent::ShiftKey, + blink::WebInputEvent::AltKey, + blink::WebInputEvent::ControlKey, + blink::WebInputEvent::CapsLockOn, + blink::WebInputEvent::NumLockOn); Java_ImeAdapter_initializeTextInputTypes( env, ui::TEXT_INPUT_TYPE_NONE, @@ -96,7 +96,7 @@ bool ImeAdapterAndroid::SendSyntheticKeyEvent(JNIEnv*, long time_ms, int key_code, int text) { - NativeWebKeyboardEvent event(static_cast<WebKit::WebInputEvent::Type>(type), + NativeWebKeyboardEvent event(static_cast<blink::WebInputEvent::Type>(type), 0 /* modifiers */, time_ms / 1000.0, key_code, text, false /* is_system_key */); rwhva_->SendKeyEvent(event); @@ -112,7 +112,7 @@ bool ImeAdapterAndroid::SendKeyEvent(JNIEnv* env, jobject, env, original_key_event, action, modifiers, time_ms, key_code, is_system_key, unicode_char); bool key_down_text_insertion = - event.type == WebKit::WebInputEvent::RawKeyDown && event.text[0]; + event.type == blink::WebInputEvent::RawKeyDown && event.text[0]; // If we are going to follow up with a synthetic Char event, then that's the // one we expect to test if it's handled or unhandled, so skip handling the // "real" event in the browser. @@ -121,7 +121,7 @@ bool ImeAdapterAndroid::SendKeyEvent(JNIEnv* env, jobject, if (key_down_text_insertion) { // Send a Char event, but without an os_event since we don't want to // roundtrip back to java such synthetic event. - NativeWebKeyboardEvent char_event(WebKit::WebInputEvent::Char, modifiers, + NativeWebKeyboardEvent char_event(blink::WebInputEvent::Char, modifiers, time_ms, key_code, unicode_char, is_system_key); char_event.skip_in_browser = key_down_text_insertion; @@ -137,9 +137,9 @@ void ImeAdapterAndroid::SetComposingText(JNIEnv* env, jobject, jstring text, return; string16 text16 = ConvertJavaStringToUTF16(env, text); - std::vector<WebKit::WebCompositionUnderline> underlines; + std::vector<blink::WebCompositionUnderline> underlines; underlines.push_back( - WebKit::WebCompositionUnderline(0, text16.length(), SK_ColorBLACK, + blink::WebCompositionUnderline(0, text16.length(), SK_ColorBLACK, false)); // new_cursor_position is as described in the Android API for // InputConnection#setComposingText, whereas the parameters for @@ -194,9 +194,9 @@ void ImeAdapterAndroid::SetComposingRegion(JNIEnv*, jobject, if (!rwhi) return; - std::vector<WebKit::WebCompositionUnderline> underlines; + std::vector<blink::WebCompositionUnderline> underlines; underlines.push_back( - WebKit::WebCompositionUnderline(0, end - start, SK_ColorBLACK, false)); + blink::WebCompositionUnderline(0, end - start, SK_ColorBLACK, false)); rwhi->Send(new ViewMsg_SetCompositionFromExistingText( rwhi->GetRoutingID(), start, end, underlines)); diff --git a/content/browser/renderer_host/ime_adapter_android.h b/content/browser/renderer_host/ime_adapter_android.h index a3e273e..ce3c335 100644 --- a/content/browser/renderer_host/ime_adapter_android.h +++ b/content/browser/renderer_host/ime_adapter_android.h @@ -27,7 +27,7 @@ class ImeAdapterAndroid { // Called from java -> native // The java side is responsible to translate android KeyEvent various enums - // and values into the corresponding WebKit::WebInputEvent. + // and values into the corresponding blink::WebInputEvent. bool SendKeyEvent(JNIEnv* env, jobject, jobject original_key_event, int action, int meta_state, diff --git a/content/browser/renderer_host/input/gesture_event_filter.cc b/content/browser/renderer_host/input/gesture_event_filter.cc index 4ab6f77..cb8f4a3 100644 --- a/content/browser/renderer_host/input/gesture_event_filter.cc +++ b/content/browser/renderer_host/input/gesture_event_filter.cc @@ -11,8 +11,8 @@ #include "content/browser/renderer_host/input/touchscreen_tap_suppression_controller.h" #include "content/public/common/content_switches.h" -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; +using blink::WebGestureEvent; +using blink::WebInputEvent; namespace content { namespace { diff --git a/content/browser/renderer_host/input/gesture_event_filter.h b/content/browser/renderer_host/input/gesture_event_filter.h index 61cb7f7..7ed57de 100644 --- a/content/browser/renderer_host/input/gesture_event_filter.h +++ b/content/browser/renderer_host/input/gesture_event_filter.h @@ -74,7 +74,7 @@ class CONTENT_EXPORT GestureEventFilter { // with state |ack_result| and event |type|. May send events if the queue is // not empty. void ProcessGestureAck(InputEventAckState ack_result, - WebKit::WebInputEvent::Type type, + blink::WebInputEvent::Type type, const ui::LatencyInfo& latency); // Sets the state of the |fling_in_progress_| field to indicate that a fling @@ -93,7 +93,7 @@ class CONTENT_EXPORT GestureEventFilter { friend class MockRenderWidgetHost; friend class GestureEventFilterTest; - static bool ShouldIgnoreAckForGestureType(WebKit::WebInputEvent::Type type); + static bool ShouldIgnoreAckForGestureType(blink::WebInputEvent::Type type); // TODO(mohsen): There are a bunch of ShouldForward.../ShouldDiscard... // methods that are getting confusing. This should be somehow fixed. Maybe diff --git a/content/browser/renderer_host/input/gesture_event_filter_unittest.cc b/content/browser/renderer_host/input/gesture_event_filter_unittest.cc index c852ef4..4dfda33 100644 --- a/content/browser/renderer_host/input/gesture_event_filter_unittest.cc +++ b/content/browser/renderer_host/input/gesture_event_filter_unittest.cc @@ -17,8 +17,8 @@ #include "third_party/WebKit/public/web/WebInputEvent.h" using base::TimeDelta; -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; +using blink::WebGestureEvent; +using blink::WebInputEvent; namespace content { diff --git a/content/browser/renderer_host/input/immediate_input_router.cc b/content/browser/renderer_host/input/immediate_input_router.cc index 444678f..06bbc95 100644 --- a/content/browser/renderer_host/input/immediate_input_router.cc +++ b/content/browser/renderer_host/input/immediate_input_router.cc @@ -30,11 +30,11 @@ using base::Time; using base::TimeDelta; using base::TimeTicks; -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; -using WebKit::WebKeyboardEvent; -using WebKit::WebMouseEvent; -using WebKit::WebMouseWheelEvent; +using blink::WebGestureEvent; +using blink::WebInputEvent; +using blink::WebKeyboardEvent; +using blink::WebMouseEvent; +using blink::WebMouseWheelEvent; namespace content { namespace { @@ -355,8 +355,8 @@ bool ImmediateInputRouter::OfferToOverscrollController( if (disposition == OverscrollController::SHOULD_FORWARD_TO_GESTURE_FILTER) { DCHECK(WebInputEvent::isGestureEventType(input_event.type)); - const WebKit::WebGestureEvent& gesture_event = - static_cast<const WebKit::WebGestureEvent&>(input_event); + const blink::WebGestureEvent& gesture_event = + static_cast<const blink::WebGestureEvent&>(input_event); // An ACK is expected for the event, so mark it as consumed. consumed = !gesture_event_filter_->ShouldForward( GestureEventWithLatencyInfo(gesture_event, latency_info)); @@ -497,7 +497,7 @@ void ImmediateInputRouter::ProcessInputEventAck( } void ImmediateInputRouter::ProcessKeyboardAck( - WebKit::WebInputEvent::Type type, + blink::WebInputEvent::Type type, InputEventAckState ack_result) { if (key_queue_.empty()) { ack_handler_->OnUnexpectedEventAck(InputAckHandler::UNEXPECTED_ACK); @@ -518,7 +518,7 @@ void ImmediateInputRouter::ProcessKeyboardAck( } } -void ImmediateInputRouter::ProcessMouseAck(WebKit::WebInputEvent::Type type, +void ImmediateInputRouter::ProcessMouseAck(blink::WebInputEvent::Type type, InputEventAckState ack_result) { if (type != WebInputEvent::MouseMove) return; diff --git a/content/browser/renderer_host/input/immediate_input_router.h b/content/browser/renderer_host/input/immediate_input_router.h index cc760bd..0c6a71a 100644 --- a/content/browser/renderer_host/input/immediate_input_router.h +++ b/content/browser/renderer_host/input/immediate_input_router.h @@ -91,33 +91,33 @@ private: bool Send(IPC::Message* message); // Filters and forwards |input_event| to the appropriate handler. - void FilterAndSendWebInputEvent(const WebKit::WebInputEvent& input_event, + void FilterAndSendWebInputEvent(const blink::WebInputEvent& input_event, const ui::LatencyInfo& latency_info, bool is_keyboard_shortcut); // Utility routine for filtering and forwarding |input_event| to the // appropriate handler. |input_event| will be offered to the overscroll // controller, client and renderer, in that order. - void OfferToHandlers(const WebKit::WebInputEvent& input_event, + void OfferToHandlers(const blink::WebInputEvent& input_event, const ui::LatencyInfo& latency_info, bool is_keyboard_shortcut); // Returns true if |input_event| was consumed by the overscroll controller. - bool OfferToOverscrollController(const WebKit::WebInputEvent& input_event, + bool OfferToOverscrollController(const blink::WebInputEvent& input_event, const ui::LatencyInfo& latency_info); // Returns true if |input_event| was consumed by the client. - bool OfferToClient(const WebKit::WebInputEvent& input_event, + bool OfferToClient(const blink::WebInputEvent& input_event, const ui::LatencyInfo& latency_info); // Returns true if |input_event| was successfully sent to the renderer // as an async IPC Message. - bool OfferToRenderer(const WebKit::WebInputEvent& input_event, + bool OfferToRenderer(const blink::WebInputEvent& input_event, const ui::LatencyInfo& latency_info, bool is_keyboard_shortcut); // IPC message handlers - void OnInputEventAck(WebKit::WebInputEvent::Type event_type, + void OnInputEventAck(blink::WebInputEvent::Type event_type, InputEventAckState ack_result, const ui::LatencyInfo& latency_info); void OnMsgMoveCaretAck(); @@ -134,17 +134,17 @@ private: }; // Note: This function may result in |this| being deleted, and as such // should be the last method called in any internal chain of event handling. - void ProcessInputEventAck(WebKit::WebInputEvent::Type event_type, + void ProcessInputEventAck(blink::WebInputEvent::Type event_type, InputEventAckState ack_result, const ui::LatencyInfo& latency_info, AckSource ack_source); // Dispatches the ack'ed event to |ack_handler_|. - void ProcessKeyboardAck(WebKit::WebInputEvent::Type type, + void ProcessKeyboardAck(blink::WebInputEvent::Type type, InputEventAckState ack_result); // Forwards a valid |next_mouse_move_| if |type| is MouseMove. - void ProcessMouseAck(WebKit::WebInputEvent::Type type, + void ProcessMouseAck(blink::WebInputEvent::Type type, InputEventAckState ack_result); // Dispatches the ack'ed event to |ack_handler_|, forwarding queued events @@ -154,7 +154,7 @@ private: // Forwards the event ack to |gesture_event_filter|, potentially triggering // dispatch of queued gesture events. - void ProcessGestureAck(WebKit::WebInputEvent::Type type, + void ProcessGestureAck(blink::WebInputEvent::Type type, InputEventAckState ack_result, const ui::LatencyInfo& latency); @@ -164,7 +164,7 @@ private: const ui::LatencyInfo& latency); // Forwards |ack_result| to the client's OverscrollController, if necessary. - void ProcessAckForOverscroll(const WebKit::WebInputEvent& event, + void ProcessAckForOverscroll(const blink::WebInputEvent& event, InputEventAckState ack_result); void HandleGestureScroll(const GestureEventWithLatencyInfo& gesture_event); diff --git a/content/browser/renderer_host/input/immediate_input_router_unittest.cc b/content/browser/renderer_host/input/immediate_input_router_unittest.cc index 63ef7d2..5162555 100644 --- a/content/browser/renderer_host/input/immediate_input_router_unittest.cc +++ b/content/browser/renderer_host/input/immediate_input_router_unittest.cc @@ -25,12 +25,12 @@ #endif using base::TimeDelta; -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; -using WebKit::WebMouseEvent; -using WebKit::WebMouseWheelEvent; -using WebKit::WebTouchEvent; -using WebKit::WebTouchPoint; +using blink::WebGestureEvent; +using blink::WebInputEvent; +using blink::WebMouseEvent; +using blink::WebMouseWheelEvent; +using blink::WebTouchEvent; +using blink::WebTouchPoint; namespace content { @@ -117,7 +117,7 @@ class ImmediateInputRouterTest : public InputRouterTest { new ImmediateInputRouter(process, client, handler, routing_id)); } - void SendInputEventACK(WebKit::WebInputEvent::Type type, + void SendInputEventACK(blink::WebInputEvent::Type type, InputEventAckState ack_result) { scoped_ptr<IPC::Message> response( new InputHostMsg_HandleInputEvent_ACK(0, type, ack_result, diff --git a/content/browser/renderer_host/input/input_router_client.h b/content/browser/renderer_host/input/input_router_client.h index ebe04c6..fefcb10 100644 --- a/content/browser/renderer_host/input/input_router_client.h +++ b/content/browser/renderer_host/input/input_router_client.h @@ -30,7 +30,7 @@ class CONTENT_EXPORT InputRouterClient { // * |CONSUMED| or |NO_CONSUMER_EXISTS| will trigger the appropriate ack. // * |UNKNOWN| will result in |input_event| being dropped. virtual InputEventAckState FilterInputEvent( - const WebKit::WebInputEvent& input_event, + const blink::WebInputEvent& input_event, const ui::LatencyInfo& latency_info) = 0; // Called each time a WebInputEvent IPC is sent. diff --git a/content/browser/renderer_host/input/input_router_unittest.cc b/content/browser/renderer_host/input/input_router_unittest.cc index 48ec3bf..55ee320 100644 --- a/content/browser/renderer_host/input/input_router_unittest.cc +++ b/content/browser/renderer_host/input/input_router_unittest.cc @@ -7,12 +7,12 @@ #include "content/browser/renderer_host/input/input_router.h" #include "content/common/input_messages.h" -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; -using WebKit::WebMouseEvent; -using WebKit::WebMouseWheelEvent; -using WebKit::WebTouchEvent; -using WebKit::WebTouchPoint; +using blink::WebGestureEvent; +using blink::WebInputEvent; +using blink::WebMouseEvent; +using blink::WebMouseWheelEvent; +using blink::WebTouchEvent; +using blink::WebTouchPoint; namespace content { diff --git a/content/browser/renderer_host/input/input_router_unittest.h b/content/browser/renderer_host/input/input_router_unittest.h index bd1e6f4..50c8184 100644 --- a/content/browser/renderer_host/input/input_router_unittest.h +++ b/content/browser/renderer_host/input/input_router_unittest.h @@ -36,16 +36,16 @@ class InputRouterTest : public testing::Test { virtual void SetUp() OVERRIDE; virtual void TearDown() OVERRIDE; - void SendInputEventACK(WebKit::WebInputEvent::Type type, + void SendInputEventACK(blink::WebInputEvent::Type type, InputEventAckState ack_result); - void SimulateKeyboardEvent(WebKit::WebInputEvent::Type type, + void SimulateKeyboardEvent(blink::WebInputEvent::Type type, bool is_shortcut); void SimulateWheelEvent(float dX, float dY, int modifiers, bool precise); void SimulateMouseMove(int x, int y, int modifiers); - void SimulateWheelEventWithPhase(WebKit::WebMouseWheelEvent::Phase phase); - void SimulateGestureEvent(const WebKit::WebGestureEvent& event); - void SimulateGestureEvent(WebKit::WebInputEvent::Type type, - WebKit::WebGestureEvent::SourceDevice sourceDevice); + void SimulateWheelEventWithPhase(blink::WebMouseWheelEvent::Phase phase); + void SimulateGestureEvent(const blink::WebGestureEvent& event); + void SimulateGestureEvent(blink::WebInputEvent::Type type, + blink::WebGestureEvent::SourceDevice sourceDevice); void SimulateGestureScrollUpdateEvent(float dX, float dY, int modifiers); void SimulateGesturePinchUpdateEvent(float scale, float anchorX, @@ -54,7 +54,7 @@ class InputRouterTest : public testing::Test { void SimulateGestureFlingStartEvent( float velocityX, float velocityY, - WebKit::WebGestureEvent::SourceDevice sourceDevice); + blink::WebGestureEvent::SourceDevice sourceDevice); void SimulateTouchEvent(int x, int y); void SetTouchTimestamp(base::TimeDelta timestamp); diff --git a/content/browser/renderer_host/input/mock_input_ack_handler.cc b/content/browser/renderer_host/input/mock_input_ack_handler.cc index 04f1cf8..0ab903f 100644 --- a/content/browser/renderer_host/input/mock_input_ack_handler.cc +++ b/content/browser/renderer_host/input/mock_input_ack_handler.cc @@ -8,12 +8,12 @@ #include "testing/gtest/include/gtest/gtest.h" using base::TimeDelta; -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; -using WebKit::WebMouseEvent; -using WebKit::WebMouseWheelEvent; -using WebKit::WebTouchEvent; -using WebKit::WebTouchPoint; +using blink::WebGestureEvent; +using blink::WebInputEvent; +using blink::WebMouseEvent; +using blink::WebMouseWheelEvent; +using blink::WebTouchEvent; +using blink::WebTouchPoint; namespace content { diff --git a/content/browser/renderer_host/input/mock_input_ack_handler.h b/content/browser/renderer_host/input/mock_input_ack_handler.h index 27b8229..88ca9e1 100644 --- a/content/browser/renderer_host/input/mock_input_ack_handler.h +++ b/content/browser/renderer_host/input/mock_input_ack_handler.h @@ -50,13 +50,13 @@ class MockInputAckHandler : public InputAckHandler { const NativeWebKeyboardEvent& acked_keyboard_event() const { return acked_key_event_; } - const WebKit::WebMouseWheelEvent& acked_wheel_event() const { + const blink::WebMouseWheelEvent& acked_wheel_event() const { return acked_wheel_event_; } const TouchEventWithLatencyInfo& acked_touch_event() const { return acked_touch_event_; } - const WebKit::WebGestureEvent& acked_gesture_event() const { + const blink::WebGestureEvent& acked_gesture_event() const { return acked_gesture_event_; } @@ -69,9 +69,9 @@ class MockInputAckHandler : public InputAckHandler { bool unexpected_event_ack_called_; InputEventAckState ack_state_; NativeWebKeyboardEvent acked_key_event_; - WebKit::WebMouseWheelEvent acked_wheel_event_; + blink::WebMouseWheelEvent acked_wheel_event_; TouchEventWithLatencyInfo acked_touch_event_; - WebKit::WebGestureEvent acked_gesture_event_; + blink::WebGestureEvent acked_gesture_event_; scoped_ptr<GestureEventWithLatencyInfo> gesture_followup_event_; scoped_ptr<TouchEventWithLatencyInfo> touch_followup_event_; diff --git a/content/browser/renderer_host/input/mock_input_router_client.cc b/content/browser/renderer_host/input/mock_input_router_client.cc index 1484d22..436f0b0 100644 --- a/content/browser/renderer_host/input/mock_input_router_client.cc +++ b/content/browser/renderer_host/input/mock_input_router_client.cc @@ -9,12 +9,12 @@ #include "testing/gtest/include/gtest/gtest.h" using base::TimeDelta; -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; -using WebKit::WebMouseEvent; -using WebKit::WebMouseWheelEvent; -using WebKit::WebTouchEvent; -using WebKit::WebTouchPoint; +using blink::WebGestureEvent; +using blink::WebInputEvent; +using blink::WebMouseEvent; +using blink::WebMouseWheelEvent; +using blink::WebTouchEvent; +using blink::WebTouchPoint; namespace content { diff --git a/content/browser/renderer_host/input/mock_input_router_client.h b/content/browser/renderer_host/input/mock_input_router_client.h index 05513728..d2ea81d 100644 --- a/content/browser/renderer_host/input/mock_input_router_client.h +++ b/content/browser/renderer_host/input/mock_input_router_client.h @@ -20,7 +20,7 @@ class MockInputRouterClient : public InputRouterClient { // InputRouterClient virtual InputEventAckState FilterInputEvent( - const WebKit::WebInputEvent& input_event, + const blink::WebInputEvent& input_event, const ui::LatencyInfo& latency_info) OVERRIDE; virtual void IncrementInFlightEventCount() OVERRIDE; virtual void DecrementInFlightEventCount() OVERRIDE; diff --git a/content/browser/renderer_host/input/synthetic_gesture_controller_new_unittest.cc b/content/browser/renderer_host/input/synthetic_gesture_controller_new_unittest.cc index 5d00354..0740440 100644 --- a/content/browser/renderer_host/input/synthetic_gesture_controller_new_unittest.cc +++ b/content/browser/renderer_host/input/synthetic_gesture_controller_new_unittest.cc @@ -99,10 +99,10 @@ class MockSyntheticSmoothScrollMouseTarget : public MockSyntheticGestureTarget { virtual ~MockSyntheticSmoothScrollMouseTarget() {} virtual void QueueInputEventToPlatform(const InputEvent& event) OVERRIDE { - const WebKit::WebInputEvent* web_event = event.web_event.get(); - DCHECK_EQ(web_event->type, WebKit::WebInputEvent::MouseWheel); - const WebKit::WebMouseWheelEvent* mouse_wheel_event = - static_cast<const WebKit::WebMouseWheelEvent*>(web_event); + const blink::WebInputEvent* web_event = event.web_event.get(); + DCHECK_EQ(web_event->type, blink::WebInputEvent::MouseWheel); + const blink::WebMouseWheelEvent* mouse_wheel_event = + static_cast<const blink::WebMouseWheelEvent*>(web_event); DCHECK_EQ(mouse_wheel_event->deltaX, 0); scroll_distance_ += mouse_wheel_event->deltaY; } @@ -120,23 +120,23 @@ class MockSyntheticSmoothScrollTouchTarget : public MockSyntheticGestureTarget { virtual ~MockSyntheticSmoothScrollTouchTarget() {} virtual void QueueInputEventToPlatform(const InputEvent& event) OVERRIDE { - const WebKit::WebInputEvent* web_event = event.web_event.get(); - DCHECK(WebKit::WebInputEvent::isTouchEventType(web_event->type)); - const WebKit::WebTouchEvent* touch_event = - static_cast<const WebKit::WebTouchEvent*>(web_event); + const blink::WebInputEvent* web_event = event.web_event.get(); + DCHECK(blink::WebInputEvent::isTouchEventType(web_event->type)); + const blink::WebTouchEvent* touch_event = + static_cast<const blink::WebTouchEvent*>(web_event); DCHECK_EQ(touch_event->touchesLength, (unsigned int)1); if (!started_) { - DCHECK_EQ(touch_event->type, WebKit::WebInputEvent::TouchStart); + DCHECK_EQ(touch_event->type, blink::WebInputEvent::TouchStart); anchor_y_ = touch_event->touches[0].position.y; started_ = true; } else { - DCHECK_NE(touch_event->type, WebKit::WebInputEvent::TouchStart); - DCHECK_NE(touch_event->type, WebKit::WebInputEvent::TouchCancel); + DCHECK_NE(touch_event->type, blink::WebInputEvent::TouchStart); + DCHECK_NE(touch_event->type, blink::WebInputEvent::TouchCancel); // Ignore move events. - if (touch_event->type == WebKit::WebInputEvent::TouchEnd) + if (touch_event->type == blink::WebInputEvent::TouchEnd) scroll_distance_ = touch_event->touches[0].position.y - anchor_y_; } } diff --git a/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture_new.cc b/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture_new.cc index a508070..06d4ff3 100644 --- a/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture_new.cc +++ b/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture_new.cc @@ -97,7 +97,7 @@ void SyntheticSmoothScrollGestureNew::ForwardTouchEvent( void SyntheticSmoothScrollGestureNew::ForwardMouseWheelEvent( SyntheticGestureTarget* target, float delta) { - WebKit::WebMouseWheelEvent mouse_wheel_event = + blink::WebMouseWheelEvent mouse_wheel_event = SyntheticWebMouseWheelEventBuilder::Build(0, delta, 0, false); target->QueueInputEventToPlatform( diff --git a/content/browser/renderer_host/input/synthetic_web_input_event_builders.cc b/content/browser/renderer_host/input/synthetic_web_input_event_builders.cc index 634299d..d6f782d 100644 --- a/content/browser/renderer_host/input/synthetic_web_input_event_builders.cc +++ b/content/browser/renderer_host/input/synthetic_web_input_event_builders.cc @@ -10,23 +10,23 @@ namespace content { -using WebKit::WebInputEvent; -using WebKit::WebKeyboardEvent; -using WebKit::WebGestureEvent; -using WebKit::WebMouseEvent; -using WebKit::WebMouseWheelEvent; -using WebKit::WebTouchEvent; -using WebKit::WebTouchPoint; +using blink::WebInputEvent; +using blink::WebKeyboardEvent; +using blink::WebGestureEvent; +using blink::WebMouseEvent; +using blink::WebMouseWheelEvent; +using blink::WebTouchEvent; +using blink::WebTouchPoint; WebMouseEvent SyntheticWebMouseEventBuilder::Build( - WebKit::WebInputEvent::Type type) { + blink::WebInputEvent::Type type) { WebMouseEvent result; result.type = type; return result; } WebMouseEvent SyntheticWebMouseEventBuilder::Build( - WebKit::WebInputEvent::Type type, + blink::WebInputEvent::Type type, int window_x, int window_y, int modifiers) { diff --git a/content/browser/renderer_host/input/synthetic_web_input_event_builders.h b/content/browser/renderer_host/input/synthetic_web_input_event_builders.h index 3b0d7a3..0139686 100644 --- a/content/browser/renderer_host/input/synthetic_web_input_event_builders.h +++ b/content/browser/renderer_host/input/synthetic_web_input_event_builders.h @@ -16,8 +16,8 @@ namespace content { class CONTENT_EXPORT SyntheticWebMouseEventBuilder { public: - static WebKit::WebMouseEvent Build(WebKit::WebInputEvent::Type type); - static WebKit::WebMouseEvent Build(WebKit::WebInputEvent::Type type, + static blink::WebMouseEvent Build(blink::WebInputEvent::Type type); + static blink::WebMouseEvent Build(blink::WebInputEvent::Type type, int window_x, int window_y, int modifiers); @@ -25,9 +25,9 @@ class CONTENT_EXPORT SyntheticWebMouseEventBuilder { class CONTENT_EXPORT SyntheticWebMouseWheelEventBuilder { public: - static WebKit::WebMouseWheelEvent Build( - WebKit::WebMouseWheelEvent::Phase phase); - static WebKit::WebMouseWheelEvent Build(float dx, + static blink::WebMouseWheelEvent Build( + blink::WebMouseWheelEvent::Phase phase); + static blink::WebMouseWheelEvent Build(float dx, float dy, int modifiers, bool precise); @@ -35,29 +35,29 @@ class CONTENT_EXPORT SyntheticWebMouseWheelEventBuilder { class CONTENT_EXPORT SyntheticWebKeyboardEventBuilder { public: - static NativeWebKeyboardEvent Build(WebKit::WebInputEvent::Type type); + static NativeWebKeyboardEvent Build(blink::WebInputEvent::Type type); }; class CONTENT_EXPORT SyntheticWebGestureEventBuilder { public: - static WebKit::WebGestureEvent Build( - WebKit::WebInputEvent::Type type, - WebKit::WebGestureEvent::SourceDevice sourceDevice); - static WebKit::WebGestureEvent BuildScrollUpdate(float dx, + static blink::WebGestureEvent Build( + blink::WebInputEvent::Type type, + blink::WebGestureEvent::SourceDevice sourceDevice); + static blink::WebGestureEvent BuildScrollUpdate(float dx, float dY, int modifiers); - static WebKit::WebGestureEvent BuildPinchUpdate(float scale, + static blink::WebGestureEvent BuildPinchUpdate(float scale, float anchor_x, float anchor_y, int modifiers); - static WebKit::WebGestureEvent BuildFling( + static blink::WebGestureEvent BuildFling( float velocity_x, float velocity_y, - WebKit::WebGestureEvent::SourceDevice source_device); + blink::WebGestureEvent::SourceDevice source_device); }; class CONTENT_EXPORT SyntheticWebTouchEvent - : public NON_EXPORTED_BASE(WebKit::WebTouchEvent) { + : public NON_EXPORTED_BASE(blink::WebTouchEvent) { public: SyntheticWebTouchEvent(); @@ -74,7 +74,7 @@ class CONTENT_EXPORT SyntheticWebTouchEvent class CONTENT_EXPORT SyntheticWebTouchEventBuilder { public: - static SyntheticWebTouchEvent Build(WebKit::WebInputEvent::Type type); + static SyntheticWebTouchEvent Build(blink::WebInputEvent::Type type); }; } // namespace content diff --git a/content/browser/renderer_host/input/touch_event_queue.cc b/content/browser/renderer_host/input/touch_event_queue.cc index 3371790..ecc12056 100644 --- a/content/browser/renderer_host/input/touch_event_queue.cc +++ b/content/browser/renderer_host/input/touch_event_queue.cc @@ -120,21 +120,21 @@ void TouchEventQueue::ProcessTouchAck(InputEventAckState ack_result, return; // Update the ACK status for each touch point in the ACKed event. - const WebKit::WebTouchEvent& event = + const blink::WebTouchEvent& event = touch_queue_.front()->coalesced_event().event; - if (event.type == WebKit::WebInputEvent::TouchEnd || - event.type == WebKit::WebInputEvent::TouchCancel) { + if (event.type == blink::WebInputEvent::TouchEnd || + event.type == blink::WebInputEvent::TouchCancel) { // The points have been released. Erase the ACK states. for (unsigned i = 0; i < event.touchesLength; ++i) { - const WebKit::WebTouchPoint& point = event.touches[i]; - if (point.state == WebKit::WebTouchPoint::StateReleased || - point.state == WebKit::WebTouchPoint::StateCancelled) + const blink::WebTouchPoint& point = event.touches[i]; + if (point.state == blink::WebTouchPoint::StateReleased || + point.state == blink::WebTouchPoint::StateCancelled) touch_ack_states_.erase(point.id); } - } else if (event.type == WebKit::WebInputEvent::TouchStart) { + } else if (event.type == blink::WebInputEvent::TouchStart) { for (unsigned i = 0; i < event.touchesLength; ++i) { - const WebKit::WebTouchPoint& point = event.touches[i]; - if (point.state == WebKit::WebTouchPoint::StatePressed) + const blink::WebTouchPoint& point = event.touches[i]; + if (point.state == blink::WebTouchPoint::StatePressed) touch_ack_states_[point.id] = ack_result; } } @@ -161,8 +161,8 @@ void TouchEventQueue::TryForwardNextEventToRenderer() { void TouchEventQueue::OnGestureScrollEvent( const GestureEventWithLatencyInfo& gesture_event) { - WebKit::WebInputEvent::Type type = gesture_event.event.type; - if (type == WebKit::WebInputEvent::GestureScrollBegin) { + blink::WebInputEvent::Type type = gesture_event.event.type; + if (type == blink::WebInputEvent::GestureScrollBegin) { // We assume the scroll event are generated synchronously from // dispatching a touch event ack, so that we can fake a cancel // event that has the correct touch ids as the touch event that @@ -174,10 +174,10 @@ void TouchEventQueue::OnGestureScrollEvent( // that is currently being acked. TouchEventWithLatencyInfo cancel_event = dispatching_touch_ack_->coalesced_event(); - cancel_event.event.type = WebKit::WebInputEvent::TouchCancel; + cancel_event.event.type = blink::WebInputEvent::TouchCancel; for (size_t i = 0; i < cancel_event.event.touchesLength; i++) cancel_event.event.touches[i].state = - WebKit::WebTouchPoint::StateCancelled; + blink::WebTouchPoint::StateCancelled; CoalescedWebTouchEvent* coalesced_cancel_event = new CoalescedWebTouchEvent(cancel_event); // Ignore the ack of the touch cancel so when it is acked, it won't get @@ -188,8 +188,8 @@ void TouchEventQueue::OnGestureScrollEvent( // in the queue is waiting for ack from renderer. So we can just insert // the touch cancel at the beginning of the queue. touch_queue_.push_front(coalesced_cancel_event); - } else if (type == WebKit::WebInputEvent::GestureScrollEnd || - type == WebKit::WebInputEvent::GestureFlingStart) { + } else if (type == blink::WebInputEvent::GestureScrollEnd || + type == blink::WebInputEvent::GestureFlingStart) { no_touch_to_renderer_ = false; } } @@ -234,19 +234,19 @@ void TouchEventQueue::PopTouchEventToClient( } bool TouchEventQueue::ShouldForwardToRenderer( - const WebKit::WebTouchEvent& event) const { + const blink::WebTouchEvent& event) const { if (no_touch_to_renderer_ && - event.type != WebKit::WebInputEvent::TouchCancel) + event.type != blink::WebInputEvent::TouchCancel) return false; // Touch press events should always be forwarded to the renderer. - if (event.type == WebKit::WebInputEvent::TouchStart) + if (event.type == blink::WebInputEvent::TouchStart) return true; for (unsigned int i = 0; i < event.touchesLength; ++i) { - const WebKit::WebTouchPoint& point = event.touches[i]; + const blink::WebTouchPoint& point = event.touches[i]; // If a point has been stationary, then don't take it into account. - if (point.state == WebKit::WebTouchPoint::StateStationary) + if (point.state == blink::WebTouchPoint::StateStationary) continue; if (touch_ack_states_.count(point.id) > 0) { diff --git a/content/browser/renderer_host/input/touch_event_queue.h b/content/browser/renderer_host/input/touch_event_queue.h index 0382288..a3053c4 100644 --- a/content/browser/renderer_host/input/touch_event_queue.h +++ b/content/browser/renderer_host/input/touch_event_queue.h @@ -87,7 +87,7 @@ class CONTENT_EXPORT TouchEventQueue { void PopTouchEventToClient(InputEventAckState ack_result, const ui::LatencyInfo& renderer_latency_info); - bool ShouldForwardToRenderer(const WebKit::WebTouchEvent& event) const; + bool ShouldForwardToRenderer(const blink::WebTouchEvent& event) const; // Handles touch event forwarding and ack'ed event dispatch. TouchEventQueueClient* client_; diff --git a/content/browser/renderer_host/input/touch_event_queue_unittest.cc b/content/browser/renderer_host/input/touch_event_queue_unittest.cc index 61f51fe..c57cbbe 100644 --- a/content/browser/renderer_host/input/touch_event_queue_unittest.cc +++ b/content/browser/renderer_host/input/touch_event_queue_unittest.cc @@ -10,10 +10,10 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/web/WebInputEvent.h" -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; -using WebKit::WebTouchEvent; -using WebKit::WebTouchPoint; +using blink::WebGestureEvent; +using blink::WebInputEvent; +using blink::WebTouchEvent; +using blink::WebTouchPoint; namespace content { @@ -757,7 +757,7 @@ TEST_F(TouchEventQueueTest, NoTouchOnScroll) { EXPECT_EQ(INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS, acked_event_state()); // GestureScrollEnd will resume the sending of TouchEvents to renderer. - SendGestureEvent(WebKit::WebInputEvent::GestureScrollEnd); + SendGestureEvent(blink::WebInputEvent::GestureScrollEnd); EXPECT_FALSE(no_touch_to_renderer()); // Now TouchEvents should be forwarded normally. diff --git a/content/browser/renderer_host/input/web_input_event_builders_android.cc b/content/browser/renderer_host/input/web_input_event_builders_android.cc index b5c96c6..43e9bb8 100644 --- a/content/browser/renderer_host/input/web_input_event_builders_android.cc +++ b/content/browser/renderer_host/input/web_input_event_builders_android.cc @@ -12,11 +12,11 @@ namespace content { -using WebKit::WebInputEvent; -using WebKit::WebKeyboardEvent; -using WebKit::WebGestureEvent; -using WebKit::WebMouseEvent; -using WebKit::WebMouseWheelEvent; +using blink::WebInputEvent; +using blink::WebKeyboardEvent; +using blink::WebGestureEvent; +using blink::WebMouseEvent; +using blink::WebMouseWheelEvent; WebKeyboardEvent WebKeyboardEventBuilder::Build(WebInputEvent::Type type, int modifiers, @@ -48,7 +48,7 @@ WebKeyboardEvent WebKeyboardEventBuilder::Build(WebInputEvent::Type type, return result; } -WebMouseEvent WebMouseEventBuilder::Build(WebKit::WebInputEvent::Type type, +WebMouseEvent WebMouseEventBuilder::Build(blink::WebInputEvent::Type type, WebMouseEvent::Button button, double time_sec, int window_x, diff --git a/content/browser/renderer_host/input/web_input_event_builders_android.h b/content/browser/renderer_host/input/web_input_event_builders_android.h index 4488375..1059572 100644 --- a/content/browser/renderer_host/input/web_input_event_builders_android.h +++ b/content/browser/renderer_host/input/web_input_event_builders_android.h @@ -11,8 +11,8 @@ namespace content { class WebMouseEventBuilder { public: - static WebKit::WebMouseEvent Build(WebKit::WebInputEvent::Type type, - WebKit::WebMouseEvent::Button button, + static blink::WebMouseEvent Build(blink::WebInputEvent::Type type, + blink::WebMouseEvent::Button button, double time_sec, int window_x, int window_y, @@ -29,7 +29,7 @@ class WebMouseWheelEventBuilder { DIRECTION_RIGHT, }; - static WebKit::WebMouseWheelEvent Build(Direction direction, + static blink::WebMouseWheelEvent Build(Direction direction, double time_sec, int window_x, int window_y); @@ -37,7 +37,7 @@ class WebMouseWheelEventBuilder { class WebKeyboardEventBuilder { public: - static WebKit::WebKeyboardEvent Build(WebKit::WebInputEvent::Type type, + static blink::WebKeyboardEvent Build(blink::WebInputEvent::Type type, int modifiers, double time_sec, int keycode, @@ -47,7 +47,7 @@ class WebKeyboardEventBuilder { class WebGestureEventBuilder { public: - static WebKit::WebGestureEvent Build(WebKit::WebInputEvent::Type type, + static blink::WebGestureEvent Build(blink::WebInputEvent::Type type, double time_sec, int x, int y); diff --git a/content/browser/renderer_host/input/web_input_event_builders_gtk.cc b/content/browser/renderer_host/input/web_input_event_builders_gtk.cc index c101595..d5c2bde 100644 --- a/content/browser/renderer_host/input/web_input_event_builders_gtk.cc +++ b/content/browser/renderer_host/input/web_input_event_builders_gtk.cc @@ -13,10 +13,10 @@ #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/events/keycodes/keyboard_code_conversion_gtk.h" -using WebKit::WebInputEvent; -using WebKit::WebMouseEvent; -using WebKit::WebMouseWheelEvent; -using WebKit::WebKeyboardEvent; +using blink::WebInputEvent; +using blink::WebMouseEvent; +using blink::WebMouseWheelEvent; +using blink::WebKeyboardEvent; namespace { @@ -53,7 +53,7 @@ void ResetClickCountState() { last_click_time = 0; last_click_x = 0; last_click_y = 0; - last_click_button = WebKit::WebMouseEvent::ButtonNone; + last_click_button = blink::WebMouseEvent::ButtonNone; } bool IsKeyPadKeyval(guint keyval) { @@ -395,7 +395,7 @@ WebKeyboardEvent WebKeyboardEventBuilder::Build(wchar_t character, // function creates a WebInputEvent::Char event without using a // GdkEventKey object. WebKeyboardEvent result; - result.type = WebKit::WebInputEvent::Char; + result.type = blink::WebInputEvent::Char; result.timeStampSeconds = timeStampSeconds; result.modifiers = GdkStateToWebEventModifiers(state); result.windowsKeyCode = character; diff --git a/content/browser/renderer_host/input/web_input_event_builders_gtk.h b/content/browser/renderer_host/input/web_input_event_builders_gtk.h index 6fe1642..0d0250b 100644 --- a/content/browser/renderer_host/input/web_input_event_builders_gtk.h +++ b/content/browser/renderer_host/input/web_input_event_builders_gtk.h @@ -19,23 +19,23 @@ namespace content { class CONTENT_EXPORT WebKeyboardEventBuilder { public: - static WebKit::WebKeyboardEvent Build(const GdkEventKey* event); - static WebKit::WebKeyboardEvent Build(wchar_t character, + static blink::WebKeyboardEvent Build(const GdkEventKey* event); + static blink::WebKeyboardEvent Build(wchar_t character, int state, double time_secs); }; class CONTENT_EXPORT WebMouseEventBuilder { public: - static WebKit::WebMouseEvent Build(const GdkEventButton* event); - static WebKit::WebMouseEvent Build(const GdkEventMotion* event); - static WebKit::WebMouseEvent Build(const GdkEventCrossing* event); + static blink::WebMouseEvent Build(const GdkEventButton* event); + static blink::WebMouseEvent Build(const GdkEventMotion* event); + static blink::WebMouseEvent Build(const GdkEventCrossing* event); }; class CONTENT_EXPORT WebMouseWheelEventBuilder { public: static float ScrollbarPixelsPerTick(); - static WebKit::WebMouseWheelEvent Build( + static blink::WebMouseWheelEvent Build( const GdkEventScroll* event); }; diff --git a/content/browser/renderer_host/input/web_input_event_builders_gtk_unittest.cc b/content/browser/renderer_host/input/web_input_event_builders_gtk_unittest.cc index 9498c9e..b5e2d42 100644 --- a/content/browser/renderer_host/input/web_input_event_builders_gtk_unittest.cc +++ b/content/browser/renderer_host/input/web_input_event_builders_gtk_unittest.cc @@ -11,9 +11,9 @@ #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/events/keycodes/keyboard_code_conversion_gtk.h" -using WebKit::WebInputEvent; -using WebKit::WebKeyboardEvent; -using WebKit::WebMouseEvent; +using blink::WebInputEvent; +using blink::WebKeyboardEvent; +using blink::WebMouseEvent; using content::WebMouseEventBuilder; using content::WebKeyboardEventBuilder; diff --git a/content/browser/renderer_host/input/web_input_event_builders_win.cc b/content/browser/renderer_host/input/web_input_event_builders_win.cc index ba081fd..8c63e44 100644 --- a/content/browser/renderer_host/input/web_input_event_builders_win.cc +++ b/content/browser/renderer_host/input/web_input_event_builders_win.cc @@ -7,10 +7,10 @@ #include "base/logging.h" #include "content/browser/renderer_host/input/web_input_event_util.h" -using WebKit::WebInputEvent; -using WebKit::WebKeyboardEvent; -using WebKit::WebMouseEvent; -using WebKit::WebMouseWheelEvent; +using blink::WebInputEvent; +using blink::WebKeyboardEvent; +using blink::WebMouseEvent; +using blink::WebMouseWheelEvent; namespace content { diff --git a/content/browser/renderer_host/input/web_input_event_builders_win.h b/content/browser/renderer_host/input/web_input_event_builders_win.h index f01cd29..d3ec4a7 100644 --- a/content/browser/renderer_host/input/web_input_event_builders_win.h +++ b/content/browser/renderer_host/input/web_input_event_builders_win.h @@ -13,19 +13,19 @@ namespace content { class WebKeyboardEventBuilder { public: - static WebKit::WebKeyboardEvent Build(HWND hwnd, UINT message, + static blink::WebKeyboardEvent Build(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); }; class WebMouseEventBuilder { public: - static WebKit::WebMouseEvent Build(HWND hwnd, UINT message, + static blink::WebMouseEvent Build(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); }; class WebMouseWheelEventBuilder { public: - static WebKit::WebMouseWheelEvent Build(HWND hwnd, UINT message, + static blink::WebMouseWheelEvent Build(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); }; diff --git a/content/browser/renderer_host/input/web_input_event_util.cc b/content/browser/renderer_host/input/web_input_event_util.cc index e3c2899..804c0b1 100644 --- a/content/browser/renderer_host/input/web_input_event_util.cc +++ b/content/browser/renderer_host/input/web_input_event_util.cc @@ -129,7 +129,7 @@ const char* GetKeyIdentifier(ui::KeyboardCode key_code) { namespace content { -void UpdateWindowsKeyCodeAndKeyIdentifier(WebKit::WebKeyboardEvent* event, +void UpdateWindowsKeyCodeAndKeyIdentifier(blink::WebKeyboardEvent* event, ui::KeyboardCode windows_key_code) { event->windowsKeyCode = windows_key_code; diff --git a/content/browser/renderer_host/input/web_input_event_util.h b/content/browser/renderer_host/input/web_input_event_util.h index 1abaf8c..f0680f2 100644 --- a/content/browser/renderer_host/input/web_input_event_util.h +++ b/content/browser/renderer_host/input/web_input_event_util.h @@ -8,7 +8,7 @@ #include "content/common/content_export.h" #include "ui/events/keycodes/keyboard_codes.h" -namespace WebKit { +namespace blink { class WebKeyboardEvent; } @@ -17,7 +17,7 @@ namespace content { // Update |event|'s windowsKeyCode and keyIdentifer properties using the // provided |windows_key_code|. CONTENT_EXPORT void UpdateWindowsKeyCodeAndKeyIdentifier( - WebKit::WebKeyboardEvent* event, + blink::WebKeyboardEvent* event, ui::KeyboardCode windows_key_code); } diff --git a/content/browser/renderer_host/input/web_input_event_util_posix.cc b/content/browser/renderer_host/input/web_input_event_util_posix.cc index 72786c8..7ae2242 100644 --- a/content/browser/renderer_host/input/web_input_event_util_posix.cc +++ b/content/browser/renderer_host/input/web_input_event_util_posix.cc @@ -22,21 +22,21 @@ ui::KeyboardCode GetWindowsKeyCodeWithoutLocation(ui::KeyboardCode key_code) { } } -WebKit::WebInputEvent::Modifiers GetLocationModifiersFromWindowsKeyCode( +blink::WebInputEvent::Modifiers GetLocationModifiersFromWindowsKeyCode( ui::KeyboardCode key_code) { switch (key_code) { case ui::VKEY_LCONTROL: case ui::VKEY_LSHIFT: case ui::VKEY_LMENU: case ui::VKEY_LWIN: - return WebKit::WebKeyboardEvent::IsLeft; + return blink::WebKeyboardEvent::IsLeft; case ui::VKEY_RCONTROL: case ui::VKEY_RSHIFT: case ui::VKEY_RMENU: case ui::VKEY_RWIN: - return WebKit::WebKeyboardEvent::IsRight; + return blink::WebKeyboardEvent::IsRight; default: - return static_cast<WebKit::WebInputEvent::Modifiers>(0); + return static_cast<blink::WebInputEvent::Modifiers>(0); } } diff --git a/content/browser/renderer_host/input/web_input_event_util_posix.h b/content/browser/renderer_host/input/web_input_event_util_posix.h index e7dc154..9f2f4c0 100644 --- a/content/browser/renderer_host/input/web_input_event_util_posix.h +++ b/content/browser/renderer_host/input/web_input_event_util_posix.h @@ -11,7 +11,7 @@ namespace content { ui::KeyboardCode GetWindowsKeyCodeWithoutLocation(ui::KeyboardCode key_code); -WebKit::WebInputEvent::Modifiers GetLocationModifiersFromWindowsKeyCode( +blink::WebInputEvent::Modifiers GetLocationModifiersFromWindowsKeyCode( ui::KeyboardCode key_code); } // namespace content diff --git a/content/browser/renderer_host/java/java_bound_object.cc b/content/browser/renderer_host/java/java_bound_object.cc index 27b9f42..e2ad87a 100644 --- a/content/browser/renderer_host/java/java_bound_object.cc +++ b/content/browser/renderer_host/java/java_bound_object.cc @@ -22,7 +22,7 @@ using base::android::GetClass; using base::android::JavaRef; using base::android::ScopedJavaGlobalRef; using base::android::ScopedJavaLocalRef; -using WebKit::WebBindings; +using blink::WebBindings; // The conversion between JavaScript and Java types is based on the Live // Connect 2 spec. See diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc index ece3056..6d792e7 100644 --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc @@ -128,7 +128,7 @@ void JavaBridgeDispatcherHost::CreateNPVariantParam(NPObject* object, int route_id = JavaBridgeChannelHost::ThreadsafeGenerateRouteID(); param->npobject_routing_id = route_id; - WebKit::WebBindings::retainObject(object); + blink::WebBindings::retainObject(object); g_background_thread.Get().message_loop()->PostTask( FROM_HERE, base::Bind(&JavaBridgeDispatcherHost::CreateObjectStub, this, object, @@ -161,7 +161,7 @@ void JavaBridgeDispatcherHost::CreateObjectStub(NPObject* object, // The NPObjectStub takes a reference to the NPObject. Release the ref added // in CreateNPVariantParam(). - WebKit::WebBindings::releaseObject(object); + blink::WebBindings::releaseObject(object); } } // namespace content diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc index a3822a0..f06d9fe 100644 --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc @@ -26,7 +26,7 @@ JavaBridgeDispatcherHostManager::JavaBridgeDispatcherHostManager( JavaBridgeDispatcherHostManager::~JavaBridgeDispatcherHostManager() { for (ObjectMap::iterator iter = objects_.begin(); iter != objects_.end(); ++iter) { - WebKit::WebBindings::releaseObject(iter->second); + blink::WebBindings::releaseObject(iter->second); } DCHECK_EQ(0U, instances_.size()); } @@ -37,7 +37,7 @@ void JavaBridgeDispatcherHostManager::AddNamedObject(const string16& name, // created later. The JavaBridgeDispatcherHost instances will take a // reference to the object, but we take one too, because this method can be // called before there are any such instances. - WebKit::WebBindings::retainObject(object); + blink::WebBindings::retainObject(object); objects_[name] = object; for (InstanceMap::iterator iter = instances_.begin(); @@ -73,7 +73,7 @@ void JavaBridgeDispatcherHostManager::RemoveNamedObject(const string16& name) { return; } - WebKit::WebBindings::releaseObject(iter->second); + blink::WebBindings::releaseObject(iter->second); objects_.erase(iter); for (InstanceMap::iterator iter = instances_.begin(); diff --git a/content/browser/renderer_host/native_web_keyboard_event_android.cc b/content/browser/renderer_host/native_web_keyboard_event_android.cc index ad5f1f1..d202918 100644 --- a/content/browser/renderer_host/native_web_keyboard_event_android.cc +++ b/content/browser/renderer_host/native_web_keyboard_event_android.cc @@ -30,7 +30,7 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent() } NativeWebKeyboardEvent::NativeWebKeyboardEvent( - WebKit::WebInputEvent::Type type, + blink::WebInputEvent::Type type, int modifiers, double time_secs, int keycode, int unicode_character, bool is_system_key) : WebKeyboardEvent(WebKeyboardEventBuilder::Build( @@ -41,7 +41,7 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent( } NativeWebKeyboardEvent::NativeWebKeyboardEvent( - jobject android_key_event, WebKit::WebInputEvent::Type type, + jobject android_key_event, blink::WebInputEvent::Type type, int modifiers, double time_secs, int keycode, int unicode_character, bool is_system_key) : WebKeyboardEvent(WebKeyboardEventBuilder::Build( diff --git a/content/browser/renderer_host/native_web_keyboard_event_aura.cc b/content/browser/renderer_host/native_web_keyboard_event_aura.cc index ad3aae3..1587bba 100644 --- a/content/browser/renderer_host/native_web_keyboard_event_aura.cc +++ b/content/browser/renderer_host/native_web_keyboard_event_aura.cc @@ -20,15 +20,15 @@ ui::Event* CopyEvent(ui::Event* event) { int EventFlagsToWebInputEventModifiers(int flags) { return - (flags & ui::EF_SHIFT_DOWN ? WebKit::WebInputEvent::ShiftKey : 0) | - (flags & ui::EF_CONTROL_DOWN ? WebKit::WebInputEvent::ControlKey : 0) | - (flags & ui::EF_CAPS_LOCK_DOWN ? WebKit::WebInputEvent::CapsLockOn : 0) | - (flags & ui::EF_ALT_DOWN ? WebKit::WebInputEvent::AltKey : 0); + (flags & ui::EF_SHIFT_DOWN ? blink::WebInputEvent::ShiftKey : 0) | + (flags & ui::EF_CONTROL_DOWN ? blink::WebInputEvent::ControlKey : 0) | + (flags & ui::EF_CAPS_LOCK_DOWN ? blink::WebInputEvent::CapsLockOn : 0) | + (flags & ui::EF_ALT_DOWN ? blink::WebInputEvent::AltKey : 0); } } // namespace -using WebKit::WebKeyboardEvent; +using blink::WebKeyboardEvent; namespace content { @@ -61,11 +61,11 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent( skip_in_browser(false) { switch (key_event_type) { case ui::ET_KEY_PRESSED: - type = is_char ? WebKit::WebInputEvent::Char : - WebKit::WebInputEvent::RawKeyDown; + type = is_char ? blink::WebInputEvent::Char : + blink::WebInputEvent::RawKeyDown; break; case ui::ET_KEY_RELEASED: - type = WebKit::WebInputEvent::KeyUp; + type = blink::WebInputEvent::KeyUp; break; default: NOTREACHED(); diff --git a/content/browser/renderer_host/native_web_keyboard_event_mac.mm b/content/browser/renderer_host/native_web_keyboard_event_mac.mm index 5b4f38c..fea2939 100644 --- a/content/browser/renderer_host/native_web_keyboard_event_mac.mm +++ b/content/browser/renderer_host/native_web_keyboard_event_mac.mm @@ -8,7 +8,7 @@ #include "third_party/WebKit/public/web/mac/WebInputEventFactory.h" -using WebKit::WebInputEventFactory; +using blink::WebInputEventFactory; namespace content { diff --git a/content/browser/renderer_host/native_web_keyboard_event_win.cc b/content/browser/renderer_host/native_web_keyboard_event_win.cc index 42d3cce..0f54a89 100644 --- a/content/browser/renderer_host/native_web_keyboard_event_win.cc +++ b/content/browser/renderer_host/native_web_keyboard_event_win.cc @@ -6,7 +6,7 @@ #include "content/browser/renderer_host/input/web_input_event_builders_win.h" -using WebKit::WebKeyboardEvent; +using blink::WebKeyboardEvent; namespace content { diff --git a/content/browser/renderer_host/overscroll_controller.cc b/content/browser/renderer_host/overscroll_controller.cc index 052eedb..4c33aa8 100644 --- a/content/browser/renderer_host/overscroll_controller.cc +++ b/content/browser/renderer_host/overscroll_controller.cc @@ -10,7 +10,7 @@ #include "content/public/browser/overscroll_configuration.h" #include "content/public/common/content_switches.h" -using WebKit::WebInputEvent; +using blink::WebInputEvent; namespace { @@ -35,29 +35,29 @@ OverscrollController::~OverscrollController() { } OverscrollController::Disposition OverscrollController::DispatchEvent( - const WebKit::WebInputEvent& event, + const blink::WebInputEvent& event, const ui::LatencyInfo& latency_info) { if (scroll_state_ != STATE_UNKNOWN) { switch (event.type) { - case WebKit::WebInputEvent::GestureScrollEnd: - case WebKit::WebInputEvent::GestureFlingStart: + case blink::WebInputEvent::GestureScrollEnd: + case blink::WebInputEvent::GestureFlingStart: scroll_state_ = STATE_UNKNOWN; break; - case WebKit::WebInputEvent::MouseWheel: { - const WebKit::WebMouseWheelEvent& wheel = - static_cast<const WebKit::WebMouseWheelEvent&>(event); + case blink::WebInputEvent::MouseWheel: { + const blink::WebMouseWheelEvent& wheel = + static_cast<const blink::WebMouseWheelEvent&>(event); if (!wheel.hasPreciseScrollingDeltas || - wheel.phase == WebKit::WebMouseWheelEvent::PhaseEnded || - wheel.phase == WebKit::WebMouseWheelEvent::PhaseCancelled) { + wheel.phase == blink::WebMouseWheelEvent::PhaseEnded || + wheel.phase == blink::WebMouseWheelEvent::PhaseCancelled) { scroll_state_ = STATE_UNKNOWN; } break; } default: - if (WebKit::WebInputEvent::isMouseEventType(event.type) || - WebKit::WebInputEvent::isKeyboardEventType(event.type)) { + if (blink::WebInputEvent::isMouseEventType(event.type) || + blink::WebInputEvent::isKeyboardEventType(event.type)) { scroll_state_ = STATE_UNKNOWN; } break; @@ -72,7 +72,7 @@ OverscrollController::Disposition OverscrollController::DispatchEvent( // touch-scrolls maintain state in the renderer side (in the compositor, for // example), and the event that completes this action needs to be sent to // the renderer so that those states can be updated/reset appropriately. - if (WebKit::WebInputEvent::isGestureEventType(event.type)) { + if (blink::WebInputEvent::isGestureEventType(event.type)) { // A gesture-event isn't sent to the GestureEventFilter when overscroll is // in progress. So dispatch the event through the RenderWidgetHost so that // it can reach the GestureEventFilter. @@ -84,7 +84,7 @@ OverscrollController::Disposition OverscrollController::DispatchEvent( if (overscroll_mode_ != OVERSCROLL_NONE && DispatchEventResetsState(event)) { SetOverscrollMode(OVERSCROLL_NONE); - if (WebKit::WebInputEvent::isGestureEventType(event.type)) { + if (blink::WebInputEvent::isGestureEventType(event.type)) { // A gesture-event isn't sent to the GestureEventFilter when overscroll is // in progress. So dispatch the event through the RenderWidgetHost so that // it can reach the GestureEventFilter. @@ -104,15 +104,15 @@ OverscrollController::Disposition OverscrollController::DispatchEvent( return SHOULD_FORWARD_TO_RENDERER; } -void OverscrollController::ReceivedEventACK(const WebKit::WebInputEvent& event, +void OverscrollController::ReceivedEventACK(const blink::WebInputEvent& event, bool processed) { if (processed) { // If a scroll event is consumed by the page, i.e. some content on the page // has been scrolled, then there is not going to be an overscroll gesture, // until the current scroll ends, and a new scroll gesture starts. if (scroll_state_ == STATE_UNKNOWN && - (event.type == WebKit::WebInputEvent::MouseWheel || - event.type == WebKit::WebInputEvent::GestureScrollUpdate)) { + (event.type == blink::WebInputEvent::MouseWheel || + event.type == blink::WebInputEvent::GestureScrollUpdate)) { scroll_state_ = STATE_CONTENT_SCROLLING; } return; @@ -121,10 +121,10 @@ void OverscrollController::ReceivedEventACK(const WebKit::WebInputEvent& event, } void OverscrollController::DiscardingGestureEvent( - const WebKit::WebGestureEvent& gesture) { + const blink::WebGestureEvent& gesture) { if (scroll_state_ != STATE_UNKNOWN && - (gesture.type == WebKit::WebInputEvent::GestureScrollEnd || - gesture.type == WebKit::WebInputEvent::GestureFlingStart)) { + (gesture.type == blink::WebInputEvent::GestureScrollEnd || + gesture.type == blink::WebInputEvent::GestureFlingStart)) { scroll_state_ = STATE_UNKNOWN; } } @@ -142,15 +142,15 @@ void OverscrollController::Cancel() { } bool OverscrollController::DispatchEventCompletesAction ( - const WebKit::WebInputEvent& event) const { + const blink::WebInputEvent& event) const { if (overscroll_mode_ == OVERSCROLL_NONE) return false; // Complete the overscroll gesture if there was a mouse move or a scroll-end // after the threshold. - if (event.type != WebKit::WebInputEvent::MouseMove && - event.type != WebKit::WebInputEvent::GestureScrollEnd && - event.type != WebKit::WebInputEvent::GestureFlingStart) + if (event.type != blink::WebInputEvent::MouseMove && + event.type != blink::WebInputEvent::GestureScrollEnd && + event.type != blink::WebInputEvent::GestureFlingStart) return false; if (!delegate_) @@ -160,10 +160,10 @@ bool OverscrollController::DispatchEventCompletesAction ( if (bounds.IsEmpty()) return false; - if (event.type == WebKit::WebInputEvent::GestureFlingStart) { + if (event.type == blink::WebInputEvent::GestureFlingStart) { // Check to see if the fling is in the same direction of the overscroll. - const WebKit::WebGestureEvent gesture = - static_cast<const WebKit::WebGestureEvent&>(event); + const blink::WebGestureEvent gesture = + static_cast<const blink::WebGestureEvent&>(event); switch (overscroll_mode_) { case OVERSCROLL_EAST: if (gesture.data.flingStart.velocityX < 0) @@ -201,34 +201,34 @@ bool OverscrollController::DispatchEventCompletesAction ( } bool OverscrollController::DispatchEventResetsState( - const WebKit::WebInputEvent& event) const { + const blink::WebInputEvent& event) const { switch (event.type) { - case WebKit::WebInputEvent::MouseWheel: { + case blink::WebInputEvent::MouseWheel: { // Only wheel events with precise deltas (i.e. from trackpad) contribute // to the overscroll gesture. - const WebKit::WebMouseWheelEvent& wheel = - static_cast<const WebKit::WebMouseWheelEvent&>(event); + const blink::WebMouseWheelEvent& wheel = + static_cast<const blink::WebMouseWheelEvent&>(event); return !wheel.hasPreciseScrollingDeltas; } - case WebKit::WebInputEvent::GestureScrollUpdate: - case WebKit::WebInputEvent::GestureFlingCancel: + case blink::WebInputEvent::GestureScrollUpdate: + case blink::WebInputEvent::GestureFlingCancel: return false; default: // Touch events can arrive during an overscroll gesture initiated by // touch-scrolling. These events should not reset the overscroll state. - return !WebKit::WebInputEvent::isTouchEventType(event.type); + return !blink::WebInputEvent::isTouchEventType(event.type); } } bool OverscrollController::ProcessEventForOverscroll( - const WebKit::WebInputEvent& event) { + const blink::WebInputEvent& event) { bool event_processed = false; switch (event.type) { - case WebKit::WebInputEvent::MouseWheel: { - const WebKit::WebMouseWheelEvent& wheel = - static_cast<const WebKit::WebMouseWheelEvent&>(event); + case blink::WebInputEvent::MouseWheel: { + const blink::WebMouseWheelEvent& wheel = + static_cast<const blink::WebMouseWheelEvent&>(event); if (!wheel.hasPreciseScrollingDeltas) break; @@ -238,19 +238,19 @@ bool OverscrollController::ProcessEventForOverscroll( event_processed = true; break; } - case WebKit::WebInputEvent::GestureScrollUpdate: { - const WebKit::WebGestureEvent& gesture = - static_cast<const WebKit::WebGestureEvent&>(event); + case blink::WebInputEvent::GestureScrollUpdate: { + const blink::WebGestureEvent& gesture = + static_cast<const blink::WebGestureEvent&>(event); ProcessOverscroll(gesture.data.scrollUpdate.deltaX, gesture.data.scrollUpdate.deltaY, gesture.type); event_processed = true; break; } - case WebKit::WebInputEvent::GestureFlingStart: { + case blink::WebInputEvent::GestureFlingStart: { const float kFlingVelocityThreshold = 1100.f; - const WebKit::WebGestureEvent& gesture = - static_cast<const WebKit::WebGestureEvent&>(event); + const blink::WebGestureEvent& gesture = + static_cast<const blink::WebGestureEvent&>(event); float velocity_x = gesture.data.flingStart.velocityX; float velocity_y = gesture.data.flingStart.velocityY; if (fabs(velocity_x) > kFlingVelocityThreshold) { @@ -275,8 +275,8 @@ bool OverscrollController::ProcessEventForOverscroll( } default: - DCHECK(WebKit::WebInputEvent::isGestureEventType(event.type) || - WebKit::WebInputEvent::isTouchEventType(event.type)) + DCHECK(blink::WebInputEvent::isGestureEventType(event.type) || + blink::WebInputEvent::isTouchEventType(event.type)) << "Received unexpected event: " << event.type; } return event_processed; @@ -284,7 +284,7 @@ bool OverscrollController::ProcessEventForOverscroll( void OverscrollController::ProcessOverscroll(float delta_x, float delta_y, - WebKit::WebInputEvent::Type type) { + blink::WebInputEvent::Type type) { if (scroll_state_ != STATE_CONTENT_SCROLLING) overscroll_delta_x_ += delta_x; overscroll_delta_y_ += delta_y; diff --git a/content/browser/renderer_host/overscroll_controller.h b/content/browser/renderer_host/overscroll_controller.h index 8586c8a..c68eb9b 100644 --- a/content/browser/renderer_host/overscroll_controller.h +++ b/content/browser/renderer_host/overscroll_controller.h @@ -48,16 +48,16 @@ class OverscrollController { // This must be called when dispatching any event from the // RenderWidgetHostView so that the state of the overscroll gesture can be // updated properly. - Disposition DispatchEvent(const WebKit::WebInputEvent& event, + Disposition DispatchEvent(const blink::WebInputEvent& event, const ui::LatencyInfo& latency_info); // This must be called when the ACK for any event comes in. This updates the // overscroll gesture status as appropriate. - void ReceivedEventACK(const WebKit::WebInputEvent& event, bool processed); + void ReceivedEventACK(const blink::WebInputEvent& event, bool processed); // This must be called when a gesture event is filtered out and not sent to // the renderer. - void DiscardingGestureEvent(const WebKit::WebGestureEvent& event); + void DiscardingGestureEvent(const blink::WebGestureEvent& event); OverscrollMode overscroll_mode() const { return overscroll_mode_; } @@ -86,22 +86,22 @@ class OverscrollController { // Returns true if the event indicates that the in-progress overscroll gesture // can now be completed. bool DispatchEventCompletesAction( - const WebKit::WebInputEvent& event) const; + const blink::WebInputEvent& event) const; // Returns true to indicate that dispatching the event should reset the // overscroll gesture status. - bool DispatchEventResetsState(const WebKit::WebInputEvent& event) const; + bool DispatchEventResetsState(const blink::WebInputEvent& event) const; // Processes an event to update the internal state for overscroll. Returns // true if the state is updated, false otherwise. - bool ProcessEventForOverscroll(const WebKit::WebInputEvent& event); + bool ProcessEventForOverscroll(const blink::WebInputEvent& event); // Processes horizontal overscroll. This can update both the overscroll mode // and the over scroll amount (i.e. |overscroll_mode_|, |overscroll_delta_x_| // and |overscroll_delta_y_|). void ProcessOverscroll(float delta_x, float delta_y, - WebKit::WebInputEvent::Type event_type); + blink::WebInputEvent::Type event_type); // Completes the desired action from the current gesture. void CompleteAction(); diff --git a/content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc b/content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc index 3dfbe2b..43ff117 100644 --- a/content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc +++ b/content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc @@ -31,7 +31,7 @@ class PepperGamepadHostTest virtual ~PepperGamepadHostTest() { } - void ConstructService(const WebKit::WebGamepads& test_data) { + void ConstructService(const blink::WebGamepads& test_data) { service_.reset(new GamepadServiceTestConstructor(test_data)); } @@ -68,15 +68,15 @@ TEST_F(PepperGamepadHostTest, ValidateHardwareBuffersMatch) { TEST_F(PepperGamepadHostTest, ValidateGamepadsMatch) { // Gamepads. COMPILE_ASSERT(sizeof(ppapi::WebKitGamepads) == - sizeof(WebKit::WebGamepads), + sizeof(blink::WebGamepads), gamepads_data_must_match); ppapi::WebKitGamepads ppapi_gamepads; - WebKit::WebGamepads web_gamepads; + blink::WebGamepads web_gamepads; EXPECT_EQ(AddressDiff(&web_gamepads.length, &web_gamepads), AddressDiff(&ppapi_gamepads.length, &ppapi_gamepads)); // See comment below on storage & the EXPECT macro. - size_t webkit_items_length_cap = WebKit::WebGamepads::itemsLengthCap; + size_t webkit_items_length_cap = blink::WebGamepads::itemsLengthCap; size_t ppapi_items_length_cap = ppapi::WebKitGamepads::kItemsLengthCap; EXPECT_EQ(webkit_items_length_cap, ppapi_items_length_cap); @@ -89,23 +89,23 @@ TEST_F(PepperGamepadHostTest, ValidateGamepadsMatch) { TEST_F(PepperGamepadHostTest, ValidateGamepadMatch) { // Gamepad. COMPILE_ASSERT(sizeof(ppapi::WebKitGamepad) == - sizeof(WebKit::WebGamepad), + sizeof(blink::WebGamepad), gamepad_data_must_match); ppapi::WebKitGamepad ppapi_gamepad; - WebKit::WebGamepad web_gamepad; + blink::WebGamepad web_gamepad; // Using EXPECT seems to force storage for the parameter, which the constants // in the WebKit/PPAPI headers don't have. So we have to use temporaries // before comparing them. - size_t webkit_id_length_cap = WebKit::WebGamepad::idLengthCap; + size_t webkit_id_length_cap = blink::WebGamepad::idLengthCap; size_t ppapi_id_length_cap = ppapi::WebKitGamepad::kIdLengthCap; EXPECT_EQ(webkit_id_length_cap, ppapi_id_length_cap); - size_t webkit_axes_length_cap = WebKit::WebGamepad::axesLengthCap; + size_t webkit_axes_length_cap = blink::WebGamepad::axesLengthCap; size_t ppapi_axes_length_cap = ppapi::WebKitGamepad::kAxesLengthCap; EXPECT_EQ(webkit_axes_length_cap, ppapi_axes_length_cap); - size_t webkit_buttons_length_cap = WebKit::WebGamepad::buttonsLengthCap; + size_t webkit_buttons_length_cap = blink::WebGamepad::buttonsLengthCap; size_t ppapi_buttons_length_cap = ppapi::WebKitGamepad::kButtonsLengthCap; EXPECT_EQ(webkit_buttons_length_cap, ppapi_buttons_length_cap); @@ -126,8 +126,8 @@ TEST_F(PepperGamepadHostTest, ValidateGamepadMatch) { } TEST_F(PepperGamepadHostTest, WaitForReply) { - WebKit::WebGamepads default_data; - memset(&default_data, 0, sizeof(WebKit::WebGamepads)); + blink::WebGamepads default_data; + memset(&default_data, 0, sizeof(blink::WebGamepads)); default_data.length = 1; default_data.items[0].connected = true; default_data.items[0].buttonsLength = 1; @@ -163,7 +163,7 @@ TEST_F(PepperGamepadHostTest, WaitForReply) { // will issue the callback on our thread. Waiting for it to read twice // ensures that it was able to issue callbacks for the first read (if it // issued one) before we try to check for it. - WebKit::WebGamepads button_down_data = default_data; + blink::WebGamepads button_down_data = default_data; button_down_data.items[0].buttons[0] = 1.f; fetcher->SetTestData(button_down_data); fetcher->WaitForDataRead(); diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index f926ff6..03d8798 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -497,7 +497,7 @@ void RenderMessageFilter::OnCreateWindow( } void RenderMessageFilter::OnCreateWidget(int opener_id, - WebKit::WebPopupType popup_type, + blink::WebPopupType popup_type, int* route_id, int* surface_id) { render_widget_helper_->CreateNewWidget( @@ -857,7 +857,7 @@ void RenderMessageFilter::OnCheckNotificationPermission( CheckDesktopNotificationPermission(source_origin, resource_context_, render_process_id_); #else - *result = WebKit::WebNotificationPresenter::PermissionAllowed; + *result = blink::WebNotificationPresenter::PermissionAllowed; #endif } diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h index d0a4386..9d95459 100644 --- a/content/browser/renderer_host/render_message_filter.h +++ b/content/browser/renderer_host/render_message_filter.h @@ -40,7 +40,7 @@ struct FontDescriptor; struct ViewHostMsg_CreateWindow_Params; -namespace WebKit { +namespace blink { struct WebScreenInfo; } @@ -126,7 +126,7 @@ class RenderMessageFilter : public BrowserMessageFilter { int* surface_id, int64* cloned_session_storage_namespace_id); void OnCreateWidget(int opener_id, - WebKit::WebPopupType popup_type, + blink::WebPopupType popup_type, int* route_id, int* surface_id); void OnCreateFullscreenWidget(int opener_id, diff --git a/content/browser/renderer_host/render_sandbox_host_linux.cc b/content/browser/renderer_host/render_sandbox_host_linux.cc index 8153718..986bff9 100644 --- a/content/browser/renderer_host/render_sandbox_host_linux.cc +++ b/content/browser/renderer_host/render_sandbox_host_linux.cc @@ -39,10 +39,10 @@ #include "third_party/skia/include/ports/SkFontConfigInterface.h" #include "ui/gfx/font_render_params_linux.h" -using WebKit::WebCString; -using WebKit::WebFontInfo; -using WebKit::WebUChar; -using WebKit::WebUChar32; +using blink::WebCString; +using blink::WebFontInfo; +using blink::WebUChar; +using blink::WebUChar32; namespace content { @@ -260,7 +260,7 @@ class SandboxIPCProcess { if (!pickle.ReadString(&iter, &preferred_locale)) return; - WebKit::WebFontFamily family; + blink::WebFontFamily family; WebFontInfo::familyForChar(c, preferred_locale.c_str(), &family); Pickle reply; @@ -286,7 +286,7 @@ class SandboxIPCProcess { } EnsureWebKitInitialized(); - WebKit::WebFontRenderStyle style; + blink::WebFontRenderStyle style; WebFontInfo::renderStyleForStrike(family.c_str(), sizeAndStyle, &style); Pickle reply; @@ -654,14 +654,14 @@ class SandboxIPCProcess { SandboxIPCProcess::~SandboxIPCProcess() { paths_.deleteAll(); if (webkit_platform_support_) - WebKit::shutdownWithoutV8(); + blink::shutdownWithoutV8(); } void SandboxIPCProcess::EnsureWebKitInitialized() { if (webkit_platform_support_) return; webkit_platform_support_.reset(new WebKitPlatformSupportImpl); - WebKit::initializeWithoutV8(webkit_platform_support_.get()); + blink::initializeWithoutV8(webkit_platform_support_.get()); } // ----------------------------------------------------------------------------- diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h index f3f31e4..dfefdec 100644 --- a/content/browser/renderer_host/render_view_host_delegate.h +++ b/content/browser/renderer_host/render_view_host_delegate.h @@ -404,7 +404,7 @@ class CONTENT_EXPORT RenderViewHostDelegate { // |popup_type| indicates if the widget is a popup and what kind of popup it // is (select, autofill...). virtual void CreateNewWidget(int route_id, - WebKit::WebPopupType popup_type) {} + blink::WebPopupType popup_type) {} // Creates a full screen RenderWidget. Similar to above. virtual void CreateNewFullscreenWidget(int route_id) {} diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index 44b4d8c..8d36fd2 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -86,13 +86,13 @@ #endif using base::TimeDelta; -using WebKit::WebConsoleMessage; -using WebKit::WebDragOperation; -using WebKit::WebDragOperationNone; -using WebKit::WebDragOperationsMask; -using WebKit::WebInputEvent; -using WebKit::WebMediaPlayerAction; -using WebKit::WebPluginAction; +using blink::WebConsoleMessage; +using blink::WebDragOperation; +using blink::WebDragOperationNone; +using blink::WebDragOperationsMask; +using blink::WebInputEvent; +using blink::WebMediaPlayerAction; +using blink::WebPluginAction; namespace content { namespace { @@ -103,11 +103,11 @@ const int kUnloadTimeoutMS = 1000; // Translate a WebKit text direction into a base::i18n one. base::i18n::TextDirection WebTextDirectionToChromeTextDirection( - WebKit::WebTextDirection dir) { + blink::WebTextDirection dir) { switch (dir) { - case WebKit::WebTextDirectionLeftToRight: + case blink::WebTextDirectionLeftToRight: return base::i18n::LEFT_TO_RIGHT; - case WebKit::WebTextDirectionRightToLeft: + case blink::WebTextDirectionRightToLeft: return base::i18n::RIGHT_TO_LEFT; default: NOTREACHED(); @@ -1308,7 +1308,7 @@ void RenderViewHostImpl::CreateNewWindow( } void RenderViewHostImpl::CreateNewWidget(int route_id, - WebKit::WebPopupType popup_type) { + blink::WebPopupType popup_type) { delegate_->CreateNewWidget(route_id, popup_type); } @@ -1515,7 +1515,7 @@ void RenderViewHostImpl::OnUpdateState(int32 page_id, const PageState& state) { void RenderViewHostImpl::OnUpdateTitle( int32 page_id, const string16& title, - WebKit::WebTextDirection title_direction) { + blink::WebTextDirection title_direction) { if (title.length() > kMaxTitleChars) { NOTREACHED() << "Renderer sent too many characters in title."; return; @@ -1870,11 +1870,11 @@ gfx::Rect RenderViewHostImpl::GetRootWindowResizerRect() const { } void RenderViewHostImpl::ForwardMouseEvent( - const WebKit::WebMouseEvent& mouse_event) { + const blink::WebMouseEvent& mouse_event) { // We make a copy of the mouse event because // RenderWidgetHost::ForwardMouseEvent will delete |mouse_event|. - WebKit::WebMouseEvent event_copy(mouse_event); + blink::WebMouseEvent event_copy(mouse_event); RenderWidgetHostImpl::ForwardMouseEvent(event_copy); switch (event_copy.type) { @@ -2019,7 +2019,7 @@ void RenderViewHostImpl::DisownOpener() { } void RenderViewHostImpl::SetAccessibilityCallbackForTesting( - const base::Callback<void(WebKit::WebAXEvent)>& callback) { + const base::Callback<void(blink::WebAXEvent)>& callback) { accessibility_testing_callback_ = callback; } @@ -2056,7 +2056,7 @@ void RenderViewHostImpl::ReloadFrame() { void RenderViewHostImpl::Find(int request_id, const string16& search_text, - const WebKit::WebFindOptions& options) { + const blink::WebFindOptions& options) { Send(new ViewMsg_Find(GetRoutingID(), request_id, search_text, options)); } @@ -2099,12 +2099,12 @@ void RenderViewHostImpl::CopyImageAt(int x, int y) { } void RenderViewHostImpl::ExecuteMediaPlayerActionAtLocation( - const gfx::Point& location, const WebKit::WebMediaPlayerAction& action) { + const gfx::Point& location, const blink::WebMediaPlayerAction& action) { Send(new ViewMsg_MediaPlayerActionAt(GetRoutingID(), location, action)); } void RenderViewHostImpl::ExecutePluginActionAtLocation( - const gfx::Point& location, const WebKit::WebPluginAction& action) { + const gfx::Point& location, const blink::WebPluginAction& action) { Send(new ViewMsg_PluginActionAt(GetRoutingID(), location, action)); } @@ -2131,9 +2131,9 @@ void RenderViewHostImpl::OnAccessibilityEvents( for (unsigned i = 0; i < params.size(); i++) { const AccessibilityHostMsg_EventParams& param = params[i]; - WebKit::WebAXEvent src_type = param.event_type; - if (src_type == WebKit::WebAXEventLayoutComplete || - src_type == WebKit::WebAXEventLoadComplete) { + blink::WebAXEvent src_type = param.event_type; + if (src_type == blink::WebAXEventLayoutComplete || + src_type == blink::WebAXEventLoadComplete) { MakeAccessibilityNodeDataTree(param.nodes, &accessibility_tree_); } accessibility_testing_callback_.Run(src_type); diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h index ed963cd..c6d6016 100644 --- a/content/browser/renderer_host/render_view_host_impl.h +++ b/content/browser/renderer_host/render_view_host_impl.h @@ -144,7 +144,7 @@ class CONTENT_EXPORT RenderViewHostImpl virtual void DisableScrollbarsForThreshold(const gfx::Size& size) OVERRIDE; virtual void DragSourceEndedAt( int client_x, int client_y, int screen_x, int screen_y, - WebKit::WebDragOperation operation) OVERRIDE; + blink::WebDragOperation operation) OVERRIDE; virtual void DragSourceMovedTo( int client_x, int client_y, int screen_x, int screen_y) OVERRIDE; virtual void DragSourceSystemDragEnded() OVERRIDE; @@ -152,12 +152,12 @@ class CONTENT_EXPORT RenderViewHostImpl const DropData& drop_data, const gfx::Point& client_pt, const gfx::Point& screen_pt, - WebKit::WebDragOperationsMask operations_allowed, + blink::WebDragOperationsMask operations_allowed, int key_modifiers) OVERRIDE; virtual void DragTargetDragOver( const gfx::Point& client_pt, const gfx::Point& screen_pt, - WebKit::WebDragOperationsMask operations_allowed, + blink::WebDragOperationsMask operations_allowed, int key_modifiers) OVERRIDE; virtual void DragTargetDragLeave() OVERRIDE; virtual void DragTargetDrop(const gfx::Point& client_pt, @@ -171,7 +171,7 @@ class CONTENT_EXPORT RenderViewHostImpl int action, const CustomContextMenuContext& context) OVERRIDE; virtual void ExecuteMediaPlayerActionAtLocation( const gfx::Point& location, - const WebKit::WebMediaPlayerAction& action) OVERRIDE; + const blink::WebMediaPlayerAction& action) OVERRIDE; virtual void ExecuteJavascriptInWebFrame(const string16& frame_xpath, const string16& jscript) OVERRIDE; virtual void ExecuteJavascriptInWebFrameCallbackResult( @@ -180,10 +180,10 @@ class CONTENT_EXPORT RenderViewHostImpl const JavascriptResultCallback& callback) OVERRIDE; virtual void ExecutePluginActionAtLocation( const gfx::Point& location, - const WebKit::WebPluginAction& action) OVERRIDE; + const blink::WebPluginAction& action) OVERRIDE; virtual void ExitFullscreen() OVERRIDE; virtual void Find(int request_id, const string16& search_text, - const WebKit::WebFindOptions& options) OVERRIDE; + const blink::WebFindOptions& options) OVERRIDE; virtual void StopFinding(StopFindAction action) OVERRIDE; virtual void FirePageBeforeUnload(bool for_cross_site_transition) OVERRIDE; virtual void FilesSelectedInChooser( @@ -384,7 +384,7 @@ class CONTENT_EXPORT RenderViewHostImpl virtual void LostCapture() OVERRIDE; virtual void LostMouseLock() OVERRIDE; virtual void ForwardMouseEvent( - const WebKit::WebMouseEvent& mouse_event) OVERRIDE; + const blink::WebMouseEvent& mouse_event) OVERRIDE; virtual void OnPointerEventActivate() OVERRIDE; virtual void ForwardKeyboardEvent( const NativeWebKeyboardEvent& key_event) OVERRIDE; @@ -399,7 +399,7 @@ class CONTENT_EXPORT RenderViewHostImpl // Creates a new RenderWidget with the given route id. |popup_type| indicates // if this widget is a popup and what kind of popup it is (select, autofill). - void CreateNewWidget(int route_id, WebKit::WebPopupType popup_type); + void CreateNewWidget(int route_id, blink::WebPopupType popup_type); // Creates a full screen RenderWidget. void CreateNewFullscreenWidget(int route_id); @@ -440,7 +440,7 @@ class CONTENT_EXPORT RenderViewHostImpl // renderer process, and the accessibility tree it sent can be // retrieved using accessibility_tree_for_testing(). void SetAccessibilityCallbackForTesting( - const base::Callback<void(WebKit::WebAXEvent)>& callback); + const base::Callback<void(blink::WebAXEvent)>& callback); // Only valid if SetAccessibilityCallbackForTesting was called and // the callback was run at least once. Returns a snapshot of the @@ -532,7 +532,7 @@ class CONTENT_EXPORT RenderViewHostImpl void OnUpdateState(int32 page_id, const PageState& state); void OnUpdateTitle(int32 page_id, const string16& title, - WebKit::WebTextDirection title_direction); + blink::WebTextDirection title_direction); void OnUpdateEncoding(const std::string& encoding); void OnUpdateTargetURL(int32 page_id, const GURL& url); void OnClose(); @@ -571,11 +571,11 @@ class CONTENT_EXPORT RenderViewHostImpl bool is_reload, IPC::Message* reply_msg); void OnStartDragging(const DropData& drop_data, - WebKit::WebDragOperationsMask operations_allowed, + blink::WebDragOperationsMask operations_allowed, const SkBitmap& bitmap, const gfx::Vector2d& bitmap_offset_in_dip, const DragEventSourceInfo& event_info); - void OnUpdateDragCursor(WebKit::WebDragOperation drag_operation); + void OnUpdateDragCursor(blink::WebDragOperation drag_operation); void OnTargetDropACK(); void OnTakeFocus(bool reverse); void OnFocusedNodeChanged(bool is_editable_node); @@ -717,7 +717,7 @@ class CONTENT_EXPORT RenderViewHostImpl std::map<int, JavascriptResultCallback> javascript_callbacks_; // Accessibility callback for testing. - base::Callback<void(WebKit::WebAXEvent)> accessibility_testing_callback_; + base::Callback<void(blink::WebAXEvent)> accessibility_testing_callback_; // The most recently received accessibility tree - for testing only. AccessibilityNodeDataTreeNode accessibility_tree_; diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc index 3d13b5e..67e08d2 100644 --- a/content/browser/renderer_host/render_view_host_unittest.cc +++ b/content/browser/renderer_host/render_view_host_unittest.cc @@ -125,14 +125,14 @@ class MockDraggingRenderViewHostDelegateView bool right_aligned, bool allow_multiple_selection) OVERRIDE {} virtual void StartDragging(const DropData& drop_data, - WebKit::WebDragOperationsMask allowed_ops, + blink::WebDragOperationsMask allowed_ops, const gfx::ImageSkia& image, const gfx::Vector2d& image_offset, const DragEventSourceInfo& event_info) OVERRIDE { drag_url_ = drop_data.url; html_base_url_ = drop_data.html_base_url; } - virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE {} + virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE {} virtual void GotFocus() OVERRIDE {} virtual void TakeFocus(bool reverse) OVERRIDE {} virtual void UpdatePreferredSize(const gfx::Size& pref_size) {} @@ -202,7 +202,7 @@ TEST_F(RenderViewHostTest, DragEnteredFileURLsStillBlocked) { UTF8ToUTF16(dragged_file_path.AsUTF8Unsafe()), string16())); rvh()->DragTargetDragEnter(dropped_data, client_point, screen_point, - WebKit::WebDragOperationNone, 0); + blink::WebDragOperationNone, 0); int id = process()->GetID(); ChildProcessSecurityPolicyImpl* policy = diff --git a/content/browser/renderer_host/render_widget_helper.cc b/content/browser/renderer_host/render_widget_helper.cc index e7e2595..7f772e3 100644 --- a/content/browser/renderer_host/render_widget_helper.cc +++ b/content/browser/renderer_host/render_widget_helper.cc @@ -300,7 +300,7 @@ void RenderWidgetHelper::OnResumeRequestsForView(int route_id) { } void RenderWidgetHelper::CreateNewWidget(int opener_id, - WebKit::WebPopupType popup_type, + blink::WebPopupType popup_type, int* route_id, int* surface_id) { *route_id = GetNextRoutingID(); @@ -327,7 +327,7 @@ void RenderWidgetHelper::CreateNewFullscreenWidget(int opener_id, } void RenderWidgetHelper::OnCreateWidgetOnUI( - int opener_id, int route_id, WebKit::WebPopupType popup_type) { + int opener_id, int route_id, blink::WebPopupType popup_type) { RenderViewHostImpl* host = RenderViewHostImpl::FromID( render_process_id_, opener_id); if (host) diff --git a/content/browser/renderer_host/render_widget_helper.h b/content/browser/renderer_host/render_widget_helper.h index c5e80a1..a81b1de 100644 --- a/content/browser/renderer_host/render_widget_helper.h +++ b/content/browser/renderer_host/render_widget_helper.h @@ -153,7 +153,7 @@ class RenderWidgetHelper int* surface_id, SessionStorageNamespace* session_storage_namespace); void CreateNewWidget(int opener_id, - WebKit::WebPopupType popup_type, + blink::WebPopupType popup_type, int* route_id, int* surface_id); void CreateNewFullscreenWidget(int opener_id, int* route_id, int* surface_id); @@ -207,7 +207,7 @@ class RenderWidgetHelper // Called on the UI thread to finish creating a widget. void OnCreateWidgetOnUI(int opener_id, int route_id, - WebKit::WebPopupType popup_type); + blink::WebPopupType popup_type); // Called on the UI thread to create a fullscreen widget. void OnCreateFullscreenWidgetOnUI(int opener_id, int route_id); diff --git a/content/browser/renderer_host/render_widget_host_delegate.cc b/content/browser/renderer_host/render_widget_host_delegate.cc index 73f5325..efc1915 100644 --- a/content/browser/renderer_host/render_widget_host_delegate.cc +++ b/content/browser/renderer_host/render_widget_host_delegate.cc @@ -13,7 +13,7 @@ bool RenderWidgetHostDelegate::PreHandleKeyboardEvent( } bool RenderWidgetHostDelegate::PreHandleWheelEvent( - const WebKit::WebMouseWheelEvent& event) { + const blink::WebMouseWheelEvent& event) { return false; } diff --git a/content/browser/renderer_host/render_widget_host_delegate.h b/content/browser/renderer_host/render_widget_host_delegate.h index 9e8d36e..22f5a19 100644 --- a/content/browser/renderer_host/render_widget_host_delegate.h +++ b/content/browser/renderer_host/render_widget_host_delegate.h @@ -9,7 +9,7 @@ #include "content/common/content_export.h" #include "ui/gfx/native_widget_types.h" -namespace WebKit { +namespace blink { class WebMouseWheelEvent; } @@ -44,7 +44,7 @@ class CONTENT_EXPORT RenderWidgetHostDelegate { // Callback to give the browser a chance to handle the specified mouse wheel // event before sending it to the renderer. // Returns true if the |event| was handled. - virtual bool PreHandleWheelEvent(const WebKit::WebMouseWheelEvent& event); + virtual bool PreHandleWheelEvent(const blink::WebMouseWheelEvent& event); // Notifies that screen rects were sent to renderer process. virtual void DidSendScreenRects(RenderWidgetHostImpl* rwh) {} diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index c1917a1..fb3adb3 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -73,12 +73,12 @@ using base::Time; using base::TimeDelta; using base::TimeTicks; -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; -using WebKit::WebKeyboardEvent; -using WebKit::WebMouseEvent; -using WebKit::WebMouseWheelEvent; -using WebKit::WebTextDirection; +using blink::WebGestureEvent; +using blink::WebInputEvent; +using blink::WebKeyboardEvent; +using blink::WebMouseEvent; +using blink::WebMouseWheelEvent; +using blink::WebTextDirection; namespace content { namespace { @@ -182,7 +182,7 @@ RenderWidgetHostImpl::RenderWidgetHostImpl(RenderWidgetHostDelegate* delegate, ignore_input_events_(false), input_method_active_(false), text_direction_updated_(false), - text_direction_(WebKit::WebTextDirectionLeftToRight), + text_direction_(blink::WebTextDirectionLeftToRight), text_direction_canceled_(false), suppress_next_char_events_(false), pending_mouse_lock_request_(false), @@ -631,7 +631,7 @@ void RenderWidgetHostImpl::WasResized() { return; if (!screen_info_) { - screen_info_.reset(new WebKit::WebScreenInfo); + screen_info_.reset(new blink::WebScreenInfo); GetWebScreenInfo(screen_info_.get()); } @@ -1009,12 +1009,12 @@ void RenderWidgetHostImpl::ForwardWheelEventWithLatencyInfo( } void RenderWidgetHostImpl::ForwardGestureEvent( - const WebKit::WebGestureEvent& gesture_event) { + const blink::WebGestureEvent& gesture_event) { ForwardGestureEventWithLatencyInfo(gesture_event, ui::LatencyInfo()); } void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo( - const WebKit::WebGestureEvent& gesture_event, + const blink::WebGestureEvent& gesture_event, const ui::LatencyInfo& ui_latency) { TRACE_EVENT0("input", "RenderWidgetHostImpl::ForwardGestureEvent"); // Early out if necessary, prior to performing latency logic. @@ -1023,7 +1023,7 @@ void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo( ui::LatencyInfo latency_info = CreateRWHLatencyInfoIfNotExist(&ui_latency); - if (gesture_event.type == WebKit::WebInputEvent::GestureScrollUpdate) { + if (gesture_event.type == blink::WebInputEvent::GestureScrollUpdate) { latency_info.AddLatencyNumber( ui::INPUT_EVENT_LATENCY_SCROLL_UPDATE_RWH_COMPONENT, GetLatencyComponentId(), @@ -1051,7 +1051,7 @@ void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo( } void RenderWidgetHostImpl::ForwardTouchEventWithLatencyInfo( - const WebKit::WebTouchEvent& touch_event, + const blink::WebTouchEvent& touch_event, const ui::LatencyInfo& ui_latency) { TRACE_EVENT0("input", "RenderWidgetHostImpl::ForwardTouchEvent"); @@ -1191,7 +1191,7 @@ void RenderWidgetHostImpl::RemoveMouseEventCallback( } } -void RenderWidgetHostImpl::GetWebScreenInfo(WebKit::WebScreenInfo* result) { +void RenderWidgetHostImpl::GetWebScreenInfo(blink::WebScreenInfo* result) { TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::GetWebScreenInfo"); if (GetView()) static_cast<RenderWidgetHostViewPort*>(GetView())->GetScreenInfo(result); @@ -1324,7 +1324,7 @@ void RenderWidgetHostImpl::SetInputMethodActive(bool activate) { void RenderWidgetHostImpl::ImeSetComposition( const string16& text, - const std::vector<WebKit::WebCompositionUnderline>& underlines, + const std::vector<blink::WebCompositionUnderline>& underlines, int selection_start, int selection_end) { Send(new ViewMsg_ImeSetComposition( @@ -1341,7 +1341,7 @@ void RenderWidgetHostImpl::ImeConfirmComposition( void RenderWidgetHostImpl::ImeCancelComposition() { Send(new ViewMsg_ImeSetComposition(GetRoutingID(), string16(), - std::vector<WebKit::WebCompositionUnderline>(), 0, 0)); + std::vector<blink::WebCompositionUnderline>(), 0, 0)); } void RenderWidgetHostImpl::ExtendSelectionAndDelete( @@ -1461,11 +1461,11 @@ void RenderWidgetHostImpl::OnSetTooltipText( // but we use the current approach to match Fx & IE's behavior. string16 wrapped_tooltip_text = tooltip_text; if (!tooltip_text.empty()) { - if (text_direction_hint == WebKit::WebTextDirectionLeftToRight) { + if (text_direction_hint == blink::WebTextDirectionLeftToRight) { // Force the tooltip to have LTR directionality. wrapped_tooltip_text = base::i18n::GetDisplayStringInLTRDirectionality(wrapped_tooltip_text); - } else if (text_direction_hint == WebKit::WebTextDirectionRightToLeft && + } else if (text_direction_hint == blink::WebTextDirectionRightToLeft && !base::i18n::IsRTL()) { // Force the tooltip to have RTL directionality. base::i18n::WrapStringWithRTLFormatting(&wrapped_tooltip_text); @@ -1971,7 +1971,7 @@ bool RenderWidgetHostImpl::KeyPressListenersHandleEvent( } InputEventAckState RenderWidgetHostImpl::FilterInputEvent( - const WebKit::WebInputEvent& event, const ui::LatencyInfo& latency_info) { + const blink::WebInputEvent& event, const ui::LatencyInfo& latency_info) { // Don't ignore touch cancel events, since they may be sent while input // events are being ignored in order to keep the renderer from getting // confused about how many touches are active. diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h index 143362b..2bda1f2 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -62,7 +62,7 @@ namespace ui { class KeyEvent; } -namespace WebKit { +namespace blink { class WebInputEvent; class WebMouseEvent; struct WebCompositionUnderline; @@ -70,7 +70,7 @@ struct WebScreenInfo; } #if defined(OS_ANDROID) -namespace WebKit { +namespace blink { class WebLayer; } #endif @@ -130,7 +130,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, virtual void Delete() OVERRIDE; virtual void SelectAll() OVERRIDE; virtual void Unselect() OVERRIDE; - virtual void UpdateTextDirection(WebKit::WebTextDirection direction) OVERRIDE; + virtual void UpdateTextDirection(blink::WebTextDirection direction) OVERRIDE; virtual void NotifyTextDirection() OVERRIDE; virtual void Focus() OVERRIDE; virtual void Blur() OVERRIDE; @@ -149,9 +149,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, #endif virtual void EnableFullAccessibilityMode() OVERRIDE; virtual void ForwardMouseEvent( - const WebKit::WebMouseEvent& mouse_event) OVERRIDE; + const blink::WebMouseEvent& mouse_event) OVERRIDE; virtual void ForwardWheelEvent( - const WebKit::WebMouseWheelEvent& wheel_event) OVERRIDE; + const blink::WebMouseWheelEvent& wheel_event) OVERRIDE; virtual void ForwardKeyboardEvent( const NativeWebKeyboardEvent& key_event) OVERRIDE; virtual const gfx::Vector2d& GetLastScrollOffset() const OVERRIDE; @@ -179,7 +179,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, const MouseEventCallback& callback) OVERRIDE; virtual void RemoveMouseEventCallback( const MouseEventCallback& callback) OVERRIDE; - virtual void GetWebScreenInfo(WebKit::WebScreenInfo* result) OVERRIDE; + virtual void GetWebScreenInfo(blink::WebScreenInfo* result) OVERRIDE; virtual void GetSnapshotFromRenderer( const gfx::Rect& src_subrect, const base::Callback<void(bool, const SkBitmap&)>& callback) OVERRIDE; @@ -287,12 +287,12 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, // Forwards the given message to the renderer. These are called by the view // when it has received a message. - void ForwardGestureEvent(const WebKit::WebGestureEvent& gesture_event); + void ForwardGestureEvent(const blink::WebGestureEvent& gesture_event); void ForwardGestureEventWithLatencyInfo( - const WebKit::WebGestureEvent& gesture_event, + const blink::WebGestureEvent& gesture_event, const ui::LatencyInfo& ui_latency); void ForwardTouchEventWithLatencyInfo( - const WebKit::WebTouchEvent& touch_event, + const blink::WebTouchEvent& touch_event, const ui::LatencyInfo& ui_latency); void ForwardMouseEventWithLatencyInfo( const MouseEventWithLatencyInfo& mouse_event); @@ -329,7 +329,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, // * when markedText of NSTextInput is called (on Mac). void ImeSetComposition( const string16& text, - const std::vector<WebKit::WebCompositionUnderline>& underlines, + const std::vector<blink::WebCompositionUnderline>& underlines, int selection_start, int selection_end); @@ -567,7 +567,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, // its delegate. // Called when a mousewheel event was not processed by the renderer. - virtual void UnhandledWheelEvent(const WebKit::WebMouseWheelEvent& event) {} + virtual void UnhandledWheelEvent(const blink::WebMouseWheelEvent& event) {} // Notification that the user has made some kind of input that could // perform an action. The gestures that count are 1) any mouse down @@ -646,7 +646,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, void OnUpdateScreenRectsAck(); void OnRequestMove(const gfx::Rect& pos); void OnSetTooltipText(const string16& tooltip_text, - WebKit::WebTextDirection text_direction_hint); + blink::WebTextDirection text_direction_hint); void OnPaintAtSizeAck(int tag, const gfx::Size& size); #if defined(OS_MACOSX) void OnCompositorSurfaceBuffersSwapped( @@ -719,7 +719,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, // InputRouterClient virtual InputEventAckState FilterInputEvent( - const WebKit::WebInputEvent& event, + const blink::WebInputEvent& event, const ui::LatencyInfo& latency_info) OVERRIDE; virtual void IncrementInFlightEventCount() OVERRIDE; virtual void DecrementInFlightEventCount() OVERRIDE; @@ -783,7 +783,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, // Cached copy of the screen info so that it doesn't need to be updated every // time the window is resized. - scoped_ptr<WebKit::WebScreenInfo> screen_info_; + scoped_ptr<blink::WebScreenInfo> screen_info_; // Set if screen_info_ may have changed and should be recomputed and force a // resize message. @@ -866,7 +866,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, // Set when we update the text direction of the selected input element. bool text_direction_updated_; - WebKit::WebTextDirection text_direction_; + blink::WebTextDirection text_direction_; // Set when we cancel updating the text direction. // This flag also ignores succeeding update requests until we call diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index ec77564..49b631c 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc @@ -46,11 +46,11 @@ #endif using base::TimeDelta; -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; -using WebKit::WebMouseWheelEvent; -using WebKit::WebTouchEvent; -using WebKit::WebTouchPoint; +using blink::WebGestureEvent; +using blink::WebInputEvent; +using blink::WebMouseWheelEvent; +using blink::WebTouchEvent; +using blink::WebTouchPoint; namespace content { @@ -439,7 +439,7 @@ class TestView : public TestRenderWidgetHostView { const WebTouchEvent& acked_event() const { return acked_event_; } int acked_event_count() const { return acked_event_count_; } void ClearAckedEvent() { - acked_event_.type = WebKit::WebInputEvent::Undefined; + acked_event_.type = blink::WebInputEvent::Undefined; acked_event_count_ = 0; } @@ -601,7 +601,7 @@ class RenderWidgetHostTest : public testing::Test { bool KeyPressEventCallback(const NativeWebKeyboardEvent& /* event */) { return handle_key_press_event_; } - bool MouseEventCallback(const WebKit::WebMouseEvent& /* event */) { + bool MouseEventCallback(const blink::WebMouseEvent& /* event */) { return handle_mouse_event_; } @@ -1943,7 +1943,7 @@ TEST_F(RenderWidgetHostTest, OverscrollWithTouchEvents) { EXPECT_EQ(0U, process_->sink().message_count()); EXPECT_TRUE(host_->TouchEventQueueEmpty()); - SimulateGestureEvent(WebKit::WebInputEvent::GestureScrollEnd, + SimulateGestureEvent(blink::WebInputEvent::GestureScrollEnd, WebGestureEvent::Touchscreen); base::MessageLoop::current()->PostDelayedTask( FROM_HERE, @@ -2001,7 +2001,7 @@ TEST_F(RenderWidgetHostTest, TouchGestureEndDispatchedAfterOverscrollComplete) { EXPECT_EQ(-5.f, host_->overscroll_delegate()->delta_y()); // Send end event. - SimulateGestureEvent(WebKit::WebInputEvent::GestureScrollEnd, + SimulateGestureEvent(blink::WebInputEvent::GestureScrollEnd, WebGestureEvent::Touchscreen); EXPECT_EQ(0U, process_->sink().message_count()); EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_mode()); @@ -2019,7 +2019,7 @@ TEST_F(RenderWidgetHostTest, TouchGestureEndDispatchedAfterOverscrollComplete) { EXPECT_EQ(1U, host_->GestureEventLastQueueEventSize()); EXPECT_EQ(0U, host_->GestureEventDebouncingQueueSize()); - SendInputEventACK(WebKit::WebInputEvent::GestureScrollEnd, + SendInputEventACK(blink::WebInputEvent::GestureScrollEnd, INPUT_EVENT_ACK_STATE_NOT_CONSUMED); EXPECT_EQ(0U, process_->sink().message_count()); EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); @@ -2059,7 +2059,7 @@ TEST_F(RenderWidgetHostTest, TouchGestureEndDispatchedAfterOverscrollComplete) { EXPECT_EQ(-5.f, host_->overscroll_delegate()->delta_y()); // Send end event. - SimulateGestureEvent(WebKit::WebInputEvent::GestureScrollEnd, + SimulateGestureEvent(blink::WebInputEvent::GestureScrollEnd, WebGestureEvent::Touchscreen); EXPECT_EQ(0U, process_->sink().message_count()); EXPECT_EQ(OVERSCROLL_NONE, host_->overscroll_mode()); @@ -2078,7 +2078,7 @@ TEST_F(RenderWidgetHostTest, TouchGestureEndDispatchedAfterOverscrollComplete) { EXPECT_EQ(1U, host_->GestureEventLastQueueEventSize()); EXPECT_EQ(0U, host_->GestureEventDebouncingQueueSize()); - SendInputEventACK(WebKit::WebInputEvent::GestureScrollEnd, + SendInputEventACK(blink::WebInputEvent::GestureScrollEnd, INPUT_EVENT_ACK_STATE_NOT_CONSUMED); EXPECT_EQ(0U, process_->sink().message_count()); EXPECT_EQ(0U, host_->GestureEventLastQueueEventSize()); diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index 2b7b6f0..b5491f2 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -214,7 +214,7 @@ void RenderWidgetHostViewAndroid::SetBounds(const gfx::Rect& rect) { SetSize(rect.size()); } -WebKit::WebGLId RenderWidgetHostViewAndroid::GetScaledContentTexture( +blink::WebGLId RenderWidgetHostViewAndroid::GetScaledContentTexture( float scale, gfx::Size* out_size) { gfx::Size size(gfx::ToCeiledSize( @@ -254,7 +254,7 @@ bool RenderWidgetHostViewAndroid::PopulateBitmapWithContents(jobject jbitmap) { GLHelper* helper = ImageTransportFactoryAndroid::GetInstance()->GetGLHelper(); - WebKit::WebGLId texture = helper->CopyAndScaleTexture( + blink::WebGLId texture = helper->CopyAndScaleTexture( texture_id_in_layer_, texture_size_in_layer_, bitmap.size(), @@ -267,7 +267,7 @@ bool RenderWidgetHostViewAndroid::PopulateBitmapWithContents(jobject jbitmap) { gfx::Rect(bitmap.size()), static_cast<unsigned char*> (bitmap.pixels())); - WebKit::WebGraphicsContext3D* context = + blink::WebGraphicsContext3D* context = ImageTransportFactoryAndroid::GetInstance()->GetContext3D(); context->deleteTexture(texture); @@ -948,7 +948,7 @@ bool RenderWidgetHostViewAndroid::HasAcceleratedSurface( return false; } -void RenderWidgetHostViewAndroid::GetScreenInfo(WebKit::WebScreenInfo* result) { +void RenderWidgetHostViewAndroid::GetScreenInfo(blink::WebScreenInfo* result) { // ScreenInfo isn't tied to the widget on Android. Always return the default. RenderWidgetHostViewBase::GetDefaultScreenInfo(result); } @@ -980,25 +980,25 @@ void RenderWidgetHostViewAndroid::SetScrollOffsetPinning( } void RenderWidgetHostViewAndroid::UnhandledWheelEvent( - const WebKit::WebMouseWheelEvent& event) { + const blink::WebMouseWheelEvent& event) { // intentionally empty, like RenderWidgetHostViewViews } void RenderWidgetHostViewAndroid::GestureEventAck( int gesture_event_type, InputEventAckState ack_result) { - if (gesture_event_type == WebKit::WebInputEvent::GestureScrollUpdate && + if (gesture_event_type == blink::WebInputEvent::GestureScrollUpdate && ack_result == INPUT_EVENT_ACK_STATE_CONSUMED) { content_view_core_->OnScrollUpdateGestureConsumed(); } - if (gesture_event_type == WebKit::WebInputEvent::GestureFlingStart && + if (gesture_event_type == blink::WebInputEvent::GestureFlingStart && ack_result == INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS) { content_view_core_->UnhandledFlingStartEvent(); } } InputEventAckState RenderWidgetHostViewAndroid::FilterInputEvent( - const WebKit::WebInputEvent& input_event) { + const blink::WebInputEvent& input_event) { if (host_) { SynchronousCompositorImpl* compositor = SynchronousCompositorImpl::FromID(host_->GetProcess()->GetID(), @@ -1103,26 +1103,26 @@ void RenderWidgetHostViewAndroid::SendKeyEvent( } void RenderWidgetHostViewAndroid::SendTouchEvent( - const WebKit::WebTouchEvent& event) { + const blink::WebTouchEvent& event) { if (host_) host_->ForwardTouchEventWithLatencyInfo(event, ui::LatencyInfo()); } void RenderWidgetHostViewAndroid::SendMouseEvent( - const WebKit::WebMouseEvent& event) { + const blink::WebMouseEvent& event) { if (host_) host_->ForwardMouseEvent(event); } void RenderWidgetHostViewAndroid::SendMouseWheelEvent( - const WebKit::WebMouseWheelEvent& event) { + const blink::WebMouseWheelEvent& event) { if (host_) host_->ForwardWheelEvent(event); } void RenderWidgetHostViewAndroid::SendGestureEvent( - const WebKit::WebGestureEvent& event) { + const blink::WebGestureEvent& event) { // Sending a gesture that may trigger overscroll should resume the effect. if (overscroll_effect_) overscroll_effect_->SetEnabled(true); @@ -1340,7 +1340,7 @@ void RenderWidgetHostViewAndroid::PrepareBitmapCopyOutputResult( // static void RenderWidgetHostViewPort::GetDefaultScreenInfo( - WebKit::WebScreenInfo* results) { + blink::WebScreenInfo* results) { const gfx::Display& display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay(); results->rect = display.bounds(); diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h index f68de7e..2257301 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.h +++ b/content/browser/renderer_host/render_widget_host_view_android.h @@ -42,7 +42,7 @@ class SingleReleaseCallback; class TextureLayer; } -namespace WebKit { +namespace blink { class WebExternalTextureLayer; class WebTouchEvent; class WebMouseEvent; @@ -140,7 +140,7 @@ class RenderWidgetHostViewAndroid const scoped_refptr<media::VideoFrame>& target, const base::Callback<void(bool)>& callback) OVERRIDE; virtual bool CanCopyToVideoFrame() const OVERRIDE; - virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; + virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE; virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch, @@ -150,9 +150,9 @@ class RenderWidgetHostViewAndroid virtual void SetScrollOffsetPinning( bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; virtual void UnhandledWheelEvent( - const WebKit::WebMouseWheelEvent& event) OVERRIDE; + const blink::WebMouseWheelEvent& event) OVERRIDE; virtual InputEventAckState FilterInputEvent( - const WebKit::WebInputEvent& input_event) OVERRIDE; + const blink::WebInputEvent& input_event) OVERRIDE; virtual void OnSetNeedsFlushInput() OVERRIDE; virtual void GestureEventAck(int gesture_event_type, InputEventAckState ack_result) OVERRIDE; @@ -208,10 +208,10 @@ class RenderWidgetHostViewAndroid void SetContentViewCore(ContentViewCoreImpl* content_view_core); SkColor GetCachedBackgroundColor() const; void SendKeyEvent(const NativeWebKeyboardEvent& event); - void SendTouchEvent(const WebKit::WebTouchEvent& event); - void SendMouseEvent(const WebKit::WebMouseEvent& event); - void SendMouseWheelEvent(const WebKit::WebMouseWheelEvent& event); - void SendGestureEvent(const WebKit::WebGestureEvent& event); + void SendTouchEvent(const blink::WebTouchEvent& event); + void SendMouseEvent(const blink::WebMouseEvent& event); + void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event); + void SendGestureEvent(const blink::WebGestureEvent& event); void SendBeginFrame(const cc::BeginFrameArgs& args); void OnTextInputStateChanged(const ViewHostMsg_TextInputState_Params& params); @@ -223,7 +223,7 @@ class RenderWidgetHostViewAndroid void WasResized(); - WebKit::WebGLId GetScaledContentTexture(float scale, gfx::Size* out_size); + blink::WebGLId GetScaledContentTexture(float scale, gfx::Size* out_size); bool PopulateBitmapWithContents(jobject jbitmap); bool HasValidFrame() const; diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index 59e7508..2f80cf1 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -88,8 +88,8 @@ using gfx::RectToSkIRect; using gfx::SkIRectToRect; -using WebKit::WebScreenInfo; -using WebKit::WebTouchEvent; +using blink::WebScreenInfo; +using blink::WebTouchEvent; namespace content { @@ -220,10 +220,10 @@ BOOL CALLBACK DismissOwnedPopups(HWND window, LPARAM arg) { } #endif -void UpdateWebTouchEventAfterDispatch(WebKit::WebTouchEvent* event, - WebKit::WebTouchPoint* point) { - if (point->state != WebKit::WebTouchPoint::StateReleased && - point->state != WebKit::WebTouchPoint::StateCancelled) +void UpdateWebTouchEventAfterDispatch(blink::WebTouchEvent* event, + blink::WebTouchPoint* point) { + if (point->state != blink::WebTouchPoint::StateReleased && + point->state != blink::WebTouchPoint::StateCancelled) return; --event->touchesLength; for (unsigned i = point - event->touches; @@ -2109,15 +2109,15 @@ void RenderWidgetHostViewAura::SetCompositionText( return; // ui::CompositionUnderline should be identical to - // WebKit::WebCompositionUnderline, so that we can do reinterpret_cast safely. + // blink::WebCompositionUnderline, so that we can do reinterpret_cast safely. COMPILE_ASSERT(sizeof(ui::CompositionUnderline) == - sizeof(WebKit::WebCompositionUnderline), + sizeof(blink::WebCompositionUnderline), ui_CompositionUnderline__WebKit_WebCompositionUnderline_diff); // TODO(suzhe): convert both renderer_host and renderer to use // ui::CompositionText. - const std::vector<WebKit::WebCompositionUnderline>& underlines = - reinterpret_cast<const std::vector<WebKit::WebCompositionUnderline>&>( + const std::vector<blink::WebCompositionUnderline>& underlines = + reinterpret_cast<const std::vector<blink::WebCompositionUnderline>&>( composition.underlines); // TODO(suzhe): due to a bug of webkit, we can't use selection range with @@ -2156,7 +2156,7 @@ void RenderWidgetHostViewAura::InsertChar(char16 ch, int flags) { if (host_) { double now = ui::EventTimeForNow().InSecondsF(); - // Send a WebKit::WebInputEvent::Char event to |host_|. + // Send a blink::WebInputEvent::Char event to |host_|. NativeWebKeyboardEvent webkit_event(ui::ET_KEY_PRESSED, true /* is_char */, ch, @@ -2311,8 +2311,8 @@ bool RenderWidgetHostViewAura::ChangeTextDirectionAndLayoutAlignment( return false; host_->UpdateTextDirection( direction == base::i18n::RIGHT_TO_LEFT ? - WebKit::WebTextDirectionRightToLeft : - WebKit::WebTextDirectionLeftToRight); + blink::WebTextDirectionRightToLeft : + blink::WebTextDirectionLeftToRight); host_->NotifyTextDirection(); return true; } @@ -2393,7 +2393,7 @@ bool RenderWidgetHostViewAura::ShouldDescendIntoChildForEventHandling( } bool RenderWidgetHostViewAura::CanFocus() { - return popup_type_ == WebKit::WebPopupTypeNone; + return popup_type_ == blink::WebPopupTypeNone; } void RenderWidgetHostViewAura::OnCaptureLost() { @@ -2497,7 +2497,7 @@ void RenderWidgetHostViewAura::DidRecreateLayer(ui::Layer *old_layer, scoped_refptr<ui::Texture> new_texture; if (host_->is_accelerated_compositing_active() && gl_helper && current_surface_.get()) { - WebKit::WebGLId texture_id = + blink::WebGLId texture_id = gl_helper->CopyTexture(current_surface_->PrepareTexture(), current_surface_->size()); if (texture_id) { @@ -2603,7 +2603,7 @@ void RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) { DCHECK(!cursor_client || !cursor_client->IsCursorVisible()); if (event->type() == ui::ET_MOUSEWHEEL) { - WebKit::WebMouseWheelEvent mouse_wheel_event = + blink::WebMouseWheelEvent mouse_wheel_event = MakeWebMouseWheelEvent(static_cast<ui::MouseWheelEvent*>(event)); if (mouse_wheel_event.deltaX != 0 || mouse_wheel_event.deltaY != 0) host_->ForwardWheelEvent(mouse_wheel_event); @@ -2621,7 +2621,7 @@ void RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) { return; } - WebKit::WebMouseEvent mouse_event = MakeWebMouseEvent(event); + blink::WebMouseEvent mouse_event = MakeWebMouseEvent(event); bool is_move_to_center_event = (event->type() == ui::ET_MOUSE_MOVED || event->type() == ui::ET_MOUSE_DRAGGED) && @@ -2676,13 +2676,13 @@ void RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) { reinterpret_cast<LPARAM>(toplevel_hwnd)); } #endif - WebKit::WebMouseWheelEvent mouse_wheel_event = + blink::WebMouseWheelEvent mouse_wheel_event = MakeWebMouseWheelEvent(static_cast<ui::MouseWheelEvent*>(event)); if (mouse_wheel_event.deltaX != 0 || mouse_wheel_event.deltaY != 0) host_->ForwardWheelEvent(mouse_wheel_event); } else if (CanRendererHandleEvent(event) && !(event->flags() & ui::EF_FROM_TOUCH)) { - WebKit::WebMouseEvent mouse_event = MakeWebMouseEvent(event); + blink::WebMouseEvent mouse_event = MakeWebMouseEvent(event); ModifyEventMovementAndCoords(&mouse_event); host_->ForwardMouseEvent(mouse_event); } @@ -2722,16 +2722,16 @@ void RenderWidgetHostViewAura::OnScrollEvent(ui::ScrollEvent* event) { if (event->type() == ui::ET_SCROLL) { if (event->finger_count() != 2) return; - WebKit::WebGestureEvent gesture_event = + blink::WebGestureEvent gesture_event = MakeWebGestureEventFlingCancel(); host_->ForwardGestureEvent(gesture_event); - WebKit::WebMouseWheelEvent mouse_wheel_event = + blink::WebMouseWheelEvent mouse_wheel_event = MakeWebMouseWheelEvent(event); host_->ForwardWheelEvent(mouse_wheel_event); RecordAction(UserMetricsAction("TrackpadScroll")); } else if (event->type() == ui::ET_SCROLL_FLING_START || event->type() == ui::ET_SCROLL_FLING_CANCEL) { - WebKit::WebGestureEvent gesture_event = + blink::WebGestureEvent gesture_event = MakeWebGestureEvent(event); host_->ForwardGestureEvent(gesture_event); if (event->type() == ui::ET_SCROLL_FLING_START) @@ -2747,7 +2747,7 @@ void RenderWidgetHostViewAura::OnTouchEvent(ui::TouchEvent* event) { return; // Update the touch event first. - WebKit::WebTouchPoint* point = UpdateWebTouchEventFromUIEvent(*event, + blink::WebTouchPoint* point = UpdateWebTouchEventFromUIEvent(*event, &touch_event_); // Forward the touch event only if a touch point was updated, and there's a @@ -2780,7 +2780,7 @@ void RenderWidgetHostViewAura::OnGestureEvent(ui::GestureEvent* event) { return; RenderViewHostDelegate* delegate = NULL; - if (popup_type_ == WebKit::WebPopupTypeNone && !is_fullscreen_) + if (popup_type_ == blink::WebPopupTypeNone && !is_fullscreen_) delegate = RenderViewHost::From(host_)->GetDelegate(); if (delegate && event->type() == ui::ET_GESTURE_BEGIN && @@ -2788,17 +2788,17 @@ void RenderWidgetHostViewAura::OnGestureEvent(ui::GestureEvent* event) { delegate->HandleGestureBegin(); } - WebKit::WebGestureEvent gesture = MakeWebGestureEvent(event); + blink::WebGestureEvent gesture = MakeWebGestureEvent(event); if (event->type() == ui::ET_GESTURE_TAP_DOWN) { // Webkit does not stop a fling-scroll on tap-down. So explicitly send an // event to stop any in-progress flings. - WebKit::WebGestureEvent fling_cancel = gesture; - fling_cancel.type = WebKit::WebInputEvent::GestureFlingCancel; - fling_cancel.sourceDevice = WebKit::WebGestureEvent::Touchscreen; + blink::WebGestureEvent fling_cancel = gesture; + fling_cancel.type = blink::WebInputEvent::GestureFlingCancel; + fling_cancel.sourceDevice = blink::WebGestureEvent::Touchscreen; host_->ForwardGestureEvent(fling_cancel); } - if (gesture.type != WebKit::WebInputEvent::Undefined) { + if (gesture.type != blink::WebInputEvent::Undefined) { host_->ForwardGestureEventWithLatencyInfo(gesture, *event->latency()); if (event->type() == ui::ET_GESTURE_SCROLL_BEGIN || @@ -3153,7 +3153,7 @@ ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const { } bool RenderWidgetHostViewAura::NeedsInputGrab() { - return popup_type_ == WebKit::WebPopupTypeSelect; + return popup_type_ == blink::WebPopupTypeSelect; } void RenderWidgetHostViewAura::FinishImeCompositionSession() { @@ -3165,11 +3165,11 @@ void RenderWidgetHostViewAura::FinishImeCompositionSession() { } void RenderWidgetHostViewAura::ModifyEventMovementAndCoords( - WebKit::WebMouseEvent* event) { + blink::WebMouseEvent* event) { // If the mouse has just entered, we must report zero movementX/Y. Hence we // reset any global_mouse_position set previously. - if (event->type == WebKit::WebInputEvent::MouseEnter || - event->type == WebKit::WebInputEvent::MouseLeave) + if (event->type == blink::WebInputEvent::MouseEnter || + event->type == blink::WebInputEvent::MouseLeave) global_mouse_position_.SetPoint(event->globalX, event->globalY); // Movement is computed by taking the difference of the new cursor position @@ -3258,7 +3258,7 @@ void RenderWidgetHostViewAura::AddedToRootWindow() { window_->GetDispatcher()->AddRootWindowObserver(this); host_->ParentChanged(GetNativeViewId()); UpdateScreenInfo(window_); - if (popup_type_ != WebKit::WebPopupTypeNone) + if (popup_type_ != blink::WebPopupTypeNone) event_filter_for_popup_exit_.reset(new EventFilterForPopupExit(this)); aura::client::CursorClient* cursor_client = diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h index ddf3f9c..206087a 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.h +++ b/content/browser/renderer_host/render_widget_host_view_aura.h @@ -223,7 +223,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura virtual void AcceleratedSurfaceSuspend() OVERRIDE; virtual void AcceleratedSurfaceRelease() OVERRIDE; virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; - virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; + virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE; virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; virtual void GestureEventAck(int gesture_event_type, InputEventAckState ack_result) OVERRIDE; @@ -438,7 +438,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura // This method computes movementX/Y and keeps track of mouse location for // mouse lock on all mouse move events. - void ModifyEventMovementAndCoords(WebKit::WebMouseEvent* event); + void ModifyEventMovementAndCoords(blink::WebMouseEvent* event); // Sends an IPC to the renderer process to communicate whether or not // the mouse cursor is visible anywhere on the screen. @@ -591,7 +591,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura // The touch-event. Its touch-points are updated as necessary. A new // touch-point is added from an ET_TOUCH_PRESSED event, and a touch-point is // removed from the list on an ET_TOUCH_RELEASED event. - WebKit::WebTouchEvent touch_event_; + blink::WebTouchEvent touch_event_; // The current text input type. ui::TextInputType text_input_type_; diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc index 88669e0..2c27071 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc @@ -416,21 +416,21 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) { view_->OnTouchEvent(&press); EXPECT_FALSE(press.handled()); - EXPECT_EQ(WebKit::WebInputEvent::TouchStart, view_->touch_event_.type); + EXPECT_EQ(blink::WebInputEvent::TouchStart, view_->touch_event_.type); EXPECT_EQ(1U, view_->touch_event_.touchesLength); - EXPECT_EQ(WebKit::WebTouchPoint::StatePressed, + EXPECT_EQ(blink::WebTouchPoint::StatePressed, view_->touch_event_.touches[0].state); view_->OnTouchEvent(&move); EXPECT_FALSE(move.handled()); - EXPECT_EQ(WebKit::WebInputEvent::TouchMove, view_->touch_event_.type); + EXPECT_EQ(blink::WebInputEvent::TouchMove, view_->touch_event_.type); EXPECT_EQ(1U, view_->touch_event_.touchesLength); - EXPECT_EQ(WebKit::WebTouchPoint::StateMoved, + EXPECT_EQ(blink::WebTouchPoint::StateMoved, view_->touch_event_.touches[0].state); view_->OnTouchEvent(&release); EXPECT_FALSE(release.handled()); - EXPECT_EQ(WebKit::WebInputEvent::TouchEnd, view_->touch_event_.type); + EXPECT_EQ(blink::WebInputEvent::TouchEnd, view_->touch_event_.type); EXPECT_EQ(0U, view_->touch_event_.touchesLength); // Now install some touch-event handlers and do the same steps. The touch @@ -441,29 +441,29 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) { view_->OnTouchEvent(&press); EXPECT_TRUE(press.stopped_propagation()); - EXPECT_EQ(WebKit::WebInputEvent::TouchStart, view_->touch_event_.type); + EXPECT_EQ(blink::WebInputEvent::TouchStart, view_->touch_event_.type); EXPECT_EQ(1U, view_->touch_event_.touchesLength); - EXPECT_EQ(WebKit::WebTouchPoint::StatePressed, + EXPECT_EQ(blink::WebTouchPoint::StatePressed, view_->touch_event_.touches[0].state); view_->OnTouchEvent(&move); EXPECT_TRUE(move.stopped_propagation()); - EXPECT_EQ(WebKit::WebInputEvent::TouchMove, view_->touch_event_.type); + EXPECT_EQ(blink::WebInputEvent::TouchMove, view_->touch_event_.type); EXPECT_EQ(1U, view_->touch_event_.touchesLength); - EXPECT_EQ(WebKit::WebTouchPoint::StateMoved, + EXPECT_EQ(blink::WebTouchPoint::StateMoved, view_->touch_event_.touches[0].state); view_->OnTouchEvent(&release); EXPECT_TRUE(release.stopped_propagation()); - EXPECT_EQ(WebKit::WebInputEvent::TouchEnd, view_->touch_event_.type); + EXPECT_EQ(blink::WebInputEvent::TouchEnd, view_->touch_event_.type); EXPECT_EQ(0U, view_->touch_event_.touchesLength); // Now start a touch event, and remove the event-handlers before the release. view_->OnTouchEvent(&press); EXPECT_TRUE(press.stopped_propagation()); - EXPECT_EQ(WebKit::WebInputEvent::TouchStart, view_->touch_event_.type); + EXPECT_EQ(blink::WebInputEvent::TouchStart, view_->touch_event_.type); EXPECT_EQ(1U, view_->touch_event_.touchesLength); - EXPECT_EQ(WebKit::WebTouchPoint::StatePressed, + EXPECT_EQ(blink::WebTouchPoint::StatePressed, view_->touch_event_.touches[0].state); widget_host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, false)); @@ -473,16 +473,16 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) { base::Time::NowFromSystemTime() - base::Time()); view_->OnTouchEvent(&move2); EXPECT_FALSE(move2.handled()); - EXPECT_EQ(WebKit::WebInputEvent::TouchMove, view_->touch_event_.type); + EXPECT_EQ(blink::WebInputEvent::TouchMove, view_->touch_event_.type); EXPECT_EQ(1U, view_->touch_event_.touchesLength); - EXPECT_EQ(WebKit::WebTouchPoint::StateMoved, + EXPECT_EQ(blink::WebTouchPoint::StateMoved, view_->touch_event_.touches[0].state); ui::TouchEvent release2(ui::ET_TOUCH_RELEASED, gfx::Point(20, 20), 0, base::Time::NowFromSystemTime() - base::Time()); view_->OnTouchEvent(&release2); EXPECT_FALSE(release2.handled()); - EXPECT_EQ(WebKit::WebInputEvent::TouchEnd, view_->touch_event_.type); + EXPECT_EQ(blink::WebInputEvent::TouchEnd, view_->touch_event_.type); EXPECT_EQ(0U, view_->touch_event_.touchesLength); } @@ -510,30 +510,30 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventSyncAsync) { view_->OnTouchEvent(&press); EXPECT_TRUE(press.stopped_propagation()); - EXPECT_EQ(WebKit::WebInputEvent::TouchStart, view_->touch_event_.type); + EXPECT_EQ(blink::WebInputEvent::TouchStart, view_->touch_event_.type); EXPECT_EQ(1U, view_->touch_event_.touchesLength); - EXPECT_EQ(WebKit::WebTouchPoint::StatePressed, + EXPECT_EQ(blink::WebTouchPoint::StatePressed, view_->touch_event_.touches[0].state); view_->OnTouchEvent(&move); EXPECT_TRUE(move.stopped_propagation()); - EXPECT_EQ(WebKit::WebInputEvent::TouchMove, view_->touch_event_.type); + EXPECT_EQ(blink::WebInputEvent::TouchMove, view_->touch_event_.type); EXPECT_EQ(1U, view_->touch_event_.touchesLength); - EXPECT_EQ(WebKit::WebTouchPoint::StateMoved, + EXPECT_EQ(blink::WebTouchPoint::StateMoved, view_->touch_event_.touches[0].state); // Send the same move event. Since the point hasn't moved, it won't affect the // queue. However, the view should consume the event. view_->OnTouchEvent(&move); EXPECT_TRUE(move.stopped_propagation()); - EXPECT_EQ(WebKit::WebInputEvent::TouchMove, view_->touch_event_.type); + EXPECT_EQ(blink::WebInputEvent::TouchMove, view_->touch_event_.type); EXPECT_EQ(1U, view_->touch_event_.touchesLength); - EXPECT_EQ(WebKit::WebTouchPoint::StateMoved, + EXPECT_EQ(blink::WebTouchPoint::StateMoved, view_->touch_event_.touches[0].state); view_->OnTouchEvent(&release); EXPECT_TRUE(release.stopped_propagation()); - EXPECT_EQ(WebKit::WebInputEvent::TouchEnd, view_->touch_event_.type); + EXPECT_EQ(blink::WebInputEvent::TouchEnd, view_->touch_event_.type); EXPECT_EQ(0U, view_->touch_event_.touchesLength); } diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc index 320e3e1..5ca099c 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.cc +++ b/content/browser/renderer_host/render_widget_host_view_base.cc @@ -378,7 +378,7 @@ void RenderWidgetHostViewBase::DetachPluginsHelper(HWND parent) { #endif // OS_WIN RenderWidgetHostViewBase::RenderWidgetHostViewBase() - : popup_type_(WebKit::WebPopupTypeNone), + : popup_type_(blink::WebPopupTypeNone), mouse_locked_(false), showing_context_menu_(false), selection_text_offset_(0), @@ -446,12 +446,12 @@ bool RenderWidgetHostViewBase::IsMouseLocked() { } void RenderWidgetHostViewBase::UnhandledWheelEvent( - const WebKit::WebMouseWheelEvent& event) { + const blink::WebMouseWheelEvent& event) { // Most implementations don't need to do anything here. } InputEventAckState RenderWidgetHostViewBase::FilterInputEvent( - const WebKit::WebInputEvent& input_event) { + const blink::WebInputEvent& input_event) { // By default, input events are simply forwarded to the renderer. return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; } @@ -467,11 +467,11 @@ void RenderWidgetHostViewBase::OnSetNeedsFlushInput() { void RenderWidgetHostViewBase::GestureEventAck(int gesture_event_type, InputEventAckState ack_result) {} -void RenderWidgetHostViewBase::SetPopupType(WebKit::WebPopupType popup_type) { +void RenderWidgetHostViewBase::SetPopupType(blink::WebPopupType popup_type) { popup_type_ = popup_type; } -WebKit::WebPopupType RenderWidgetHostViewBase::GetPopupType() { +blink::WebPopupType RenderWidgetHostViewBase::GetPopupType() { return popup_type_; } diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h index 459afee..abe318f 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.h +++ b/content/browser/renderer_host/render_widget_host_view_base.h @@ -58,15 +58,15 @@ class CONTENT_EXPORT RenderWidgetHostViewBase virtual string16 GetSelectedText() const OVERRIDE; virtual bool IsMouseLocked() OVERRIDE; virtual void UnhandledWheelEvent( - const WebKit::WebMouseWheelEvent& event) OVERRIDE; + const blink::WebMouseWheelEvent& event) OVERRIDE; virtual InputEventAckState FilterInputEvent( - const WebKit::WebInputEvent& input_event) OVERRIDE; + const blink::WebInputEvent& input_event) OVERRIDE; virtual void OnSetNeedsFlushInput() OVERRIDE; virtual void OnDidFlushInput() OVERRIDE; virtual void GestureEventAck(int gesture_event_type, InputEventAckState ack_result) OVERRIDE; - virtual void SetPopupType(WebKit::WebPopupType popup_type) OVERRIDE; - virtual WebKit::WebPopupType GetPopupType() OVERRIDE; + virtual void SetPopupType(blink::WebPopupType popup_type) OVERRIDE; + virtual blink::WebPopupType GetPopupType() OVERRIDE; virtual BrowserAccessibilityManager* GetBrowserAccessibilityManager() const OVERRIDE; virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch, @@ -126,7 +126,7 @@ class CONTENT_EXPORT RenderWidgetHostViewBase // Whether this view is a popup and what kind of popup it is (select, // autofill...). - WebKit::WebPopupType popup_type_; + blink::WebPopupType popup_type_; // A custom background to paint behind the web content. This will be tiled // horizontally. Can be null, in which case we fall back to painting white. diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.cc b/content/browser/renderer_host/render_widget_host_view_gtk.cc index 5e182a8..320b96f 100644 --- a/content/browser/renderer_host/render_widget_host_view_gtk.cc +++ b/content/browser/renderer_host/render_widget_host_view_gtk.cc @@ -50,8 +50,8 @@ #include "ui/gfx/text_elider.h" #include "webkit/common/cursors/webcursor_gtk_data.h" -using WebKit::WebMouseWheelEvent; -using WebKit::WebScreenInfo; +using blink::WebMouseWheelEvent; +using blink::WebScreenInfo; namespace content { namespace { @@ -94,7 +94,7 @@ GdkCursor* GetMozSpinningCursor() { return moz_spinning_cursor; } -bool MovedToPoint(const WebKit::WebMouseEvent& mouse_event, +bool MovedToPoint(const blink::WebMouseEvent& mouse_event, const gfx::Point& center) { return mouse_event.globalX == center.x() && mouse_event.globalY == center.y(); @@ -385,7 +385,7 @@ class RenderWidgetHostViewGtkWidget { host_view->ModifyEventForEdgeDragging(widget, event); - WebKit::WebMouseEvent mouse_event = WebMouseEventBuilder::Build(event); + blink::WebMouseEvent mouse_event = WebMouseEventBuilder::Build(event); if (host_view->mouse_locked_) { gfx::Point center = host_view->GetWidgetCenter(); @@ -435,7 +435,7 @@ class RenderWidgetHostViewGtkWidget { // additionally send this crossing event with the state indicating the // button is down, it causes problems with drag and drop in WebKit.) if (!(event->state & any_button_mask)) { - WebKit::WebMouseEvent mouse_event = WebMouseEventBuilder::Build(event); + blink::WebMouseEvent mouse_event = WebMouseEventBuilder::Build(event); host_view->ModifyEventMovementAndCoords(&mouse_event); // When crossing out and back into a render view the movement values // must represent the instantaneous movement of the mouse, not the jump @@ -993,11 +993,11 @@ void RenderWidgetHostViewGtk::OnDestroy(GtkWidget* widget) { } bool RenderWidgetHostViewGtk::NeedsInputGrab() { - return popup_type_ == WebKit::WebPopupTypeSelect; + return popup_type_ == blink::WebPopupTypeSelect; } bool RenderWidgetHostViewGtk::IsPopup() const { - return popup_type_ != WebKit::WebPopupTypeNone; + return popup_type_ != blink::WebPopupTypeNone; } void RenderWidgetHostViewGtk::DoSharedInit() { @@ -1450,7 +1450,7 @@ gfx::Point RenderWidgetHostViewGtk::GetWidgetCenter() { } void RenderWidgetHostViewGtk::ModifyEventMovementAndCoords( - WebKit::WebMouseEvent* event) { + blink::WebMouseEvent* event) { // Movement is computed by taking the difference of the new cursor position // and the previous. Under mouse lock the cursor will be warped back to the // center so that we are not limited by clipping boundaries. diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.h b/content/browser/renderer_host/render_widget_host_view_gtk.h index 1f70b04..f256df7 100644 --- a/content/browser/renderer_host/render_widget_host_view_gtk.h +++ b/content/browser/renderer_host/render_widget_host_view_gtk.h @@ -124,7 +124,7 @@ class CONTENT_EXPORT RenderWidgetHostViewGtk bool has_horizontal_scrollbar) OVERRIDE; virtual void SetScrollOffsetPinning( bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; - virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; + virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE; virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; virtual void ResizeCompositingSurface(const gfx::Size&) OVERRIDE; @@ -149,7 +149,7 @@ class CONTENT_EXPORT RenderWidgetHostViewGtk // Mouse events always provide a movementX/Y which needs to be computed. // Also, mouse lock requires knowledge of last unlocked cursor coordinates. // State is stored on the host view to do this, and the mouse event modified. - void ModifyEventMovementAndCoords(WebKit::WebMouseEvent* event); + void ModifyEventMovementAndCoords(blink::WebMouseEvent* event); void Paint(const gfx::Rect&); diff --git a/content/browser/renderer_host/render_widget_host_view_guest.cc b/content/browser/renderer_host/render_widget_host_view_guest.cc index 87765b5..49c55fe 100644 --- a/content/browser/renderer_host/render_widget_host_view_guest.cc +++ b/content/browser/renderer_host/render_widget_host_view_guest.cc @@ -35,11 +35,11 @@ bool ShouldSendPinchGesture() { return pinch_allowed; } -WebKit::WebGestureEvent CreateFlingCancelEvent(double time_stamp) { - WebKit::WebGestureEvent gesture_event; +blink::WebGestureEvent CreateFlingCancelEvent(double time_stamp) { + blink::WebGestureEvent gesture_event; gesture_event.timeStampSeconds = time_stamp; - gesture_event.type = WebKit::WebGestureEvent::GestureFlingCancel; - gesture_event.sourceDevice = WebKit::WebGestureEvent::Touchscreen; + gesture_event.type = blink::WebGestureEvent::GestureFlingCancel; + gesture_event.sourceDevice = blink::WebGestureEvent::Touchscreen; return gesture_event; } @@ -398,7 +398,7 @@ void RenderWidgetHostViewGuest::UnlockMouse() { return platform_view_->UnlockMouse(); } -void RenderWidgetHostViewGuest::GetScreenInfo(WebKit::WebScreenInfo* results) { +void RenderWidgetHostViewGuest::GetScreenInfo(blink::WebScreenInfo* results) { RenderWidgetHostViewPort* embedder_view = RenderWidgetHostViewPort::FromRWHV( guest_->GetEmbedderRenderWidgetHostView()); @@ -525,8 +525,8 @@ void RenderWidgetHostViewGuest::DispatchCancelTouchEvent( if (!host_) return; - WebKit::WebTouchEvent cancel_event; - cancel_event.type = WebKit::WebInputEvent::TouchCancel; + blink::WebTouchEvent cancel_event; + cancel_event.type = blink::WebInputEvent::TouchCancel; cancel_event.timeStampSeconds = event->time_stamp().InSecondsF(); host_->ForwardTouchEventWithLatencyInfo(cancel_event, *event->latency()); } @@ -546,7 +546,7 @@ bool RenderWidgetHostViewGuest::ForwardGestureEventToRenderer( return true; } - WebKit::WebGestureEvent web_gesture = + blink::WebGestureEvent web_gesture = MakeWebGestureEventFromUIEvent(*gesture); const gfx::Point& client_point = gesture->location(); const gfx::Point& screen_point = gesture->location(); @@ -556,9 +556,9 @@ bool RenderWidgetHostViewGuest::ForwardGestureEventToRenderer( web_gesture.globalX = screen_point.x(); web_gesture.globalY = screen_point.y(); - if (web_gesture.type == WebKit::WebGestureEvent::Undefined) + if (web_gesture.type == blink::WebGestureEvent::Undefined) return false; - if (web_gesture.type == WebKit::WebGestureEvent::GestureTapDown) { + if (web_gesture.type == blink::WebGestureEvent::GestureTapDown) { host_->ForwardGestureEvent( CreateFlingCancelEvent(gesture->time_stamp().InSecondsF())); } diff --git a/content/browser/renderer_host/render_widget_host_view_guest.h b/content/browser/renderer_host/render_widget_host_view_guest.h index c050aaa..4832eae 100644 --- a/content/browser/renderer_host/render_widget_host_view_guest.h +++ b/content/browser/renderer_host/render_widget_host_view_guest.h @@ -141,7 +141,7 @@ class CONTENT_EXPORT RenderWidgetHostViewGuest #endif // defined(OS_WIN) || defined(USE_AURA) virtual bool LockMouse() OVERRIDE; virtual void UnlockMouse() OVERRIDE; - virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; + virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE; virtual void OnAccessibilityEvents( const std::vector<AccessibilityHostMsg_EventParams>& params) OVERRIDE; diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h index da16bc2..93c0143 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.h +++ b/content/browser/renderer_host/render_widget_host_view_mac.h @@ -114,7 +114,7 @@ class RenderWidgetHostViewMacEditCommandHelper; string16 markedText_; // Underline information of the |markedText_|. - std::vector<WebKit::WebCompositionUnderline> underlines_; + std::vector<blink::WebCompositionUnderline> underlines_; // Indicates if doCommandBySelector method receives any edit command when // handling a key down event. @@ -304,7 +304,7 @@ class RenderWidgetHostViewMac : public RenderWidgetHostViewBase, virtual void AcceleratedSurfaceRelease() OVERRIDE; virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; virtual void AboutToWaitForBackingStoreMsg() OVERRIDE; - virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; + virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE; virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; @@ -315,7 +315,7 @@ class RenderWidgetHostViewMac : public RenderWidgetHostViewBase, virtual bool LockMouse() OVERRIDE; virtual void UnlockMouse() OVERRIDE; virtual void UnhandledWheelEvent( - const WebKit::WebMouseWheelEvent& event) OVERRIDE; + const blink::WebMouseWheelEvent& event) OVERRIDE; // IPC::Sender implementation. virtual bool Send(IPC::Message* message) OVERRIDE; @@ -326,7 +326,7 @@ class RenderWidgetHostViewMac : public RenderWidgetHostViewBase, virtual void ReleaseReferencesToSoftwareFrame() OVERRIDE; // Forwards the mouse event to the renderer. - void ForwardMouseEvent(const WebKit::WebMouseEvent& event); + void ForwardMouseEvent(const blink::WebMouseEvent& event); void KillSelf(); diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm index 71dfb16..9082dd1 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -76,10 +76,10 @@ using content::RenderWidgetHostImpl; using content::RenderWidgetHostViewMac; using content::RenderWidgetHostViewMacEditCommandHelper; using content::TextInputClientMac; -using WebKit::WebInputEvent; -using WebKit::WebInputEventFactory; -using WebKit::WebMouseEvent; -using WebKit::WebMouseWheelEvent; +using blink::WebInputEvent; +using blink::WebInputEventFactory; +using blink::WebMouseEvent; +using blink::WebMouseWheelEvent; enum CoreAnimationStatus { CORE_ANIMATION_DISABLED, @@ -287,7 +287,7 @@ namespace { const size_t kMaxTooltipLength = 1024; // TODO(suzhe): Upstream this function. -WebKit::WebColor WebColorFromNSColor(NSColor *color) { +blink::WebColor WebColorFromNSColor(NSColor *color) { CGFloat r, g, b, a; [color getRed:&r green:&g blue:&b alpha:&a]; @@ -302,7 +302,7 @@ WebKit::WebColor WebColorFromNSColor(NSColor *color) { // third_party/WebKit/Source/WebKit/mac/WebView/WebHTMLView.mm void ExtractUnderlines( NSAttributedString* string, - std::vector<WebKit::WebCompositionUnderline>* underlines) { + std::vector<blink::WebCompositionUnderline>* underlines) { int length = [[string string] length]; int i = 0; while (i < length) { @@ -311,13 +311,13 @@ void ExtractUnderlines( longestEffectiveRange:&range inRange:NSMakeRange(i, length - i)]; if (NSNumber *style = [attrs objectForKey:NSUnderlineStyleAttributeName]) { - WebKit::WebColor color = SK_ColorBLACK; + blink::WebColor color = SK_ColorBLACK; if (NSColor *colorAttr = [attrs objectForKey:NSUnderlineColorAttributeName]) { color = WebColorFromNSColor( [colorAttr colorUsingColorSpaceName:NSDeviceRGBColorSpace]); } - underlines->push_back(WebKit::WebCompositionUnderline( + underlines->push_back(blink::WebCompositionUnderline( range.location, NSMaxRange(range), color, [style intValue] > 1)); } i = range.location + range.length; @@ -374,13 +374,13 @@ NSWindow* ApparentWindowForView(NSView* view) { return enclosing_window; } -WebKit::WebScreenInfo GetWebScreenInfo(NSView* view) { +blink::WebScreenInfo GetWebScreenInfo(NSView* view) { gfx::Display display = gfx::Screen::GetNativeScreen()->GetDisplayNearestWindow(view); NSScreen* screen = [NSScreen deepestScreen]; - WebKit::WebScreenInfo results; + blink::WebScreenInfo results; results.deviceScaleFactor = static_cast<int>(display.device_scale_factor()); results.depth = NSBitsPerPixelFromDepth([screen depth]); @@ -407,7 +407,7 @@ RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( // static void RenderWidgetHostViewPort::GetDefaultScreenInfo( - WebKit::WebScreenInfo* results) { + blink::WebScreenInfo* results) { *results = GetWebScreenInfo(NULL); } @@ -626,7 +626,7 @@ void RenderWidgetHostViewMac::InitAsChild( void RenderWidgetHostViewMac::InitAsPopup( RenderWidgetHostView* parent_host_view, const gfx::Rect& pos) { - bool activatable = popup_type_ == WebKit::WebPopupTypeNone; + bool activatable = popup_type_ == blink::WebPopupTypeNone; [cocoa_view_ setCloseOnDeactivate:YES]; [cocoa_view_ setCanBeKeyView:activatable ? YES : NO]; @@ -1139,7 +1139,7 @@ void RenderWidgetHostViewMac::SetShowingContextMenu(bool showing) { } bool RenderWidgetHostViewMac::IsPopup() const { - return popup_type_ != WebKit::WebPopupTypeNone; + return popup_type_ != blink::WebPopupTypeNone; } BackingStore* RenderWidgetHostViewMac::AllocBackingStore( @@ -1703,7 +1703,7 @@ void RenderWidgetHostViewMac::OnSwapCompositorFrame( void RenderWidgetHostViewMac::OnAcceleratedCompositingStateChange() { } -void RenderWidgetHostViewMac::GetScreenInfo(WebKit::WebScreenInfo* results) { +void RenderWidgetHostViewMac::GetScreenInfo(blink::WebScreenInfo* results) { *results = GetWebScreenInfo(GetNativeView()); } @@ -1766,7 +1766,7 @@ void RenderWidgetHostViewMac::UnlockMouse() { } void RenderWidgetHostViewMac::UnhandledWheelEvent( - const WebKit::WebMouseWheelEvent& event) { + const blink::WebMouseWheelEvent& event) { // Only record a wheel event as unhandled if JavaScript handlers got a chance // to see it (no-op wheel events are ignored by the event dispatcher) if (event.deltaX || event.deltaY) @@ -2413,7 +2413,7 @@ void RenderWidgetHostViewMac::FrameSwapped() { // So before sending the real key down event, we need to send a fake key up // event to balance it. NativeWebKeyboardEvent fakeEvent = event; - fakeEvent.type = WebKit::WebInputEvent::KeyUp; + fakeEvent.type = blink::WebInputEvent::KeyUp; fakeEvent.skip_in_browser = true; widgetHost->ForwardKeyboardEvent(fakeEvent); // Not checking |renderWidgetHostView_->render_widget_host_| here because @@ -2439,7 +2439,7 @@ void RenderWidgetHostViewMac::FrameSwapped() { if (!textInserted && textToBeInserted_.length() == 1) { // If a single character was inserted, then we just send it as a keypress // event. - event.type = WebKit::WebInputEvent::Char; + event.type = blink::WebInputEvent::Char; event.text[0] = textToBeInserted_[0]; event.text[1] = 0; event.skip_in_browser = true; @@ -2451,7 +2451,7 @@ void RenderWidgetHostViewMac::FrameSwapped() { // We don't get insertText: calls if ctrl or cmd is down, or the key event // generates an insert command. So synthesize a keypress event for these // cases, unless the key event generated any other command. - event.type = WebKit::WebInputEvent::Char; + event.type = blink::WebInputEvent::Char; event.skip_in_browser = true; widgetHost->ForwardKeyboardEvent(event); } @@ -3538,7 +3538,7 @@ extern NSString *NSTextInputReplacementRangeAttributeName; } else { // Use a thin black underline by default. underlines_.push_back( - WebKit::WebCompositionUnderline(0, length, SK_ColorBLACK, false)); + blink::WebCompositionUnderline(0, length, SK_ColorBLACK, false)); } // If we are handling a key down event, then SetComposition() will be diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm index 7a152d1..ad37bfd 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm @@ -329,7 +329,7 @@ TEST_F(RenderWidgetHostViewMacTest, GetFirstRectForCharacterRangeCaretCase) { NSRange actual_range; rwhv_mac_->SelectionChanged(kDummyString, kDummyOffset, caret_range); params.anchor_rect = params.focus_rect = caret_rect; - params.anchor_dir = params.focus_dir = WebKit::WebTextDirectionLeftToRight; + params.anchor_dir = params.focus_dir = blink::WebTextDirectionLeftToRight; rwhv_mac_->SelectionBoundsChanged(params); EXPECT_TRUE(rwhv_mac_->GetCachedFirstRectForCharacterRange( caret_range.ToNSRange(), @@ -711,7 +711,7 @@ TEST_F(RenderWidgetHostViewMacTest, ScrollWheelEndEventDelivery) { // Send an ACK for the first wheel event, so that the queue will be flushed. scoped_ptr<IPC::Message> response(new InputHostMsg_HandleInputEvent_ACK( - 0, WebKit::WebInputEvent::MouseWheel, INPUT_EVENT_ACK_STATE_CONSUMED, + 0, blink::WebInputEvent::MouseWheel, INPUT_EVENT_ACK_STATE_CONSUMED, ui::LatencyInfo())); host->OnMessageReceived(*response); @@ -756,7 +756,7 @@ TEST_F(RenderWidgetHostViewMacTest, IgnoreEmptyUnhandledWheelEvent) { // Indicate that the wheel event was unhandled. scoped_ptr<IPC::Message> response1(new InputHostMsg_HandleInputEvent_ACK(0, - WebKit::WebInputEvent::MouseWheel, INPUT_EVENT_ACK_STATE_NOT_CONSUMED, + blink::WebInputEvent::MouseWheel, INPUT_EVENT_ACK_STATE_NOT_CONSUMED, ui::LatencyInfo())); host->OnMessageReceived(*response1); @@ -771,7 +771,7 @@ TEST_F(RenderWidgetHostViewMacTest, IgnoreEmptyUnhandledWheelEvent) { // Indicate that the wheel event was also unhandled. scoped_ptr<IPC::Message> response2(new InputHostMsg_HandleInputEvent_ACK(0, - WebKit::WebInputEvent::MouseWheel, INPUT_EVENT_ACK_STATE_NOT_CONSUMED, + blink::WebInputEvent::MouseWheel, INPUT_EVENT_ACK_STATE_NOT_CONSUMED, ui::LatencyInfo())); host->OnMessageReceived(*response2); diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index 97ec948..f0b25b3 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -83,9 +83,9 @@ using base::TimeDelta; using base::TimeTicks; using ui::ViewProp; -using WebKit::WebInputEvent; -using WebKit::WebMouseEvent; -using WebKit::WebTextDirection; +using blink::WebInputEvent; +using blink::WebMouseEvent; +using blink::WebTextDirection; namespace content { namespace { @@ -202,10 +202,10 @@ bool DecodeScrollGesture(const GESTUREINFO& gi, return true; } -WebKit::WebMouseWheelEvent MakeFakeScrollWheelEvent(HWND hwnd, +blink::WebMouseWheelEvent MakeFakeScrollWheelEvent(HWND hwnd, POINT start, POINT delta) { - WebKit::WebMouseWheelEvent result; + blink::WebMouseWheelEvent result; result.type = WebInputEvent::MouseWheel; result.timeStampSeconds = ::GetMessageTime() / 1000.0; result.button = WebMouseEvent::ButtonNone; @@ -236,17 +236,17 @@ inline void SetTouchType(TOUCHINPUT* point, int type) { point->dwFlags = (point->dwFlags & kTouchMask) | type; } -ui::EventType ConvertToUIEvent(WebKit::WebTouchPoint::State t) { +ui::EventType ConvertToUIEvent(blink::WebTouchPoint::State t) { switch (t) { - case WebKit::WebTouchPoint::StatePressed: + case blink::WebTouchPoint::StatePressed: return ui::ET_TOUCH_PRESSED; - case WebKit::WebTouchPoint::StateMoved: + case blink::WebTouchPoint::StateMoved: return ui::ET_TOUCH_MOVED; - case WebKit::WebTouchPoint::StateStationary: + case blink::WebTouchPoint::StateStationary: return ui::ET_TOUCH_STATIONARY; - case WebKit::WebTouchPoint::StateReleased: + case blink::WebTouchPoint::StateReleased: return ui::ET_TOUCH_RELEASED; - case WebKit::WebTouchPoint::StateCancelled: + case blink::WebTouchPoint::StateCancelled: return ui::ET_TOUCH_CANCELLED; default: DCHECK(false) << "Unexpected ui type. " << t; @@ -255,9 +255,9 @@ ui::EventType ConvertToUIEvent(WebKit::WebTouchPoint::State t) { } // Creates a WebGestureEvent corresponding to the given |gesture| -WebKit::WebGestureEvent CreateWebGestureEvent(HWND hwnd, +blink::WebGestureEvent CreateWebGestureEvent(HWND hwnd, const ui::GestureEvent& gesture) { - WebKit::WebGestureEvent gesture_event = + blink::WebGestureEvent gesture_event = MakeWebGestureEventFromUIEvent(gesture); POINT client_point = gesture.location().ToPOINT(); @@ -272,17 +272,17 @@ WebKit::WebGestureEvent CreateWebGestureEvent(HWND hwnd, return gesture_event; } -WebKit::WebGestureEvent CreateFlingCancelEvent(double time_stamp) { - WebKit::WebGestureEvent gesture_event; +blink::WebGestureEvent CreateFlingCancelEvent(double time_stamp) { + blink::WebGestureEvent gesture_event; gesture_event.timeStampSeconds = time_stamp; - gesture_event.type = WebKit::WebGestureEvent::GestureFlingCancel; - gesture_event.sourceDevice = WebKit::WebGestureEvent::Touchscreen; + gesture_event.type = blink::WebGestureEvent::GestureFlingCancel; + gesture_event.sourceDevice = blink::WebGestureEvent::Touchscreen; return gesture_event; } class TouchEventFromWebTouchPoint : public ui::TouchEvent { public: - TouchEventFromWebTouchPoint(const WebKit::WebTouchPoint& touch_point, + TouchEventFromWebTouchPoint(const blink::WebTouchPoint& touch_point, base::TimeDelta& timestamp) : ui::TouchEvent(ConvertToUIEvent(touch_point.state), touch_point.position, @@ -307,7 +307,7 @@ bool ShouldSendPinchGesture() { } void GetScreenInfoForWindow(gfx::NativeViewId id, - WebKit::WebScreenInfo* results) { + blink::WebScreenInfo* results) { HWND window = gfx::NativeViewFromId(id); HMONITOR monitor = MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY); @@ -322,7 +322,7 @@ void GetScreenInfoForWindow(gfx::NativeViewId id, dev_mode.dmDriverExtra = 0; EnumDisplaySettings(monitor_info.szDevice, ENUM_CURRENT_SETTINGS, &dev_mode); - WebKit::WebScreenInfo screen_info; + blink::WebScreenInfo screen_info; screen_info.depth = dev_mode.dmBitsPerPel; screen_info.depthPerComponent = 8; screen_info.deviceScaleFactor = gfx::win::GetDeviceScaleFactor(); @@ -351,18 +351,18 @@ class WebTouchState { bool ReleaseTouchPoints(); // The contained WebTouchEvent. - const WebKit::WebTouchEvent& touch_event() { return touch_event_; } + const blink::WebTouchEvent& touch_event() { return touch_event_; } // Returns if any touches are modified in the event. bool is_changed() { return touch_event_.changedTouchesLength != 0; } private: // Adds a touch point or returns NULL if there's not enough space. - WebKit::WebTouchPoint* AddTouchPoint(TOUCHINPUT* touch_input); + blink::WebTouchPoint* AddTouchPoint(TOUCHINPUT* touch_input); // Copy details from a TOUCHINPUT to an existing WebTouchPoint, returning // true if the resulting point is a stationary move. - bool UpdateTouchPoint(WebKit::WebTouchPoint* touch_point, + bool UpdateTouchPoint(blink::WebTouchPoint* touch_point, TOUCHINPUT* touch_input); // Find (or create) a mapping for _os_touch_id_. @@ -371,7 +371,7 @@ class WebTouchState { // Remove any mappings that are no longer in use. void RemoveExpiredMappings(); - WebKit::WebTouchEvent touch_event_; + blink::WebTouchEvent touch_event_; const RenderWidgetHostViewWin* const window_; ui::SequentialIDGenerator id_generator_; @@ -595,7 +595,7 @@ void RenderWidgetHostViewWin::CleanupCompositorWindow() { bool RenderWidgetHostViewWin::IsActivatable() const { // Popups should not be activated. - return popup_type_ == WebKit::WebPopupTypeNone; + return popup_type_ == blink::WebPopupTypeNone; } void RenderWidgetHostViewWin::Focus() { @@ -962,9 +962,9 @@ void RenderWidgetHostViewWin::DispatchCancelTouchEvent( !render_widget_host_->ShouldForwardTouchEvent()) { return; } - DCHECK(event->type() == WebKit::WebInputEvent::TouchCancel); - WebKit::WebTouchEvent cancel_event; - cancel_event.type = WebKit::WebInputEvent::TouchCancel; + DCHECK(event->type() == blink::WebInputEvent::TouchCancel); + blink::WebTouchEvent cancel_event; + cancel_event.type = blink::WebInputEvent::TouchCancel; cancel_event.timeStampSeconds = event->time_stamp().InSecondsF(); render_widget_host_->ForwardTouchEventWithLatencyInfo( cancel_event, *event->latency()); @@ -987,12 +987,12 @@ void RenderWidgetHostViewWin::SetCompositionText( if (!render_widget_host_) return; // ui::CompositionUnderline should be identical to - // WebKit::WebCompositionUnderline, so that we can do reinterpret_cast safely. + // blink::WebCompositionUnderline, so that we can do reinterpret_cast safely. COMPILE_ASSERT(sizeof(ui::CompositionUnderline) == - sizeof(WebKit::WebCompositionUnderline), + sizeof(blink::WebCompositionUnderline), ui_CompositionUnderline__WebKit_WebCompositionUnderline_diff); - const std::vector<WebKit::WebCompositionUnderline>& underlines = - reinterpret_cast<const std::vector<WebKit::WebCompositionUnderline>&>( + const std::vector<blink::WebCompositionUnderline>& underlines = + reinterpret_cast<const std::vector<blink::WebCompositionUnderline>&>( composition.underlines); render_widget_host_->ImeSetComposition(composition.text, underlines, composition.selection.end(), @@ -1664,9 +1664,9 @@ LRESULT RenderWidgetHostViewWin::OnImeComposition( imm32_manager_->UpdateImeWindow(m_hWnd); // ui::CompositionUnderline should be identical to - // WebKit::WebCompositionUnderline, so that we can do reinterpret_cast safely. + // blink::WebCompositionUnderline, so that we can do reinterpret_cast safely. COMPILE_ASSERT(sizeof(ui::CompositionUnderline) == - sizeof(WebKit::WebCompositionUnderline), + sizeof(blink::WebCompositionUnderline), ui_CompositionUnderline__WebKit_WebCompositionUnderline_diff); // Retrieve the result string and its attributes of the ongoing composition @@ -1690,8 +1690,8 @@ LRESULT RenderWidgetHostViewWin::OnImeComposition( // TODO(suzhe): convert both renderer_host and renderer to use // ui::CompositionText. - const std::vector<WebKit::WebCompositionUnderline>& underlines = - reinterpret_cast<const std::vector<WebKit::WebCompositionUnderline>&>( + const std::vector<blink::WebCompositionUnderline>& underlines = + reinterpret_cast<const std::vector<blink::WebCompositionUnderline>&>( composition.underlines); render_widget_host_->ImeSetComposition( composition.text, underlines, @@ -1928,8 +1928,8 @@ LRESULT RenderWidgetHostViewWin::OnKeyEvent(UINT message, WPARAM wparam, if (ui::IMM32Manager::IsCtrlShiftPressed(&dir)) { render_widget_host_->UpdateTextDirection( dir == base::i18n::RIGHT_TO_LEFT ? - WebKit::WebTextDirectionRightToLeft : - WebKit::WebTextDirectionLeftToRight); + blink::WebTextDirectionRightToLeft : + blink::WebTextDirectionLeftToRight); } } else if (wparam != VK_CONTROL) { // Bug 9762: http://crbug.com/9762 A user pressed a key except shift @@ -2006,7 +2006,7 @@ LRESULT RenderWidgetHostViewWin::OnWheelEvent(UINT message, WPARAM wparam, } if (render_widget_host_) { - WebKit::WebMouseWheelEvent wheel_event = + blink::WebMouseWheelEvent wheel_event = WebMouseWheelEventBuilder::Build(m_hWnd, message, wparam, lparam); float scale = gfx::win::GetDeviceScaleFactor(); wheel_event.x /= scale; @@ -2032,14 +2032,14 @@ size_t WebTouchState::UpdateTouchPoints( // and alter/add any touchpoints (from the touch input buffer) that we can // coalesce into a single message. The return value is the number of consumed // input message. - WebKit::WebTouchPoint* point = touch_event_.touches; - WebKit::WebTouchPoint* end = point + touch_event_.touchesLength; + blink::WebTouchPoint* point = touch_event_.touches; + blink::WebTouchPoint* end = point + touch_event_.touchesLength; while (point < end) { - if (point->state == WebKit::WebTouchPoint::StateReleased) { + if (point->state == blink::WebTouchPoint::StateReleased) { *point = *(--end); --touch_event_.touchesLength; } else { - point->state = WebKit::WebTouchPoint::StateStationary; + point->state = blink::WebTouchPoint::StateStationary; point++; } } @@ -2052,7 +2052,7 @@ size_t WebTouchState::UpdateTouchPoints( for (size_t i = 0; i < count; ++i) { unsigned int mapped_id = GetMappedTouch(points[i].dwID); - WebKit::WebTouchPoint* point = NULL; + blink::WebTouchPoint* point = NULL; for (unsigned j = 0; j < touch_event_.touchesLength; ++j) { if (static_cast<DWORD>(touch_event_.touches[j].id) == mapped_id) { point = &touch_event_.touches[j]; @@ -2076,26 +2076,26 @@ size_t WebTouchState::UpdateTouchPoints( case TOUCHEVENTF_DOWN: { if (!(point = AddTouchPoint(&points[i]))) continue; - touch_event_.type = WebKit::WebInputEvent::TouchStart; + touch_event_.type = blink::WebInputEvent::TouchStart; break; } case TOUCHEVENTF_UP: { if (!point) // Just throw away a stray up. continue; - point->state = WebKit::WebTouchPoint::StateReleased; + point->state = blink::WebTouchPoint::StateReleased; UpdateTouchPoint(point, &points[i]); - touch_event_.type = WebKit::WebInputEvent::TouchEnd; + touch_event_.type = blink::WebInputEvent::TouchEnd; break; } case TOUCHEVENTF_MOVE: { if (point) { - point->state = WebKit::WebTouchPoint::StateMoved; + point->state = blink::WebTouchPoint::StateMoved; // Don't update the message if the point didn't really move. if (UpdateTouchPoint(point, &points[i])) continue; - touch_event_.type = WebKit::WebInputEvent::TouchMove; + touch_event_.type = blink::WebInputEvent::TouchMove; } else if (touch_event_.changedTouchesLength) { RemoveExpiredMappings(); // Can't add a point if we're already handling move events. @@ -2106,7 +2106,7 @@ size_t WebTouchState::UpdateTouchPoints( continue; last_type = TOUCHEVENTF_DOWN; SetTouchType(&points[i], TOUCHEVENTF_DOWN); - touch_event_.type = WebKit::WebInputEvent::TouchStart; + touch_event_.type = blink::WebInputEvent::TouchStart; } break; } @@ -2123,10 +2123,10 @@ size_t WebTouchState::UpdateTouchPoints( } void WebTouchState::RemoveExpiredMappings() { - WebKit::WebTouchPoint* point = touch_event_.touches; - WebKit::WebTouchPoint* end = point + touch_event_.touchesLength; + blink::WebTouchPoint* point = touch_event_.touches; + blink::WebTouchPoint* end = point + touch_event_.touchesLength; for (; point < end; ++point) { - if (point->state == WebKit::WebTouchPoint::StateReleased) + if (point->state == blink::WebTouchPoint::StateReleased) id_generator_.ReleaseGeneratedID(point->id); } } @@ -2136,34 +2136,34 @@ bool WebTouchState::ReleaseTouchPoints() { if (touch_event_.touchesLength == 0) return false; // Mark every active touchpoint as released. - touch_event_.type = WebKit::WebInputEvent::TouchEnd; + touch_event_.type = blink::WebInputEvent::TouchEnd; touch_event_.changedTouchesLength = touch_event_.touchesLength; for (unsigned int i = 0; i < touch_event_.touchesLength; ++i) { - touch_event_.touches[i].state = WebKit::WebTouchPoint::StateReleased; + touch_event_.touches[i].state = blink::WebTouchPoint::StateReleased; touch_event_.changedTouches[i].state = - WebKit::WebTouchPoint::StateReleased; + blink::WebTouchPoint::StateReleased; } return true; } -WebKit::WebTouchPoint* WebTouchState::AddTouchPoint( +blink::WebTouchPoint* WebTouchState::AddTouchPoint( TOUCHINPUT* touch_input) { DCHECK(touch_event_.touchesLength < - WebKit::WebTouchEvent::touchesLengthCap); + blink::WebTouchEvent::touchesLengthCap); if (touch_event_.touchesLength >= - WebKit::WebTouchEvent::touchesLengthCap) + blink::WebTouchEvent::touchesLengthCap) return NULL; - WebKit::WebTouchPoint* point = + blink::WebTouchPoint* point = &touch_event_.touches[touch_event_.touchesLength++]; - point->state = WebKit::WebTouchPoint::StatePressed; + point->state = blink::WebTouchPoint::StatePressed; point->id = GetMappedTouch(touch_input->dwID); UpdateTouchPoint(point, touch_input); return point; } bool WebTouchState::UpdateTouchPoint( - WebKit::WebTouchPoint* touch_point, + blink::WebTouchPoint* touch_point, TOUCHINPUT* touch_input) { CPoint coordinates( TOUCH_COORD_TO_PIXEL(touch_input->x) / @@ -2188,7 +2188,7 @@ bool WebTouchState::UpdateTouchPoint( touch_point->screenPosition.y == coordinates.y && touch_point->radiusX == radius_x && touch_point->radiusY == radius_y) { - touch_point->state = WebKit::WebTouchPoint::StateStationary; + touch_point->state = blink::WebTouchPoint::StateStationary; return true; } @@ -2223,8 +2223,8 @@ LRESULT RenderWidgetHostViewWin::OnTouchEvent(UINT message, WPARAM wparam, // TODO(jschuh): Add support for an arbitrary number of touchpoints. size_t total = std::min(static_cast<int>(LOWORD(wparam)), - static_cast<int>(WebKit::WebTouchEvent::touchesLengthCap)); - TOUCHINPUT points[WebKit::WebTouchEvent::touchesLengthCap]; + static_cast<int>(blink::WebTouchEvent::touchesLengthCap)); + TOUCHINPUT points[blink::WebTouchEvent::touchesLengthCap]; if (!total || !ui::GetTouchInputInfoWrapper((HTOUCHINPUT)lparam, total, points, sizeof(TOUCHINPUT))) { @@ -2252,7 +2252,7 @@ LRESULT RenderWidgetHostViewWin::OnTouchEvent(UINT message, WPARAM wparam, render_widget_host_->ForwardTouchEventWithLatencyInfo( touch_state_->touch_event(), ui::LatencyInfo()); } else { - const WebKit::WebTouchEvent& touch_event = touch_state_->touch_event(); + const blink::WebTouchEvent& touch_event = touch_state_->touch_event(); base::TimeDelta timestamp = base::TimeDelta::FromMilliseconds( touch_event.timeStampSeconds * 1000); for (size_t i = 0; i < touch_event.touchesLength; ++i) { @@ -2483,7 +2483,7 @@ void RenderWidgetHostViewWin::AcceleratedPaint(HDC dc) { accelerated_surface_->Present(dc); } -void RenderWidgetHostViewWin::GetScreenInfo(WebKit::WebScreenInfo* results) { +void RenderWidgetHostViewWin::GetScreenInfo(blink::WebScreenInfo* results) { GetScreenInfoForWindow(GetNativeViewId(), results); } @@ -2875,10 +2875,10 @@ bool RenderWidgetHostViewWin::ForwardGestureEventToRenderer( return true; } - WebKit::WebGestureEvent web_gesture = CreateWebGestureEvent(m_hWnd, *gesture); - if (web_gesture.type == WebKit::WebGestureEvent::Undefined) + blink::WebGestureEvent web_gesture = CreateWebGestureEvent(m_hWnd, *gesture); + if (web_gesture.type == blink::WebGestureEvent::Undefined) return false; - if (web_gesture.type == WebKit::WebGestureEvent::GestureTapDown) { + if (web_gesture.type == blink::WebGestureEvent::GestureTapDown) { render_widget_host_->ForwardGestureEvent( CreateFlingCancelEvent(gesture->time_stamp().InSecondsF())); } @@ -3204,7 +3204,7 @@ RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( // static void RenderWidgetHostViewPort::GetDefaultScreenInfo( - WebKit::WebScreenInfo* results) { + blink::WebScreenInfo* results) { GetScreenInfoForWindow(0, results); } diff --git a/content/browser/renderer_host/render_widget_host_view_win.h b/content/browser/renderer_host/render_widget_host_view_win.h index fc48414..d6540b3 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.h +++ b/content/browser/renderer_host/render_widget_host_view_win.h @@ -49,7 +49,7 @@ class IMM32Manager; class ViewProp; } -namespace WebKit { +namespace blink { struct WebScreenInfo; } @@ -221,7 +221,7 @@ class RenderWidgetHostViewWin bool has_horizontal_scrollbar) OVERRIDE; virtual void SetScrollOffsetPinning( bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; - virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; + virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE; virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; virtual void ResizeCompositingSurface(const gfx::Size&) OVERRIDE; diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc index d89f353..3100326 100644 --- a/content/browser/renderer_host/test_render_view_host.cc +++ b/content/browser/renderer_host/test_render_view_host.cc @@ -370,7 +370,7 @@ void TestRenderViewHost::SimulateWasShown() { void TestRenderViewHost::TestOnStartDragging( const DropData& drop_data) { - WebKit::WebDragOperationsMask drag_operation = WebKit::WebDragOperationEvery; + blink::WebDragOperationsMask drag_operation = blink::WebDragOperationEvery; DragEventSourceInfo event_info; OnStartDragging(drop_data, drag_operation, SkBitmap(), gfx::Vector2d(), event_info); diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h index 5abed25..71cb18d 100644 --- a/content/browser/renderer_host/test_render_view_host.h +++ b/content/browser/renderer_host/test_render_view_host.h @@ -153,7 +153,7 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase { #elif defined(OS_WIN) && !defined(USE_AURA) virtual void WillWmDestroy() OVERRIDE; #endif - virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE {} + virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE {} virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; virtual void SetHasHorizontalScrollbar( bool has_horizontal_scrollbar) OVERRIDE { } diff --git a/content/browser/renderer_host/ui_events_helper.cc b/content/browser/renderer_host/ui_events_helper.cc index d1fbcfa..1dc312d 100644 --- a/content/browser/renderer_host/ui_events_helper.cc +++ b/content/browser/renderer_host/ui_events_helper.cc @@ -13,39 +13,39 @@ namespace { int WebModifiersToUIFlags(int modifiers) { int flags = ui::EF_NONE; - if (modifiers & WebKit::WebInputEvent::ShiftKey) + if (modifiers & blink::WebInputEvent::ShiftKey) flags |= ui::EF_SHIFT_DOWN; - if (modifiers & WebKit::WebInputEvent::ControlKey) + if (modifiers & blink::WebInputEvent::ControlKey) flags |= ui::EF_CONTROL_DOWN; - if (modifiers & WebKit::WebInputEvent::AltKey) + if (modifiers & blink::WebInputEvent::AltKey) flags |= ui::EF_ALT_DOWN; - if (modifiers & WebKit::WebInputEvent::LeftButtonDown) + if (modifiers & blink::WebInputEvent::LeftButtonDown) flags |= ui::EF_LEFT_MOUSE_BUTTON; - if (modifiers & WebKit::WebInputEvent::RightButtonDown) + if (modifiers & blink::WebInputEvent::RightButtonDown) flags |= ui::EF_RIGHT_MOUSE_BUTTON; - if (modifiers & WebKit::WebInputEvent::MiddleButtonDown) + if (modifiers & blink::WebInputEvent::MiddleButtonDown) flags |= ui::EF_MIDDLE_MOUSE_BUTTON; - if (modifiers & WebKit::WebInputEvent::CapsLockOn) + if (modifiers & blink::WebInputEvent::CapsLockOn) flags |= ui::EF_CAPS_LOCK_DOWN; return flags; } ui::EventType WebTouchPointStateToEventType( - WebKit::WebTouchPoint::State state) { + blink::WebTouchPoint::State state) { switch (state) { - case WebKit::WebTouchPoint::StateReleased: + case blink::WebTouchPoint::StateReleased: return ui::ET_TOUCH_RELEASED; - case WebKit::WebTouchPoint::StatePressed: + case blink::WebTouchPoint::StatePressed: return ui::ET_TOUCH_PRESSED; - case WebKit::WebTouchPoint::StateMoved: + case blink::WebTouchPoint::StateMoved: return ui::ET_TOUCH_MOVED; - case WebKit::WebTouchPoint::StateCancelled: + case blink::WebTouchPoint::StateCancelled: return ui::ET_TOUCH_CANCELLED; default: @@ -53,35 +53,35 @@ ui::EventType WebTouchPointStateToEventType( } } -WebKit::WebTouchPoint::State TouchPointStateFromEvent( +blink::WebTouchPoint::State TouchPointStateFromEvent( const ui::TouchEvent& event) { switch (event.type()) { case ui::ET_TOUCH_PRESSED: - return WebKit::WebTouchPoint::StatePressed; + return blink::WebTouchPoint::StatePressed; case ui::ET_TOUCH_RELEASED: - return WebKit::WebTouchPoint::StateReleased; + return blink::WebTouchPoint::StateReleased; case ui::ET_TOUCH_MOVED: - return WebKit::WebTouchPoint::StateMoved; + return blink::WebTouchPoint::StateMoved; case ui::ET_TOUCH_CANCELLED: - return WebKit::WebTouchPoint::StateCancelled; + return blink::WebTouchPoint::StateCancelled; default: - return WebKit::WebTouchPoint::StateUndefined; + return blink::WebTouchPoint::StateUndefined; } } -WebKit::WebInputEvent::Type TouchEventTypeFromEvent( +blink::WebInputEvent::Type TouchEventTypeFromEvent( const ui::TouchEvent& event) { switch (event.type()) { case ui::ET_TOUCH_PRESSED: - return WebKit::WebInputEvent::TouchStart; + return blink::WebInputEvent::TouchStart; case ui::ET_TOUCH_RELEASED: - return WebKit::WebInputEvent::TouchEnd; + return blink::WebInputEvent::TouchEnd; case ui::ET_TOUCH_MOVED: - return WebKit::WebInputEvent::TouchMove; + return blink::WebInputEvent::TouchMove; case ui::ET_TOUCH_CANCELLED: - return WebKit::WebInputEvent::TouchCancel; + return blink::WebInputEvent::TouchCancel; default: - return WebKit::WebInputEvent::Undefined; + return blink::WebInputEvent::Undefined; } } @@ -93,19 +93,19 @@ bool MakeUITouchEventsFromWebTouchEvents( const TouchEventWithLatencyInfo& touch_with_latency, ScopedVector<ui::TouchEvent>* list, TouchEventCoordinateSystem coordinate_system) { - const WebKit::WebTouchEvent& touch = touch_with_latency.event; + const blink::WebTouchEvent& touch = touch_with_latency.event; ui::EventType type = ui::ET_UNKNOWN; switch (touch.type) { - case WebKit::WebInputEvent::TouchStart: + case blink::WebInputEvent::TouchStart: type = ui::ET_TOUCH_PRESSED; break; - case WebKit::WebInputEvent::TouchEnd: + case blink::WebInputEvent::TouchEnd: type = ui::ET_TOUCH_RELEASED; break; - case WebKit::WebInputEvent::TouchMove: + case blink::WebInputEvent::TouchMove: type = ui::ET_TOUCH_MOVED; break; - case WebKit::WebInputEvent::TouchCancel: + case blink::WebInputEvent::TouchCancel: type = ui::ET_TOUCH_CANCELLED; break; default: @@ -117,7 +117,7 @@ bool MakeUITouchEventsFromWebTouchEvents( base::TimeDelta timestamp = base::TimeDelta::FromMicroseconds( static_cast<int64>(touch.timeStampSeconds * 1000000)); for (unsigned i = 0; i < touch.touchesLength; ++i) { - const WebKit::WebTouchPoint& point = touch.touches[i]; + const blink::WebTouchPoint& point = touch.touches[i]; if (WebTouchPointStateToEventType(point.state) != type) continue; // In aura, the touch-event needs to be in the screen coordinate, since the @@ -148,79 +148,79 @@ bool MakeUITouchEventsFromWebTouchEvents( return true; } -WebKit::WebGestureEvent MakeWebGestureEventFromUIEvent( +blink::WebGestureEvent MakeWebGestureEventFromUIEvent( const ui::GestureEvent& event) { - WebKit::WebGestureEvent gesture_event; + blink::WebGestureEvent gesture_event; switch (event.type()) { case ui::ET_GESTURE_TAP: - gesture_event.type = WebKit::WebInputEvent::GestureTap; + gesture_event.type = blink::WebInputEvent::GestureTap; gesture_event.data.tap.tapCount = event.details().tap_count(); gesture_event.data.tap.width = event.details().bounding_box().width(); gesture_event.data.tap.height = event.details().bounding_box().height(); break; case ui::ET_GESTURE_TAP_DOWN: - gesture_event.type = WebKit::WebInputEvent::GestureTapDown; + gesture_event.type = blink::WebInputEvent::GestureTapDown; gesture_event.data.tapDown.width = event.details().bounding_box().width(); gesture_event.data.tapDown.height = event.details().bounding_box().height(); break; case ui::ET_GESTURE_SHOW_PRESS: - gesture_event.type = WebKit::WebInputEvent::GestureShowPress; + gesture_event.type = blink::WebInputEvent::GestureShowPress; gesture_event.data.showPress.width = event.details().bounding_box().width(); gesture_event.data.showPress.height = event.details().bounding_box().height(); break; case ui::ET_GESTURE_TAP_CANCEL: - gesture_event.type = WebKit::WebInputEvent::GestureTapCancel; + gesture_event.type = blink::WebInputEvent::GestureTapCancel; break; case ui::ET_GESTURE_SCROLL_BEGIN: - gesture_event.type = WebKit::WebInputEvent::GestureScrollBegin; + gesture_event.type = blink::WebInputEvent::GestureScrollBegin; break; case ui::ET_GESTURE_SCROLL_UPDATE: - gesture_event.type = WebKit::WebInputEvent::GestureScrollUpdate; + gesture_event.type = blink::WebInputEvent::GestureScrollUpdate; gesture_event.data.scrollUpdate.deltaX = event.details().scroll_x(); gesture_event.data.scrollUpdate.deltaY = event.details().scroll_y(); break; case ui::ET_GESTURE_SCROLL_END: - gesture_event.type = WebKit::WebInputEvent::GestureScrollEnd; + gesture_event.type = blink::WebInputEvent::GestureScrollEnd; break; case ui::ET_GESTURE_PINCH_BEGIN: - gesture_event.type = WebKit::WebInputEvent::GesturePinchBegin; + gesture_event.type = blink::WebInputEvent::GesturePinchBegin; break; case ui::ET_GESTURE_PINCH_UPDATE: - gesture_event.type = WebKit::WebInputEvent::GesturePinchUpdate; + gesture_event.type = blink::WebInputEvent::GesturePinchUpdate; gesture_event.data.pinchUpdate.scale = event.details().scale(); break; case ui::ET_GESTURE_PINCH_END: - gesture_event.type = WebKit::WebInputEvent::GesturePinchEnd; + gesture_event.type = blink::WebInputEvent::GesturePinchEnd; break; case ui::ET_SCROLL_FLING_START: - gesture_event.type = WebKit::WebInputEvent::GestureFlingStart; + gesture_event.type = blink::WebInputEvent::GestureFlingStart; gesture_event.data.flingStart.velocityX = event.details().velocity_x(); gesture_event.data.flingStart.velocityY = event.details().velocity_y(); break; case ui::ET_SCROLL_FLING_CANCEL: - gesture_event.type = WebKit::WebInputEvent::GestureFlingCancel; + gesture_event.type = blink::WebInputEvent::GestureFlingCancel; break; case ui::ET_GESTURE_LONG_PRESS: - gesture_event.type = WebKit::WebInputEvent::GestureLongPress; + gesture_event.type = blink::WebInputEvent::GestureLongPress; gesture_event.data.longPress.width = event.details().bounding_box().width(); gesture_event.data.longPress.height = event.details().bounding_box().height(); break; case ui::ET_GESTURE_LONG_TAP: - gesture_event.type = WebKit::WebInputEvent::GestureLongTap; + gesture_event.type = blink::WebInputEvent::GestureLongTap; gesture_event.data.longPress.width = event.details().bounding_box().width(); gesture_event.data.longPress.height = event.details().bounding_box().height(); break; case ui::ET_GESTURE_TWO_FINGER_TAP: - gesture_event.type = WebKit::WebInputEvent::GestureTwoFingerTap; + gesture_event.type = blink::WebInputEvent::GestureTwoFingerTap; gesture_event.data.twoFingerTap.firstFingerWidth = event.details().first_finger_width(); gesture_event.data.twoFingerTap.firstFingerHeight = @@ -229,13 +229,13 @@ WebKit::WebGestureEvent MakeWebGestureEventFromUIEvent( case ui::ET_GESTURE_BEGIN: case ui::ET_GESTURE_END: case ui::ET_GESTURE_MULTIFINGER_SWIPE: - gesture_event.type = WebKit::WebInputEvent::Undefined; + gesture_event.type = blink::WebInputEvent::Undefined; break; default: NOTREACHED() << "Unknown gesture type: " << event.type(); } - gesture_event.sourceDevice = WebKit::WebGestureEvent::Touchscreen; + gesture_event.sourceDevice = blink::WebGestureEvent::Touchscreen; gesture_event.modifiers = EventFlagsToWebEventModifiers(event.flags()); gesture_event.timeStampSeconds = event.time_stamp().InSecondsF(); @@ -246,31 +246,31 @@ int EventFlagsToWebEventModifiers(int flags) { int modifiers = 0; if (flags & ui::EF_SHIFT_DOWN) - modifiers |= WebKit::WebInputEvent::ShiftKey; + modifiers |= blink::WebInputEvent::ShiftKey; if (flags & ui::EF_CONTROL_DOWN) - modifiers |= WebKit::WebInputEvent::ControlKey; + modifiers |= blink::WebInputEvent::ControlKey; if (flags & ui::EF_ALT_DOWN) - modifiers |= WebKit::WebInputEvent::AltKey; + modifiers |= blink::WebInputEvent::AltKey; // TODO(beng): MetaKey/META_MASK if (flags & ui::EF_LEFT_MOUSE_BUTTON) - modifiers |= WebKit::WebInputEvent::LeftButtonDown; + modifiers |= blink::WebInputEvent::LeftButtonDown; if (flags & ui::EF_MIDDLE_MOUSE_BUTTON) - modifiers |= WebKit::WebInputEvent::MiddleButtonDown; + modifiers |= blink::WebInputEvent::MiddleButtonDown; if (flags & ui::EF_RIGHT_MOUSE_BUTTON) - modifiers |= WebKit::WebInputEvent::RightButtonDown; + modifiers |= blink::WebInputEvent::RightButtonDown; if (flags & ui::EF_CAPS_LOCK_DOWN) - modifiers |= WebKit::WebInputEvent::CapsLockOn; + modifiers |= blink::WebInputEvent::CapsLockOn; return modifiers; } -WebKit::WebTouchPoint* UpdateWebTouchEventFromUIEvent( +blink::WebTouchPoint* UpdateWebTouchEventFromUIEvent( const ui::TouchEvent& event, - WebKit::WebTouchEvent* web_event) { - WebKit::WebTouchPoint* point = NULL; + blink::WebTouchEvent* web_event) { + blink::WebTouchPoint* point = NULL; switch (event.type()) { case ui::ET_TOUCH_PRESSED: // Add a new touch point. - if (web_event->touchesLength < WebKit::WebTouchEvent::touchesLengthCap) { + if (web_event->touchesLength < blink::WebTouchEvent::touchesLengthCap) { point = &web_event->touches[web_event->touchesLength++]; point->id = event.touch_id(); } @@ -306,7 +306,7 @@ WebKit::WebTouchPoint* UpdateWebTouchEventFromUIEvent( // Update the location and state of the point. point->state = TouchPointStateFromEvent(event); - if (point->state == WebKit::WebTouchPoint::StateMoved) { + if (point->state == blink::WebTouchPoint::StateMoved) { // It is possible for badly written touch drivers to emit Move events even // when the touch location hasn't changed. In such cases, consume the event // and pretend nothing happened. @@ -322,9 +322,9 @@ WebKit::WebTouchPoint* UpdateWebTouchEventFromUIEvent( // Mark the rest of the points as stationary. for (unsigned i = 0; i < web_event->touchesLength; ++i) { - WebKit::WebTouchPoint* iter = web_event->touches + i; + blink::WebTouchPoint* iter = web_event->touches + i; if (iter != point) - iter->state = WebKit::WebTouchPoint::StateStationary; + iter->state = blink::WebTouchPoint::StateStationary; } // Update the type of the touch event. diff --git a/content/browser/renderer_host/ui_events_helper.h b/content/browser/renderer_host/ui_events_helper.h index 734a314..51fd46f 100644 --- a/content/browser/renderer_host/ui_events_helper.h +++ b/content/browser/renderer_host/ui_events_helper.h @@ -9,7 +9,7 @@ #include "content/common/content_export.h" #include "content/port/browser/event_with_latency_info.h" -namespace WebKit { +namespace blink { class WebGestureEvent; class WebTouchEvent; class WebTouchPoint; @@ -41,7 +41,7 @@ CONTENT_EXPORT bool MakeUITouchEventsFromWebTouchEvents( // Creates a WebGestureEvent from a ui::GestureEvent. Note that it does not // populate the event coordinates (i.e. |x|, |y|, |globalX|, and |globalY|). So // the caller must populate these fields. -WebKit::WebGestureEvent MakeWebGestureEventFromUIEvent( +blink::WebGestureEvent MakeWebGestureEventFromUIEvent( const ui::GestureEvent& event); int EventFlagsToWebEventModifiers(int flags); @@ -49,9 +49,9 @@ int EventFlagsToWebEventModifiers(int flags); // Updates the WebTouchEvent based on the TouchEvent. It returns the updated // WebTouchPoint contained in the WebTouchEvent, or NULL if no point was // updated. -WebKit::WebTouchPoint* UpdateWebTouchEventFromUIEvent( +blink::WebTouchPoint* UpdateWebTouchEventFromUIEvent( const ui::TouchEvent& event, - WebKit::WebTouchEvent* web_event); + blink::WebTouchEvent* web_event); } #endif // CONTENT_BROWSER_RENDERER_HOST_UI_EVENTS_HELPER_H_ diff --git a/content/browser/renderer_host/web_input_event_aura.cc b/content/browser/renderer_host/web_input_event_aura.cc index 6bb5e58..5127c07 100644 --- a/content/browser/renderer_host/web_input_event_aura.cc +++ b/content/browser/renderer_host/web_input_event_aura.cc @@ -13,7 +13,7 @@ namespace content { #if defined(USE_X11) || defined(USE_OZONE) // From third_party/WebKit/Source/web/gtk/WebInputEventFactory.cpp: -WebKit::WebUChar GetControlCharacter(int windows_key_code, bool shift) { +blink::WebUChar GetControlCharacter(int windows_key_code, bool shift) { if (windows_key_code >= ui::VKEY_A && windows_key_code <= ui::VKEY_Z) { // ctrl-A ~ ctrl-Z map to \x01 ~ \x1A @@ -58,40 +58,40 @@ WebKit::WebUChar GetControlCharacter(int windows_key_code, bool shift) { } #endif #if defined(OS_WIN) -WebKit::WebMouseEvent MakeUntranslatedWebMouseEventFromNativeEvent( +blink::WebMouseEvent MakeUntranslatedWebMouseEventFromNativeEvent( base::NativeEvent native_event); -WebKit::WebMouseWheelEvent MakeUntranslatedWebMouseWheelEventFromNativeEvent( +blink::WebMouseWheelEvent MakeUntranslatedWebMouseWheelEventFromNativeEvent( base::NativeEvent native_event); -WebKit::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent( +blink::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent( base::NativeEvent native_event); -WebKit::WebGestureEvent MakeWebGestureEventFromNativeEvent( +blink::WebGestureEvent MakeWebGestureEventFromNativeEvent( base::NativeEvent native_event); #elif defined(USE_X11) -WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( +blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( ui::KeyEvent* event); #elif defined(USE_OZONE) -WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( +blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( ui::KeyEvent* event) { base::NativeEvent native_event = event->native_event(); ui::EventType type = ui::EventTypeFromNative(native_event); - WebKit::WebKeyboardEvent webkit_event; + blink::WebKeyboardEvent webkit_event; webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); switch (type) { case ui::ET_KEY_PRESSED: - webkit_event.type = event->is_char() ? WebKit::WebInputEvent::Char : - WebKit::WebInputEvent::RawKeyDown; + webkit_event.type = event->is_char() ? blink::WebInputEvent::Char : + blink::WebInputEvent::RawKeyDown; break; case ui::ET_KEY_RELEASED: - webkit_event.type = WebKit::WebInputEvent::KeyUp; + webkit_event.type = blink::WebInputEvent::KeyUp; break; default: NOTREACHED(); } - if (webkit_event.modifiers & WebKit::WebInputEvent::AltKey) + if (webkit_event.modifiers & blink::WebInputEvent::AltKey) webkit_event.isSystemKey = true; wchar_t character = ui::KeyboardCodeFromNative(native_event); @@ -103,11 +103,11 @@ WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( else webkit_event.unmodifiedText[0] = character; - if (webkit_event.modifiers & WebKit::WebInputEvent::ControlKey) { + if (webkit_event.modifiers & blink::WebInputEvent::ControlKey) { webkit_event.text[0] = GetControlCharacter( webkit_event.windowsKeyCode, - webkit_event.modifiers & WebKit::WebInputEvent::ShiftKey); + webkit_event.modifiers & blink::WebInputEvent::ShiftKey); } else { webkit_event.text[0] = webkit_event.unmodifiedText[0]; } @@ -118,12 +118,12 @@ WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( } #endif #if defined(USE_X11) || defined(USE_OZONE) -WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( +blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( ui::ScrollEvent* event) { - WebKit::WebMouseWheelEvent webkit_event; + blink::WebMouseWheelEvent webkit_event; - webkit_event.type = WebKit::WebInputEvent::MouseWheel; - webkit_event.button = WebKit::WebMouseEvent::ButtonNone; + webkit_event.type = blink::WebInputEvent::MouseWheel; + webkit_event.button = blink::WebMouseEvent::ButtonNone; webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); webkit_event.hasPreciseScrollingDeltas = true; @@ -142,18 +142,18 @@ WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( return webkit_event; } -WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent( +blink::WebGestureEvent MakeWebGestureEventFromAuraEvent( ui::ScrollEvent* event) { - WebKit::WebGestureEvent webkit_event; + blink::WebGestureEvent webkit_event; switch (event->type()) { case ui::ET_SCROLL_FLING_START: - webkit_event.type = WebKit::WebInputEvent::GestureFlingStart; + webkit_event.type = blink::WebInputEvent::GestureFlingStart; webkit_event.data.flingStart.velocityX = event->x_offset(); webkit_event.data.flingStart.velocityY = event->y_offset(); break; case ui::ET_SCROLL_FLING_CANCEL: - webkit_event.type = WebKit::WebInputEvent::GestureFlingCancel; + webkit_event.type = blink::WebInputEvent::GestureFlingCancel; break; case ui::ET_SCROLL: NOTREACHED() << "Invalid gesture type: " << event->type(); @@ -162,7 +162,7 @@ WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent( NOTREACHED() << "Unknown gesture type: " << event->type(); } - webkit_event.sourceDevice = WebKit::WebGestureEvent::Touchpad; + webkit_event.sourceDevice = blink::WebGestureEvent::Touchpad; webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); return webkit_event; @@ -170,9 +170,9 @@ WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent( #endif -WebKit::WebMouseEvent MakeWebMouseEventFromAuraEvent( +blink::WebMouseEvent MakeWebMouseEventFromAuraEvent( ui::MouseEvent* event); -WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( +blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( ui::MouseWheelEvent* event); // General approach: @@ -187,7 +187,7 @@ WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( // provide coordinates relative to the aura::Window that is hosting the // renderer, not the top level platform window. // -// The approach is to fully construct a WebKit::WebInputEvent from the +// The approach is to fully construct a blink::WebInputEvent from the // ui::Event's base::NativeEvent, and then replace the coordinate fields with // the translated values from the ui::Event. // @@ -198,9 +198,9 @@ WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( // ui::MouseEvent. This will not be necessary once only XInput2 is supported. // -WebKit::WebMouseEvent MakeWebMouseEvent(ui::MouseEvent* event) { +blink::WebMouseEvent MakeWebMouseEvent(ui::MouseEvent* event) { // Construct an untranslated event from the platform event data. - WebKit::WebMouseEvent webkit_event = + blink::WebMouseEvent webkit_event = #if defined(OS_WIN) // On Windows we have WM_ events comming from desktop and pure aura // events comming from metro mode. @@ -226,14 +226,14 @@ WebKit::WebMouseEvent MakeWebMouseEvent(ui::MouseEvent* event) { return webkit_event; } -WebKit::WebMouseWheelEvent MakeWebMouseWheelEvent(ui::MouseWheelEvent* event) { +blink::WebMouseWheelEvent MakeWebMouseWheelEvent(ui::MouseWheelEvent* event) { #if defined(OS_WIN) // Construct an untranslated event from the platform event data. - WebKit::WebMouseWheelEvent webkit_event = event->native_event().message ? + blink::WebMouseWheelEvent webkit_event = event->native_event().message ? MakeUntranslatedWebMouseWheelEventFromNativeEvent(event->native_event()) : MakeWebMouseWheelEventFromAuraEvent(event); #else - WebKit::WebMouseWheelEvent webkit_event = + blink::WebMouseWheelEvent webkit_event = MakeWebMouseWheelEventFromAuraEvent(event); #endif @@ -249,13 +249,13 @@ WebKit::WebMouseWheelEvent MakeWebMouseWheelEvent(ui::MouseWheelEvent* event) { return webkit_event; } -WebKit::WebMouseWheelEvent MakeWebMouseWheelEvent(ui::ScrollEvent* event) { +blink::WebMouseWheelEvent MakeWebMouseWheelEvent(ui::ScrollEvent* event) { #if defined(OS_WIN) // Construct an untranslated event from the platform event data. - WebKit::WebMouseWheelEvent webkit_event = + blink::WebMouseWheelEvent webkit_event = MakeUntranslatedWebMouseWheelEventFromNativeEvent(event->native_event()); #else - WebKit::WebMouseWheelEvent webkit_event = + blink::WebMouseWheelEvent webkit_event = MakeWebMouseWheelEventFromAuraEvent(event); #endif @@ -271,7 +271,7 @@ WebKit::WebMouseWheelEvent MakeWebMouseWheelEvent(ui::ScrollEvent* event) { return webkit_event; } -WebKit::WebKeyboardEvent MakeWebKeyboardEvent(ui::KeyEvent* event) { +blink::WebKeyboardEvent MakeWebKeyboardEvent(ui::KeyEvent* event) { // Windows can figure out whether or not to construct a RawKeyDown or a Char // WebInputEvent based on the type of message carried in // event->native_event(). X11 is not so fortunate, there is no separate @@ -286,8 +286,8 @@ WebKit::WebKeyboardEvent MakeWebKeyboardEvent(ui::KeyEvent* event) { #endif } -WebKit::WebGestureEvent MakeWebGestureEvent(ui::GestureEvent* event) { - WebKit::WebGestureEvent gesture_event; +blink::WebGestureEvent MakeWebGestureEvent(ui::GestureEvent* event) { + blink::WebGestureEvent gesture_event; #if defined(OS_WIN) if (event->HasNativeEvent()) gesture_event = MakeWebGestureEventFromNativeEvent(event->native_event()); @@ -307,8 +307,8 @@ WebKit::WebGestureEvent MakeWebGestureEvent(ui::GestureEvent* event) { return gesture_event; } -WebKit::WebGestureEvent MakeWebGestureEvent(ui::ScrollEvent* event) { - WebKit::WebGestureEvent gesture_event; +blink::WebGestureEvent MakeWebGestureEvent(ui::ScrollEvent* event) { + blink::WebGestureEvent gesture_event; #if defined(OS_WIN) gesture_event = MakeWebGestureEventFromNativeEvent(event->native_event()); @@ -326,43 +326,43 @@ WebKit::WebGestureEvent MakeWebGestureEvent(ui::ScrollEvent* event) { return gesture_event; } -WebKit::WebGestureEvent MakeWebGestureEventFlingCancel() { - WebKit::WebGestureEvent gesture_event; +blink::WebGestureEvent MakeWebGestureEventFlingCancel() { + blink::WebGestureEvent gesture_event; // All other fields are ignored on a GestureFlingCancel event. - gesture_event.type = WebKit::WebInputEvent::GestureFlingCancel; - gesture_event.sourceDevice = WebKit::WebGestureEvent::Touchpad; + gesture_event.type = blink::WebInputEvent::GestureFlingCancel; + gesture_event.sourceDevice = blink::WebGestureEvent::Touchpad; return gesture_event; } -WebKit::WebMouseEvent MakeWebMouseEventFromAuraEvent(ui::MouseEvent* event) { - WebKit::WebMouseEvent webkit_event; +blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(ui::MouseEvent* event) { + blink::WebMouseEvent webkit_event; webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); - webkit_event.button = WebKit::WebMouseEvent::ButtonNone; + webkit_event.button = blink::WebMouseEvent::ButtonNone; if (event->flags() & ui::EF_LEFT_MOUSE_BUTTON) - webkit_event.button = WebKit::WebMouseEvent::ButtonLeft; + webkit_event.button = blink::WebMouseEvent::ButtonLeft; if (event->flags() & ui::EF_MIDDLE_MOUSE_BUTTON) - webkit_event.button = WebKit::WebMouseEvent::ButtonMiddle; + webkit_event.button = blink::WebMouseEvent::ButtonMiddle; if (event->flags() & ui::EF_RIGHT_MOUSE_BUTTON) - webkit_event.button = WebKit::WebMouseEvent::ButtonRight; + webkit_event.button = blink::WebMouseEvent::ButtonRight; switch (event->type()) { case ui::ET_MOUSE_PRESSED: - webkit_event.type = WebKit::WebInputEvent::MouseDown; + webkit_event.type = blink::WebInputEvent::MouseDown; webkit_event.clickCount = event->GetClickCount(); break; case ui::ET_MOUSE_RELEASED: - webkit_event.type = WebKit::WebInputEvent::MouseUp; + webkit_event.type = blink::WebInputEvent::MouseUp; webkit_event.clickCount = event->GetClickCount(); break; case ui::ET_MOUSE_ENTERED: case ui::ET_MOUSE_EXITED: case ui::ET_MOUSE_MOVED: case ui::ET_MOUSE_DRAGGED: - webkit_event.type = WebKit::WebInputEvent::MouseMove; + webkit_event.type = blink::WebInputEvent::MouseMove; break; default: NOTIMPLEMENTED() << "Received unexpected event: " << event->type(); @@ -372,12 +372,12 @@ WebKit::WebMouseEvent MakeWebMouseEventFromAuraEvent(ui::MouseEvent* event) { return webkit_event; } -WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( +blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( ui::MouseWheelEvent* event) { - WebKit::WebMouseWheelEvent webkit_event; + blink::WebMouseWheelEvent webkit_event; - webkit_event.type = WebKit::WebInputEvent::MouseWheel; - webkit_event.button = WebKit::WebMouseEvent::ButtonNone; + webkit_event.type = blink::WebInputEvent::MouseWheel; + webkit_event.button = blink::WebMouseEvent::ButtonNone; webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); webkit_event.deltaX = event->x_offset(); diff --git a/content/browser/renderer_host/web_input_event_aura.h b/content/browser/renderer_host/web_input_event_aura.h index 3c4c894..eeff886 100644 --- a/content/browser/renderer_host/web_input_event_aura.h +++ b/content/browser/renderer_host/web_input_event_aura.h @@ -23,22 +23,22 @@ namespace content { const int kPixelsPerTick = 53; #if defined(USE_X11) || defined(USE_OZONE) -CONTENT_EXPORT WebKit::WebUChar GetControlCharacter( +CONTENT_EXPORT blink::WebUChar GetControlCharacter( int windows_key_code, bool shift); #endif -CONTENT_EXPORT WebKit::WebMouseEvent MakeWebMouseEvent( +CONTENT_EXPORT blink::WebMouseEvent MakeWebMouseEvent( ui::MouseEvent* event); -CONTENT_EXPORT WebKit::WebMouseWheelEvent MakeWebMouseWheelEvent( +CONTENT_EXPORT blink::WebMouseWheelEvent MakeWebMouseWheelEvent( ui::MouseWheelEvent* event); -CONTENT_EXPORT WebKit::WebMouseWheelEvent MakeWebMouseWheelEvent( +CONTENT_EXPORT blink::WebMouseWheelEvent MakeWebMouseWheelEvent( ui::ScrollEvent* event); -CONTENT_EXPORT WebKit::WebKeyboardEvent MakeWebKeyboardEvent( +CONTENT_EXPORT blink::WebKeyboardEvent MakeWebKeyboardEvent( ui::KeyEvent* event); -CONTENT_EXPORT WebKit::WebGestureEvent MakeWebGestureEvent( +CONTENT_EXPORT blink::WebGestureEvent MakeWebGestureEvent( ui::GestureEvent* event); -CONTENT_EXPORT WebKit::WebGestureEvent MakeWebGestureEvent( +CONTENT_EXPORT blink::WebGestureEvent MakeWebGestureEvent( ui::ScrollEvent* event); -CONTENT_EXPORT WebKit::WebGestureEvent MakeWebGestureEventFlingCancel(); +CONTENT_EXPORT blink::WebGestureEvent MakeWebGestureEventFlingCancel(); } // namespace content diff --git a/content/browser/renderer_host/web_input_event_aura_unittest.cc b/content/browser/renderer_host/web_input_event_aura_unittest.cc index 059ebb2..dd82378 100644 --- a/content/browser/renderer_host/web_input_event_aura_unittest.cc +++ b/content/browser/renderer_host/web_input_event_aura_unittest.cc @@ -29,9 +29,9 @@ TEST(WebInputEventAuraTest, TestMakeWebKeyboardEvent) { 0, // X does not set ControlMask for KeyPress. &xev); ui::KeyEvent event(&xev, false /* is_char */); - WebKit::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); + blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); // However, modifier bit for Control in |webkit_event| should be set. - EXPECT_EQ(webkit_event.modifiers, WebKit::WebInputEvent::ControlKey); + EXPECT_EQ(webkit_event.modifiers, blink::WebInputEvent::ControlKey); } { // Release Ctrl. @@ -40,7 +40,7 @@ TEST(WebInputEventAuraTest, TestMakeWebKeyboardEvent) { ControlMask, // X sets the mask for KeyRelease. &xev); ui::KeyEvent event(&xev, false /* is_char */); - WebKit::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); + blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); // However, modifier bit for Control in |webkit_event| shouldn't be set. EXPECT_EQ(webkit_event.modifiers, 0); } @@ -59,7 +59,7 @@ TEST(WebInputEventAuraTest, TestMakeWebKeyboardEventWindowsKeyCode) { &xev); xev.xkey.keycode = XKeysymToKeycode(gfx::GetXDisplay(), XK_Control_L); ui::KeyEvent event(&xev, false /* is_char */); - WebKit::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); + blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); // ui::VKEY_LCONTROL, instead of ui::VKEY_CONTROL, should be filled. EXPECT_EQ(ui::VKEY_LCONTROL, webkit_event.windowsKeyCode); } @@ -71,7 +71,7 @@ TEST(WebInputEventAuraTest, TestMakeWebKeyboardEventWindowsKeyCode) { &xev); xev.xkey.keycode = XKeysymToKeycode(gfx::GetXDisplay(), XK_Control_R); ui::KeyEvent event(&xev, false /* is_char */); - WebKit::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); + blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(&event); // ui::VKEY_RCONTROL, instead of ui::VKEY_CONTROL, should be filled. EXPECT_EQ(ui::VKEY_RCONTROL, webkit_event.windowsKeyCode); } diff --git a/content/browser/renderer_host/web_input_event_aurawin.cc b/content/browser/renderer_host/web_input_event_aurawin.cc index 771b792..06e2dbf 100644 --- a/content/browser/renderer_host/web_input_event_aurawin.cc +++ b/content/browser/renderer_host/web_input_event_aurawin.cc @@ -13,7 +13,7 @@ namespace content { // On Windows, we can just use the builtin WebKit factory methods to fully // construct our pre-translated events. -WebKit::WebMouseEvent MakeUntranslatedWebMouseEventFromNativeEvent( +blink::WebMouseEvent MakeUntranslatedWebMouseEventFromNativeEvent( base::NativeEvent native_event) { return WebMouseEventBuilder::Build(native_event.hwnd, native_event.message, @@ -21,7 +21,7 @@ WebKit::WebMouseEvent MakeUntranslatedWebMouseEventFromNativeEvent( native_event.lParam); } -WebKit::WebMouseWheelEvent MakeUntranslatedWebMouseWheelEventFromNativeEvent( +blink::WebMouseWheelEvent MakeUntranslatedWebMouseWheelEventFromNativeEvent( base::NativeEvent native_event) { return WebMouseWheelEventBuilder::Build(native_event.hwnd, native_event.message, @@ -29,7 +29,7 @@ WebKit::WebMouseWheelEvent MakeUntranslatedWebMouseWheelEventFromNativeEvent( native_event.lParam); } -WebKit::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent( +blink::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent( base::NativeEvent native_event) { return WebKeyboardEventBuilder::Build(native_event.hwnd, native_event.message, @@ -37,11 +37,11 @@ WebKit::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent( native_event.lParam); } -WebKit::WebGestureEvent MakeWebGestureEventFromNativeEvent( +blink::WebGestureEvent MakeWebGestureEventFromNativeEvent( base::NativeEvent native_event) { // TODO: Create gestures from native event. NOTIMPLEMENTED(); - return WebKit::WebGestureEvent(); + return blink::WebGestureEvent(); } } // namespace content diff --git a/content/browser/renderer_host/web_input_event_aurax11.cc b/content/browser/renderer_host/web_input_event_aurax11.cc index 76ae55f..6bec493 100644 --- a/content/browser/renderer_host/web_input_event_aurax11.cc +++ b/content/browser/renderer_host/web_input_event_aurax11.cc @@ -89,10 +89,10 @@ int XKeyEventToWindowsKeyCode(XKeyEvent* event) { } // namespace -WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( +blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( ui::KeyEvent* event) { base::NativeEvent native_event = event->native_event(); - WebKit::WebKeyboardEvent webkit_event; + blink::WebKeyboardEvent webkit_event; XKeyEvent* native_key_event = &native_event->xkey; webkit_event.timeStampSeconds = event->time_stamp().InSecondsF(); @@ -100,17 +100,17 @@ WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( switch (native_event->type) { case KeyPress: - webkit_event.type = event->is_char() ? WebKit::WebInputEvent::Char : - WebKit::WebInputEvent::RawKeyDown; + webkit_event.type = event->is_char() ? blink::WebInputEvent::Char : + blink::WebInputEvent::RawKeyDown; break; case KeyRelease: - webkit_event.type = WebKit::WebInputEvent::KeyUp; + webkit_event.type = blink::WebInputEvent::KeyUp; break; default: NOTREACHED(); } - if (webkit_event.modifiers & WebKit::WebInputEvent::AltKey) + if (webkit_event.modifiers & blink::WebInputEvent::AltKey) webkit_event.isSystemKey = true; webkit_event.windowsKeyCode = XKeyEventToWindowsKeyCode(native_key_event); @@ -121,11 +121,11 @@ WebKit::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( else webkit_event.unmodifiedText[0] = ui::GetCharacterFromXEvent(native_event); - if (webkit_event.modifiers & WebKit::WebInputEvent::ControlKey) { + if (webkit_event.modifiers & blink::WebInputEvent::ControlKey) { webkit_event.text[0] = GetControlCharacter( webkit_event.windowsKeyCode, - webkit_event.modifiers & WebKit::WebInputEvent::ShiftKey); + webkit_event.modifiers & blink::WebInputEvent::ShiftKey); } else { webkit_event.text[0] = webkit_event.unmodifiedText[0]; } diff --git a/content/browser/service_worker/service_worker_dispatcher_host.cc b/content/browser/service_worker/service_worker_dispatcher_host.cc index b93f8a9..98e4d7a 100644 --- a/content/browser/service_worker/service_worker_dispatcher_host.cc +++ b/content/browser/service_worker/service_worker_dispatcher_host.cc @@ -11,7 +11,7 @@ #include "third_party/WebKit/public/platform/WebServiceWorkerError.h" #include "url/gurl.h" -using WebKit::WebServiceWorkerError; +using blink::WebServiceWorkerError; namespace content { @@ -60,7 +60,7 @@ void ServiceWorkerDispatcherHost::OnRegisterServiceWorker( Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError( thread_id, request_id, - WebKit::WebServiceWorkerError::DisabledError, + blink::WebServiceWorkerError::DisabledError, ASCIIToUTF16("ServiceWorker is disabled"))); return; } @@ -72,7 +72,7 @@ void ServiceWorkerDispatcherHost::OnRegisterServiceWorker( Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError( thread_id, request_id, - WebKit::WebServiceWorkerError::SecurityError, + blink::WebServiceWorkerError::SecurityError, ASCIIToUTF16(kDomainMismatchErrorMessage))); return; } diff --git a/content/browser/speech/input_tag_speech_browsertest.cc b/content/browser/speech/input_tag_speech_browsertest.cc index 425a0cf..10c1878 100644 --- a/content/browser/speech/input_tag_speech_browsertest.cc +++ b/content/browser/speech/input_tag_speech_browsertest.cc @@ -40,9 +40,9 @@ class InputTagSpeechBrowserTest : public ContentBrowserTest { GURL test_url = GetTestUrl("speech", filename); NavigateToURL(shell(), test_url); - WebKit::WebMouseEvent mouse_event; - mouse_event.type = WebKit::WebInputEvent::MouseDown; - mouse_event.button = WebKit::WebMouseEvent::ButtonLeft; + blink::WebMouseEvent mouse_event; + mouse_event.type = blink::WebInputEvent::MouseDown; + mouse_event.button = blink::WebMouseEvent::ButtonLeft; mouse_event.x = 0; mouse_event.y = 0; mouse_event.clickCount = 1; @@ -52,7 +52,7 @@ class InputTagSpeechBrowserTest : public ContentBrowserTest { NOTIFICATION_LOAD_STOP, Source<NavigationController>(&web_contents->GetController())); web_contents->GetRenderViewHost()->ForwardMouseEvent(mouse_event); - mouse_event.type = WebKit::WebInputEvent::MouseUp; + mouse_event.type = blink::WebInputEvent::MouseUp; web_contents->GetRenderViewHost()->ForwardMouseEvent(mouse_event); fake_speech_recognition_manager_.WaitForRecognitionStarted(); diff --git a/content/browser/web_contents/drag_utils_gtk.cc b/content/browser/web_contents/drag_utils_gtk.cc index 8164c53..279ae9d 100644 --- a/content/browser/web_contents/drag_utils_gtk.cc +++ b/content/browser/web_contents/drag_utils_gtk.cc @@ -4,12 +4,12 @@ #include "content/browser/web_contents/drag_utils_gtk.h" -using WebKit::WebDragOperationsMask; -using WebKit::WebDragOperation; -using WebKit::WebDragOperationNone; -using WebKit::WebDragOperationCopy; -using WebKit::WebDragOperationLink; -using WebKit::WebDragOperationMove; +using blink::WebDragOperationsMask; +using blink::WebDragOperation; +using blink::WebDragOperationNone; +using blink::WebDragOperationCopy; +using blink::WebDragOperationLink; +using blink::WebDragOperationMove; namespace content { diff --git a/content/browser/web_contents/drag_utils_gtk.h b/content/browser/web_contents/drag_utils_gtk.h index 7232df1..f6d8839 100644 --- a/content/browser/web_contents/drag_utils_gtk.h +++ b/content/browser/web_contents/drag_utils_gtk.h @@ -15,8 +15,8 @@ namespace content { // Convenience methods for converting between web drag operations and the GDK // equivalent. CONTENT_EXPORT GdkDragAction WebDragOpToGdkDragAction( - WebKit::WebDragOperationsMask op); -CONTENT_EXPORT WebKit::WebDragOperationsMask GdkDragActionToWebDragOp( + blink::WebDragOperationsMask op); +CONTENT_EXPORT blink::WebDragOperationsMask GdkDragActionToWebDragOp( GdkDragAction action); } // namespace content diff --git a/content/browser/web_contents/touch_editable_impl_aura.cc b/content/browser/web_contents/touch_editable_impl_aura.cc index 6ca8e04..50c89fa 100644 --- a/content/browser/web_contents/touch_editable_impl_aura.cc +++ b/content/browser/web_contents/touch_editable_impl_aura.cc @@ -195,7 +195,7 @@ bool TouchEditableImplAura::HandleInputEvent(const ui::Event* event) { void TouchEditableImplAura::GestureEventAck(int gesture_event_type) { DCHECK(rwhva_); - if (gesture_event_type == WebKit::WebInputEvent::GestureTap && + if (gesture_event_type == blink::WebInputEvent::GestureTap && text_input_type_ != ui::TEXT_INPUT_TYPE_NONE && is_tap_on_focused_textfield_) { StartTouchEditing(); @@ -203,9 +203,9 @@ void TouchEditableImplAura::GestureEventAck(int gesture_event_type) { touch_selection_controller_->SelectionChanged(); } - if (gesture_event_type == WebKit::WebInputEvent::GestureLongPress) + if (gesture_event_type == blink::WebInputEvent::GestureLongPress) selection_gesture_in_process_ = false; - if (gesture_event_type == WebKit::WebInputEvent::GestureTap) { + if (gesture_event_type == blink::WebInputEvent::GestureTap) { if (tap_gesture_tap_count_queue_.front() > 1) selection_gesture_in_process_ = false; tap_gesture_tap_count_queue_.pop(); diff --git a/content/browser/web_contents/web_contents_drag_win.cc b/content/browser/web_contents/web_contents_drag_win.cc index cb24210..72c1758 100644 --- a/content/browser/web_contents/web_contents_drag_win.cc +++ b/content/browser/web_contents/web_contents_drag_win.cc @@ -38,10 +38,10 @@ #include "ui/gfx/screen.h" #include "ui/gfx/size.h" -using WebKit::WebDragOperationsMask; -using WebKit::WebDragOperationCopy; -using WebKit::WebDragOperationLink; -using WebKit::WebDragOperationMove; +using blink::WebDragOperationsMask; +using blink::WebDragOperationCopy; +using blink::WebDragOperationLink; +using blink::WebDragOperationMove; namespace content { namespace { diff --git a/content/browser/web_contents/web_contents_drag_win.h b/content/browser/web_contents/web_contents_drag_win.h index b6a9805..943cc7d 100644 --- a/content/browser/web_contents/web_contents_drag_win.h +++ b/content/browser/web_contents/web_contents_drag_win.h @@ -46,7 +46,7 @@ class CONTENT_EXPORT WebContentsDragWin // Called on UI thread. void StartDragging(const DropData& drop_data, - WebKit::WebDragOperationsMask ops, + blink::WebDragOperationsMask ops, const gfx::ImageSkia& image, const gfx::Vector2d& image_offset); void CancelDrag(); @@ -74,7 +74,7 @@ class CONTENT_EXPORT WebContentsDragWin // progress. No further processing should be done beyond this return point // because the instance has been destroyed. bool DoDragging(const DropData& drop_data, - WebKit::WebDragOperationsMask ops, + blink::WebDragOperationsMask ops, const GURL& page_url, const std::string& page_encoding, const gfx::ImageSkia& image, @@ -82,7 +82,7 @@ class CONTENT_EXPORT WebContentsDragWin // Called on drag-and-drop thread. void StartBackgroundDragging(const DropData& drop_data, - WebKit::WebDragOperationsMask ops, + blink::WebDragOperationsMask ops, const GURL& page_url, const std::string& page_encoding, const gfx::ImageSkia& image, diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index feab408..c7d716a 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -1157,7 +1157,7 @@ void WebContentsImpl::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) { } bool WebContentsImpl::PreHandleWheelEvent( - const WebKit::WebMouseWheelEvent& event) { + const blink::WebMouseWheelEvent& event) { #if !defined(OS_MACOSX) // On platforms other than Mac, control+mousewheel changes zoom. On Mac, this // isn't done for two reasons: @@ -1167,7 +1167,7 @@ bool WebContentsImpl::PreHandleWheelEvent( // with control key set which isn't what the user wants if (delegate_ && event.wheelTicksY && - (event.modifiers & WebKit::WebInputEvent::ControlKey)) { + (event.modifiers & blink::WebInputEvent::ControlKey)) { delegate_->ContentsZoomChange(event.wheelTicksY > 0); return true; } @@ -1356,17 +1356,17 @@ void WebContentsImpl::CreateNewWindow( } void WebContentsImpl::CreateNewWidget(int route_id, - WebKit::WebPopupType popup_type) { + blink::WebPopupType popup_type) { CreateNewWidget(route_id, false, popup_type); } void WebContentsImpl::CreateNewFullscreenWidget(int route_id) { - CreateNewWidget(route_id, true, WebKit::WebPopupTypeNone); + CreateNewWidget(route_id, true, blink::WebPopupTypeNone); } void WebContentsImpl::CreateNewWidget(int route_id, bool is_fullscreen, - WebKit::WebPopupType popup_type) { + blink::WebPopupType popup_type) { RenderProcessHost* process = GetRenderProcessHost(); RenderWidgetHostImpl* widget_host = new RenderWidgetHostImpl(this, process, route_id, IsHidden()); @@ -1811,7 +1811,7 @@ void WebContentsImpl::Close() { } void WebContentsImpl::DragSourceEndedAt(int client_x, int client_y, - int screen_x, int screen_y, WebKit::WebDragOperation operation) { + int screen_x, int screen_y, blink::WebDragOperation operation) { if (browser_plugin_embedder_.get()) browser_plugin_embedder_->DragSourceEndedAt(client_x, client_y, screen_x, screen_y, operation); diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h index 1f5bc60..d0ac6b3 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -154,7 +154,7 @@ class CONTENT_EXPORT WebContentsImpl // Informs the render view host and the BrowserPluginEmbedder, if present, of // a Drag Source End. void DragSourceEndedAt(int client_x, int client_y, int screen_x, - int screen_y, WebKit::WebDragOperation operation); + int screen_y, blink::WebDragOperation operation); // Informs the render view host and the BrowserPluginEmbedder, if present, of // a Drag Source Move. @@ -407,7 +407,7 @@ class CONTENT_EXPORT WebContentsImpl const ViewHostMsg_CreateWindow_Params& params, SessionStorageNamespace* session_storage_namespace) OVERRIDE; virtual void CreateNewWidget(int route_id, - WebKit::WebPopupType popup_type) OVERRIDE; + blink::WebPopupType popup_type) OVERRIDE; virtual void CreateNewFullscreenWidget(int route_id) OVERRIDE; virtual void ShowCreatedWindow(int route_id, WindowOpenDisposition disposition, @@ -434,7 +434,7 @@ class CONTENT_EXPORT WebContentsImpl virtual void HandleKeyboardEvent( const NativeWebKeyboardEvent& event) OVERRIDE; virtual bool PreHandleWheelEvent( - const WebKit::WebMouseWheelEvent& event) OVERRIDE; + const blink::WebMouseWheelEvent& event) OVERRIDE; virtual void DidSendScreenRects(RenderWidgetHostImpl* rwh) OVERRIDE; #if defined(OS_WIN) && defined(USE_AURA) virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE; @@ -724,7 +724,7 @@ class CONTENT_EXPORT WebContentsImpl // Helper for CreateNewWidget/CreateNewFullscreenWidget. void CreateNewWidget(int route_id, bool is_fullscreen, - WebKit::WebPopupType popup_type); + blink::WebPopupType popup_type); // Helper for ShowCreatedWidget/ShowCreatedFullscreenWidget. void ShowCreatedWidget(int route_id, diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc index 4aa02cb..fc27ace 100644 --- a/content/browser/web_contents/web_contents_view_android.cc +++ b/content/browser/web_contents/web_contents_view_android.cc @@ -199,14 +199,14 @@ void WebContentsViewAndroid::ShowPopupMenu( void WebContentsViewAndroid::StartDragging( const DropData& drop_data, - WebKit::WebDragOperationsMask allowed_ops, + blink::WebDragOperationsMask allowed_ops, const gfx::ImageSkia& image, const gfx::Vector2d& image_offset, const DragEventSourceInfo& event_info) { NOTIMPLEMENTED(); } -void WebContentsViewAndroid::UpdateDragCursor(WebKit::WebDragOperation op) { +void WebContentsViewAndroid::UpdateDragCursor(blink::WebDragOperation op) { NOTIMPLEMENTED(); } diff --git a/content/browser/web_contents/web_contents_view_android.h b/content/browser/web_contents/web_contents_view_android.h index 594bc5c..bcfc0cf 100644 --- a/content/browser/web_contents/web_contents_view_android.h +++ b/content/browser/web_contents/web_contents_view_android.h @@ -72,11 +72,11 @@ class WebContentsViewAndroid : public WebContentsViewPort, bool right_aligned, bool allow_multiple_selection) OVERRIDE; virtual void StartDragging(const DropData& drop_data, - WebKit::WebDragOperationsMask allowed_ops, + blink::WebDragOperationsMask allowed_ops, const gfx::ImageSkia& image, const gfx::Vector2d& image_offset, const DragEventSourceInfo& event_info) OVERRIDE; - virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE; + virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE; virtual void GotFocus() OVERRIDE; virtual void TakeFocus(bool reverse) OVERRIDE; diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc index c25ca7e..67ff98b 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -334,40 +334,40 @@ void PrepareDropData(DropData* drop_data, const ui::OSExchangeData& data) { pickle.data(), pickle.size(), &drop_data->custom_data); } -// Utilities to convert between WebKit::WebDragOperationsMask and +// Utilities to convert between blink::WebDragOperationsMask and // ui::DragDropTypes. -int ConvertFromWeb(WebKit::WebDragOperationsMask ops) { +int ConvertFromWeb(blink::WebDragOperationsMask ops) { int drag_op = ui::DragDropTypes::DRAG_NONE; - if (ops & WebKit::WebDragOperationCopy) + if (ops & blink::WebDragOperationCopy) drag_op |= ui::DragDropTypes::DRAG_COPY; - if (ops & WebKit::WebDragOperationMove) + if (ops & blink::WebDragOperationMove) drag_op |= ui::DragDropTypes::DRAG_MOVE; - if (ops & WebKit::WebDragOperationLink) + if (ops & blink::WebDragOperationLink) drag_op |= ui::DragDropTypes::DRAG_LINK; return drag_op; } -WebKit::WebDragOperationsMask ConvertToWeb(int drag_op) { - int web_drag_op = WebKit::WebDragOperationNone; +blink::WebDragOperationsMask ConvertToWeb(int drag_op) { + int web_drag_op = blink::WebDragOperationNone; if (drag_op & ui::DragDropTypes::DRAG_COPY) - web_drag_op |= WebKit::WebDragOperationCopy; + web_drag_op |= blink::WebDragOperationCopy; if (drag_op & ui::DragDropTypes::DRAG_MOVE) - web_drag_op |= WebKit::WebDragOperationMove; + web_drag_op |= blink::WebDragOperationMove; if (drag_op & ui::DragDropTypes::DRAG_LINK) - web_drag_op |= WebKit::WebDragOperationLink; - return (WebKit::WebDragOperationsMask) web_drag_op; + web_drag_op |= blink::WebDragOperationLink; + return (blink::WebDragOperationsMask) web_drag_op; } int ConvertAuraEventFlagsToWebInputEventModifiers(int aura_event_flags) { int web_input_event_modifiers = 0; if (aura_event_flags & ui::EF_SHIFT_DOWN) - web_input_event_modifiers |= WebKit::WebInputEvent::ShiftKey; + web_input_event_modifiers |= blink::WebInputEvent::ShiftKey; if (aura_event_flags & ui::EF_CONTROL_DOWN) - web_input_event_modifiers |= WebKit::WebInputEvent::ControlKey; + web_input_event_modifiers |= blink::WebInputEvent::ControlKey; if (aura_event_flags & ui::EF_ALT_DOWN) - web_input_event_modifiers |= WebKit::WebInputEvent::AltKey; + web_input_event_modifiers |= blink::WebInputEvent::AltKey; if (aura_event_flags & ui::EF_COMMAND_DOWN) - web_input_event_modifiers |= WebKit::WebInputEvent::MetaKey; + web_input_event_modifiers |= blink::WebInputEvent::MetaKey; return web_input_event_modifiers; } @@ -807,7 +807,7 @@ WebContentsViewAura::WebContentsViewAura( WebContentsViewDelegate* delegate) : web_contents_(web_contents), delegate_(delegate), - current_drag_op_(WebKit::WebDragOperationNone), + current_drag_op_(blink::WebDragOperationNone), drag_dest_delegate_(NULL), current_rvh_for_drag_(NULL), overscroll_change_brightness_(false), @@ -850,7 +850,7 @@ void WebContentsViewAura::SizeChangedCommon(const gfx::Size& size) { rwhv->SetSize(size); } -void WebContentsViewAura::EndDrag(WebKit::WebDragOperationsMask ops) { +void WebContentsViewAura::EndDrag(blink::WebDragOperationsMask ops) { aura::Window* root_window = GetNativeView()->GetRootWindow(); gfx::Point screen_loc = gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(); @@ -1265,7 +1265,7 @@ void WebContentsViewAura::ShowPopupMenu(const gfx::Rect& bounds, void WebContentsViewAura::StartDragging( const DropData& drop_data, - WebKit::WebDragOperationsMask operations, + blink::WebDragOperationsMask operations, const gfx::ImageSkia& image, const gfx::Vector2d& image_offset, const DragEventSourceInfo& event_info) { @@ -1321,7 +1321,7 @@ void WebContentsViewAura::StartDragging( web_contents_->SystemDragEnded(); } -void WebContentsViewAura::UpdateDragCursor(WebKit::WebDragOperation operation) { +void WebContentsViewAura::UpdateDragCursor(blink::WebDragOperation operation) { current_drag_op_ = operation; } @@ -1579,7 +1579,7 @@ void WebContentsViewAura::OnDragEntered(const ui::DropTargetEvent& event) { current_drop_data_.reset(new DropData()); PrepareDropData(current_drop_data_.get(), event.data()); - WebKit::WebDragOperationsMask op = ConvertToWeb(event.source_operations()); + blink::WebDragOperationsMask op = ConvertToWeb(event.source_operations()); gfx::Point screen_pt = gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(); @@ -1599,7 +1599,7 @@ int WebContentsViewAura::OnDragUpdated(const ui::DropTargetEvent& event) { if (current_rvh_for_drag_ != web_contents_->GetRenderViewHost()) OnDragEntered(event); - WebKit::WebDragOperationsMask op = ConvertToWeb(event.source_operations()); + blink::WebDragOperationsMask op = ConvertToWeb(event.source_operations()); gfx::Point screen_pt = gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(); web_contents_->GetRenderViewHost()->DragTargetDragOver( diff --git a/content/browser/web_contents/web_contents_view_aura.h b/content/browser/web_contents/web_contents_view_aura.h index e7e59fd..7d377b0 100644 --- a/content/browser/web_contents/web_contents_view_aura.h +++ b/content/browser/web_contents/web_contents_view_aura.h @@ -55,7 +55,7 @@ class CONTENT_EXPORT WebContentsViewAura void SizeChangedCommon(const gfx::Size& size); - void EndDrag(WebKit::WebDragOperationsMask ops); + void EndDrag(blink::WebDragOperationsMask ops); // Creates and sets up the overlay window that will be displayed during the // overscroll gesture. @@ -133,11 +133,11 @@ class CONTENT_EXPORT WebContentsViewAura bool right_aligned, bool allow_multiple_selection) OVERRIDE; virtual void StartDragging(const DropData& drop_data, - WebKit::WebDragOperationsMask operations, + blink::WebDragOperationsMask operations, const gfx::ImageSkia& image, const gfx::Vector2d& image_offset, const DragEventSourceInfo& event_info) OVERRIDE; - virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE; + virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE; virtual void GotFocus() OVERRIDE; virtual void TakeFocus(bool reverse) OVERRIDE; @@ -196,7 +196,7 @@ class CONTENT_EXPORT WebContentsViewAura scoped_ptr<WebContentsViewDelegate> delegate_; - WebKit::WebDragOperationsMask current_drag_op_; + blink::WebDragOperationsMask current_drag_op_; scoped_ptr<DropData> current_drop_data_; diff --git a/content/browser/web_contents/web_contents_view_gtk.cc b/content/browser/web_contents/web_contents_view_gtk.cc index a3cbb0e..4e3874f 100644 --- a/content/browser/web_contents/web_contents_view_gtk.cc +++ b/content/browser/web_contents/web_contents_view_gtk.cc @@ -29,8 +29,8 @@ #include "ui/gfx/rect.h" #include "ui/gfx/size.h" -using WebKit::WebDragOperation; -using WebKit::WebDragOperationsMask; +using blink::WebDragOperation; +using blink::WebDragOperationsMask; namespace content { namespace { diff --git a/content/browser/web_contents/web_contents_view_gtk.h b/content/browser/web_contents/web_contents_view_gtk.h index 4a456fc..41f84ab 100644 --- a/content/browser/web_contents/web_contents_view_gtk.h +++ b/content/browser/web_contents/web_contents_view_gtk.h @@ -81,11 +81,11 @@ class CONTENT_EXPORT WebContentsViewGtk bool right_aligned, bool allow_multiple_selection) OVERRIDE; virtual void StartDragging(const DropData& drop_data, - WebKit::WebDragOperationsMask allowed_ops, + blink::WebDragOperationsMask allowed_ops, const gfx::ImageSkia& image, const gfx::Vector2d& image_offset, const DragEventSourceInfo& event_info) OVERRIDE; - virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE; + virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE; virtual void GotFocus() OVERRIDE; virtual void TakeFocus(bool reverse) OVERRIDE; diff --git a/content/browser/web_contents/web_contents_view_guest.cc b/content/browser/web_contents/web_contents_view_guest.cc index 8d70a56..ac236da 100644 --- a/content/browser/web_contents/web_contents_view_guest.cc +++ b/content/browser/web_contents/web_contents_view_guest.cc @@ -25,8 +25,8 @@ #include "ui/aura/window.h" #endif -using WebKit::WebDragOperation; -using WebKit::WebDragOperationsMask; +using blink::WebDragOperation; +using blink::WebDragOperationsMask; namespace content { diff --git a/content/browser/web_contents/web_contents_view_guest.h b/content/browser/web_contents/web_contents_view_guest.h index 81bf8d9..1e1d812 100644 --- a/content/browser/web_contents/web_contents_view_guest.h +++ b/content/browser/web_contents/web_contents_view_guest.h @@ -84,11 +84,11 @@ class CONTENT_EXPORT WebContentsViewGuest bool right_aligned, bool allow_multiple_selection) OVERRIDE; virtual void StartDragging(const DropData& drop_data, - WebKit::WebDragOperationsMask allowed_ops, + blink::WebDragOperationsMask allowed_ops, const gfx::ImageSkia& image, const gfx::Vector2d& image_offset, const DragEventSourceInfo& event_info) OVERRIDE; - virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE; + virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE; virtual void GotFocus() OVERRIDE; virtual void TakeFocus(bool reverse) OVERRIDE; diff --git a/content/browser/web_contents/web_contents_view_mac.h b/content/browser/web_contents/web_contents_view_mac.h index a8e7bb3..3d0b94f 100644 --- a/content/browser/web_contents/web_contents_view_mac.h +++ b/content/browser/web_contents/web_contents_view_mac.h @@ -105,11 +105,11 @@ class WebContentsViewMac : public WebContentsViewPort, bool right_aligned, bool allow_multiple_selection) OVERRIDE; virtual void StartDragging(const DropData& drop_data, - WebKit::WebDragOperationsMask allowed_operations, + blink::WebDragOperationsMask allowed_operations, const gfx::ImageSkia& image, const gfx::Vector2d& image_offset, const DragEventSourceInfo& event_info) OVERRIDE; - virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE; + virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE; virtual void GotFocus() OVERRIDE; virtual void TakeFocus(bool reverse) OVERRIDE; diff --git a/content/browser/web_contents/web_contents_view_mac.mm b/content/browser/web_contents/web_contents_view_mac.mm index d1ab628..4283ca9 100644 --- a/content/browser/web_contents/web_contents_view_mac.mm +++ b/content/browser/web_contents/web_contents_view_mac.mm @@ -28,8 +28,8 @@ #include "ui/base/dragdrop/cocoa_dnd_util.h" #include "ui/gfx/image/image_skia_util_mac.h" -using WebKit::WebDragOperation; -using WebKit::WebDragOperationsMask; +using blink::WebDragOperation; +using blink::WebDragOperationsMask; using content::DropData; using content::PopupMenuHelper; using content::RenderViewHostFactory; @@ -39,10 +39,10 @@ using content::WebContents; using content::WebContentsImpl; using content::WebContentsViewMac; -// Ensure that the WebKit::WebDragOperation enum values stay in sync with +// Ensure that the blink::WebDragOperation enum values stay in sync with // NSDragOperation constants, since the code below static_casts between 'em. #define COMPILE_ASSERT_MATCHING_ENUM(name) \ - COMPILE_ASSERT(int(NS##name) == int(WebKit::Web##name), enum_mismatch_##name) + COMPILE_ASSERT(int(NS##name) == int(blink::Web##name), enum_mismatch_##name) COMPILE_ASSERT_MATCHING_ENUM(DragOperationNone); COMPILE_ASSERT_MATCHING_ENUM(DragOperationCopy); COMPILE_ASSERT_MATCHING_ENUM(DragOperationLink); diff --git a/content/browser/web_contents/web_contents_view_win.cc b/content/browser/web_contents/web_contents_view_win.cc index 5c64162..92548d2 100644 --- a/content/browser/web_contents/web_contents_view_win.cc +++ b/content/browser/web_contents/web_contents_view_win.cc @@ -261,7 +261,7 @@ void WebContentsViewWin::ShowPopupMenu(const gfx::Rect& bounds, } void WebContentsViewWin::StartDragging(const DropData& drop_data, - WebKit::WebDragOperationsMask operations, + blink::WebDragOperationsMask operations, const gfx::ImageSkia& image, const gfx::Vector2d& image_offset, const DragEventSourceInfo& event_info) { @@ -273,7 +273,7 @@ void WebContentsViewWin::StartDragging(const DropData& drop_data, drag_handler_->StartDragging(drop_data, operations, image, image_offset); } -void WebContentsViewWin::UpdateDragCursor(WebKit::WebDragOperation operation) { +void WebContentsViewWin::UpdateDragCursor(blink::WebDragOperation operation) { drag_dest_->set_drag_cursor(operation); } diff --git a/content/browser/web_contents/web_contents_view_win.h b/content/browser/web_contents/web_contents_view_win.h index adfe675..505addd 100644 --- a/content/browser/web_contents/web_contents_view_win.h +++ b/content/browser/web_contents/web_contents_view_win.h @@ -88,11 +88,11 @@ class CONTENT_EXPORT WebContentsViewWin bool right_aligned, bool allow_multiple_selection) OVERRIDE; virtual void StartDragging(const DropData& drop_data, - WebKit::WebDragOperationsMask operations, + blink::WebDragOperationsMask operations, const gfx::ImageSkia& image, const gfx::Vector2d& image_offset, const DragEventSourceInfo& event_info) OVERRIDE; - virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE; + virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE; virtual void GotFocus() OVERRIDE; virtual void TakeFocus(bool reverse) OVERRIDE; diff --git a/content/browser/web_contents/web_drag_dest_gtk.cc b/content/browser/web_contents/web_drag_dest_gtk.cc index 55f0d9c..bb9a4d4 100644 --- a/content/browser/web_contents/web_drag_dest_gtk.cc +++ b/content/browser/web_contents/web_drag_dest_gtk.cc @@ -22,8 +22,8 @@ #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/gtk/gtk_screen_util.h" -using WebKit::WebDragOperation; -using WebKit::WebDragOperationNone; +using blink::WebDragOperation; +using blink::WebDragOperationNone; namespace content { @@ -36,13 +36,13 @@ int GetModifierFlags(GtkWidget* widget) { gdk_window_get_pointer(gtk_widget_get_window(widget), NULL, NULL, &state); if (state & GDK_SHIFT_MASK) - modifier_state |= WebKit::WebInputEvent::ShiftKey; + modifier_state |= blink::WebInputEvent::ShiftKey; if (state & GDK_CONTROL_MASK) - modifier_state |= WebKit::WebInputEvent::ControlKey; + modifier_state |= blink::WebInputEvent::ControlKey; if (state & GDK_MOD1_MASK) - modifier_state |= WebKit::WebInputEvent::AltKey; + modifier_state |= blink::WebInputEvent::AltKey; if (state & GDK_META_MASK) - modifier_state |= WebKit::WebInputEvent::MetaKey; + modifier_state |= blink::WebInputEvent::MetaKey; return modifier_state; } diff --git a/content/browser/web_contents/web_drag_dest_gtk.h b/content/browser/web_contents/web_drag_dest_gtk.h index b912afa..7258e1b 100644 --- a/content/browser/web_contents/web_drag_dest_gtk.h +++ b/content/browser/web_contents/web_drag_dest_gtk.h @@ -32,7 +32,7 @@ class CONTENT_EXPORT WebDragDestGtk { // This is called when the renderer responds to a drag motion event. We must // update the system drag cursor. - void UpdateDragStatus(WebKit::WebDragOperation operation); + void UpdateDragStatus(blink::WebDragOperation operation); // Informs the renderer when a system drag has left the render view. // See OnDragLeave(). diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm index 8a529e8..b3fefca 100644 --- a/content/browser/web_contents/web_drag_dest_mac.mm +++ b/content/browser/web_contents/web_drag_dest_mac.mm @@ -18,7 +18,7 @@ #import "ui/base/dragdrop/cocoa_dnd_util.h" #include "ui/base/window_open_disposition.h" -using WebKit::WebDragOperationsMask; +using blink::WebDragOperationsMask; using content::DropData; using content::OpenURLParams; using content::Referrer; @@ -28,13 +28,13 @@ int GetModifierFlags() { int modifier_state = 0; UInt32 currentModifiers = GetCurrentKeyModifiers(); if (currentModifiers & ::shiftKey) - modifier_state |= WebKit::WebInputEvent::ShiftKey; + modifier_state |= blink::WebInputEvent::ShiftKey; if (currentModifiers & ::controlKey) - modifier_state |= WebKit::WebInputEvent::ControlKey; + modifier_state |= blink::WebInputEvent::ControlKey; if (currentModifiers & ::optionKey) - modifier_state |= WebKit::WebInputEvent::AltKey; + modifier_state |= blink::WebInputEvent::AltKey; if (currentModifiers & ::cmdKey) - modifier_state |= WebKit::WebInputEvent::MetaKey; + modifier_state |= blink::WebInputEvent::MetaKey; return modifier_state; } diff --git a/content/browser/web_contents/web_drag_dest_win.cc b/content/browser/web_contents/web_drag_dest_win.cc index 60f0c05..e497f86 100644 --- a/content/browser/web_contents/web_drag_dest_win.cc +++ b/content/browser/web_contents/web_drag_dest_win.cc @@ -23,11 +23,11 @@ #include "ui/gfx/point.h" #include "url/gurl.h" -using WebKit::WebDragOperationNone; -using WebKit::WebDragOperationCopy; -using WebKit::WebDragOperationLink; -using WebKit::WebDragOperationMove; -using WebKit::WebDragOperationGeneric; +using blink::WebDragOperationNone; +using blink::WebDragOperationCopy; +using blink::WebDragOperationLink; +using blink::WebDragOperationMove; +using blink::WebDragOperationGeneric; namespace content { namespace { @@ -48,15 +48,15 @@ DWORD GetPreferredDropEffect(DWORD effect) { int GetModifierFlags() { int modifier_state = 0; if (base::win::IsShiftPressed()) - modifier_state |= WebKit::WebInputEvent::ShiftKey; + modifier_state |= blink::WebInputEvent::ShiftKey; if (base::win::IsCtrlPressed()) - modifier_state |= WebKit::WebInputEvent::ControlKey; + modifier_state |= blink::WebInputEvent::ControlKey; if (base::win::IsAltPressed()) - modifier_state |= WebKit::WebInputEvent::AltKey; + modifier_state |= blink::WebInputEvent::AltKey; if (::GetKeyState(VK_LWIN) & kHighBitMaskShort) - modifier_state |= WebKit::WebInputEvent::MetaKey; + modifier_state |= blink::WebInputEvent::MetaKey; if (::GetKeyState(VK_RWIN) & kHighBitMaskShort) - modifier_state |= WebKit::WebInputEvent::MetaKey; + modifier_state |= blink::WebInputEvent::MetaKey; return modifier_state; } diff --git a/content/browser/web_contents/web_drag_dest_win.h b/content/browser/web_contents/web_drag_dest_win.h index 5ddb7ed..9e3ca8d 100644 --- a/content/browser/web_contents/web_drag_dest_win.h +++ b/content/browser/web_contents/web_drag_dest_win.h @@ -29,7 +29,7 @@ class CONTENT_EXPORT WebDragDest : public ui::DropTargetWin { DropData* current_drop_data() const { return drop_data_.get(); } - void set_drag_cursor(WebKit::WebDragOperation op) { + void set_drag_cursor(blink::WebDragOperation op) { drag_cursor_ = op; } @@ -66,7 +66,7 @@ class CONTENT_EXPORT WebDragDest : public ui::DropTargetWin { // Used to determine what cursor we should display when dragging over web // content area. This can be updated async during a drag operation. - WebKit::WebDragOperation drag_cursor_; + blink::WebDragOperation drag_cursor_; // A special drop target handler for when we try to d&d while an interstitial // page is showing. diff --git a/content/browser/web_contents/web_drag_source_gtk.cc b/content/browser/web_contents/web_drag_source_gtk.cc index 0ad27de..2f9e587 100644 --- a/content/browser/web_contents/web_drag_source_gtk.cc +++ b/content/browser/web_contents/web_drag_source_gtk.cc @@ -28,9 +28,9 @@ #include "ui/gfx/gtk_compat.h" #include "ui/gfx/gtk_util.h" -using WebKit::WebDragOperation; -using WebKit::WebDragOperationsMask; -using WebKit::WebDragOperationNone; +using blink::WebDragOperation; +using blink::WebDragOperationsMask; +using blink::WebDragOperationNone; namespace content { diff --git a/content/browser/web_contents/web_drag_source_gtk.h b/content/browser/web_contents/web_drag_source_gtk.h index bcf9a01..577f60b 100644 --- a/content/browser/web_contents/web_drag_source_gtk.h +++ b/content/browser/web_contents/web_drag_source_gtk.h @@ -39,7 +39,7 @@ class CONTENT_EXPORT WebDragSourceGtk : // Starts a drag for the WebContents this WebDragSourceGtk was created for. // Returns false if the drag could not be started. bool StartDragging(const DropData& drop_data, - WebKit::WebDragOperationsMask allowed_ops, + blink::WebDragOperationsMask allowed_ops, GdkEventButton* last_mouse_down, const SkBitmap& image, const gfx::Vector2d& image_offset); diff --git a/content/browser/web_contents/web_drag_source_mac.mm b/content/browser/web_contents/web_drag_source_mac.mm index 0417379..805e73b 100644 --- a/content/browser/web_contents/web_drag_source_mac.mm +++ b/content/browser/web_contents/web_drag_source_mac.mm @@ -285,7 +285,7 @@ void PromiseWriterHelper(const DropData& drop_data, operation &= ~NSDragOperationMove; contents_->DragSourceEndedAt(localPoint.x, localPoint.y, screenPoint.x, - screenPoint.y, static_cast<WebKit::WebDragOperation>(operation)); + screenPoint.y, static_cast<blink::WebDragOperation>(operation)); } // Make sure the pasteboard owner isn't us. diff --git a/content/browser/web_contents/web_drag_source_win.cc b/content/browser/web_contents/web_drag_source_win.cc index 77dc4c4..6697d73 100644 --- a/content/browser/web_contents/web_drag_source_win.cc +++ b/content/browser/web_contents/web_drag_source_win.cc @@ -13,7 +13,7 @@ #include "content/public/browser/notification_types.h" #include "ui/base/dragdrop/os_exchange_data.h" -using WebKit::WebDragOperationNone; +using blink::WebDragOperationNone; namespace content { namespace { diff --git a/content/browser/web_contents/web_drag_utils_win.cc b/content/browser/web_contents/web_drag_utils_win.cc index bada245..8558c82 100644 --- a/content/browser/web_contents/web_drag_utils_win.cc +++ b/content/browser/web_contents/web_drag_utils_win.cc @@ -7,13 +7,13 @@ #include <oleidl.h> #include "base/logging.h" -using WebKit::WebDragOperation; -using WebKit::WebDragOperationsMask; -using WebKit::WebDragOperationNone; -using WebKit::WebDragOperationCopy; -using WebKit::WebDragOperationLink; -using WebKit::WebDragOperationMove; -using WebKit::WebDragOperationGeneric; +using blink::WebDragOperation; +using blink::WebDragOperationsMask; +using blink::WebDragOperationNone; +using blink::WebDragOperationCopy; +using blink::WebDragOperationLink; +using blink::WebDragOperationMove; +using blink::WebDragOperationGeneric; namespace content { diff --git a/content/browser/web_contents/web_drag_utils_win.h b/content/browser/web_contents/web_drag_utils_win.h index 8721da9..d45cb8e 100644 --- a/content/browser/web_contents/web_drag_utils_win.h +++ b/content/browser/web_contents/web_drag_utils_win.h @@ -11,11 +11,11 @@ namespace content { -WebKit::WebDragOperation WinDragOpToWebDragOp(DWORD effect); -WebKit::WebDragOperationsMask WinDragOpMaskToWebDragOpMask(DWORD effects); +blink::WebDragOperation WinDragOpToWebDragOp(DWORD effect); +blink::WebDragOperationsMask WinDragOpMaskToWebDragOpMask(DWORD effects); -DWORD WebDragOpToWinDragOp(WebKit::WebDragOperation op); -DWORD WebDragOpMaskToWinDragOpMask(WebKit::WebDragOperationsMask ops); +DWORD WebDragOpToWinDragOp(blink::WebDragOperation op); +DWORD WebDragOpMaskToWinDragOpMask(blink::WebDragOperationsMask ops); } // namespace content |