diff options
Diffstat (limited to 'content/renderer')
336 files changed, 3878 insertions, 3878 deletions
diff --git a/content/renderer/accessibility/accessibility_node_serializer.cc b/content/renderer/accessibility/accessibility_node_serializer.cc index 488b693..39fa245 100644 --- a/content/renderer/accessibility/accessibility_node_serializer.cc +++ b/content/renderer/accessibility/accessibility_node_serializer.cc @@ -23,12 +23,12 @@ #include "third_party/WebKit/public/web/WebInputElement.h" #include "third_party/WebKit/public/web/WebNode.h" -using WebKit::WebAXObject; -using WebKit::WebDocument; -using WebKit::WebDocumentType; -using WebKit::WebElement; -using WebKit::WebNode; -using WebKit::WebVector; +using blink::WebAXObject; +using blink::WebDocument; +using blink::WebDocumentType; +using blink::WebElement; +using blink::WebNode; +using blink::WebVector; namespace content { namespace { @@ -55,71 +55,71 @@ bool IsParentUnignoredOf(const WebAXObject& ancestor, uint32 ConvertState(const WebAXObject& o) { uint32 state = 0; if (o.isChecked()) - state |= (1 << WebKit::WebAXStateChecked); + state |= (1 << blink::WebAXStateChecked); if (o.isCollapsed()) - state |= (1 << WebKit::WebAXStateCollapsed); + state |= (1 << blink::WebAXStateCollapsed); if (o.canSetFocusAttribute()) - state |= (1 << WebKit::WebAXStateFocusable); + state |= (1 << blink::WebAXStateFocusable); if (o.isFocused()) - state |= (1 << WebKit::WebAXStateFocused); + state |= (1 << blink::WebAXStateFocused); - if (o.role() == WebKit::WebAXRolePopUpButton || + if (o.role() == blink::WebAXRolePopUpButton || o.ariaHasPopup()) { - state |= (1 << WebKit::WebAXStateHaspopup); + state |= (1 << blink::WebAXStateHaspopup); if (!o.isCollapsed()) - state |= (1 << WebKit::WebAXStateExpanded); + state |= (1 << blink::WebAXStateExpanded); } if (o.isHovered()) - state |= (1 << WebKit::WebAXStateHovered); + state |= (1 << blink::WebAXStateHovered); if (o.isIndeterminate()) - state |= (1 << WebKit::WebAXStateIndeterminate); + state |= (1 << blink::WebAXStateIndeterminate); if (!o.isVisible()) - state |= (1 << WebKit::WebAXStateInvisible); + state |= (1 << blink::WebAXStateInvisible); if (o.isLinked()) - state |= (1 << WebKit::WebAXStateLinked); + state |= (1 << blink::WebAXStateLinked); if (o.isMultiSelectable()) - state |= (1 << WebKit::WebAXStateMultiselectable); + state |= (1 << blink::WebAXStateMultiselectable); if (o.isOffScreen()) - state |= (1 << WebKit::WebAXStateOffscreen); + state |= (1 << blink::WebAXStateOffscreen); if (o.isPressed()) - state |= (1 << WebKit::WebAXStatePressed); + state |= (1 << blink::WebAXStatePressed); if (o.isPasswordField()) - state |= (1 << WebKit::WebAXStateProtected); + state |= (1 << blink::WebAXStateProtected); if (o.isReadOnly()) - state |= (1 << WebKit::WebAXStateReadonly); + state |= (1 << blink::WebAXStateReadonly); if (o.isRequired()) - state |= (1 << WebKit::WebAXStateRequired); + state |= (1 << blink::WebAXStateRequired); if (o.canSetSelectedAttribute()) - state |= (1 << WebKit::WebAXStateSelectable); + state |= (1 << blink::WebAXStateSelectable); if (o.isSelected()) - state |= (1 << WebKit::WebAXStateSelected); + state |= (1 << blink::WebAXStateSelected); if (o.isVisited()) - state |= (1 << WebKit::WebAXStateVisited); + state |= (1 << blink::WebAXStateVisited); if (o.isEnabled()) - state |= (1 << WebKit::WebAXStateEnabled); + state |= (1 << blink::WebAXStateEnabled); if (o.isVertical()) - state |= (1 << WebKit::WebAXStateVertical); + state |= (1 << blink::WebAXStateVertical); if (o.isVisited()) - state |= (1 << WebKit::WebAXStateVisited); + state |= (1 << blink::WebAXStateVisited); return state; } @@ -143,7 +143,7 @@ void SerializeAccessibilityNode( dst->AddStringAttribute(dst->ATTR_VALUE, UTF16ToUTF8(src.stringValue())); } - if (dst->role == WebKit::WebAXRoleColorWell) { + if (dst->role == blink::WebAXRoleColorWell) { int r, g, b; src.colorValue(r, g, b); dst->AddIntAttribute(dst->ATTR_COLOR_VALUE_RED, r); @@ -151,7 +151,7 @@ void SerializeAccessibilityNode( dst->AddIntAttribute(dst->ATTR_COLOR_VALUE_BLUE, b); } - if (dst->role == WebKit::WebAXRoleInlineTextBox) { + if (dst->role == blink::WebAXRoleInlineTextBox) { dst->AddIntAttribute(dst->ATTR_TEXT_DIRECTION, src.textDirection()); WebVector<int> src_character_offsets; @@ -208,18 +208,18 @@ void SerializeAccessibilityNode( if (!src.url().isEmpty()) dst->AddStringAttribute(dst->ATTR_URL, src.url().spec()); - if (dst->role == WebKit::WebAXRoleHeading) + if (dst->role == blink::WebAXRoleHeading) dst->AddIntAttribute(dst->ATTR_HIERARCHICAL_LEVEL, src.headingLevel()); - else if ((dst->role == WebKit::WebAXRoleTreeItem || - dst->role == WebKit::WebAXRoleRow) && + else if ((dst->role == blink::WebAXRoleTreeItem || + dst->role == blink::WebAXRoleRow) && src.hierarchicalLevel() > 0) { dst->AddIntAttribute(dst->ATTR_HIERARCHICAL_LEVEL, src.hierarchicalLevel()); } // Treat the active list box item as focused. - if (dst->role == WebKit::WebAXRoleListBoxOption && + if (dst->role == blink::WebAXRoleListBoxOption && src.isSelectedOptionActive()) { - dst->state |= (1 << WebKit::WebAXStateFocused); + dst->state |= (1 << blink::WebAXStateFocused); } if (src.canvasHasFallbackContent()) @@ -237,7 +237,7 @@ void SerializeAccessibilityNode( is_iframe = (element.tagName() == ASCIIToUTF16("IFRAME")); if (LowerCaseEqualsASCII(element.getAttribute("aria-expanded"), "true")) - dst->state |= (1 << WebKit::WebAXStateExpanded); + dst->state |= (1 << blink::WebAXStateExpanded); // TODO(ctguil): The tagName in WebKit is lower cased but // HTMLElement::nodeName calls localNameUpper. Consider adding @@ -252,9 +252,9 @@ void SerializeAccessibilityNode( dst->html_attributes.push_back(std::make_pair(name, value)); } - if (dst->role == WebKit::WebAXRoleEditableText || - dst->role == WebKit::WebAXRoleTextArea || - dst->role == WebKit::WebAXRoleTextField) { + if (dst->role == blink::WebAXRoleEditableText || + dst->role == blink::WebAXRoleTextArea || + dst->role == blink::WebAXRoleTextField) { dst->AddIntAttribute(dst->ATTR_TEXT_SEL_START, src.selectionStart()); dst->AddIntAttribute(dst->ATTR_TEXT_SEL_END, src.selectionEnd()); @@ -342,10 +342,10 @@ void SerializeAccessibilityNode( container_live_relevant); } - if (dst->role == WebKit::WebAXRoleProgressIndicator || - dst->role == WebKit::WebAXRoleScrollBar || - dst->role == WebKit::WebAXRoleSlider || - dst->role == WebKit::WebAXRoleSpinButton) { + if (dst->role == blink::WebAXRoleProgressIndicator || + dst->role == blink::WebAXRoleScrollBar || + dst->role == blink::WebAXRoleSlider || + dst->role == blink::WebAXRoleSpinButton) { dst->AddFloatAttribute(dst->ATTR_VALUE_FOR_RANGE, src.valueForRange()); dst->AddFloatAttribute(dst->ATTR_MAX_VALUE_FOR_RANGE, src.maxValueForRange()); @@ -353,8 +353,8 @@ void SerializeAccessibilityNode( src.minValueForRange()); } - if (dst->role == WebKit::WebAXRoleDocument || - dst->role == WebKit::WebAXRoleWebArea) { + if (dst->role == blink::WebAXRoleDocument || + dst->role == blink::WebAXRoleWebArea) { dst->AddStringAttribute(dst->ATTR_HTML_TAG, "#document"); const WebDocument& document = src.document(); if (name.empty()) @@ -387,7 +387,7 @@ void SerializeAccessibilityNode( dst->AddIntAttribute(dst->ATTR_SCROLL_Y_MAX, max_offset.height()); } - if (dst->role == WebKit::WebAXRoleTable) { + if (dst->role == blink::WebAXRoleTable) { int column_count = src.columnCount(); int row_count = src.rowCount(); if (column_count > 0 && row_count > 0) { @@ -417,23 +417,23 @@ void SerializeAccessibilityNode( } } - if (dst->role == WebKit::WebAXRoleRow) { + if (dst->role == blink::WebAXRoleRow) { dst->AddIntAttribute(dst->ATTR_TABLE_ROW_INDEX, src.rowIndex()); WebAXObject header = src.rowHeader(); if (!header.isDetached()) dst->AddIntAttribute(dst->ATTR_TABLE_ROW_HEADER_ID, header.axID()); } - if (dst->role == WebKit::WebAXRoleColumn) { + if (dst->role == blink::WebAXRoleColumn) { dst->AddIntAttribute(dst->ATTR_TABLE_COLUMN_INDEX, src.columnIndex()); WebAXObject header = src.columnHeader(); if (!header.isDetached()) dst->AddIntAttribute(dst->ATTR_TABLE_COLUMN_HEADER_ID, header.axID()); } - if (dst->role == WebKit::WebAXRoleCell || - dst->role == WebKit::WebAXRoleRowHeader || - dst->role == WebKit::WebAXRoleColumnHeader) { + if (dst->role == blink::WebAXRoleCell || + dst->role == blink::WebAXRoleRowHeader || + dst->role == blink::WebAXRoleColumnHeader) { dst->AddIntAttribute(dst->ATTR_TABLE_CELL_COLUMN_INDEX, src.cellColumnIndex()); dst->AddIntAttribute(dst->ATTR_TABLE_CELL_COLUMN_SPAN, @@ -466,10 +466,10 @@ bool ShouldIncludeChildNode( const WebAXObject& parent, const WebAXObject& child) { switch(parent.role()) { - case WebKit::WebAXRoleSlider: - case WebKit::WebAXRoleEditableText: - case WebKit::WebAXRoleTextArea: - case WebKit::WebAXRoleTextField: + case blink::WebAXRoleSlider: + case blink::WebAXRoleEditableText: + case blink::WebAXRoleTextArea: + case blink::WebAXRoleTextField: return false; default: break; diff --git a/content/renderer/accessibility/accessibility_node_serializer.h b/content/renderer/accessibility/accessibility_node_serializer.h index 24e7e9e..374a79d 100644 --- a/content/renderer/accessibility/accessibility_node_serializer.h +++ b/content/renderer/accessibility/accessibility_node_serializer.h @@ -11,12 +11,12 @@ namespace content { void SerializeAccessibilityNode( - const WebKit::WebAXObject& src, + const blink::WebAXObject& src, AccessibilityNodeData* dst); bool ShouldIncludeChildNode( - const WebKit::WebAXObject& parent, - const WebKit::WebAXObject& child); + const blink::WebAXObject& parent, + const blink::WebAXObject& child); } // namespace content diff --git a/content/renderer/accessibility/renderer_accessibility.cc b/content/renderer/accessibility/renderer_accessibility.cc index cf2ecd6..18eb78f 100644 --- a/content/renderer/accessibility/renderer_accessibility.cc +++ b/content/renderer/accessibility/renderer_accessibility.cc @@ -12,10 +12,10 @@ #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebView.h" -using WebKit::WebAXObject; -using WebKit::WebDocument; -using WebKit::WebFrame; -using WebKit::WebView; +using blink::WebAXObject; +using blink::WebDocument; +using blink::WebFrame; +using blink::WebView; namespace content { @@ -44,59 +44,59 @@ WebDocument RendererAccessibility::GetMainDocument() { #ifndef NDEBUG const std::string RendererAccessibility::AccessibilityEventToString( - WebKit::WebAXEvent event) { + blink::WebAXEvent event) { switch (event) { - case WebKit::WebAXEventActiveDescendantChanged: + case blink::WebAXEventActiveDescendantChanged: return "active descendant changed"; - case WebKit::WebAXEventAriaAttributeChanged: + case blink::WebAXEventAriaAttributeChanged: return "aria attribute changed"; - case WebKit::WebAXEventAutocorrectionOccured: + case blink::WebAXEventAutocorrectionOccured: return "autocorrection occurred"; - case WebKit::WebAXEventBlur: + case blink::WebAXEventBlur: return "blur"; - case WebKit::WebAXEventAlert: + case blink::WebAXEventAlert: return "alert"; - case WebKit::WebAXEventCheckedStateChanged: + case blink::WebAXEventCheckedStateChanged: return "check state changed"; - case WebKit::WebAXEventChildrenChanged: + case blink::WebAXEventChildrenChanged: return "children changed"; - case WebKit::WebAXEventFocus: + case blink::WebAXEventFocus: return "focus changed"; - case WebKit::WebAXEventInvalidStatusChanged: + case blink::WebAXEventInvalidStatusChanged: return "invalid status changed"; - case WebKit::WebAXEventLayoutComplete: + case blink::WebAXEventLayoutComplete: return "layout complete"; - case WebKit::WebAXEventLiveRegionChanged: + case blink::WebAXEventLiveRegionChanged: return "live region changed"; - case WebKit::WebAXEventLoadComplete: + case blink::WebAXEventLoadComplete: return "load complete"; - case WebKit::WebAXEventMenuListItemSelected: + case blink::WebAXEventMenuListItemSelected: return "menu list item selected"; - case WebKit::WebAXEventMenuListValueChanged: + case blink::WebAXEventMenuListValueChanged: return "menu list changed"; - case WebKit::WebAXEventShow: + case blink::WebAXEventShow: return "object show"; - case WebKit::WebAXEventHide: + case blink::WebAXEventHide: return "object hide"; - case WebKit::WebAXEventRowCountChanged: + case blink::WebAXEventRowCountChanged: return "row count changed"; - case WebKit::WebAXEventRowCollapsed: + case blink::WebAXEventRowCollapsed: return "row collapsed"; - case WebKit::WebAXEventRowExpanded: + case blink::WebAXEventRowExpanded: return "row expanded"; - case WebKit::WebAXEventScrolledToAnchor: + case blink::WebAXEventScrolledToAnchor: return "scrolled to anchor"; - case WebKit::WebAXEventSelectedChildrenChanged: + case blink::WebAXEventSelectedChildrenChanged: return "selected children changed"; - case WebKit::WebAXEventSelectedTextChanged: + case blink::WebAXEventSelectedTextChanged: return "selected text changed"; - case WebKit::WebAXEventTextChanged: + case blink::WebAXEventTextChanged: return "text changed"; - case WebKit::WebAXEventTextInserted: + case blink::WebAXEventTextInserted: return "text inserted"; - case WebKit::WebAXEventTextRemoved: + case blink::WebAXEventTextRemoved: return "text removed"; - case WebKit::WebAXEventValueChanged: + case blink::WebAXEventValueChanged: return "value changed"; default: NOTREACHED(); diff --git a/content/renderer/accessibility/renderer_accessibility.h b/content/renderer/accessibility/renderer_accessibility.h index 93799ea..cc157ff 100644 --- a/content/renderer/accessibility/renderer_accessibility.h +++ b/content/renderer/accessibility/renderer_accessibility.h @@ -9,7 +9,7 @@ #include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/public/web/WebAXObject.h" -namespace WebKit { +namespace blink { class WebDocument; }; @@ -55,15 +55,15 @@ class CONTENT_EXPORT RendererAccessibility : public RenderViewObserver { // Called when an accessibility notification occurs in WebKit. virtual void HandleWebAccessibilityEvent( - const WebKit::WebAXObject& obj, WebKit::WebAXEvent event) = 0; + const blink::WebAXObject& obj, blink::WebAXEvent event) = 0; protected: // Returns the main top-level document for this page, or NULL if there's // no view or frame. - WebKit::WebDocument GetMainDocument(); + blink::WebDocument GetMainDocument(); #ifndef NDEBUG - const std::string AccessibilityEventToString(WebKit::WebAXEvent event); + const std::string AccessibilityEventToString(blink::WebAXEvent event); #endif // The RenderViewImpl that owns us. diff --git a/content/renderer/accessibility/renderer_accessibility_browsertest.cc b/content/renderer/accessibility/renderer_accessibility_browsertest.cc index b8da316..6cc5550 100644 --- a/content/renderer/accessibility/renderer_accessibility_browsertest.cc +++ b/content/renderer/accessibility/renderer_accessibility_browsertest.cc @@ -14,8 +14,8 @@ #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebView.h" -using WebKit::WebAXObject; -using WebKit::WebDocument; +using blink::WebAXObject; +using blink::WebDocument; namespace content { @@ -102,7 +102,7 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) { SetMode(AccessibilityModeEditableTextOnly); // Set a minimum size and give focus so simulated events work. - view()->webwidget()->resize(WebKit::WebSize(500, 500)); + view()->webwidget()->resize(blink::WebSize(500, 500)); view()->webwidget()->setFocus(true); std::string html = @@ -125,16 +125,16 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) { AccessibilityHostMsg_EventParams event; GetLastAccEvent(&event); EXPECT_EQ(event.event_type, - WebKit::WebAXEventLayoutComplete); + blink::WebAXEventLayoutComplete); EXPECT_EQ(event.id, 1); EXPECT_EQ(event.nodes.size(), 2U); EXPECT_EQ(event.nodes[0].id, 1); EXPECT_EQ(event.nodes[0].role, - WebKit::WebAXRoleRootWebArea); + blink::WebAXRoleRootWebArea); EXPECT_EQ(event.nodes[0].state, - (1U << WebKit::WebAXStateReadonly) | - (1U << WebKit::WebAXStateFocusable) | - (1U << WebKit::WebAXStateFocused)); + (1U << blink::WebAXStateReadonly) | + (1U << blink::WebAXStateFocusable) | + (1U << blink::WebAXStateFocused)); EXPECT_EQ(event.nodes[0].child_ids.size(), 1U); } @@ -146,21 +146,21 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) { AccessibilityHostMsg_EventParams event; GetLastAccEvent(&event); EXPECT_EQ(event.event_type, - WebKit::WebAXEventFocus); + blink::WebAXEventFocus); EXPECT_EQ(event.id, 3); EXPECT_EQ(event.nodes[0].id, 1); EXPECT_EQ(event.nodes[0].role, - WebKit::WebAXRoleRootWebArea); + blink::WebAXRoleRootWebArea); EXPECT_EQ(event.nodes[0].state, - (1U << WebKit::WebAXStateReadonly) | - (1U << WebKit::WebAXStateFocusable)); + (1U << blink::WebAXStateReadonly) | + (1U << blink::WebAXStateFocusable)); EXPECT_EQ(event.nodes[0].child_ids.size(), 1U); EXPECT_EQ(event.nodes[1].id, 3); EXPECT_EQ(event.nodes[1].role, - WebKit::WebAXRoleGroup); + blink::WebAXRoleGroup); EXPECT_EQ(event.nodes[1].state, - (1U << WebKit::WebAXStateFocusable) | - (1U << WebKit::WebAXStateFocused)); + (1U << blink::WebAXStateFocusable) | + (1U << blink::WebAXStateFocused)); } // Check other editable text nodes. @@ -172,8 +172,8 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) { GetLastAccEvent(&event); EXPECT_EQ(event.id, 4); EXPECT_EQ(event.nodes[1].state, - (1U << WebKit::WebAXStateFocusable) | - (1U << WebKit::WebAXStateFocused)); + (1U << blink::WebAXStateFocusable) | + (1U << blink::WebAXStateFocused)); } { @@ -184,8 +184,8 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) { GetLastAccEvent(&event); EXPECT_EQ(event.id, 5); EXPECT_EQ(event.nodes[1].state, - (1U << WebKit::WebAXStateFocusable) | - (1U << WebKit::WebAXStateFocused)); + (1U << blink::WebAXStateFocusable) | + (1U << blink::WebAXStateFocused)); } { @@ -196,8 +196,8 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) { GetLastAccEvent(&event); EXPECT_EQ(event.id, 6); EXPECT_EQ(event.nodes[1].state, - (1U << WebKit::WebAXStateFocusable) | - (1U << WebKit::WebAXStateFocused)); + (1U << blink::WebAXStateFocusable) | + (1U << blink::WebAXStateFocused)); } // Try focusing things that aren't editable text. @@ -209,9 +209,9 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) { GetLastAccEvent(&event); EXPECT_EQ(event.id, 7); EXPECT_EQ(event.nodes[1].state, - (1U << WebKit::WebAXStateFocusable) | - (1U << WebKit::WebAXStateFocused) | - (1U << WebKit::WebAXStateReadonly)); + (1U << blink::WebAXStateFocusable) | + (1U << blink::WebAXStateFocused) | + (1U << blink::WebAXStateReadonly)); } { @@ -222,9 +222,9 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) { GetLastAccEvent(&event); EXPECT_EQ(event.id, 8); EXPECT_EQ(event.nodes[1].state, - (1U << WebKit::WebAXStateFocusable) | - (1U << WebKit::WebAXStateFocused) | - (1U << WebKit::WebAXStateReadonly)); + (1U << blink::WebAXStateFocusable) | + (1U << blink::WebAXStateFocused) | + (1U << blink::WebAXStateReadonly)); } // Clear focus. @@ -269,7 +269,7 @@ TEST_F(RendererAccessibilityTest, SendFullAccessibilityTreeOnReload) { WebAXObject root_obj = document.accessibilityObject(); accessibility->HandleWebAccessibilityEvent( root_obj, - WebKit::WebAXEventLayoutComplete); + blink::WebAXEventLayoutComplete); accessibility->SendPendingAccessibilityEvents(); EXPECT_EQ(4, accessibility->browser_tree_node_count()); EXPECT_EQ(1, CountAccessibilityNodesSentToBrowser()); @@ -289,7 +289,7 @@ TEST_F(RendererAccessibilityTest, SendFullAccessibilityTreeOnReload) { sink_->ClearMessages(); accessibility->HandleWebAccessibilityEvent( root_obj, - WebKit::WebAXEventLayoutComplete); + blink::WebAXEventLayoutComplete); accessibility->SendPendingAccessibilityEvents(); EXPECT_EQ(4, accessibility->browser_tree_node_count()); EXPECT_EQ(4, CountAccessibilityNodesSentToBrowser()); @@ -304,7 +304,7 @@ TEST_F(RendererAccessibilityTest, SendFullAccessibilityTreeOnReload) { const WebAXObject& first_child = root_obj.childAt(0); accessibility->HandleWebAccessibilityEvent( first_child, - WebKit::WebAXEventLiveRegionChanged); + blink::WebAXEventLiveRegionChanged); accessibility->SendPendingAccessibilityEvents(); EXPECT_EQ(4, accessibility->browser_tree_node_count()); EXPECT_EQ(4, CountAccessibilityNodesSentToBrowser()); @@ -343,7 +343,7 @@ TEST_F(RendererAccessibilityTest, WebAXObject root_obj = document.accessibilityObject(); accessibility->HandleWebAccessibilityEvent( root_obj, - WebKit::WebAXEventValueChanged); + blink::WebAXEventValueChanged); view()->OnSwapOut(); accessibility->SendPendingAccessibilityEvents(); EXPECT_FALSE(sink_->GetUniqueMessageMatching( @@ -405,7 +405,7 @@ TEST_F(RendererAccessibilityTest, HideAccessibilityObject) { sink_->ClearMessages(); accessibility->HandleWebAccessibilityEvent( node_a, - WebKit::WebAXEventChildrenChanged); + blink::WebAXEventChildrenChanged); accessibility->SendPendingAccessibilityEvents(); EXPECT_EQ(3, accessibility->browser_tree_node_count()); @@ -455,7 +455,7 @@ TEST_F(RendererAccessibilityTest, ShowAccessibilityObject) { WebAXObject node_a = root_obj.childAt(0); accessibility->HandleWebAccessibilityEvent( node_a, - WebKit::WebAXEventChildrenChanged); + blink::WebAXEventChildrenChanged); accessibility->SendPendingAccessibilityEvents(); EXPECT_EQ(4, accessibility->browser_tree_node_count()); @@ -509,7 +509,7 @@ TEST_F(RendererAccessibilityTest, DetachAccessibilityObject) { sink_->ClearMessages(); accessibility->HandleWebAccessibilityEvent( body, - WebKit::WebAXEventChildrenChanged); + blink::WebAXEventChildrenChanged); accessibility->SendPendingAccessibilityEvents(); diff --git a/content/renderer/accessibility/renderer_accessibility_complete.cc b/content/renderer/accessibility/renderer_accessibility_complete.cc index e6c003f..e5a6576 100644 --- a/content/renderer/accessibility/renderer_accessibility_complete.cc +++ b/content/renderer/accessibility/renderer_accessibility_complete.cc @@ -17,14 +17,14 @@ #include "third_party/WebKit/public/web/WebNode.h" #include "third_party/WebKit/public/web/WebView.h" -using WebKit::WebAXObject; -using WebKit::WebDocument; -using WebKit::WebFrame; -using WebKit::WebNode; -using WebKit::WebPoint; -using WebKit::WebRect; -using WebKit::WebSize; -using WebKit::WebView; +using blink::WebAXObject; +using blink::WebDocument; +using blink::WebFrame; +using blink::WebNode; +using blink::WebPoint; +using blink::WebRect; +using blink::WebSize; +using blink::WebView; namespace content { @@ -44,7 +44,7 @@ RendererAccessibilityComplete::RendererAccessibilityComplete( // accessibility being enabled. Initialize the browser's cached // accessibility tree by sending it a notification. HandleWebAccessibilityEvent(document.accessibilityObject(), - WebKit::WebAXEventLayoutComplete); + blink::WebAXEventLayoutComplete); } } @@ -81,11 +81,11 @@ void RendererAccessibilityComplete::FocusedNodeChanged(const WebNode& node) { // When focus is cleared, implicitly focus the document. // TODO(dmazzoni): Make WebKit send this notification instead. HandleWebAccessibilityEvent(document.accessibilityObject(), - WebKit::WebAXEventBlur); + blink::WebAXEventBlur); } } -void RendererAccessibilityComplete::DidFinishLoad(WebKit::WebFrame* frame) { +void RendererAccessibilityComplete::DidFinishLoad(blink::WebFrame* frame) { const WebDocument& document = GetMainDocument(); if (document.isNull()) return; @@ -96,12 +96,12 @@ void RendererAccessibilityComplete::DidFinishLoad(WebKit::WebFrame* frame) { // TODO(dmazzoni): remove this once rdar://5794454 is fixed. WebAXObject new_root = document.accessibilityObject(); if (!browser_root_ || new_root.axID() != browser_root_->id) - HandleWebAccessibilityEvent(new_root, WebKit::WebAXEventLayoutComplete); + HandleWebAccessibilityEvent(new_root, blink::WebAXEventLayoutComplete); } void RendererAccessibilityComplete::HandleWebAccessibilityEvent( - const WebKit::WebAXObject& obj, - WebKit::WebAXEvent event) { + const blink::WebAXObject& obj, + blink::WebAXEvent event) { const WebDocument& document = GetMainDocument(); if (document.isNull()) return; @@ -117,7 +117,7 @@ void RendererAccessibilityComplete::HandleWebAccessibilityEvent( if (!obj.equals(document.accessibilityObject())) { HandleWebAccessibilityEvent( document.accessibilityObject(), - WebKit::WebAXEventLayoutComplete); + blink::WebAXEventLayoutComplete); } } @@ -189,7 +189,7 @@ void RendererAccessibilityComplete::SendPendingAccessibilityEvents() { // doesn't also send us events for each child that changed // selection state, so make sure we re-send that whole subtree. if (event.event_type == - WebKit::WebAXEventSelectedChildrenChanged) { + blink::WebAXEventSelectedChildrenChanged) { base::hash_map<int32, BrowserTreeNode*>::iterator iter = browser_id_map_.find(obj.axID()); if (iter != browser_id_map_.end()) @@ -208,7 +208,7 @@ void RendererAccessibilityComplete::SendPendingAccessibilityEvents() { obj.axID() != root_id) { obj = obj.parentObject(); if (event.event_type == - WebKit::WebAXEventChildrenChanged) { + blink::WebAXEventChildrenChanged) { event.id = obj.axID(); } } @@ -309,7 +309,7 @@ void RendererAccessibilityComplete::AppendLocationChangeEvents( return; AccessibilityHostMsg_EventParams event_msg; - event_msg.event_type = static_cast<WebKit::WebAXEvent>(-1); + event_msg.event_type = static_cast<blink::WebAXEvent>(-1); event_msg.id = root_object.axID(); event_msg.nodes.resize(location_changes.size()); for (size_t i = 0; i < location_changes.size(); i++) { @@ -329,7 +329,7 @@ RendererAccessibilityComplete::CreateBrowserTreeNode() { } void RendererAccessibilityComplete::SerializeChangedNodes( - const WebKit::WebAXObject& obj, + const blink::WebAXObject& obj, std::vector<AccessibilityNodeData>* dst, std::set<int>* ids_serialized) { if (ids_serialized->find(obj.axID()) != ids_serialized->end()) @@ -432,7 +432,7 @@ void RendererAccessibilityComplete::SerializeChangedNodes( AccessibilityNodeData* serialized_node = &dst->back(); SerializeAccessibilityNode(obj, serialized_node); if (serialized_node->id == browser_root_->id) - serialized_node->role = WebKit::WebAXRoleRootWebArea; + serialized_node->role = blink::WebAXRoleRootWebArea; // Iterate over the children, make note of the ones that are new // and need to be serialized, and update the BrowserTreeNode @@ -528,7 +528,7 @@ void RendererAccessibilityComplete::OnScrollToMakeVisible( // https://bugs.webkit.org/show_bug.cgi?id=73460 HandleWebAccessibilityEvent( document.accessibilityObject(), - WebKit::WebAXEventLayoutComplete); + blink::WebAXEventLayoutComplete); } void RendererAccessibilityComplete::OnScrollToPoint( @@ -554,7 +554,7 @@ void RendererAccessibilityComplete::OnScrollToPoint( // https://bugs.webkit.org/show_bug.cgi?id=73460 HandleWebAccessibilityEvent( document.accessibilityObject(), - WebKit::WebAXEventLayoutComplete); + blink::WebAXEventLayoutComplete); } void RendererAccessibilityComplete::OnSetTextSelection( @@ -573,11 +573,11 @@ void RendererAccessibilityComplete::OnSetTextSelection( } // TODO(dmazzoni): support elements other than <input>. - WebKit::WebNode node = obj.node(); + blink::WebNode node = obj.node(); if (!node.isNull() && node.isElementNode()) { - WebKit::WebElement element = node.to<WebKit::WebElement>(); - WebKit::WebInputElement* input_element = - WebKit::toWebInputElement(&element); + blink::WebElement element = node.to<blink::WebElement>(); + blink::WebInputElement* input_element = + blink::toWebInputElement(&element); if (input_element && input_element->isTextField()) input_element->setSelectionRange(start_offset, end_offset); } diff --git a/content/renderer/accessibility/renderer_accessibility_complete.h b/content/renderer/accessibility/renderer_accessibility_complete.h index 174062a..d23c7ba 100644 --- a/content/renderer/accessibility/renderer_accessibility_complete.h +++ b/content/renderer/accessibility/renderer_accessibility_complete.h @@ -16,7 +16,7 @@ #include "third_party/WebKit/public/web/WebAXEnums.h" #include "third_party/WebKit/public/web/WebAXObject.h" -namespace WebKit { +namespace blink { class WebDocument; class WebNode; }; @@ -40,12 +40,12 @@ class CONTENT_EXPORT RendererAccessibilityComplete // RenderView::Observer implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void FocusedNodeChanged(const WebKit::WebNode& node) OVERRIDE; - virtual void DidFinishLoad(WebKit::WebFrame* frame) OVERRIDE; + virtual void FocusedNodeChanged(const blink::WebNode& node) OVERRIDE; + virtual void DidFinishLoad(blink::WebFrame* frame) OVERRIDE; // RendererAccessibility. virtual void HandleWebAccessibilityEvent( - const WebKit::WebAXObject& obj, WebKit::WebAXEvent event) OVERRIDE; + const blink::WebAXObject& obj, blink::WebAXEvent event) OVERRIDE; // In order to keep track of what nodes the browser knows about, we keep a // representation of the browser tree - just IDs and parent/child @@ -78,7 +78,7 @@ class CONTENT_EXPORT RendererAccessibilityComplete // |obj|, based on what object ids we know the browser already has. // The set of ids serialized is added to |ids_serialized|, and any // ids previously in that set are not serialized again. - void SerializeChangedNodes(const WebKit::WebAXObject& obj, + void SerializeChangedNodes(const blink::WebAXObject& obj, std::vector<AccessibilityNodeData>* dst, std::set<int>* ids_serialized); @@ -97,19 +97,19 @@ class CONTENT_EXPORT RendererAccessibilityComplete void OnFatalError(); // Checks if a WebKit accessibility object is an editable text node. - bool IsEditableText(const WebKit::WebAXObject& node); + bool IsEditableText(const blink::WebAXObject& node); // Recursively explore the tree of WebKit accessibility objects rooted // at |src|, and for each editable text node encountered, add a // corresponding WebAccessibility node as a child of |dst|. void RecursiveAddEditableTextNodesToTree( - const WebKit::WebAXObject& src, + const blink::WebAXObject& src, AccessibilityNodeData* dst); // Build a tree of serializable AccessibilityNodeData nodes to send to the // browser process, given a WebAXObject node from WebKit. // Modifies |dst| in-place, it's assumed to be empty. - void BuildAccessibilityTree(const WebKit::WebAXObject& src, + void BuildAccessibilityTree(const blink::WebAXObject& src, bool include_children, AccessibilityNodeData* dst); diff --git a/content/renderer/accessibility/renderer_accessibility_focus_only.cc b/content/renderer/accessibility/renderer_accessibility_focus_only.cc index cea316e..050918d 100644 --- a/content/renderer/accessibility/renderer_accessibility_focus_only.cc +++ b/content/renderer/accessibility/renderer_accessibility_focus_only.cc @@ -12,11 +12,11 @@ #include "third_party/WebKit/public/web/WebNode.h" #include "third_party/WebKit/public/web/WebView.h" -using WebKit::WebDocument; -using WebKit::WebElement; -using WebKit::WebFrame; -using WebKit::WebNode; -using WebKit::WebView; +using blink::WebDocument; +using blink::WebElement; +using blink::WebFrame; +using blink::WebNode; +using blink::WebView; namespace { // The root node will always have id 1. Let each child node have a new @@ -36,7 +36,7 @@ RendererAccessibilityFocusOnly::~RendererAccessibilityFocusOnly() { } void RendererAccessibilityFocusOnly::HandleWebAccessibilityEvent( - const WebKit::WebAXObject& obj, WebKit::WebAXEvent event) { + const blink::WebAXObject& obj, blink::WebAXEvent event) { // Do nothing. } @@ -45,7 +45,7 @@ void RendererAccessibilityFocusOnly::FocusedNodeChanged(const WebNode& node) { HandleFocusedNodeChanged(node, true); } -void RendererAccessibilityFocusOnly::DidFinishLoad(WebKit::WebFrame* frame) { +void RendererAccessibilityFocusOnly::DidFinishLoad(blink::WebFrame* frame) { WebView* view = render_view()->GetWebView(); if (view->focusedFrame() != frame) return; @@ -88,8 +88,8 @@ void RendererAccessibilityFocusOnly::HandleFocusedNodeChanged( // event, which doesn't post a native event on Windows. event.event_type = send_focus_event ? - WebKit::WebAXEventFocus : - WebKit::WebAXEventLayoutComplete; + blink::WebAXEventFocus : + blink::WebAXEventLayoutComplete; // Set the id that the event applies to: the root node if nothing // has focus, otherwise the focused node. @@ -101,17 +101,17 @@ void RendererAccessibilityFocusOnly::HandleFocusedNodeChanged( // Always include the root of the tree, the document. It always has id 1. root.id = 1; - root.role = WebKit::WebAXRoleRootWebArea; + root.role = blink::WebAXRoleRootWebArea; root.state = - (1 << WebKit::WebAXStateReadonly) | - (1 << WebKit::WebAXStateFocusable); + (1 << blink::WebAXStateReadonly) | + (1 << blink::WebAXStateFocusable); if (!node_has_focus) - root.state |= (1 << WebKit::WebAXStateFocused); + root.state |= (1 << blink::WebAXStateFocused); root.location = gfx::Rect(render_view_->size()); root.child_ids.push_back(next_id_); child.id = next_id_; - child.role = WebKit::WebAXRoleGroup; + child.role = blink::WebAXRoleGroup; if (!node.isNull() && node.isElementNode()) { child.location = gfx::Rect( @@ -124,10 +124,10 @@ void RendererAccessibilityFocusOnly::HandleFocusedNodeChanged( if (node_has_focus) { child.state = - (1 << WebKit::WebAXStateFocusable) | - (1 << WebKit::WebAXStateFocused); + (1 << blink::WebAXStateFocusable) | + (1 << blink::WebAXStateFocused); if (!node_is_editable_text) - child.state |= (1 << WebKit::WebAXStateReadonly); + child.state |= (1 << blink::WebAXStateReadonly); } #ifndef NDEBUG diff --git a/content/renderer/accessibility/renderer_accessibility_focus_only.h b/content/renderer/accessibility/renderer_accessibility_focus_only.h index 1d01e1d..c8e09c5 100644 --- a/content/renderer/accessibility/renderer_accessibility_focus_only.h +++ b/content/renderer/accessibility/renderer_accessibility_focus_only.h @@ -54,14 +54,14 @@ class RendererAccessibilityFocusOnly : public RendererAccessibility { // RendererAccessibility implementation. virtual void HandleWebAccessibilityEvent( - const WebKit::WebAXObject& obj, WebKit::WebAXEvent event) OVERRIDE; + const blink::WebAXObject& obj, blink::WebAXEvent event) OVERRIDE; // RenderView::Observer implementation. - virtual void FocusedNodeChanged(const WebKit::WebNode& node) OVERRIDE; - virtual void DidFinishLoad(WebKit::WebFrame* frame) OVERRIDE; + virtual void FocusedNodeChanged(const blink::WebNode& node) OVERRIDE; + virtual void DidFinishLoad(blink::WebFrame* frame) OVERRIDE; private: - void HandleFocusedNodeChanged(const WebKit::WebNode& node, + void HandleFocusedNodeChanged(const blink::WebNode& node, bool send_focus_event); int next_id_; diff --git a/content/renderer/active_notification_tracker.cc b/content/renderer/active_notification_tracker.cc index 9f0b6e0..a813ea0 100644 --- a/content/renderer/active_notification_tracker.cc +++ b/content/renderer/active_notification_tracker.cc @@ -9,8 +9,8 @@ #include "third_party/WebKit/public/web/WebNotification.h" #include "third_party/WebKit/public/web/WebNotificationPermissionCallback.h" -using WebKit::WebNotification; -using WebKit::WebNotificationPermissionCallback; +using blink::WebNotification; +using blink::WebNotificationPermissionCallback; namespace content { @@ -38,7 +38,7 @@ bool ActiveNotificationTracker::GetNotification( } int ActiveNotificationTracker::RegisterNotification( - const WebKit::WebNotification& proxy) { + const blink::WebNotification& proxy) { if (reverse_notification_table_.find(proxy) != reverse_notification_table_.end()) { return reverse_notification_table_[proxy]; diff --git a/content/renderer/active_notification_tracker.h b/content/renderer/active_notification_tracker.h index 6591eae..d4d710a 100644 --- a/content/renderer/active_notification_tracker.h +++ b/content/renderer/active_notification_tracker.h @@ -13,7 +13,7 @@ #include "content/common/content_export.h" #include "third_party/WebKit/public/web/WebNotification.h" -namespace WebKit { +namespace blink { class WebNotificationPermissionCallback; } @@ -28,16 +28,16 @@ class CONTENT_EXPORT ActiveNotificationTracker { ~ActiveNotificationTracker(); // Methods for tracking active notification objects. - int RegisterNotification(const WebKit::WebNotification& notification); + int RegisterNotification(const blink::WebNotification& notification); void UnregisterNotification(int id); - bool GetId(const WebKit::WebNotification& notification, int& id); - bool GetNotification(int id, WebKit::WebNotification* notification); + bool GetId(const blink::WebNotification& notification, int& id); + bool GetNotification(int id, blink::WebNotification* notification); // Methods for tracking active permission requests. int RegisterPermissionRequest( - WebKit::WebNotificationPermissionCallback* callback); + blink::WebNotificationPermissionCallback* callback); void OnPermissionRequestComplete(int id); - WebKit::WebNotificationPermissionCallback* GetCallback(int id); + blink::WebNotificationPermissionCallback* GetCallback(int id); // Clears out all active notifications. Useful on page navigation. void Clear(); @@ -47,12 +47,12 @@ class CONTENT_EXPORT ActiveNotificationTracker { void DetachAll(); private: - typedef std::map<WebKit::WebNotification, int> ReverseTable; + typedef std::map<blink::WebNotification, int> ReverseTable; // Tracking maps for active notifications and permission requests. - IDMap<WebKit::WebNotification> notification_table_; + IDMap<blink::WebNotification> notification_table_; ReverseTable reverse_notification_table_; - IDMap<WebKit::WebNotificationPermissionCallback> callback_table_; + IDMap<blink::WebNotificationPermissionCallback> callback_table_; DISALLOW_COPY_AND_ASSIGN(ActiveNotificationTracker); }; diff --git a/content/renderer/active_notification_tracker_unittest.cc b/content/renderer/active_notification_tracker_unittest.cc index 714a0d1..88e8dcd 100644 --- a/content/renderer/active_notification_tracker_unittest.cc +++ b/content/renderer/active_notification_tracker_unittest.cc @@ -10,13 +10,13 @@ namespace content { TEST(ActiveNotificationTrackerTest, TestLookupAndClear) { ActiveNotificationTracker tracker; - WebKit::WebNotification notification1; + blink::WebNotification notification1; int id1 = tracker.RegisterNotification(notification1); - WebKit::WebNotification notification2; + blink::WebNotification notification2; int id2 = tracker.RegisterNotification(notification2); - WebKit::WebNotification result; + blink::WebNotification result; tracker.GetNotification(id1, &result); EXPECT_TRUE(result == notification1); diff --git a/content/renderer/android/content_detector.cc b/content/renderer/android/content_detector.cc index 95caba5..66af041 100644 --- a/content/renderer/android/content_detector.cc +++ b/content/renderer/android/content_detector.cc @@ -9,14 +9,14 @@ #include "third_party/WebKit/public/web/WebHitTestResult.h" #include "third_party/WebKit/public/web/WebSurroundingText.h" -using WebKit::WebRange; -using WebKit::WebSurroundingText; +using blink::WebRange; +using blink::WebSurroundingText; namespace content { ContentDetector::Result::Result() : valid(false) {} -ContentDetector::Result::Result(const WebKit::WebRange& content_boundaries, +ContentDetector::Result::Result(const blink::WebRange& content_boundaries, const std::string& text, const GURL& intent_url) : valid(true), @@ -28,12 +28,12 @@ ContentDetector::Result::Result(const WebKit::WebRange& content_boundaries, ContentDetector::Result::~Result() {} ContentDetector::Result ContentDetector::FindTappedContent( - const WebKit::WebHitTestResult& hit_test) { + const blink::WebHitTestResult& hit_test) { if (hit_test.isNull()) return Result(); std::string content_text; - WebKit::WebRange range = FindContentRange(hit_test, &content_text); + blink::WebRange range = FindContentRange(hit_test, &content_text); if (range.isNull()) return Result(); @@ -42,7 +42,7 @@ ContentDetector::Result ContentDetector::FindTappedContent( } WebRange ContentDetector::FindContentRange( - const WebKit::WebHitTestResult& hit_test, + const blink::WebHitTestResult& hit_test, std::string* content_text) { // As the surrounding text extractor looks at maxLength/2 characters on // either side of the hit point, we need to double max content length here. diff --git a/content/renderer/android/content_detector.h b/content/renderer/android/content_detector.h index d17a585..85ee668 100644 --- a/content/renderer/android/content_detector.h +++ b/content/renderer/android/content_detector.h @@ -8,7 +8,7 @@ #include "third_party/WebKit/public/web/WebRange.h" #include "url/gurl.h" -namespace WebKit { +namespace blink { class WebHitTestResult; } @@ -20,13 +20,13 @@ class ContentDetector { // Holds the content detection results. struct Result { Result(); - Result(const WebKit::WebRange& content_boundaries, + Result(const blink::WebRange& content_boundaries, const std::string& text, const GURL& intent_url); ~Result(); bool valid; - WebKit::WebRange content_boundaries; + blink::WebRange content_boundaries; std::string text; // Processed text of the content. GURL intent_url; // URL of the intent that should process this content. }; @@ -35,7 +35,7 @@ class ContentDetector { // Returns a WebKit range delimiting the contents found around the tapped // position. If no content is found a null range will be returned. - Result FindTappedContent(const WebKit::WebHitTestResult& hit_test); + Result FindTappedContent(const blink::WebHitTestResult& hit_test); protected: ContentDetector() {} @@ -57,7 +57,7 @@ class ContentDetector { // position in order to search for content. virtual size_t GetMaximumContentLength() = 0; - WebKit::WebRange FindContentRange(const WebKit::WebHitTestResult& hit_test, + blink::WebRange FindContentRange(const blink::WebHitTestResult& hit_test, std::string* content_text); DISALLOW_COPY_AND_ASSIGN(ContentDetector); diff --git a/content/renderer/bmp_image_decoder_unittest.cc b/content/renderer/bmp_image_decoder_unittest.cc index 019eeb5..666196a 100644 --- a/content/renderer/bmp_image_decoder_unittest.cc +++ b/content/renderer/bmp_image_decoder_unittest.cc @@ -10,8 +10,8 @@ class BMPImageDecoderTest : public ImageDecoderTest { BMPImageDecoderTest() : ImageDecoderTest("bmp") { } protected: - virtual WebKit::WebImageDecoder* CreateWebKitImageDecoder() const OVERRIDE { - return new WebKit::WebImageDecoder(WebKit::WebImageDecoder::TypeBMP); + virtual blink::WebImageDecoder* CreateWebKitImageDecoder() const OVERRIDE { + return new blink::WebImageDecoder(blink::WebImageDecoder::TypeBMP); } // The BMPImageDecoderTest tests are really slow under Valgrind. diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc index 77af957..bd78021 100644 --- a/content/renderer/browser_plugin/browser_plugin.cc +++ b/content/renderer/browser_plugin/browser_plugin.cc @@ -43,13 +43,13 @@ #include "base/sys_info.h" #endif -using WebKit::WebCanvas; -using WebKit::WebPluginContainer; -using WebKit::WebPluginParams; -using WebKit::WebPoint; -using WebKit::WebRect; -using WebKit::WebURL; -using WebKit::WebVector; +using blink::WebCanvas; +using blink::WebPluginContainer; +using blink::WebPluginParams; +using blink::WebPoint; +using blink::WebRect; +using blink::WebURL; +using blink::WebVector; namespace content { @@ -59,7 +59,7 @@ static std::string GetInternalEventName(const char* event_name) { return base::StringPrintf("-internal-%s", event_name); } -typedef std::map<WebKit::WebPluginContainer*, +typedef std::map<blink::WebPluginContainer*, BrowserPlugin*> PluginContainerMap; static base::LazyInstance<PluginContainerMap> g_plugin_container_map = LAZY_INSTANCE_INITIALIZER; @@ -68,7 +68,7 @@ static base::LazyInstance<PluginContainerMap> g_plugin_container_map = BrowserPlugin::BrowserPlugin( RenderViewImpl* render_view, - WebKit::WebFrame* frame, + blink::WebFrame* frame, const WebPluginParams& params) : guest_instance_id_(browser_plugin::kInstanceIDNone), attached_(false), @@ -108,7 +108,7 @@ BrowserPlugin::~BrowserPlugin() { /*static*/ BrowserPlugin* BrowserPlugin::FromContainer( - WebKit::WebPluginContainer* container) { + blink::WebPluginContainer* container) { PluginContainerMap* browser_plugins = g_plugin_container_map.Pointer(); PluginContainerMap::iterator it = browser_plugins->find(container); return it == browser_plugins->end() ? NULL : it->second; @@ -141,14 +141,14 @@ void BrowserPlugin::UpdateDOMAttribute(const std::string& attribute_name, if (!container()) return; - WebKit::WebElement element = container()->element(); - WebKit::WebString web_attribute_name = - WebKit::WebString::fromUTF8(attribute_name); + blink::WebElement element = container()->element(); + blink::WebString web_attribute_name = + blink::WebString::fromUTF8(attribute_name); if (!HasDOMAttribute(attribute_name) || (std::string(element.getAttribute(web_attribute_name).utf8()) != attribute_value)) { element.setAttribute(web_attribute_name, - WebKit::WebString::fromUTF8(attribute_value)); + blink::WebString::fromUTF8(attribute_value)); } } @@ -157,7 +157,7 @@ void BrowserPlugin::RemoveDOMAttribute(const std::string& attribute_name) { return; container()->element().removeAttribute( - WebKit::WebString::fromUTF8(attribute_name)); + blink::WebString::fromUTF8(attribute_name)); } std::string BrowserPlugin::GetDOMAttributeValue( @@ -166,7 +166,7 @@ std::string BrowserPlugin::GetDOMAttributeValue( return std::string(); return container()->element().getAttribute( - WebKit::WebString::fromUTF8(attribute_name)).utf8(); + blink::WebString::fromUTF8(attribute_name)).utf8(); } bool BrowserPlugin::HasDOMAttribute(const std::string& attribute_name) const { @@ -174,7 +174,7 @@ bool BrowserPlugin::HasDOMAttribute(const std::string& attribute_name) const { return false; return container()->element().hasAttribute( - WebKit::WebString::fromUTF8(attribute_name)); + blink::WebString::fromUTF8(attribute_name)); } std::string BrowserPlugin::GetNameAttribute() const { @@ -481,8 +481,8 @@ void BrowserPlugin::OnShouldAcceptTouchEvents(int guest_instance_id, bool accept) { if (container()) { container()->requestTouchEventType(accept ? - WebKit::WebPluginContainer::TouchEventRequestTypeRaw : - WebKit::WebPluginContainer::TouchEventRequestTypeNone); + blink::WebPluginContainer::TouchEventRequestTypeRaw : + blink::WebPluginContainer::TouchEventRequestTypeNone); } } @@ -636,29 +636,29 @@ NPObject* BrowserPlugin::GetContentWindow() const { content_window_routing_id_); if (!guest_render_view) return NULL; - WebKit::WebFrame* guest_frame = guest_render_view->GetWebView()->mainFrame(); + blink::WebFrame* guest_frame = guest_render_view->GetWebView()->mainFrame(); return guest_frame->windowObject(); } // static -bool BrowserPlugin::AttachWindowTo(const WebKit::WebNode& node, int window_id) { +bool BrowserPlugin::AttachWindowTo(const blink::WebNode& node, int window_id) { if (node.isNull()) return false; if (!node.isElementNode()) return false; - WebKit::WebElement shim_element = node.toConst<WebKit::WebElement>(); + blink::WebElement shim_element = node.toConst<blink::WebElement>(); // The shim containing the BrowserPlugin must be attached to a document. if (shim_element.document().isNull()) return false; - WebKit::WebNode shadow_root = shim_element.shadowRoot(); + blink::WebNode shadow_root = shim_element.shadowRoot(); if (shadow_root.isNull() || !shadow_root.hasChildNodes()) return false; - WebKit::WebNode plugin_element = shadow_root.firstChild(); - WebKit::WebPluginContainer* plugin_container = + blink::WebNode plugin_element = shadow_root.firstChild(); + blink::WebPluginContainer* plugin_container = plugin_element.pluginContainer(); if (!plugin_container) return false; @@ -782,7 +782,7 @@ void BrowserPlugin::TriggerEvent(const std::string& event_name, if (!container()) return; - WebKit::WebFrame* frame = container()->element().document().frame(); + blink::WebFrame* frame = container()->element().document().frame(); if (!frame) return; @@ -803,17 +803,17 @@ void BrowserPlugin::TriggerEvent(const std::string& event_name, return; } - WebKit::WebDOMEvent dom_event = frame->document().createEvent("CustomEvent"); - WebKit::WebDOMCustomEvent event = dom_event.to<WebKit::WebDOMCustomEvent>(); + blink::WebDOMEvent dom_event = frame->document().createEvent("CustomEvent"); + blink::WebDOMCustomEvent event = dom_event.to<blink::WebDOMCustomEvent>(); // The events triggered directly from the plugin <object> are internal events // whose implementation details can (and likely will) change over time. The // wrapper/shim (e.g. <webview> tag) should receive these events, and expose a // more appropriate (and stable) event to the consumers as part of the API. event.initCustomEvent( - WebKit::WebString::fromUTF8(GetInternalEventName(event_name.c_str())), + blink::WebString::fromUTF8(GetInternalEventName(event_name.c_str())), false, false, - WebKit::WebSerializedScriptValue::serialize( + blink::WebSerializedScriptValue::serialize( v8::String::New(json_string.c_str(), json_string.size()))); container()->element().dispatchEvent(event); } @@ -835,7 +835,7 @@ bool BrowserPlugin::ShouldGuestBeFocused() const { return plugin_focused_ && embedder_focused; } -WebKit::WebPluginContainer* BrowserPlugin::container() const { +blink::WebPluginContainer* BrowserPlugin::container() const { return container_; } @@ -918,7 +918,7 @@ NPObject* BrowserPlugin::scriptableObject() { NPObject* browser_plugin_np_object(bindings_->np_object()); // The object is expected to be retained before it is returned. - WebKit::WebBindings::retainObject(browser_plugin_np_object); + blink::WebBindings::retainObject(browser_plugin_np_object); return browser_plugin_np_object; } @@ -990,7 +990,7 @@ bool BrowserPlugin::InBounds(const gfx::Point& position) const { gfx::Point BrowserPlugin::ToLocalCoordinates(const gfx::Point& point) const { if (container_) - return container_->windowToLocalPoint(WebKit::WebPoint(point)); + return container_->windowToLocalPoint(blink::WebPoint(point)); return gfx::Point(point.x() - plugin_rect_.x(), point.y() - plugin_rect_.y()); } @@ -1182,34 +1182,34 @@ bool BrowserPlugin::acceptsInputEvents() { return true; } -bool BrowserPlugin::handleInputEvent(const WebKit::WebInputEvent& event, - WebKit::WebCursorInfo& cursor_info) { +bool BrowserPlugin::handleInputEvent(const blink::WebInputEvent& event, + blink::WebCursorInfo& cursor_info) { if (guest_crashed_ || !HasGuestInstanceID()) return false; - if (event.type == WebKit::WebInputEvent::ContextMenu) + if (event.type == blink::WebInputEvent::ContextMenu) return true; - const WebKit::WebInputEvent* modified_event = &event; - scoped_ptr<WebKit::WebTouchEvent> touch_event; + const blink::WebInputEvent* modified_event = &event; + scoped_ptr<blink::WebTouchEvent> touch_event; // WebKit gives BrowserPlugin a list of touches that are down, but the browser // process expects a list of all touches. We modify the TouchEnd event here to // match these expectations. - if (event.type == WebKit::WebInputEvent::TouchEnd) { - const WebKit::WebTouchEvent* orig_touch_event = - static_cast<const WebKit::WebTouchEvent*>(&event); - touch_event.reset(new WebKit::WebTouchEvent()); - memcpy(touch_event.get(), orig_touch_event, sizeof(WebKit::WebTouchEvent)); + if (event.type == blink::WebInputEvent::TouchEnd) { + const blink::WebTouchEvent* orig_touch_event = + static_cast<const blink::WebTouchEvent*>(&event); + touch_event.reset(new blink::WebTouchEvent()); + memcpy(touch_event.get(), orig_touch_event, sizeof(blink::WebTouchEvent)); if (touch_event->changedTouchesLength > 0) { memcpy(&touch_event->touches[touch_event->touchesLength], &touch_event->changedTouches, - touch_event->changedTouchesLength * sizeof(WebKit::WebTouchPoint)); + touch_event->changedTouchesLength * sizeof(blink::WebTouchPoint)); } touch_event->touchesLength += touch_event->changedTouchesLength; modified_event = touch_event.get(); } - if (WebKit::WebInputEvent::isKeyboardEventType(event.type) && + if (blink::WebInputEvent::isKeyboardEventType(event.type) && !edit_commands_.empty()) { browser_plugin_manager()->Send( new BrowserPluginHostMsg_SetEditCommandsForNextKeyEvent( @@ -1228,11 +1228,11 @@ bool BrowserPlugin::handleInputEvent(const WebKit::WebInputEvent& event, return true; } -bool BrowserPlugin::handleDragStatusUpdate(WebKit::WebDragStatus drag_status, - const WebKit::WebDragData& drag_data, - WebKit::WebDragOperationsMask mask, - const WebKit::WebPoint& position, - const WebKit::WebPoint& screen) { +bool BrowserPlugin::handleDragStatusUpdate(blink::WebDragStatus drag_status, + const blink::WebDragData& drag_data, + blink::WebDragOperationsMask mask, + const blink::WebPoint& position, + const blink::WebPoint& screen) { if (guest_crashed_ || !HasGuestInstanceID()) return false; browser_plugin_manager()->Send( @@ -1247,7 +1247,7 @@ bool BrowserPlugin::handleDragStatusUpdate(WebKit::WebDragStatus drag_status, } void BrowserPlugin::didReceiveResponse( - const WebKit::WebURLResponse& response) { + const blink::WebURLResponse& response) { } void BrowserPlugin::didReceiveData(const char* data, int data_length) { @@ -1256,20 +1256,20 @@ void BrowserPlugin::didReceiveData(const char* data, int data_length) { void BrowserPlugin::didFinishLoading() { } -void BrowserPlugin::didFailLoading(const WebKit::WebURLError& error) { +void BrowserPlugin::didFailLoading(const blink::WebURLError& error) { } -void BrowserPlugin::didFinishLoadingFrameRequest(const WebKit::WebURL& url, +void BrowserPlugin::didFinishLoadingFrameRequest(const blink::WebURL& url, void* notify_data) { } void BrowserPlugin::didFailLoadingFrameRequest( - const WebKit::WebURL& url, + const blink::WebURL& url, void* notify_data, - const WebKit::WebURLError& error) { + const blink::WebURLError& error) { } -bool BrowserPlugin::executeEditCommand(const WebKit::WebString& name) { +bool BrowserPlugin::executeEditCommand(const blink::WebString& name) { browser_plugin_manager()->Send(new BrowserPluginHostMsg_ExecuteEditCommand( render_view_routing_id_, guest_instance_id_, @@ -1279,8 +1279,8 @@ bool BrowserPlugin::executeEditCommand(const WebKit::WebString& name) { return true; } -bool BrowserPlugin::executeEditCommand(const WebKit::WebString& name, - const WebKit::WebString& value) { +bool BrowserPlugin::executeEditCommand(const blink::WebString& name, + const blink::WebString& value) { edit_commands_.push_back(EditCommand(name.utf8(), value.utf8())); // BrowserPlugin swallows edit commands. return true; @@ -1302,7 +1302,7 @@ void BrowserPlugin::OnMouseLockLost() { } bool BrowserPlugin::HandleMouseLockedInputEvent( - const WebKit::WebMouseEvent& event) { + const blink::WebMouseEvent& event) { browser_plugin_manager()->Send( new BrowserPluginHostMsg_HandleInputEvent(render_view_routing_id_, guest_instance_id_, diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h index 05a88cc..ad5bad3 100644 --- a/content/renderer/browser_plugin/browser_plugin.h +++ b/content/renderer/browser_plugin/browser_plugin.h @@ -33,7 +33,7 @@ class BrowserPluginManager; class MockBrowserPlugin; class CONTENT_EXPORT BrowserPlugin : - NON_EXPORTED_BASE(public WebKit::WebPlugin), + NON_EXPORTED_BASE(public blink::WebPlugin), public MouseLockDispatcher::LockTarget { public: RenderViewImpl* render_view() const { return render_view_.get(); } @@ -41,7 +41,7 @@ class CONTENT_EXPORT BrowserPlugin : int guest_instance_id() const { return guest_instance_id_; } bool attached() const { return attached_; } - static BrowserPlugin* FromContainer(WebKit::WebPluginContainer* container); + static BrowserPlugin* FromContainer(blink::WebPluginContainer* container); bool OnMessageReceived(const IPC::Message& msg); @@ -101,7 +101,7 @@ class CONTENT_EXPORT BrowserPlugin : // Attaches the window identified by |window_id| to the the given node // encapsulating a BrowserPlugin. - static bool AttachWindowTo(const WebKit::WebNode& node, + static bool AttachWindowTo(const blink::WebNode& node, int window_id); // Informs the guest of an updated focus state. @@ -138,9 +138,9 @@ class CONTENT_EXPORT BrowserPlugin : // Returns whether a message should be forwarded to BrowserPlugin. static bool ShouldForwardToBrowserPlugin(const IPC::Message& message); - // WebKit::WebPlugin implementation. - virtual WebKit::WebPluginContainer* container() const OVERRIDE; - virtual bool initialize(WebKit::WebPluginContainer* container) OVERRIDE; + // blink::WebPlugin implementation. + virtual blink::WebPluginContainer* container() const OVERRIDE; + virtual bool initialize(blink::WebPluginContainer* container) OVERRIDE; virtual void destroy() OVERRIDE; virtual NPObject* scriptableObject() OVERRIDE; virtual struct _NPP* pluginNPP() OVERRIDE; @@ -148,45 +148,45 @@ class CONTENT_EXPORT BrowserPlugin : virtual bool supportsEditCommands() const OVERRIDE; virtual bool canProcessDrag() const OVERRIDE; virtual void paint( - WebKit::WebCanvas* canvas, - const WebKit::WebRect& rect) OVERRIDE; + blink::WebCanvas* canvas, + const blink::WebRect& rect) OVERRIDE; virtual void updateGeometry( - const WebKit::WebRect& frame_rect, - const WebKit::WebRect& clip_rect, - const WebKit::WebVector<WebKit::WebRect>& cut_outs_rects, + const blink::WebRect& frame_rect, + const blink::WebRect& clip_rect, + const blink::WebVector<blink::WebRect>& cut_outs_rects, bool is_visible) OVERRIDE; virtual void updateFocus(bool focused) OVERRIDE; virtual void updateVisibility(bool visible) OVERRIDE; virtual bool acceptsInputEvents() OVERRIDE; virtual bool handleInputEvent( - const WebKit::WebInputEvent& event, - WebKit::WebCursorInfo& cursor_info) OVERRIDE; - virtual bool handleDragStatusUpdate(WebKit::WebDragStatus drag_status, - const WebKit::WebDragData& drag_data, - WebKit::WebDragOperationsMask mask, - const WebKit::WebPoint& position, - const WebKit::WebPoint& screen) OVERRIDE; + const blink::WebInputEvent& event, + blink::WebCursorInfo& cursor_info) OVERRIDE; + virtual bool handleDragStatusUpdate(blink::WebDragStatus drag_status, + const blink::WebDragData& drag_data, + blink::WebDragOperationsMask mask, + const blink::WebPoint& position, + const blink::WebPoint& screen) OVERRIDE; virtual void didReceiveResponse( - const WebKit::WebURLResponse& response) OVERRIDE; + const blink::WebURLResponse& response) OVERRIDE; virtual void didReceiveData(const char* data, int data_length) OVERRIDE; virtual void didFinishLoading() OVERRIDE; - virtual void didFailLoading(const WebKit::WebURLError& error) OVERRIDE; + virtual void didFailLoading(const blink::WebURLError& error) OVERRIDE; virtual void didFinishLoadingFrameRequest( - const WebKit::WebURL& url, + const blink::WebURL& url, void* notify_data) OVERRIDE; virtual void didFailLoadingFrameRequest( - const WebKit::WebURL& url, + const blink::WebURL& url, void* notify_data, - const WebKit::WebURLError& error) OVERRIDE; - virtual bool executeEditCommand(const WebKit::WebString& name) OVERRIDE; - virtual bool executeEditCommand(const WebKit::WebString& name, - const WebKit::WebString& value) OVERRIDE; + const blink::WebURLError& error) OVERRIDE; + virtual bool executeEditCommand(const blink::WebString& name) OVERRIDE; + virtual bool executeEditCommand(const blink::WebString& name, + const blink::WebString& value) OVERRIDE; // MouseLockDispatcher::LockTarget implementation. virtual void OnLockMouseACK(bool succeeded) OVERRIDE; virtual void OnMouseLockLost() OVERRIDE; virtual bool HandleMouseLockedInputEvent( - const WebKit::WebMouseEvent& event) OVERRIDE; + const blink::WebMouseEvent& event) OVERRIDE; private: friend class base::DeleteHelper<BrowserPlugin>; @@ -206,8 +206,8 @@ class CONTENT_EXPORT BrowserPlugin : // guest WebContents that's hosted by this BrowserPlugin. BrowserPlugin( RenderViewImpl* render_view, - WebKit::WebFrame* frame, - const WebKit::WebPluginParams& params); + blink::WebFrame* frame, + const blink::WebPluginParams& params); virtual ~BrowserPlugin(); @@ -307,7 +307,7 @@ class CONTENT_EXPORT BrowserPlugin : // If the |render_view_| is destroyed before the BrowserPlugin is destroyed // then we will attempt to access a NULL pointer. int render_view_routing_id_; - WebKit::WebPluginContainer* container_; + blink::WebPluginContainer* container_; scoped_ptr<BrowserPluginBindings> bindings_; scoped_ptr<BrowserPluginBackingStore> backing_store_; scoped_ptr<base::SharedMemory> current_damage_buffer_; diff --git a/content/renderer/browser_plugin/browser_plugin_bindings.cc b/content/renderer/browser_plugin/browser_plugin_bindings.cc index 5dd5231..ffeafcf 100644 --- a/content/renderer/browser_plugin/browser_plugin_bindings.cc +++ b/content/renderer/browser_plugin/browser_plugin_bindings.cc @@ -28,12 +28,12 @@ #include "third_party/npapi/bindings/npapi.h" #include "v8/include/v8.h" -using WebKit::WebBindings; -using WebKit::WebElement; -using WebKit::WebDOMEvent; -using WebKit::WebDOMMessageEvent; -using WebKit::WebPluginContainer; -using WebKit::WebString; +using blink::WebBindings; +using blink::WebElement; +using blink::WebDOMEvent; +using blink::WebDOMMessageEvent; +using blink::WebPluginContainer; +using blink::WebString; namespace content { @@ -242,7 +242,7 @@ class BrowserPluginBindingAttach: public BrowserPluginMethodBinding { return false; scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create()); - v8::Handle<v8::Value> obj(WebKit::WebBindings::toV8Value(&args[0])); + v8::Handle<v8::Value> obj(blink::WebBindings::toV8Value(&args[0])); scoped_ptr<base::Value> value( converter->FromV8Value(obj, bindings->instance()->render_view()-> GetWebView()->mainFrame()->mainWorldScriptContext())); @@ -272,7 +272,7 @@ class BrowserPluginBindingAttachWindowTo : public BrowserPluginMethodBinding { virtual bool Invoke(BrowserPluginBindings* bindings, const NPVariant* args, NPVariant* result) OVERRIDE { - WebKit::WebNode node; + blink::WebNode node; WebBindings::getNode(NPVARIANT_TO_OBJECT(args[0]), &node); int window_id = IntFromNPVariant(args[1]); BOOLEAN_TO_NPVARIANT(BrowserPlugin::AttachWindowTo(node, window_id), diff --git a/content/renderer/browser_plugin/browser_plugin_browsertest.cc b/content/renderer/browser_plugin/browser_plugin_browsertest.cc index d12b45b..fab51e5 100644 --- a/content/renderer/browser_plugin/browser_plugin_browsertest.cc +++ b/content/renderer/browser_plugin/browser_plugin_browsertest.cc @@ -61,7 +61,7 @@ class TestContentRendererClient : public ContentRendererClient { virtual ~TestContentRendererClient() { } virtual bool AllowBrowserPlugin( - WebKit::WebPluginContainer* container) OVERRIDE { + blink::WebPluginContainer* container) OVERRIDE { // Allow BrowserPlugin for tests. return true; } @@ -114,7 +114,7 @@ std::string BrowserPluginTest::ExecuteScriptAndReturnString( const std::string& script) { v8::HandleScope handle_scope(v8::Isolate::GetCurrent()); v8::Handle<v8::Value> value = GetMainFrame()->executeScriptAndReturnValue( - WebKit::WebScriptSource(WebKit::WebString::fromUTF8(script.c_str()))); + blink::WebScriptSource(blink::WebString::fromUTF8(script.c_str()))); if (value.IsEmpty() || !value->IsString()) return std::string(); @@ -129,7 +129,7 @@ int BrowserPluginTest::ExecuteScriptAndReturnInt( const std::string& script) { v8::HandleScope handle_scope(v8::Isolate::GetCurrent()); v8::Handle<v8::Value> value = GetMainFrame()->executeScriptAndReturnValue( - WebKit::WebScriptSource(WebKit::WebString::fromUTF8(script.c_str()))); + blink::WebScriptSource(blink::WebString::fromUTF8(script.c_str()))); if (value.IsEmpty() || !value->IsInt32()) return 0; @@ -142,7 +142,7 @@ bool BrowserPluginTest::ExecuteScriptAndReturnBool( const std::string& script, bool* result) { v8::HandleScope handle_scope(v8::Isolate::GetCurrent()); v8::Handle<v8::Value> value = GetMainFrame()->executeScriptAndReturnValue( - WebKit::WebScriptSource(WebKit::WebString::fromUTF8(script.c_str()))); + blink::WebScriptSource(blink::WebString::fromUTF8(script.c_str()))); if (value.IsEmpty() || !value->IsBoolean()) return false; diff --git a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc index 12e5f34..e2b4a69 100644 --- a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc +++ b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc @@ -32,7 +32,7 @@ BrowserPluginCompositingHelper::SwapBuffersInfo::SwapBuffersInfo() } BrowserPluginCompositingHelper::BrowserPluginCompositingHelper( - WebKit::WebPluginContainer* container, + blink::WebPluginContainer* container, BrowserPluginManager* manager, int instance_id, int host_routing_id) diff --git a/content/renderer/browser_plugin/browser_plugin_compositing_helper.h b/content/renderer/browser_plugin/browser_plugin_compositing_helper.h index 93eba2f..a1d1603 100644 --- a/content/renderer/browser_plugin/browser_plugin_compositing_helper.h +++ b/content/renderer/browser_plugin/browser_plugin_compositing_helper.h @@ -28,7 +28,7 @@ class DelegatedFrameResourceCollection; class DelegatedRendererLayer; } -namespace WebKit { +namespace blink { class WebPluginContainer; class WebLayer; } @@ -40,7 +40,7 @@ class BrowserPluginManager; class CONTENT_EXPORT BrowserPluginCompositingHelper : public base::RefCounted<BrowserPluginCompositingHelper> { public: - BrowserPluginCompositingHelper(WebKit::WebPluginContainer* container, + BrowserPluginCompositingHelper(blink::WebPluginContainer* container, BrowserPluginManager* manager, int instance_id, int host_routing_id); @@ -106,8 +106,8 @@ class CONTENT_EXPORT BrowserPluginCompositingHelper : scoped_refptr<cc::SolidColorLayer> background_layer_; scoped_refptr<cc::TextureLayer> texture_layer_; scoped_refptr<cc::DelegatedRendererLayer> delegated_layer_; - scoped_ptr<WebKit::WebLayer> web_layer_; - WebKit::WebPluginContainer* container_; + scoped_ptr<blink::WebLayer> web_layer_; + blink::WebPluginContainer* container_; scoped_refptr<BrowserPluginManager> browser_plugin_manager_; }; diff --git a/content/renderer/browser_plugin/browser_plugin_manager.h b/content/renderer/browser_plugin/browser_plugin_manager.h index 7e08a1e..687e62c 100644 --- a/content/renderer/browser_plugin/browser_plugin_manager.h +++ b/content/renderer/browser_plugin/browser_plugin_manager.h @@ -12,7 +12,7 @@ #include "content/public/renderer/render_view_observer.h" #include "ipc/ipc_sender.h" -namespace WebKit { +namespace blink { class WebFrame; struct WebPluginParams; } @@ -46,8 +46,8 @@ class CONTENT_EXPORT BrowserPluginManager // responsible for removing its association via RemoveBrowserPlugin. virtual BrowserPlugin* CreateBrowserPlugin( RenderViewImpl* render_view, - WebKit::WebFrame* frame, - const WebKit::WebPluginParams& params) = 0; + blink::WebFrame* frame, + const blink::WebPluginParams& params) = 0; // Asynchronously requests a new browser-process-allocated instance ID. // After the browser process allocates an ID, it calls back into the diff --git a/content/renderer/browser_plugin/browser_plugin_manager_impl.cc b/content/renderer/browser_plugin/browser_plugin_manager_impl.cc index e7732f8..18ebeca 100644 --- a/content/renderer/browser_plugin/browser_plugin_manager_impl.cc +++ b/content/renderer/browser_plugin/browser_plugin_manager_impl.cc @@ -24,8 +24,8 @@ BrowserPluginManagerImpl::~BrowserPluginManagerImpl() { BrowserPlugin* BrowserPluginManagerImpl::CreateBrowserPlugin( RenderViewImpl* render_view, - WebKit::WebFrame* frame, - const WebKit::WebPluginParams& params) { + blink::WebFrame* frame, + const blink::WebPluginParams& params) { return new BrowserPlugin(render_view, frame, params); } diff --git a/content/renderer/browser_plugin/browser_plugin_manager_impl.h b/content/renderer/browser_plugin/browser_plugin_manager_impl.h index 30ee72c..45f4ece 100644 --- a/content/renderer/browser_plugin/browser_plugin_manager_impl.h +++ b/content/renderer/browser_plugin/browser_plugin_manager_impl.h @@ -23,8 +23,8 @@ class BrowserPluginManagerImpl : public BrowserPluginManager { // BrowserPluginManager implementation. virtual BrowserPlugin* CreateBrowserPlugin( RenderViewImpl* render_view, - WebKit::WebFrame* frame, - const WebKit::WebPluginParams& params) OVERRIDE; + blink::WebFrame* frame, + const blink::WebPluginParams& params) OVERRIDE; virtual void AllocateInstanceID( const base::WeakPtr<BrowserPlugin>& browser_plugin) OVERRIDE; diff --git a/content/renderer/browser_plugin/mock_browser_plugin.cc b/content/renderer/browser_plugin/mock_browser_plugin.cc index 39b2d2d..f39b13a 100644 --- a/content/renderer/browser_plugin/mock_browser_plugin.cc +++ b/content/renderer/browser_plugin/mock_browser_plugin.cc @@ -8,8 +8,8 @@ namespace content { MockBrowserPlugin::MockBrowserPlugin(RenderViewImpl* render_view, - WebKit::WebFrame* frame, - const WebKit::WebPluginParams& params) + blink::WebFrame* frame, + const blink::WebPluginParams& params) : BrowserPlugin(render_view, frame, params) { } diff --git a/content/renderer/browser_plugin/mock_browser_plugin.h b/content/renderer/browser_plugin/mock_browser_plugin.h index acd001b..76621b5 100644 --- a/content/renderer/browser_plugin/mock_browser_plugin.h +++ b/content/renderer/browser_plugin/mock_browser_plugin.h @@ -12,8 +12,8 @@ namespace content { class MockBrowserPlugin : public BrowserPlugin { public: MockBrowserPlugin(RenderViewImpl* render_view, - WebKit::WebFrame* frame, - const WebKit::WebPluginParams& params); + blink::WebFrame* frame, + const blink::WebPluginParams& params); virtual ~MockBrowserPlugin(); diff --git a/content/renderer/browser_plugin/mock_browser_plugin_manager.cc b/content/renderer/browser_plugin/mock_browser_plugin_manager.cc index 9007f6e..c3656400 100644 --- a/content/renderer/browser_plugin/mock_browser_plugin_manager.cc +++ b/content/renderer/browser_plugin/mock_browser_plugin_manager.cc @@ -22,8 +22,8 @@ MockBrowserPluginManager::~MockBrowserPluginManager() { BrowserPlugin* MockBrowserPluginManager::CreateBrowserPlugin( RenderViewImpl* render_view, - WebKit::WebFrame* frame, - const WebKit::WebPluginParams& params) { + blink::WebFrame* frame, + const blink::WebPluginParams& params) { return new MockBrowserPlugin(render_view, frame, params); } diff --git a/content/renderer/browser_plugin/mock_browser_plugin_manager.h b/content/renderer/browser_plugin/mock_browser_plugin_manager.h index 78ae0be..544d263 100644 --- a/content/renderer/browser_plugin/mock_browser_plugin_manager.h +++ b/content/renderer/browser_plugin/mock_browser_plugin_manager.h @@ -20,8 +20,8 @@ class MockBrowserPluginManager : public BrowserPluginManager { // BrowserPluginManager implementation. virtual BrowserPlugin* CreateBrowserPlugin( RenderViewImpl* render_view, - WebKit::WebFrame* frame, - const WebKit::WebPluginParams& params) OVERRIDE; + blink::WebFrame* frame, + const blink::WebPluginParams& params) OVERRIDE; virtual void AllocateInstanceID( const base::WeakPtr<BrowserPlugin>& browser_plugin) OVERRIDE; diff --git a/content/renderer/clipboard_utils.cc b/content/renderer/clipboard_utils.cc index d146f67..28c04c9 100644 --- a/content/renderer/clipboard_utils.cc +++ b/content/renderer/clipboard_utils.cc @@ -11,8 +11,8 @@ namespace content { -std::string URLToMarkup(const WebKit::WebURL& url, - const WebKit::WebString& title) { +std::string URLToMarkup(const blink::WebURL& url, + const blink::WebString& title) { std::string markup("<a href=\""); markup.append(url.spec()); markup.append("\">"); @@ -22,8 +22,8 @@ std::string URLToMarkup(const WebKit::WebURL& url, return markup; } -std::string URLToImageMarkup(const WebKit::WebURL& url, - const WebKit::WebString& title) { +std::string URLToImageMarkup(const blink::WebURL& url, + const blink::WebString& title) { std::string markup("<img src=\""); markup.append(net::EscapeForHTML(url.spec())); markup.append("\""); diff --git a/content/renderer/clipboard_utils.h b/content/renderer/clipboard_utils.h index e767907..3acf7b4 100644 --- a/content/renderer/clipboard_utils.h +++ b/content/renderer/clipboard_utils.h @@ -9,18 +9,18 @@ #include "content/common/content_export.h" -namespace WebKit { +namespace blink { class WebString; class WebURL; } namespace content { -CONTENT_EXPORT std::string URLToMarkup(const WebKit::WebURL& url, - const WebKit::WebString& title); +CONTENT_EXPORT std::string URLToMarkup(const blink::WebURL& url, + const blink::WebString& title); -CONTENT_EXPORT std::string URLToImageMarkup(const WebKit::WebURL& url, - const WebKit::WebString& title); +CONTENT_EXPORT std::string URLToImageMarkup(const blink::WebURL& url, + const blink::WebString& title); } // namespace content diff --git a/content/renderer/context_menu_params_builder.cc b/content/renderer/context_menu_params_builder.cc index e8cd078..f864459 100644 --- a/content/renderer/context_menu_params_builder.cc +++ b/content/renderer/context_menu_params_builder.cc @@ -16,7 +16,7 @@ namespace content { // static ContextMenuParams ContextMenuParamsBuilder::Build( - const WebKit::WebContextMenuData& data) { + const blink::WebContextMenuData& data) { ContextMenuParams params; params.media_type = data.mediaType; params.x = data.mousePosition.x; @@ -55,7 +55,7 @@ ContextMenuParams ContextMenuParamsBuilder::Build( params.frame_page_state = HistoryItemToPageState(data.frameHistoryItem); if (!params.link_url.is_empty()) { - WebKit::WebNode selectedNode = data.node; + blink::WebNode selectedNode = data.node; // If there are other embedded tags (like <a ..>Some <b>text</b></a>) // we need to extract the parent <a/> node. @@ -63,7 +63,7 @@ ContextMenuParams ContextMenuParamsBuilder::Build( selectedNode = selectedNode.parentNode(); } - WebKit::WebElement selectedElement = selectedNode.to<WebKit::WebElement>(); + blink::WebElement selectedElement = selectedNode.to<blink::WebElement>(); if (selectedNode.isLink() && !selectedElement.isNull()) { params.link_text = selectedElement.innerText(); } else { diff --git a/content/renderer/context_menu_params_builder.h b/content/renderer/context_menu_params_builder.h index 414d61b..624f855 100644 --- a/content/renderer/context_menu_params_builder.h +++ b/content/renderer/context_menu_params_builder.h @@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_CONTEXT_MENU_PARAMS_BUILDER_H_ #define CONTENT_RENDERER_CONTEXT_MENU_PARAMS_BUILDER_H_ -namespace WebKit { +namespace blink { struct WebContextMenuData; } @@ -14,7 +14,7 @@ struct ContextMenuParams; class ContextMenuParamsBuilder { public: - static ContextMenuParams Build(const WebKit::WebContextMenuData& data); + static ContextMenuParams Build(const blink::WebContextMenuData& data); }; } // namespace content diff --git a/content/renderer/cpp_bound_class_unittest.cc b/content/renderer/cpp_bound_class_unittest.cc index 2c0f75f..0aeab77 100644 --- a/content/renderer/cpp_bound_class_unittest.cc +++ b/content/renderer/cpp_bound_class_unittest.cc @@ -59,7 +59,7 @@ class TestObserver : public RenderViewObserver { public: explicit TestObserver(RenderView* render_view) : RenderViewObserver(render_view) {} - virtual void DidClearWindowObject(WebKit::WebFrame* frame) OVERRIDE { + virtual void DidClearWindowObject(blink::WebFrame* frame) OVERRIDE { example_bound_class_.BindToJavascript(frame, "example"); } void set_fallback_method_enabled(bool use_fallback) { @@ -80,7 +80,7 @@ class CppBoundClassTest : public RenderViewTest { observer_.reset(new TestObserver(view_)); observer_->set_fallback_method_enabled(useFallback()); - WebKit::WebURLRequest url_request; + blink::WebURLRequest url_request; url_request.initialize(); url_request.setURL(GURL(kAboutBlankURL)); diff --git a/content/renderer/cursor_utils.cc b/content/renderer/cursor_utils.cc index 80351c9..97085b2 100644 --- a/content/renderer/cursor_utils.cc +++ b/content/renderer/cursor_utils.cc @@ -8,7 +8,7 @@ #include "third_party/WebKit/public/web/WebCursorInfo.h" #include "webkit/common/cursors/webcursor.h" -using WebKit::WebCursorInfo; +using blink::WebCursorInfo; namespace content { diff --git a/content/renderer/cursor_utils.h b/content/renderer/cursor_utils.h index 2e594af..e19f758 100644 --- a/content/renderer/cursor_utils.h +++ b/content/renderer/cursor_utils.h @@ -7,20 +7,20 @@ class WebCursor; -namespace WebKit { +namespace blink { struct WebCursorInfo; } namespace content { -// Adapts our cursor info to WebKit::WebCursorInfo. +// Adapts our cursor info to blink::WebCursorInfo. bool GetWebKitCursorInfo(const WebCursor& cursor, - WebKit::WebCursorInfo* webkit_cursor_info); + blink::WebCursorInfo* webkit_cursor_info); -// Adapts WebKit::CursorInfo to our cursor. +// Adapts blink::CursorInfo to our cursor. void InitializeCursorFromWebKitCursorInfo( WebCursor* cursor, - const WebKit::WebCursorInfo& webkit_cursor_info); + const blink::WebCursorInfo& webkit_cursor_info); } // namespace content diff --git a/content/renderer/date_time_formatter.cc b/content/renderer/date_time_formatter.cc index a0ce77b..1b94049 100644 --- a/content/renderer/date_time_formatter.cc +++ b/content/renderer/date_time_formatter.cc @@ -77,10 +77,10 @@ static const char* FindLongestTimePatternWhichMatches(const std::string& value, } DateTimeFormatter::DateTimeFormatter( - const WebKit::WebDateTimeChooserParams& source) + const blink::WebDateTimeChooserParams& source) : formatted_string_(source.currentValue.utf8()) { CreatePatternMap(); - if (source.type == WebKit::WebDateTimeInputTypeTime) + if (source.type == blink::WebDateTimeInputTypeTime) time_pattern_ = FindLongestTimePatternWhichMatches(formatted_string_, source.step); ExtractType(source); @@ -214,27 +214,27 @@ const std::string DateTimeFormatter::FormatString() const { } void DateTimeFormatter::ExtractType( - const WebKit::WebDateTimeChooserParams& source) { + const blink::WebDateTimeChooserParams& source) { switch (source.type) { - case WebKit::WebDateTimeInputTypeDate: + case blink::WebDateTimeInputTypeDate: type_ = ui::TEXT_INPUT_TYPE_DATE; break; - case WebKit::WebDateTimeInputTypeDateTime: + case blink::WebDateTimeInputTypeDateTime: type_ = ui::TEXT_INPUT_TYPE_DATE_TIME; break; - case WebKit::WebDateTimeInputTypeDateTimeLocal: + case blink::WebDateTimeInputTypeDateTimeLocal: type_ = ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL; break; - case WebKit::WebDateTimeInputTypeMonth: + case blink::WebDateTimeInputTypeMonth: type_ = ui::TEXT_INPUT_TYPE_MONTH; break; - case WebKit::WebDateTimeInputTypeTime: + case blink::WebDateTimeInputTypeTime: type_ = ui::TEXT_INPUT_TYPE_TIME; break; - case WebKit::WebDateTimeInputTypeWeek: + case blink::WebDateTimeInputTypeWeek: type_ = ui::TEXT_INPUT_TYPE_WEEK; break; - case WebKit::WebDateTimeInputTypeNone: + case blink::WebDateTimeInputTypeNone: default: type_ = ui::TEXT_INPUT_TYPE_NONE; } diff --git a/content/renderer/date_time_formatter.h b/content/renderer/date_time_formatter.h index b2b7341..b91e117 100644 --- a/content/renderer/date_time_formatter.h +++ b/content/renderer/date_time_formatter.h @@ -13,9 +13,9 @@ #include "third_party/icu/source/i18n/unicode/gregocal.h" #include "ui/base/ime/text_input_type.h" -namespace WebKit { +namespace blink { struct WebDateTimeChooserParams; -} // namespace WebKit +} // namespace blink namespace content { @@ -24,7 +24,7 @@ namespace content { // It is timezone agnostic. class CONTENT_EXPORT DateTimeFormatter { public: - explicit DateTimeFormatter(const WebKit::WebDateTimeChooserParams& source); + explicit DateTimeFormatter(const blink::WebDateTimeChooserParams& source); DateTimeFormatter(ui::TextInputType type, int year, int month, @@ -55,7 +55,7 @@ class CONTENT_EXPORT DateTimeFormatter { const std::string FormatString() const; int ExtractValue( const icu::Calendar* calendar, UCalendarDateFields value) const; - void ExtractType(const WebKit::WebDateTimeChooserParams& source); + void ExtractType(const blink::WebDateTimeChooserParams& source); void ClearAll(); ui::TextInputType type_; diff --git a/content/renderer/date_time_formatter_unittest.cc b/content/renderer/date_time_formatter_unittest.cc index 0d8b07f..b521188 100644 --- a/content/renderer/date_time_formatter_unittest.cc +++ b/content/renderer/date_time_formatter_unittest.cc @@ -17,9 +17,9 @@ class RendererDateTimePickerTest { }; TEST(RendererDateTimePickerTest, TestParserValidStringInputs) { - WebKit::WebDateTimeChooserParams params; + blink::WebDateTimeChooserParams params; params.currentValue = "2010-07"; - params.type = WebKit::WebDateTimeInputTypeMonth; + params.type = blink::WebDateTimeInputTypeMonth; DateTimeFormatter sut(params); EXPECT_EQ(2010, sut.GetYear()); @@ -36,7 +36,7 @@ TEST(RendererDateTimePickerTest, TestParserValidStringInputs) { EXPECT_EQ(ui::TEXT_INPUT_TYPE_MONTH, sut.GetType()); params.currentValue = "2012-05-25"; - params.type = WebKit::WebDateTimeInputTypeDate; + params.type = blink::WebDateTimeInputTypeDate; DateTimeFormatter sut2(params); EXPECT_EQ(2012, sut2.GetYear()); EXPECT_EQ(4, sut2.GetMonth()); @@ -49,7 +49,7 @@ TEST(RendererDateTimePickerTest, TestParserValidStringInputs) { EXPECT_EQ(ui::TEXT_INPUT_TYPE_DATE, sut2.GetType()); params.currentValue = "2013-05-21T12:15"; - params.type = WebKit::WebDateTimeInputTypeDateTimeLocal; + params.type = blink::WebDateTimeInputTypeDateTimeLocal; DateTimeFormatter sut3(params); EXPECT_EQ(2013, sut3.GetYear()); EXPECT_EQ(4, sut3.GetMonth()); @@ -62,7 +62,7 @@ TEST(RendererDateTimePickerTest, TestParserValidStringInputs) { EXPECT_EQ(ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL, sut3.GetType()); params.currentValue = "2013-W15"; - params.type = WebKit::WebDateTimeInputTypeWeek; + params.type = blink::WebDateTimeInputTypeWeek; DateTimeFormatter sut4(params); EXPECT_EQ(2013, sut4.GetYear()); EXPECT_EQ(3, sut4.GetMonth()); @@ -75,7 +75,7 @@ TEST(RendererDateTimePickerTest, TestParserValidStringInputs) { EXPECT_EQ(ui::TEXT_INPUT_TYPE_WEEK, sut4.GetType()); params.currentValue = "12:15"; - params.type = WebKit::WebDateTimeInputTypeTime; + params.type = blink::WebDateTimeInputTypeTime; DateTimeFormatter sut5(params); EXPECT_EQ(12, sut5.GetHour()); EXPECT_EQ(15, sut5.GetMinute()); @@ -84,7 +84,7 @@ TEST(RendererDateTimePickerTest, TestParserValidStringInputs) { EXPECT_EQ(ui::TEXT_INPUT_TYPE_TIME, sut5.GetType()); params.currentValue = "12:15:02"; - params.type = WebKit::WebDateTimeInputTypeTime; + params.type = blink::WebDateTimeInputTypeTime; DateTimeFormatter sut6(params); EXPECT_EQ(12, sut6.GetHour()); EXPECT_EQ(15, sut6.GetMinute()); @@ -93,7 +93,7 @@ TEST(RendererDateTimePickerTest, TestParserValidStringInputs) { EXPECT_EQ(ui::TEXT_INPUT_TYPE_TIME, sut6.GetType()); params.currentValue = "12:15:02.1"; - params.type = WebKit::WebDateTimeInputTypeTime; + params.type = blink::WebDateTimeInputTypeTime; DateTimeFormatter sut7(params); EXPECT_EQ(12, sut7.GetHour()); EXPECT_EQ(15, sut7.GetMinute()); @@ -102,7 +102,7 @@ TEST(RendererDateTimePickerTest, TestParserValidStringInputs) { EXPECT_EQ(ui::TEXT_INPUT_TYPE_TIME, sut7.GetType()); params.currentValue = "12:15:02.123"; - params.type = WebKit::WebDateTimeInputTypeTime; + params.type = blink::WebDateTimeInputTypeTime; DateTimeFormatter sut8(params); EXPECT_EQ(12, sut8.GetHour()); EXPECT_EQ(15, sut8.GetMinute()); @@ -115,9 +115,9 @@ TEST(RendererDateTimePickerTest, TestParserValidStringInputs) { TEST(RendererDateTimePickerTest, TestParserInvalidStringInputs) { // Random non parsable text - WebKit::WebDateTimeChooserParams params; + blink::WebDateTimeChooserParams params; params.currentValue = "<script injection"; - params.type = WebKit::WebDateTimeInputTypeMonth; + params.type = blink::WebDateTimeInputTypeMonth; DateTimeFormatter sut(params); EXPECT_EQ(0, sut.GetYear()); EXPECT_EQ(0, sut.GetMonth()); @@ -129,7 +129,7 @@ TEST(RendererDateTimePickerTest, TestParserInvalidStringInputs) { // unimplemented type params.currentValue = "week 23"; - params.type = WebKit::WebDateTimeInputTypeWeek; // Not implemented + params.type = blink::WebDateTimeInputTypeWeek; // Not implemented DateTimeFormatter sut2(params); EXPECT_EQ(0, sut2.GetYear()); EXPECT_EQ(0, sut2.GetMonth()); @@ -141,7 +141,7 @@ TEST(RendererDateTimePickerTest, TestParserInvalidStringInputs) { // type is a subset of pattern params.currentValue = "2012-05-25"; - params.type = WebKit::WebDateTimeInputTypeDateTimeLocal; + params.type = blink::WebDateTimeInputTypeDateTimeLocal; DateTimeFormatter sut3(params); EXPECT_EQ(0, sut3.GetYear()); EXPECT_EQ(0, sut3.GetMonth()); @@ -153,7 +153,7 @@ TEST(RendererDateTimePickerTest, TestParserInvalidStringInputs) { // type is a superset of pattern params.currentValue = "2013-05-21T12:15"; - params.type = WebKit::WebDateTimeInputTypeMonth; + params.type = blink::WebDateTimeInputTypeMonth; DateTimeFormatter sut4(params); EXPECT_EQ(2013, sut4.GetYear()); EXPECT_EQ(4, sut4.GetMonth()); diff --git a/content/renderer/device_orientation/device_motion_event_pump.cc b/content/renderer/device_orientation/device_motion_event_pump.cc index e7ad8ca..c60bd7a 100644 --- a/content/renderer/device_orientation/device_motion_event_pump.cc +++ b/content/renderer/device_orientation/device_motion_event_pump.cc @@ -22,7 +22,7 @@ DeviceMotionEventPump::~DeviceMotionEventPump() { } bool DeviceMotionEventPump::SetListener( - WebKit::WebDeviceMotionListener* listener) { + blink::WebDeviceMotionListener* listener) { listener_ = listener; return listener_ ? RequestStart() : Stop(); } @@ -39,7 +39,7 @@ bool DeviceMotionEventPump::OnControlMessageReceived( void DeviceMotionEventPump::FireEvent() { DCHECK(listener_); - WebKit::WebDeviceMotionData data; + blink::WebDeviceMotionData data; if (reader_->GetLatestData(&data) && data.allAvailableSensorsAreActive) listener_->didChangeDeviceMotion(data); } diff --git a/content/renderer/device_orientation/device_motion_event_pump.h b/content/renderer/device_orientation/device_motion_event_pump.h index 4fa453d..f262ad4 100644 --- a/content/renderer/device_orientation/device_motion_event_pump.h +++ b/content/renderer/device_orientation/device_motion_event_pump.h @@ -10,13 +10,13 @@ #include "content/renderer/shared_memory_seqlock_reader.h" #include "third_party/WebKit/public/platform/WebDeviceMotionData.h" -namespace WebKit { +namespace blink { class WebDeviceMotionListener; } namespace content { -typedef SharedMemorySeqLockReader<WebKit::WebDeviceMotionData> +typedef SharedMemorySeqLockReader<blink::WebDeviceMotionData> DeviceMotionSharedMemoryReader; class CONTENT_EXPORT DeviceMotionEventPump : public DeviceSensorEventPump { @@ -27,7 +27,7 @@ class CONTENT_EXPORT DeviceMotionEventPump : public DeviceSensorEventPump { // Sets the listener to receive updates for device motion data at // regular intervals. Returns true if the registration was successful. - bool SetListener(WebKit::WebDeviceMotionListener* listener); + bool SetListener(blink::WebDeviceMotionListener* listener); // RenderProcessObserver implementation. virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; @@ -38,7 +38,7 @@ class CONTENT_EXPORT DeviceMotionEventPump : public DeviceSensorEventPump { virtual bool SendStartMessage() OVERRIDE; virtual bool SendStopMessage() OVERRIDE; - WebKit::WebDeviceMotionListener* listener_; + blink::WebDeviceMotionListener* listener_; scoped_ptr<DeviceMotionSharedMemoryReader> reader_; }; diff --git a/content/renderer/device_orientation/device_motion_event_pump_unittest.cc b/content/renderer/device_orientation/device_motion_event_pump_unittest.cc index 7ec3e04..6cb78b6 100644 --- a/content/renderer/device_orientation/device_motion_event_pump_unittest.cc +++ b/content/renderer/device_orientation/device_motion_event_pump_unittest.cc @@ -17,14 +17,14 @@ namespace content { class DeviceMotionEventPumpTest : public testing::Test { }; -class MockDeviceMotionListener : public WebKit::WebDeviceMotionListener { +class MockDeviceMotionListener : public blink::WebDeviceMotionListener { public: MockDeviceMotionListener(); virtual ~MockDeviceMotionListener() { } virtual void didChangeDeviceMotion( - const WebKit::WebDeviceMotionData&) OVERRIDE; + const blink::WebDeviceMotionData&) OVERRIDE; bool did_change_device_motion_; - WebKit::WebDeviceMotionData data_; + blink::WebDeviceMotionData data_; }; MockDeviceMotionListener::MockDeviceMotionListener() @@ -33,7 +33,7 @@ MockDeviceMotionListener::MockDeviceMotionListener() } void MockDeviceMotionListener::didChangeDeviceMotion( - const WebKit::WebDeviceMotionData& data) { + const blink::WebDeviceMotionData& data) { memcpy(&data_, &data, sizeof(data)); did_change_device_motion_ = true; } @@ -71,7 +71,7 @@ TEST_F(DeviceMotionEventPumpTest, MAYBE_DidStartPolling) { memset(buffer, 0, sizeof(DeviceMotionHardwareBuffer)); shared_memory.ShareToProcess(base::kNullProcessHandle, &handle); - WebKit::WebDeviceMotionData& data = buffer->data; + blink::WebDeviceMotionData& data = buffer->data; data.accelerationX = 1; data.hasAccelerationX = true; data.accelerationY = 2; @@ -87,7 +87,7 @@ TEST_F(DeviceMotionEventPumpTest, MAYBE_DidStartPolling) { RunAllPendingInMessageLoop(); motion_pump->SetListener(0); - WebKit::WebDeviceMotionData& received_data = listener->data_; + blink::WebDeviceMotionData& received_data = listener->data_; EXPECT_TRUE(listener->did_change_device_motion_); EXPECT_TRUE(received_data.hasAccelerationX); EXPECT_EQ(1, (double)received_data.accelerationX); @@ -128,7 +128,7 @@ TEST_F(DeviceMotionEventPumpTest, MAYBE_DidStartPollingNotAllSensorsActive) { memset(buffer, 0, sizeof(DeviceMotionHardwareBuffer)); shared_memory.ShareToProcess(base::kNullProcessHandle, &handle); - WebKit::WebDeviceMotionData& data = buffer->data; + blink::WebDeviceMotionData& data = buffer->data; data.accelerationX = 1; data.hasAccelerationX = true; data.accelerationY = 2; @@ -144,7 +144,7 @@ TEST_F(DeviceMotionEventPumpTest, MAYBE_DidStartPollingNotAllSensorsActive) { RunAllPendingInMessageLoop(); motion_pump->SetListener(0); - WebKit::WebDeviceMotionData& received_data = listener->data_; + blink::WebDeviceMotionData& received_data = listener->data_; // No change in device motion because allAvailableSensorsAreActive is false. EXPECT_FALSE(listener->did_change_device_motion_); EXPECT_FALSE(received_data.hasAccelerationX); diff --git a/content/renderer/device_orientation/device_orientation_event_pump.cc b/content/renderer/device_orientation/device_orientation_event_pump.cc index ca45537..1493043 100644 --- a/content/renderer/device_orientation/device_orientation_event_pump.cc +++ b/content/renderer/device_orientation/device_orientation_event_pump.cc @@ -26,7 +26,7 @@ DeviceOrientationEventPump::~DeviceOrientationEventPump() { } bool DeviceOrientationEventPump::SetListener( - WebKit::WebDeviceOrientationListener* listener) { + blink::WebDeviceOrientationListener* listener) { listener_ = listener; return listener_ ? RequestStart() : Stop(); } @@ -43,7 +43,7 @@ bool DeviceOrientationEventPump::OnControlMessageReceived( void DeviceOrientationEventPump::FireEvent() { DCHECK(listener_); - WebKit::WebDeviceOrientationData data; + blink::WebDeviceOrientationData data; if (reader_->GetLatestData(&data) && ShouldFireEvent(data)) { memcpy(&data_, &data, sizeof(data)); listener_->didChangeDeviceOrientation(data); @@ -59,7 +59,7 @@ static bool IsSignificantlyDifferent(bool hasAngle1, double angle1, } bool DeviceOrientationEventPump::ShouldFireEvent( - const WebKit::WebDeviceOrientationData& data) const { + const blink::WebDeviceOrientationData& data) const { return data.allAvailableSensorsAreActive && (IsSignificantlyDifferent( data_.hasAlpha, data_.alpha, data.hasAlpha, data.alpha) || diff --git a/content/renderer/device_orientation/device_orientation_event_pump.h b/content/renderer/device_orientation/device_orientation_event_pump.h index 26658ff..ac7f31c 100644 --- a/content/renderer/device_orientation/device_orientation_event_pump.h +++ b/content/renderer/device_orientation/device_orientation_event_pump.h @@ -10,13 +10,13 @@ #include "content/renderer/shared_memory_seqlock_reader.h" #include "third_party/WebKit/public/platform/WebDeviceOrientationData.h" -namespace WebKit { +namespace blink { class WebDeviceOrientationListener; } namespace content { -typedef SharedMemorySeqLockReader<WebKit::WebDeviceOrientationData> +typedef SharedMemorySeqLockReader<blink::WebDeviceOrientationData> DeviceOrientationSharedMemoryReader; class CONTENT_EXPORT DeviceOrientationEventPump : public DeviceSensorEventPump { @@ -31,7 +31,7 @@ class CONTENT_EXPORT DeviceOrientationEventPump : public DeviceSensorEventPump { // Sets the listener to receive updates for device orientation data at // regular intervals. Returns true if the registration was successful. - bool SetListener(WebKit::WebDeviceOrientationListener* listener); + bool SetListener(blink::WebDeviceOrientationListener* listener); // RenderProcessObserver implementation. virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; @@ -42,10 +42,10 @@ class CONTENT_EXPORT DeviceOrientationEventPump : public DeviceSensorEventPump { virtual bool SendStartMessage() OVERRIDE; virtual bool SendStopMessage() OVERRIDE; - bool ShouldFireEvent(const WebKit::WebDeviceOrientationData& data) const; + bool ShouldFireEvent(const blink::WebDeviceOrientationData& data) const; - WebKit::WebDeviceOrientationListener* listener_; - WebKit::WebDeviceOrientationData data_; + blink::WebDeviceOrientationListener* listener_; + blink::WebDeviceOrientationData data_; scoped_ptr<DeviceOrientationSharedMemoryReader> reader_; }; diff --git a/content/renderer/device_orientation/device_orientation_event_pump_unittest.cc b/content/renderer/device_orientation/device_orientation_event_pump_unittest.cc index e1f568b..402cd07 100644 --- a/content/renderer/device_orientation/device_orientation_event_pump_unittest.cc +++ b/content/renderer/device_orientation/device_orientation_event_pump_unittest.cc @@ -14,15 +14,15 @@ namespace content { class MockDeviceOrientationListener - : public WebKit::WebDeviceOrientationListener { + : public blink::WebDeviceOrientationListener { public: MockDeviceOrientationListener(); virtual ~MockDeviceOrientationListener() { } virtual void didChangeDeviceOrientation( - const WebKit::WebDeviceOrientationData&) OVERRIDE; + const blink::WebDeviceOrientationData&) OVERRIDE; void ResetDidChangeOrientation(); bool did_change_device_orientation_; - WebKit::WebDeviceOrientationData data_; + blink::WebDeviceOrientationData data_; }; MockDeviceOrientationListener::MockDeviceOrientationListener() @@ -31,7 +31,7 @@ MockDeviceOrientationListener::MockDeviceOrientationListener() } void MockDeviceOrientationListener::didChangeDeviceOrientation( - const WebKit::WebDeviceOrientationData& data) { + const blink::WebDeviceOrientationData& data) { memcpy(&data_, &data, sizeof(data)); did_change_device_orientation_ = true; } @@ -75,7 +75,7 @@ class DeviceOrientationEventPumpTest : public testing::Test { } void InitBuffer() { - WebKit::WebDeviceOrientationData& data = buffer_->data; + blink::WebDeviceOrientationData& data = buffer_->data; data.alpha = 1; data.hasAlpha = true; data.beta = 2; @@ -107,7 +107,7 @@ TEST_F(DeviceOrientationEventPumpTest, MAYBE_DidStartPolling) { base::MessageLoop::current()->Run(); - WebKit::WebDeviceOrientationData& received_data = listener_->data_; + blink::WebDeviceOrientationData& received_data = listener_->data_; EXPECT_TRUE(listener_->did_change_device_orientation_); EXPECT_TRUE(received_data.allAvailableSensorsAreActive); EXPECT_EQ(1, (double)received_data.alpha); @@ -136,7 +136,7 @@ TEST_F(DeviceOrientationEventPumpTest, base::MessageLoop::current()->Run(); - WebKit::WebDeviceOrientationData& received_data = listener_->data_; + blink::WebDeviceOrientationData& received_data = listener_->data_; EXPECT_TRUE(listener_->did_change_device_orientation_); EXPECT_TRUE(received_data.allAvailableSensorsAreActive); EXPECT_EQ(1, (double)received_data.alpha); diff --git a/content/renderer/devtools/devtools_agent.cc b/content/renderer/devtools/devtools_agent.cc index 6b83e8d..5c37855 100644 --- a/content/renderer/devtools/devtools_agent.cc +++ b/content/renderer/devtools/devtools_agent.cc @@ -29,15 +29,15 @@ #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" #endif -using WebKit::WebConsoleMessage; -using WebKit::WebDevToolsAgent; -using WebKit::WebDevToolsAgentClient; -using WebKit::WebFrame; -using WebKit::WebPoint; -using WebKit::WebString; -using WebKit::WebCString; -using WebKit::WebVector; -using WebKit::WebView; +using blink::WebConsoleMessage; +using blink::WebDevToolsAgent; +using blink::WebDevToolsAgentClient; +using blink::WebFrame; +using blink::WebPoint; +using blink::WebString; +using blink::WebCString; +using blink::WebVector; +using blink::WebView; using base::debug::TraceLog; @@ -108,7 +108,7 @@ bool DevToolsAgent::OnMessageReceived(const IPC::Message& message) { } void DevToolsAgent::sendMessageToInspectorFrontend( - const WebKit::WebString& message) { + const blink::WebString& message) { Send(new DevToolsClientMsg_DispatchOnInspectorFrontend(routing_id(), message.utf8())); } @@ -118,11 +118,11 @@ int DevToolsAgent::hostIdentifier() { } void DevToolsAgent::saveAgentRuntimeState( - const WebKit::WebString& state) { + const blink::WebString& state) { Send(new DevToolsHostMsg_SaveAgentRuntimeState(routing_id(), state.utf8())); } -WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop* +blink::WebDevToolsAgentClient::WebKitClientMessageLoop* DevToolsAgent::createClientMessageLoop() { return new WebKitClientMessageLoopImpl(); } @@ -171,8 +171,8 @@ void DevToolsAgent::TraceEventCallbackWrapper( } void DevToolsAgent::enableDeviceEmulation( - const WebKit::WebSize& device_size, - const WebKit::WebRect& view_rect, + const blink::WebSize& device_size, + const blink::WebRect& view_rect, float device_scale_factor, bool fit_to_view) { RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view()); @@ -188,7 +188,7 @@ void DevToolsAgent::disableDeviceEmulation() { #if defined(USE_TCMALLOC) && !defined(OS_WIN) static void AllocationVisitor(void* data, const void* ptr) { - typedef WebKit::WebDevToolsAgentClient::AllocatedObjectVisitor Visitor; + typedef blink::WebDevToolsAgentClient::AllocatedObjectVisitor Visitor; Visitor* visitor = reinterpret_cast<Visitor*>(data); visitor->visitObject(ptr); } diff --git a/content/renderer/devtools/devtools_agent.h b/content/renderer/devtools/devtools_agent.h index 45d5566..fcefaaf 100644 --- a/content/renderer/devtools/devtools_agent.h +++ b/content/renderer/devtools/devtools_agent.h @@ -14,7 +14,7 @@ #include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/public/web/WebDevToolsAgentClient.h" -namespace WebKit { +namespace blink { class WebDevToolsAgent; } @@ -26,7 +26,7 @@ class RenderViewImpl; // agents infrastructure are flowing through this communication agent. // There is a corresponding DevToolsClient object on the client side. class DevToolsAgent : public RenderViewObserver, - public WebKit::WebDevToolsAgentClient { + public blink::WebDevToolsAgentClient { public: explicit DevToolsAgent(RenderViewImpl* render_view); virtual ~DevToolsAgent(); @@ -34,7 +34,7 @@ class DevToolsAgent : public RenderViewObserver, // Returns agent instance for its host id. static DevToolsAgent* FromHostId(int host_id); - WebKit::WebDevToolsAgent* GetWebAgent(); + blink::WebDevToolsAgent* GetWebAgent(); bool IsAttached(); @@ -45,11 +45,11 @@ class DevToolsAgent : public RenderViewObserver, virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // WebDevToolsAgentClient implementation - virtual void sendMessageToInspectorFrontend(const WebKit::WebString& data); + virtual void sendMessageToInspectorFrontend(const blink::WebString& data); virtual int hostIdentifier(); - virtual void saveAgentRuntimeState(const WebKit::WebString& state); - virtual WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop* + virtual void saveAgentRuntimeState(const blink::WebString& state); + virtual blink::WebDevToolsAgentClient::WebKitClientMessageLoop* createClientMessageLoop(); virtual void clearBrowserCache(); virtual void clearBrowserCookies(); @@ -63,8 +63,8 @@ class DevToolsAgent : public RenderViewObserver, virtual void setTraceEventCallback(TraceEventCallback cb); virtual void enableDeviceEmulation( - const WebKit::WebSize& device_size, - const WebKit::WebRect& view_rect, float device_scale_factor, + const blink::WebSize& device_size, + const blink::WebRect& view_rect, float device_scale_factor, bool fit_to_view); virtual void disableDeviceEmulation(); diff --git a/content/renderer/devtools/devtools_agent_filter.cc b/content/renderer/devtools/devtools_agent_filter.cc index 1613ad8..fc9e34f 100644 --- a/content/renderer/devtools/devtools_agent_filter.cc +++ b/content/renderer/devtools/devtools_agent_filter.cc @@ -11,8 +11,8 @@ #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/web/WebDevToolsAgent.h" -using WebKit::WebDevToolsAgent; -using WebKit::WebString; +using blink::WebDevToolsAgent; +using blink::WebString; namespace content { diff --git a/content/renderer/devtools/devtools_client.cc b/content/renderer/devtools/devtools_client.cc index 5793d2c..41b9481 100644 --- a/content/renderer/devtools/devtools_client.cc +++ b/content/renderer/devtools/devtools_client.cc @@ -18,8 +18,8 @@ #include "ui/base/ui_base_switches.h" #include "webkit/common/appcache/appcache_interfaces.h" -using WebKit::WebDevToolsFrontend; -using WebKit::WebString; +using blink::WebDevToolsFrontend; +using blink::WebString; namespace content { diff --git a/content/renderer/devtools/devtools_client.h b/content/renderer/devtools/devtools_client.h index 1c9d3f8..be1e902 100644 --- a/content/renderer/devtools/devtools_client.h +++ b/content/renderer/devtools/devtools_client.h @@ -12,7 +12,7 @@ #include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/public/web/WebDevToolsFrontendClient.h" -namespace WebKit { +namespace blink { class WebDevToolsFrontend; class WebString; } @@ -29,7 +29,7 @@ class RenderViewImpl; // code in glue class CONTENT_EXPORT DevToolsClient : public RenderViewObserver, - NON_EXPORTED_BASE(public WebKit::WebDevToolsFrontendClient) { + NON_EXPORTED_BASE(public blink::WebDevToolsFrontendClient) { public: explicit DevToolsClient(RenderViewImpl* render_view); virtual ~DevToolsClient(); @@ -39,14 +39,14 @@ class CONTENT_EXPORT DevToolsClient virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // WebDevToolsFrontendClient implementation. - virtual void sendMessageToBackend(const WebKit::WebString&) OVERRIDE; - virtual void sendMessageToEmbedder(const WebKit::WebString&) OVERRIDE; + virtual void sendMessageToBackend(const blink::WebString&) OVERRIDE; + virtual void sendMessageToEmbedder(const blink::WebString&) OVERRIDE; virtual bool isUnderTest() OVERRIDE; void OnDispatchOnInspectorFrontend(const std::string& message); - scoped_ptr<WebKit::WebDevToolsFrontend> web_tools_frontend_; + scoped_ptr<blink::WebDevToolsFrontend> web_tools_frontend_; DISALLOW_COPY_AND_ASSIGN(DevToolsClient); }; diff --git a/content/renderer/disambiguation_popup_helper.cc b/content/renderer/disambiguation_popup_helper.cc index 88f2e51..9fff7b9 100644 --- a/content/renderer/disambiguation_popup_helper.cc +++ b/content/renderer/disambiguation_popup_helper.cc @@ -7,8 +7,8 @@ #include "third_party/WebKit/public/platform/WebRect.h" #include "ui/gfx/size_conversions.h" -using WebKit::WebRect; -using WebKit::WebVector; +using blink::WebRect; +using blink::WebVector; namespace { diff --git a/content/renderer/disambiguation_popup_helper.h b/content/renderer/disambiguation_popup_helper.h index 535683d..0238f8a 100644 --- a/content/renderer/disambiguation_popup_helper.h +++ b/content/renderer/disambiguation_popup_helper.h @@ -13,7 +13,7 @@ class Rect; class Size; } -namespace WebKit { +namespace blink { struct WebRect; } @@ -24,7 +24,7 @@ class DisambiguationPopupHelper { public: CONTENT_EXPORT static float ComputeZoomAreaAndScaleFactor( const gfx::Rect& tap_rect, - const WebKit::WebVector<WebKit::WebRect>& target_rects, + const blink::WebVector<blink::WebRect>& target_rects, const gfx::Size& screen_size, const gfx::Size& visible_content_size, float total_scale, diff --git a/content/renderer/disambiguation_popup_helper_unittest.cc b/content/renderer/disambiguation_popup_helper_unittest.cc index 0b6d002..8cbbe4b 100644 --- a/content/renderer/disambiguation_popup_helper_unittest.cc +++ b/content/renderer/disambiguation_popup_helper_unittest.cc @@ -33,7 +33,7 @@ class DisambiguationPopupHelperUnittest : public testing::Test { TEST_F(DisambiguationPopupHelperUnittest, ClipByViewport) { gfx::Rect tap_rect(1000, 1000, 10, 10); - WebKit::WebVector<WebKit::WebRect> target_rects(static_cast<size_t>(1)); + blink::WebVector<blink::WebRect> target_rects(static_cast<size_t>(1)); target_rects[0] = gfx::Rect(-20, -20, 10, 10); gfx::Rect zoom_rect; @@ -50,7 +50,7 @@ TEST_F(DisambiguationPopupHelperUnittest, ClipByViewport) { TEST_F(DisambiguationPopupHelperUnittest, MiniTarget) { gfx::Rect tap_rect(-5, -5, 20, 20); - WebKit::WebVector<WebKit::WebRect> target_rects(static_cast<size_t>(1)); + blink::WebVector<blink::WebRect> target_rects(static_cast<size_t>(1)); target_rects[0] = gfx::Rect(10, 10, 1, 1); gfx::Rect zoom_rect; @@ -68,7 +68,7 @@ TEST_F(DisambiguationPopupHelperUnittest, MiniTarget) { TEST_F(DisambiguationPopupHelperUnittest, LongLinks) { gfx::Rect tap_rect(10, 10, 20, 20); - WebKit::WebVector<WebKit::WebRect> target_rects(static_cast<size_t>(2)); + blink::WebVector<blink::WebRect> target_rects(static_cast<size_t>(2)); target_rects[0] = gfx::Rect(15, 15, 1000, 5); target_rects[1] = gfx::Rect(15, 25, 1000, 5); diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc index 2239998..e6aae19 100644 --- a/content/renderer/dom_serializer_browsertest.cc +++ b/content/renderer/dom_serializer_browsertest.cc @@ -35,21 +35,21 @@ #include "third_party/WebKit/public/web/WebPageSerializerClient.h" #include "third_party/WebKit/public/web/WebView.h" -using WebKit::WebCString; -using WebKit::WebData; -using WebKit::WebDocument; -using WebKit::WebElement; -using WebKit::WebFrame; -using WebKit::WebNode; -using WebKit::WebNodeCollection; -using WebKit::WebNodeList; -using WebKit::WebPageSerializer; -using WebKit::WebPageSerializerClient; -using WebKit::WebNode; -using WebKit::WebString; -using WebKit::WebURL; -using WebKit::WebView; -using WebKit::WebVector; +using blink::WebCString; +using blink::WebData; +using blink::WebDocument; +using blink::WebElement; +using blink::WebFrame; +using blink::WebNode; +using blink::WebNodeCollection; +using blink::WebNodeList; +using blink::WebPageSerializer; +using blink::WebPageSerializerClient; +using blink::WebNode; +using blink::WebString; +using blink::WebURL; +using blink::WebView; +using blink::WebVector; namespace content { @@ -150,7 +150,7 @@ class LoadObserver : public RenderViewObserver { : RenderViewObserver(render_view), quit_closure_(quit_closure) {} - virtual void DidFinishLoad(WebKit::WebFrame* frame) OVERRIDE { + virtual void DidFinishLoad(blink::WebFrame* frame) OVERRIDE { if (frame == render_view()->GetWebView()->mainFrame()) quit_closure_.Run(); } diff --git a/content/renderer/dom_storage/dom_storage_dispatcher.cc b/content/renderer/dom_storage/dom_storage_dispatcher.cc index 8759153b..b4daaad 100644 --- a/content/renderer/dom_storage/dom_storage_dispatcher.cc +++ b/content/renderer/dom_storage/dom_storage_dispatcher.cc @@ -142,7 +142,7 @@ class DomStorageDispatcher::ProxyImpl : public DOMStorageProxy { // to more reliably commit changes during shutdown. void PushPendingCallback(const CompletionCallback& callback) { if (pending_callbacks_.empty()) - WebKit::Platform::current()->suddenTerminationChanged(false); + blink::Platform::current()->suddenTerminationChanged(false); pending_callbacks_.push_back(callback); } @@ -150,7 +150,7 @@ class DomStorageDispatcher::ProxyImpl : public DOMStorageProxy { CompletionCallback callback = pending_callbacks_.front(); pending_callbacks_.pop_front(); if (pending_callbacks_.empty()) - WebKit::Platform::current()->suddenTerminationChanged(true); + blink::Platform::current()->suddenTerminationChanged(true); return callback; } @@ -316,7 +316,7 @@ void DomStorageDispatcher::OnStorageEvent( } if (params.namespace_id == kLocalStorageNamespaceId) { - WebKit::WebStorageEventDispatcher::dispatchLocalStorageEvent( + blink::WebStorageEventDispatcher::dispatchLocalStorageEvent( params.key, params.old_value, params.new_value, @@ -327,7 +327,7 @@ void DomStorageDispatcher::OnStorageEvent( } else { WebStorageNamespaceImpl session_namespace_for_event_dispatch(params.namespace_id); - WebKit::WebStorageEventDispatcher::dispatchSessionStorageEvent( + blink::WebStorageEventDispatcher::dispatchSessionStorageEvent( params.key, params.old_value, params.new_value, diff --git a/content/renderer/dom_storage/webstoragearea_impl.cc b/content/renderer/dom_storage/webstoragearea_impl.cc index d5bf07d..c307535 100644 --- a/content/renderer/dom_storage/webstoragearea_impl.cc +++ b/content/renderer/dom_storage/webstoragearea_impl.cc @@ -14,8 +14,8 @@ #include "content/renderer/render_thread_impl.h" #include "third_party/WebKit/public/platform/WebURL.h" -using WebKit::WebString; -using WebKit::WebURL; +using blink::WebString; +using blink::WebURL; namespace content { diff --git a/content/renderer/dom_storage/webstoragearea_impl.h b/content/renderer/dom_storage/webstoragearea_impl.h index 7854562..24056ce 100644 --- a/content/renderer/dom_storage/webstoragearea_impl.h +++ b/content/renderer/dom_storage/webstoragearea_impl.h @@ -16,7 +16,7 @@ namespace content { class DOMStorageCachedArea; -class WebStorageAreaImpl : public WebKit::WebStorageArea { +class WebStorageAreaImpl : public blink::WebStorageArea { public: static WebStorageAreaImpl* FromConnectionId(int id); @@ -25,14 +25,14 @@ class WebStorageAreaImpl : public WebKit::WebStorageArea { // See WebStorageArea.h for documentation on these functions. virtual unsigned length(); - virtual WebKit::WebString key(unsigned index); - virtual WebKit::WebString getItem(const WebKit::WebString& key); + virtual blink::WebString key(unsigned index); + virtual blink::WebString getItem(const blink::WebString& key); virtual void setItem( - const WebKit::WebString& key, const WebKit::WebString& value, - const WebKit::WebURL& page_url, WebStorageArea::Result& result); + const blink::WebString& key, const blink::WebString& value, + const blink::WebURL& page_url, WebStorageArea::Result& result); virtual void removeItem( - const WebKit::WebString& key, const WebKit::WebURL& page_url); - virtual void clear(const WebKit::WebURL& url); + const blink::WebString& key, const blink::WebURL& page_url); + virtual void clear(const blink::WebURL& url); virtual size_t memoryBytesUsedByCache() const; private: diff --git a/content/renderer/dom_storage/webstoragenamespace_impl.cc b/content/renderer/dom_storage/webstoragenamespace_impl.cc index d5f1dc5..531263d 100644 --- a/content/renderer/dom_storage/webstoragenamespace_impl.cc +++ b/content/renderer/dom_storage/webstoragenamespace_impl.cc @@ -10,9 +10,9 @@ #include "third_party/WebKit/public/platform/WebString.h" #include "url/gurl.h" -using WebKit::WebStorageArea; -using WebKit::WebStorageNamespace; -using WebKit::WebString; +using blink::WebStorageArea; +using blink::WebStorageNamespace; +using blink::WebString; namespace content { diff --git a/content/renderer/dom_storage/webstoragenamespace_impl.h b/content/renderer/dom_storage/webstoragenamespace_impl.h index 52c1b35..364e648 100644 --- a/content/renderer/dom_storage/webstoragenamespace_impl.h +++ b/content/renderer/dom_storage/webstoragenamespace_impl.h @@ -10,7 +10,7 @@ namespace content { -class WebStorageNamespaceImpl : public WebKit::WebStorageNamespace { +class WebStorageNamespaceImpl : public blink::WebStorageNamespace { public: // The default constructor creates a local storage namespace, the second // constructor should be used for session storage namepaces. @@ -19,9 +19,9 @@ class WebStorageNamespaceImpl : public WebKit::WebStorageNamespace { virtual ~WebStorageNamespaceImpl(); // See WebStorageNamespace.h for documentation on these functions. - virtual WebKit::WebStorageArea* createStorageArea( - const WebKit::WebString& origin); - virtual WebKit::WebStorageNamespace* copy(); + virtual blink::WebStorageArea* createStorageArea( + const blink::WebString& origin); + virtual blink::WebStorageNamespace* copy(); virtual bool isSameNamespace(const WebStorageNamespace&) const; private: diff --git a/content/renderer/drop_data_builder.cc b/content/renderer/drop_data_builder.cc index 56bc81a..f9e5c42 100644 --- a/content/renderer/drop_data_builder.cc +++ b/content/renderer/drop_data_builder.cc @@ -11,15 +11,15 @@ #include "third_party/WebKit/public/platform/WebVector.h" #include "ui/base/clipboard/clipboard.h" -using WebKit::WebDragData; -using WebKit::WebVector; +using blink::WebDragData; +using blink::WebVector; namespace content { //static DropData DropDataBuilder::Build(const WebDragData& drag_data) { DropData result; - result.referrer_policy = WebKit::WebReferrerPolicyDefault; + result.referrer_policy = blink::WebReferrerPolicyDefault; const WebVector<WebDragData::Item>& item_list = drag_data.items(); for (size_t i = 0; i < item_list.size(); ++i) { diff --git a/content/renderer/drop_data_builder.h b/content/renderer/drop_data_builder.h index 4870d47..2dfb7b9 100644 --- a/content/renderer/drop_data_builder.h +++ b/content/renderer/drop_data_builder.h @@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_DROP_DATA_BUILDER_H_ #define CONTENT_RENDERER_DROP_DATA_BUILDER_H_ -namespace WebKit { +namespace blink { class WebDragData; } @@ -14,7 +14,7 @@ struct DropData; class DropDataBuilder { public: - static DropData Build(const WebKit::WebDragData& data); + static DropData Build(const blink::WebDragData& data); }; } // namespace content diff --git a/content/renderer/external_popup_menu.cc b/content/renderer/external_popup_menu.cc index 070ccd3..0cb922b 100644 --- a/content/renderer/external_popup_menu.cc +++ b/content/renderer/external_popup_menu.cc @@ -14,8 +14,8 @@ namespace content { ExternalPopupMenu::ExternalPopupMenu( RenderViewImpl* render_view, - const WebKit::WebPopupMenuInfo& popup_menu_info, - WebKit::WebExternalPopupMenuClient* popup_menu_client) + const blink::WebPopupMenuInfo& popup_menu_info, + blink::WebExternalPopupMenuClient* popup_menu_client) : render_view_(render_view), popup_menu_info_(popup_menu_info), popup_menu_client_(popup_menu_client), @@ -26,8 +26,8 @@ void ExternalPopupMenu::SetOriginScaleForEmulation(float scale) { origin_scale_for_emulation_ = scale; } -void ExternalPopupMenu::show(const WebKit::WebRect& bounds) { - WebKit::WebRect rect = bounds; +void ExternalPopupMenu::show(const blink::WebRect& bounds) { + blink::WebRect rect = bounds; if (origin_scale_for_emulation_) { rect.x *= origin_scale_for_emulation_; rect.y *= origin_scale_for_emulation_; diff --git a/content/renderer/external_popup_menu.h b/content/renderer/external_popup_menu.h index 28d65ac..6266542 100644 --- a/content/renderer/external_popup_menu.h +++ b/content/renderer/external_popup_menu.h @@ -12,18 +12,18 @@ #include "third_party/WebKit/public/web/WebPopupMenuInfo.h" #include "ui/gfx/point.h" -namespace WebKit { +namespace blink { class WebExternalPopupMenuClient; } namespace content { class RenderViewImpl; -class ExternalPopupMenu : public WebKit::WebExternalPopupMenu { +class ExternalPopupMenu : public blink::WebExternalPopupMenu { public: ExternalPopupMenu(RenderViewImpl* render_view, - const WebKit::WebPopupMenuInfo& popup_menu_info, - WebKit::WebExternalPopupMenuClient* popup_menu_client); + const blink::WebPopupMenuInfo& popup_menu_info, + blink::WebExternalPopupMenuClient* popup_menu_client); virtual ~ExternalPopupMenu() {} @@ -40,14 +40,14 @@ class ExternalPopupMenu : public WebKit::WebExternalPopupMenu { void DidSelectItems(bool canceled, const std::vector<int>& selected_indices); #endif - // WebKit::WebExternalPopupMenu implementation: - virtual void show(const WebKit::WebRect& bounds); + // blink::WebExternalPopupMenu implementation: + virtual void show(const blink::WebRect& bounds); virtual void close(); private: RenderViewImpl* render_view_; - WebKit::WebPopupMenuInfo popup_menu_info_; - WebKit::WebExternalPopupMenuClient* popup_menu_client_; + blink::WebPopupMenuInfo popup_menu_info_; + blink::WebExternalPopupMenuClient* popup_menu_client_; // Popups may be displaced when screen metrics emulation is enabled. // This scale is used to properly adjust popup position. diff --git a/content/renderer/external_popup_menu_browsertest.cc b/content/renderer/external_popup_menu_browsertest.cc index 30e5397..fd6041d 100644 --- a/content/renderer/external_popup_menu_browsertest.cc +++ b/content/renderer/external_popup_menu_browsertest.cc @@ -31,7 +31,7 @@ class ExternalPopupMenuTest : public RenderViewTest { virtual void SetUp() { RenderViewTest::SetUp(); // We need to set this explictly as RenderMain is not run. - WebKit::WebView::setUseExternalPopupMenus(true); + blink::WebView::setUseExternalPopupMenus(true); std::string html = "<select id='mySelect' onchange='selectChanged(this)'>" " <option>zero</option>" @@ -52,7 +52,7 @@ class ExternalPopupMenuTest : public RenderViewTest { LoadHTML(html.c_str()); // Set a minimum size and give focus so simulated events work. - view()->webwidget()->resize(WebKit::WebSize(500, 500)); + view()->webwidget()->resize(blink::WebSize(500, 500)); view()->webwidget()->setFocus(true); } diff --git a/content/renderer/fetchers/alt_error_page_resource_fetcher.cc b/content/renderer/fetchers/alt_error_page_resource_fetcher.cc index cbcab09..56cb6b8 100644 --- a/content/renderer/fetchers/alt_error_page_resource_fetcher.cc +++ b/content/renderer/fetchers/alt_error_page_resource_fetcher.cc @@ -8,10 +8,10 @@ #include "base/bind_helpers.h" #include "content/renderer/fetchers/resource_fetcher.h" -using WebKit::WebFrame; -using WebKit::WebURLError; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; +using blink::WebFrame; +using blink::WebURLError; +using blink::WebURLRequest; +using blink::WebURLResponse; namespace content { diff --git a/content/renderer/fetchers/alt_error_page_resource_fetcher.h b/content/renderer/fetchers/alt_error_page_resource_fetcher.h index 6d82857..7fcf34c 100644 --- a/content/renderer/fetchers/alt_error_page_resource_fetcher.h +++ b/content/renderer/fetchers/alt_error_page_resource_fetcher.h @@ -11,7 +11,7 @@ #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "url/gurl.h" -namespace WebKit { +namespace blink { class WebFrame; class WebURLResponse; } @@ -26,16 +26,16 @@ class AltErrorPageResourceFetcher { // This will be called when the alternative error page has been fetched, // successfully or not. If there is a failure, the third parameter (the // data) will be empty. - typedef base::Callback<void(WebKit::WebFrame*, - const WebKit::WebURLRequest&, - const WebKit::WebURLError&, + typedef base::Callback<void(blink::WebFrame*, + const blink::WebURLRequest&, + const blink::WebURLError&, const std::string&)> Callback; AltErrorPageResourceFetcher( const GURL& url, - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& original_request, - const WebKit::WebURLError& original_error, + blink::WebFrame* frame, + const blink::WebURLRequest& original_request, + const blink::WebURLError& original_error, const Callback& callback); ~AltErrorPageResourceFetcher(); @@ -43,22 +43,22 @@ class AltErrorPageResourceFetcher { void Cancel(); private: - void OnURLFetchComplete(const WebKit::WebURLResponse& response, + void OnURLFetchComplete(const blink::WebURLResponse& response, const std::string& data); // Does the actual fetching. scoped_ptr<ResourceFetcherWithTimeout> fetcher_; - WebKit::WebFrame* frame_; + blink::WebFrame* frame_; Callback callback_; // The original request. If loading the alternate error page fails, it's // needed to generate the error page. - WebKit::WebURLRequest original_request_; + blink::WebURLRequest original_request_; // The error associated with this load. If there's an error talking with the // alt error page server, we need this to complete the original load. - WebKit::WebURLError original_error_; + blink::WebURLError original_error_; DISALLOW_COPY_AND_ASSIGN(AltErrorPageResourceFetcher); }; diff --git a/content/renderer/fetchers/image_resource_fetcher.cc b/content/renderer/fetchers/image_resource_fetcher.cc index 0ce0d4e..fe6d1cd 100644 --- a/content/renderer/fetchers/image_resource_fetcher.cc +++ b/content/renderer/fetchers/image_resource_fetcher.cc @@ -12,9 +12,9 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/size.h" -using WebKit::WebFrame; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; +using blink::WebFrame; +using blink::WebURLRequest; +using blink::WebURLResponse; namespace content { diff --git a/content/renderer/fetchers/image_resource_fetcher.h b/content/renderer/fetchers/image_resource_fetcher.h index 2ddb20d..a7d16c1 100644 --- a/content/renderer/fetchers/image_resource_fetcher.h +++ b/content/renderer/fetchers/image_resource_fetcher.h @@ -22,10 +22,10 @@ class ImageResourceFetcher { ImageResourceFetcher( const GURL& image_url, - WebKit::WebFrame* frame, + blink::WebFrame* frame, int id, int image_size, - WebKit::WebURLRequest::TargetType target_type, + blink::WebURLRequest::TargetType target_type, const Callback& callback); virtual ~ImageResourceFetcher(); @@ -38,7 +38,7 @@ class ImageResourceFetcher { private: // ResourceFetcher::Callback. Decodes the image and invokes callback_. - void OnURLFetchComplete(const WebKit::WebURLResponse& response, + void OnURLFetchComplete(const blink::WebURLResponse& response, const std::string& data); Callback callback_; diff --git a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc index 304abe8..f910406 100644 --- a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc +++ b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc @@ -11,9 +11,9 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/size.h" -using WebKit::WebFrame; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; +using blink::WebFrame; +using blink::WebURLRequest; +using blink::WebURLResponse; namespace content { diff --git a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h index 3e7c326..4377a26 100644 --- a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h +++ b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h @@ -24,9 +24,9 @@ class MultiResolutionImageResourceFetcher{ MultiResolutionImageResourceFetcher( const GURL& image_url, - WebKit::WebFrame* frame, + blink::WebFrame* frame, int id, - WebKit::WebURLRequest::TargetType target_type, + blink::WebURLRequest::TargetType target_type, const Callback& callback); virtual ~MultiResolutionImageResourceFetcher(); @@ -42,7 +42,7 @@ class MultiResolutionImageResourceFetcher{ private: // ResourceFetcher::Callback. Decodes the image and invokes callback_. - void OnURLFetchComplete(const WebKit::WebURLResponse& response, + void OnURLFetchComplete(const blink::WebURLResponse& response, const std::string& data); Callback callback_; diff --git a/content/renderer/fetchers/resource_fetcher.cc b/content/renderer/fetchers/resource_fetcher.cc index 455f59e..ccdda07 100644 --- a/content/renderer/fetchers/resource_fetcher.cc +++ b/content/renderer/fetchers/resource_fetcher.cc @@ -15,11 +15,11 @@ #include "third_party/WebKit/public/web/WebKit.h" using base::TimeDelta; -using WebKit::WebFrame; -using WebKit::WebURLError; -using WebKit::WebURLLoader; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; +using blink::WebFrame; +using blink::WebURLError; +using blink::WebURLLoader; +using blink::WebURLRequest; +using blink::WebURLResponse; namespace content { @@ -54,7 +54,7 @@ void ResourceFetcher::Start(WebFrame* frame) { request.setFirstPartyForCookies(frame->document().firstPartyForCookies()); frame->dispatchWillSendRequest(request); - loader_.reset(WebKit::Platform::current()->createURLLoader()); + loader_.reset(blink::Platform::current()->createURLLoader()); loader_->loadAsynchronously(request, this); } diff --git a/content/renderer/fetchers/resource_fetcher.h b/content/renderer/fetchers/resource_fetcher.h index 5900973..038dc55 100644 --- a/content/renderer/fetchers/resource_fetcher.h +++ b/content/renderer/fetchers/resource_fetcher.h @@ -27,7 +27,7 @@ class GURL; -namespace WebKit { +namespace blink { class WebFrame; class WebURLLoader; struct WebURLError; @@ -36,18 +36,18 @@ struct WebURLError; namespace content { class CONTENT_EXPORT ResourceFetcher - : NON_EXPORTED_BASE(public WebKit::WebURLLoaderClient) { + : NON_EXPORTED_BASE(public blink::WebURLLoaderClient) { public: // This will be called when the URL has been fetched, successfully or not. // If there is a failure, response and data will both be empty. |response| // and |data| are both valid until the URLFetcher instance is destroyed. - typedef base::Callback<void(const WebKit::WebURLResponse&, + typedef base::Callback<void(const blink::WebURLResponse&, const std::string&)> Callback; // We need a frame to make requests. ResourceFetcher( - const GURL& url, WebKit::WebFrame* frame, - WebKit::WebURLRequest::TargetType target_type, + const GURL& url, blink::WebFrame* frame, + blink::WebURLRequest::TargetType target_type, const Callback& callback); virtual ~ResourceFetcher(); @@ -59,43 +59,43 @@ class CONTENT_EXPORT ResourceFetcher protected: // WebURLLoaderClient methods: virtual void willSendRequest( - WebKit::WebURLLoader* loader, WebKit::WebURLRequest& new_request, - const WebKit::WebURLResponse& redirect_response); + blink::WebURLLoader* loader, blink::WebURLRequest& new_request, + const blink::WebURLResponse& redirect_response); virtual void didSendData( - WebKit::WebURLLoader* loader, unsigned long long bytes_sent, + blink::WebURLLoader* loader, unsigned long long bytes_sent, unsigned long long total_bytes_to_be_sent); virtual void didReceiveResponse( - WebKit::WebURLLoader* loader, const WebKit::WebURLResponse& response); + blink::WebURLLoader* loader, const blink::WebURLResponse& response); virtual void didReceiveCachedMetadata( - WebKit::WebURLLoader* loader, const char* data, int data_length); + blink::WebURLLoader* loader, const char* data, int data_length); virtual void didReceiveData( - WebKit::WebURLLoader* loader, const char* data, int data_length, + blink::WebURLLoader* loader, const char* data, int data_length, int encoded_data_length); virtual void didFinishLoading( - WebKit::WebURLLoader* loader, double finishTime); + blink::WebURLLoader* loader, double finishTime); virtual void didFail( - WebKit::WebURLLoader* loader, const WebKit::WebURLError& error); + blink::WebURLLoader* loader, const blink::WebURLError& error); - scoped_ptr<WebKit::WebURLLoader> loader_; + scoped_ptr<blink::WebURLLoader> loader_; // URL we're fetching GURL url_; // Target type - WebKit::WebURLRequest::TargetType target_type_; + blink::WebURLRequest::TargetType target_type_; // A copy of the original resource response - WebKit::WebURLResponse response_; + blink::WebURLResponse response_; // Set to true once the request is compelte. bool completed_; private: // Start the actual download. - void Start(WebKit::WebFrame* frame); + void Start(blink::WebFrame* frame); - void RunCallback(const WebKit::WebURLResponse& response, + void RunCallback(const blink::WebURLResponse& response, const std::string& data); // Callback when we're done @@ -114,8 +114,8 @@ class CONTENT_EXPORT ResourceFetcherWithTimeout : NON_EXPORTED_BASE(public ResourceFetcher) { public: ResourceFetcherWithTimeout(const GURL& url, - WebKit::WebFrame* frame, - WebKit::WebURLRequest::TargetType target_type, + blink::WebFrame* frame, + blink::WebURLRequest::TargetType target_type, int timeout_secs, const Callback& callback); virtual ~ResourceFetcherWithTimeout(); diff --git a/content/renderer/gamepad_shared_memory_reader.cc b/content/renderer/gamepad_shared_memory_reader.cc index f4e8194..23edeb3 100644 --- a/content/renderer/gamepad_shared_memory_reader.cc +++ b/content/renderer/gamepad_shared_memory_reader.cc @@ -35,14 +35,14 @@ GamepadSharedMemoryReader::GamepadSharedMemoryReader() static_cast<GamepadHardwareBuffer*>(memory); } -void GamepadSharedMemoryReader::SampleGamepads(WebKit::WebGamepads& gamepads) { +void GamepadSharedMemoryReader::SampleGamepads(blink::WebGamepads& gamepads) { // ========== // DANGER // ========== // // This logic is duplicated in Pepper as well. If you change it, that also // needs to be in sync. See ppapi/proxy/gamepad_resource.cc. - WebKit::WebGamepads read_into; + blink::WebGamepads read_into; TRACE_EVENT0("GAMEPAD", "SampleGamepads"); if (!base::SharedMemory::IsHandleValid(renderer_shared_memory_handle_)) @@ -82,7 +82,7 @@ void GamepadSharedMemoryReader::SampleGamepads(WebKit::WebGamepads& gamepads) { // gamepads to prevent fingerprinting. The actual data is not cleared. // WebKit will only copy out data into the JS buffers for connected // gamepads so this is sufficient. - for (unsigned i = 0; i < WebKit::WebGamepads::itemsLengthCap; i++) + for (unsigned i = 0; i < blink::WebGamepads::itemsLengthCap; i++) gamepads.items[i].connected = false; } } diff --git a/content/renderer/gamepad_shared_memory_reader.h b/content/renderer/gamepad_shared_memory_reader.h index 8c10b90..08dc41a 100644 --- a/content/renderer/gamepad_shared_memory_reader.h +++ b/content/renderer/gamepad_shared_memory_reader.h @@ -17,7 +17,7 @@ class GamepadSharedMemoryReader { public: GamepadSharedMemoryReader(); virtual ~GamepadSharedMemoryReader(); - void SampleGamepads(WebKit::WebGamepads&); + void SampleGamepads(blink::WebGamepads&); private: base::SharedMemoryHandle renderer_shared_memory_handle_; diff --git a/content/renderer/geolocation_dispatcher.cc b/content/renderer/geolocation_dispatcher.cc index 57eeeb6..031376c 100644 --- a/content/renderer/geolocation_dispatcher.cc +++ b/content/renderer/geolocation_dispatcher.cc @@ -13,11 +13,11 @@ #include "third_party/WebKit/public/web/WebGeolocationPosition.h" #include "third_party/WebKit/public/web/WebGeolocationError.h" -using WebKit::WebGeolocationController; -using WebKit::WebGeolocationError; -using WebKit::WebGeolocationPermissionRequest; -using WebKit::WebGeolocationPermissionRequestManager; -using WebKit::WebGeolocationPosition; +using blink::WebGeolocationController; +using blink::WebGeolocationError; +using blink::WebGeolocationPermissionRequest; +using blink::WebGeolocationPermissionRequestManager; +using blink::WebGeolocationPosition; namespace content { @@ -150,7 +150,7 @@ void GeolocationDispatcher::OnPositionUpdated( } controller_->errorOccurred( WebGeolocationError( - code, WebKit::WebString::fromUTF8(geoposition.error_message))); + code, blink::WebString::fromUTF8(geoposition.error_message))); } } diff --git a/content/renderer/geolocation_dispatcher.h b/content/renderer/geolocation_dispatcher.h index bda1ff7..5a96070 100644 --- a/content/renderer/geolocation_dispatcher.h +++ b/content/renderer/geolocation_dispatcher.h @@ -10,7 +10,7 @@ #include "third_party/WebKit/public/web/WebGeolocationClient.h" #include "third_party/WebKit/public/web/WebGeolocationController.h" -namespace WebKit { +namespace blink { class WebGeolocationController; class WebGeolocationPermissionRequest; class WebGeolocationPermissionRequestManager; @@ -25,7 +25,7 @@ struct Geoposition; // WebKit. // It's the complement of GeolocationDispatcherHost (owned by RenderViewHost). class GeolocationDispatcher : public RenderViewObserver, - public WebKit::WebGeolocationClient { + public blink::WebGeolocationClient { public: explicit GeolocationDispatcher(RenderViewImpl* render_view); virtual ~GeolocationDispatcher(); @@ -39,12 +39,12 @@ class GeolocationDispatcher : public RenderViewObserver, virtual void startUpdating(); virtual void stopUpdating(); virtual void setEnableHighAccuracy(bool enable_high_accuracy); - virtual void setController(WebKit::WebGeolocationController* controller); - virtual bool lastPosition(WebKit::WebGeolocationPosition& position); + virtual void setController(blink::WebGeolocationController* controller); + virtual bool lastPosition(blink::WebGeolocationPosition& position); virtual void requestPermission( - const WebKit::WebGeolocationPermissionRequest& permissionRequest); + const blink::WebGeolocationPermissionRequest& permissionRequest); virtual void cancelPermissionRequest( - const WebKit::WebGeolocationPermissionRequest& permissionRequest); + const blink::WebGeolocationPermissionRequest& permissionRequest); // Permission for using geolocation has been set. void OnPermissionSet(int bridge_id, bool is_allowed); @@ -55,9 +55,9 @@ class GeolocationDispatcher : public RenderViewObserver, // The controller_ is valid for the lifetime of the underlying // WebCore::GeolocationController. geolocationDestroyed() is // invoked when the underlying object is destroyed. - scoped_ptr< WebKit::WebGeolocationController> controller_; + scoped_ptr< blink::WebGeolocationController> controller_; - scoped_ptr<WebKit::WebGeolocationPermissionRequestManager> + scoped_ptr<blink::WebGeolocationPermissionRequestManager> pending_permissions_; bool enable_high_accuracy_; bool updating_; diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc index 1af771d..7acb6c6 100644 --- a/content/renderer/gpu/gpu_benchmarking_extension.cc +++ b/content/renderer/gpu/gpu_benchmarking_extension.cc @@ -32,13 +32,13 @@ #include "v8/include/v8.h" #include "webkit/renderer/compositor_bindings/web_rendering_stats_impl.h" -using WebKit::WebCanvas; -using WebKit::WebFrame; -using WebKit::WebImageCache; -using WebKit::WebPrivatePtr; -using WebKit::WebRenderingStatsImpl; -using WebKit::WebSize; -using WebKit::WebView; +using blink::WebCanvas; +using blink::WebFrame; +using blink::WebImageCache; +using blink::WebPrivatePtr; +using blink::WebRenderingStatsImpl; +using blink::WebSize; +using blink::WebView; const char kGpuBenchmarkingExtensionName[] = "v8/GpuBenchmarking"; @@ -488,7 +488,7 @@ class GpuBenchmarkingWrapper : public v8::Extension { int mouse_event_y = 0; if (arglen == 3) { - WebKit::WebRect rect = context.render_view_impl()->windowRect(); + blink::WebRect rect = context.render_view_impl()->windowRect(); mouse_event_x = rect.x + rect.width / 2; mouse_event_y = rect.y + rect.height / 2; } else { diff --git a/content/renderer/gpu/input_event_filter.cc b/content/renderer/gpu/input_event_filter.cc index 208c471..69ae39f 100644 --- a/content/renderer/gpu/input_event_filter.cc +++ b/content/renderer/gpu/input_event_filter.cc @@ -14,7 +14,7 @@ #include "content/renderer/gpu/input_event_filter.h" #include "ui/gfx/vector2d_f.h" -using WebKit::WebInputEvent; +using blink::WebInputEvent; namespace content { @@ -148,7 +148,7 @@ void InputEventFilter::ForwardToHandler(const IPC::Message& message) { SendACK(event->type, ack, latency_info, routing_id); } -void InputEventFilter::SendACK(WebKit::WebInputEvent::Type type, +void InputEventFilter::SendACK(blink::WebInputEvent::Type type, InputEventAckState ack_result, const ui::LatencyInfo& latency_info, int routing_id) { diff --git a/content/renderer/gpu/input_event_filter.h b/content/renderer/gpu/input_event_filter.h index b452620..f155693 100644 --- a/content/renderer/gpu/input_event_filter.h +++ b/content/renderer/gpu/input_event_filter.h @@ -62,7 +62,7 @@ class CONTENT_EXPORT InputEventFilter void ForwardToMainListener(const IPC::Message& message); void ForwardToHandler(const IPC::Message& message); - void SendACK(WebKit::WebInputEvent::Type type, + void SendACK(blink::WebInputEvent::Type type, InputEventAckState ack_result, const ui::LatencyInfo& latency_info, int routing_id); diff --git a/content/renderer/gpu/input_event_filter_unittest.cc b/content/renderer/gpu/input_event_filter_unittest.cc index d8e6052..93a0707 100644 --- a/content/renderer/gpu/input_event_filter_unittest.cc +++ b/content/renderer/gpu/input_event_filter_unittest.cc @@ -14,8 +14,8 @@ #include "ipc/ipc_test_sink.h" #include "testing/gtest/include/gtest/gtest.h" -using WebKit::WebInputEvent; -using WebKit::WebMouseEvent; +using blink::WebInputEvent; +using blink::WebMouseEvent; namespace content { namespace { diff --git a/content/renderer/gpu/input_handler_manager.cc b/content/renderer/gpu/input_handler_manager.cc index 1db011b..affb844 100644 --- a/content/renderer/gpu/input_handler_manager.cc +++ b/content/renderer/gpu/input_handler_manager.cc @@ -12,7 +12,7 @@ #include "content/renderer/gpu/input_handler_manager_client.h" #include "content/renderer/gpu/input_handler_wrapper.h" -using WebKit::WebInputEvent; +using blink::WebInputEvent; namespace content { diff --git a/content/renderer/gpu/input_handler_manager.h b/content/renderer/gpu/input_handler_manager.h index 3811d63..7c7c4d6 100644 --- a/content/renderer/gpu/input_handler_manager.h +++ b/content/renderer/gpu/input_handler_manager.h @@ -21,7 +21,7 @@ class InputHandler; struct DidOverscrollParams; } -namespace WebKit { +namespace blink { class WebInputEvent; } @@ -52,7 +52,7 @@ class InputHandlerManager { // Called from the compositor's thread. InputEventAckState HandleInputEvent(int routing_id, - const WebKit::WebInputEvent* input_event, + const blink::WebInputEvent* input_event, const ui::LatencyInfo& latency_info); // Called from the compositor's thread. diff --git a/content/renderer/gpu/input_handler_manager_client.h b/content/renderer/gpu/input_handler_manager_client.h index c147a8a6..63bb44e7 100644 --- a/content/renderer/gpu/input_handler_manager_client.h +++ b/content/renderer/gpu/input_handler_manager_client.h @@ -20,7 +20,7 @@ class InputHandler; struct DidOverscrollParams; } -namespace WebKit { +namespace blink { class WebInputEvent; } @@ -35,7 +35,7 @@ class CONTENT_EXPORT InputHandlerManagerClient { // The client should only makes calls to |handler| on the compositor thread. typedef base::Callback< InputEventAckState(int /*routing_id*/, - const WebKit::WebInputEvent*, + const blink::WebInputEvent*, const ui::LatencyInfo& latency_info)> Handler; // Called from the main thread. diff --git a/content/renderer/gpu/input_handler_proxy.cc b/content/renderer/gpu/input_handler_proxy.cc index 77dd0f0..911ebbb 100644 --- a/content/renderer/gpu/input_handler_proxy.cc +++ b/content/renderer/gpu/input_handler_proxy.cc @@ -12,14 +12,14 @@ #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/events/latency_info.h" -using WebKit::WebFloatPoint; -using WebKit::WebFloatSize; -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; -using WebKit::WebMouseEvent; -using WebKit::WebMouseWheelEvent; -using WebKit::WebPoint; -using WebKit::WebTouchEvent; +using blink::WebFloatPoint; +using blink::WebFloatSize; +using blink::WebGestureEvent; +using blink::WebInputEvent; +using blink::WebMouseEvent; +using blink::WebMouseWheelEvent; +using blink::WebPoint; +using blink::WebTouchEvent; namespace { @@ -263,7 +263,7 @@ InputHandlerProxy::HandleGestureFling( gesture_event.sourceDevice, WebFloatPoint(gesture_event.data.flingStart.velocityX, gesture_event.data.flingStart.velocityY), - WebKit::WebSize())); + blink::WebSize())); fling_overscrolled_horizontally_ = false; fling_overscrolled_vertically_ = false; TRACE_EVENT_ASYNC_BEGIN0( @@ -365,7 +365,7 @@ bool InputHandlerProxy::CancelCurrentFling() { had_fling_animation); fling_curve_.reset(); gesture_scroll_on_impl_thread_ = false; - fling_parameters_ = WebKit::WebActiveWheelFlingParameters(); + fling_parameters_ = blink::WebActiveWheelFlingParameters(); return had_fling_animation; } diff --git a/content/renderer/gpu/input_handler_proxy.h b/content/renderer/gpu/input_handler_proxy.h index e307827..e022144 100644 --- a/content/renderer/gpu/input_handler_proxy.h +++ b/content/renderer/gpu/input_handler_proxy.h @@ -25,7 +25,7 @@ class InputHandlerProxyClient; // intended for a specific WebWidget. class CONTENT_EXPORT InputHandlerProxy : public cc::InputHandlerClient, - public NON_EXPORTED_BASE(WebKit::WebGestureCurveTarget) { + public NON_EXPORTED_BASE(blink::WebGestureCurveTarget) { public: explicit InputHandlerProxy(cc::InputHandler* input_handler); virtual ~InputHandlerProxy(); @@ -38,9 +38,9 @@ class CONTENT_EXPORT InputHandlerProxy DROP_EVENT }; EventDisposition HandleInputEventWithLatencyInfo( - const WebKit::WebInputEvent& event, + const blink::WebInputEvent& event, const ui::LatencyInfo& latency_info); - EventDisposition HandleInputEvent(const WebKit::WebInputEvent& event); + EventDisposition HandleInputEvent(const blink::WebInputEvent& event); // cc::InputHandlerClient implementation. virtual void WillShutdown() OVERRIDE; @@ -48,27 +48,27 @@ class CONTENT_EXPORT InputHandlerProxy virtual void MainThreadHasStoppedFlinging() OVERRIDE; virtual void DidOverscroll(const cc::DidOverscrollParams& params) OVERRIDE; - // WebKit::WebGestureCurveTarget implementation. - virtual void scrollBy(const WebKit::WebFloatSize& offset); - virtual void notifyCurrentFlingVelocity(const WebKit::WebFloatSize& velocity); + // blink::WebGestureCurveTarget implementation. + virtual void scrollBy(const blink::WebFloatSize& offset); + virtual void notifyCurrentFlingVelocity(const blink::WebFloatSize& velocity); bool gesture_scroll_on_impl_thread_for_testing() const { return gesture_scroll_on_impl_thread_; } private: - EventDisposition HandleGestureFling(const WebKit::WebGestureEvent& event); + EventDisposition HandleGestureFling(const blink::WebGestureEvent& event); // Returns true if we scrolled by the increment. - bool TouchpadFlingScroll(const WebKit::WebFloatSize& increment); + bool TouchpadFlingScroll(const blink::WebFloatSize& increment); // Returns true if we actually had an active fling to cancel. bool CancelCurrentFling(); - scoped_ptr<WebKit::WebGestureCurve> fling_curve_; + scoped_ptr<blink::WebGestureCurve> fling_curve_; // Parameters for the active fling animation, stored in case we need to // transfer it out later. - WebKit::WebActiveWheelFlingParameters fling_parameters_; + blink::WebActiveWheelFlingParameters fling_parameters_; InputHandlerProxyClient* client_; cc::InputHandler* input_handler_; diff --git a/content/renderer/gpu/input_handler_proxy_client.h b/content/renderer/gpu/input_handler_proxy_client.h index 6ef000c..2b9b9ef 100644 --- a/content/renderer/gpu/input_handler_proxy_client.h +++ b/content/renderer/gpu/input_handler_proxy_client.h @@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_GPU_INPUT_HANDLER_PROXY_CLIENT_H_ #define CONTENT_RENDERER_GPU_INPUT_HANDLER_PROXY_CLIENT_H_ -namespace WebKit { +namespace blink { class WebGestureCurve; struct WebActiveWheelFlingParameters; struct WebFloatPoint; @@ -23,14 +23,14 @@ class InputHandlerProxyClient { // Transfers an active wheel fling animation initiated by a previously // handled input event out to the client. virtual void TransferActiveWheelFlingAnimation( - const WebKit::WebActiveWheelFlingParameters& params) = 0; + const blink::WebActiveWheelFlingParameters& params) = 0; // Creates a new fling animation curve instance for device |device_source| // with |velocity| and already scrolled |cumulative_scroll| pixels. - virtual WebKit::WebGestureCurve* CreateFlingAnimationCurve( + virtual blink::WebGestureCurve* CreateFlingAnimationCurve( int device_source, - const WebKit::WebFloatPoint& velocity, - const WebKit::WebSize& cumulative_scroll) = 0; + const blink::WebFloatPoint& velocity, + const blink::WebSize& cumulative_scroll) = 0; virtual void DidOverscroll(const cc::DidOverscrollParams& params) = 0; diff --git a/content/renderer/gpu/input_handler_proxy_unittest.cc b/content/renderer/gpu/input_handler_proxy_unittest.cc index 999b4d1..b93e0d0 100644 --- a/content/renderer/gpu/input_handler_proxy_unittest.cc +++ b/content/renderer/gpu/input_handler_proxy_unittest.cc @@ -16,14 +16,14 @@ #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/events/latency_info.h" -using WebKit::WebActiveWheelFlingParameters; -using WebKit::WebFloatPoint; -using WebKit::WebFloatSize; -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; -using WebKit::WebMouseWheelEvent; -using WebKit::WebPoint; -using WebKit::WebSize; +using blink::WebActiveWheelFlingParameters; +using blink::WebFloatPoint; +using blink::WebFloatSize; +using blink::WebGestureEvent; +using blink::WebInputEvent; +using blink::WebMouseWheelEvent; +using blink::WebPoint; +using blink::WebSize; namespace content { namespace { @@ -79,18 +79,18 @@ class MockInputHandler : public cc::InputHandler { // A simple WebGestureCurve implementation that flings at a constant velocity // indefinitely. -class FakeWebGestureCurve : public WebKit::WebGestureCurve { +class FakeWebGestureCurve : public blink::WebGestureCurve { public: - FakeWebGestureCurve(const WebKit::WebFloatPoint& velocity, - const WebKit::WebSize& cumulative_scroll) + FakeWebGestureCurve(const blink::WebFloatPoint& velocity, + const blink::WebSize& cumulative_scroll) : velocity_(velocity), cumulative_scroll_(cumulative_scroll) {} virtual ~FakeWebGestureCurve() {} // Returns false if curve has finished and can no longer be applied. - virtual bool apply(double time, WebKit::WebGestureCurveTarget* target) { - WebKit::WebSize displacement(velocity_.x * time, velocity_.y * time); - WebKit::WebFloatSize increment( + virtual bool apply(double time, blink::WebGestureCurveTarget* target) { + blink::WebSize displacement(velocity_.x * time, velocity_.y * time); + blink::WebFloatSize increment( displacement.width - cumulative_scroll_.width, displacement.height - cumulative_scroll_.height); cumulative_scroll_ = displacement; @@ -101,8 +101,8 @@ class FakeWebGestureCurve : public WebKit::WebGestureCurve { } private: - WebKit::WebFloatPoint velocity_; - WebKit::WebSize cumulative_scroll_; + blink::WebFloatPoint velocity_; + blink::WebSize cumulative_scroll_; DISALLOW_COPY_AND_ASSIGN(FakeWebGestureCurve); }; @@ -118,7 +118,7 @@ class MockInputHandlerProxyClient MOCK_METHOD1(TransferActiveWheelFlingAnimation, void(const WebActiveWheelFlingParameters&)); - virtual WebKit::WebGestureCurve* CreateFlingAnimationCurve( + virtual blink::WebGestureCurve* CreateFlingAnimationCurve( int deviceSource, const WebFloatPoint& velocity, const WebSize& cumulative_scroll) OVERRIDE { diff --git a/content/renderer/gpu/input_handler_wrapper.cc b/content/renderer/gpu/input_handler_wrapper.cc index 348ff6d..d1747f2 100644 --- a/content/renderer/gpu/input_handler_wrapper.cc +++ b/content/renderer/gpu/input_handler_wrapper.cc @@ -30,7 +30,7 @@ InputHandlerWrapper::~InputHandlerWrapper() { } void InputHandlerWrapper::TransferActiveWheelFlingAnimation( - const WebKit::WebActiveWheelFlingParameters& params) { + const blink::WebActiveWheelFlingParameters& params) { main_loop_->PostTask( FROM_HERE, base::Bind(&RenderViewImpl::TransferActiveWheelFlingAnimation, @@ -42,11 +42,11 @@ void InputHandlerWrapper::WillShutdown() { input_handler_manager_->RemoveInputHandler(routing_id_); } -WebKit::WebGestureCurve* InputHandlerWrapper::CreateFlingAnimationCurve( +blink::WebGestureCurve* InputHandlerWrapper::CreateFlingAnimationCurve( int deviceSource, - const WebKit::WebFloatPoint& velocity, - const WebKit::WebSize& cumulative_scroll) { - return WebKit::Platform::current()->createFlingAnimationCurve( + const blink::WebFloatPoint& velocity, + const blink::WebSize& cumulative_scroll) { + return blink::Platform::current()->createFlingAnimationCurve( deviceSource, velocity, cumulative_scroll); } diff --git a/content/renderer/gpu/input_handler_wrapper.h b/content/renderer/gpu/input_handler_wrapper.h index f72bae5..9a5ba0c 100644 --- a/content/renderer/gpu/input_handler_wrapper.h +++ b/content/renderer/gpu/input_handler_wrapper.h @@ -30,11 +30,11 @@ class InputHandlerWrapper // InputHandlerProxyClient implementation. virtual void WillShutdown() OVERRIDE; virtual void TransferActiveWheelFlingAnimation( - const WebKit::WebActiveWheelFlingParameters& params) OVERRIDE; - virtual WebKit::WebGestureCurve* CreateFlingAnimationCurve( + const blink::WebActiveWheelFlingParameters& params) OVERRIDE; + virtual blink::WebGestureCurve* CreateFlingAnimationCurve( int deviceSource, - const WebKit::WebFloatPoint& velocity, - const WebKit::WebSize& cumulativeScroll) OVERRIDE; + const blink::WebFloatPoint& velocity, + const blink::WebSize& cumulativeScroll) OVERRIDE; virtual void DidOverscroll(const cc::DidOverscrollParams& params) OVERRIDE; private: diff --git a/content/renderer/gpu/mailbox_output_surface.cc b/content/renderer/gpu/mailbox_output_surface.cc index 0d7d397..09e1ec0 100644 --- a/content/renderer/gpu/mailbox_output_surface.cc +++ b/content/renderer/gpu/mailbox_output_surface.cc @@ -53,7 +53,7 @@ MailboxOutputSurface::~MailboxOutputSurface() { void MailboxOutputSurface::EnsureBackbuffer() { is_backbuffer_discarded_ = false; - WebKit::WebGraphicsContext3D* context3d = context_provider_->Context3d(); + blink::WebGraphicsContext3D* context3d = context_provider_->Context3d(); if (!current_backing_.texture_id) { // Find a texture of matching size to recycle. @@ -103,7 +103,7 @@ void MailboxOutputSurface::EnsureBackbuffer() { void MailboxOutputSurface::DiscardBackbuffer() { is_backbuffer_discarded_ = true; - WebKit::WebGraphicsContext3D* context3d = context_provider_->Context3d(); + blink::WebGraphicsContext3D* context3d = context_provider_->Context3d(); if (current_backing_.texture_id) { context3d->deleteTexture(current_backing_.texture_id); @@ -137,7 +137,7 @@ void MailboxOutputSurface::BindFramebuffer() { EnsureBackbuffer(); DCHECK(current_backing_.texture_id); - WebKit::WebGraphicsContext3D* context3d = context_provider_->Context3d(); + blink::WebGraphicsContext3D* context3d = context_provider_->Context3d(); if (!fbo_) fbo_ = context3d->createFramebuffer(); diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc index 9d728cc..85b204b 100644 --- a/content/renderer/gpu/render_widget_compositor.cc +++ b/content/renderer/gpu/render_widget_compositor.cc @@ -39,9 +39,9 @@ namespace cc { class Layer; } -using WebKit::WebFloatPoint; -using WebKit::WebSize; -using WebKit::WebRect; +using blink::WebFloatPoint; +using blink::WebSize; +using blink::WebRect; namespace content { namespace { @@ -430,7 +430,7 @@ void RenderWidgetCompositor::setSurfaceReady() { layer_tree_host_->SetLayerTreeHostClientReady(); } -void RenderWidgetCompositor::setRootLayer(const WebKit::WebLayer& layer) { +void RenderWidgetCompositor::setRootLayer(const blink::WebLayer& layer) { layer_tree_host_->SetRootLayer( static_cast<const webkit::WebLayerImpl*>(&layer)->layer()); } @@ -466,7 +466,7 @@ float RenderWidgetCompositor::deviceScaleFactor() const { return layer_tree_host_->device_scale_factor(); } -void RenderWidgetCompositor::setBackgroundColor(WebKit::WebColor color) { +void RenderWidgetCompositor::setBackgroundColor(blink::WebColor color) { layer_tree_host_->set_background_color(color); } @@ -489,7 +489,7 @@ void RenderWidgetCompositor::setPageScaleFactorAndLimits( } void RenderWidgetCompositor::startPageScaleAnimation( - const WebKit::WebPoint& destination, + const blink::WebPoint& destination, bool use_anchor, float new_page_scale, double duration_sec) { @@ -521,16 +521,16 @@ void RenderWidgetCompositor::didStopFlinging() { layer_tree_host_->DidStopFlinging(); } -void RenderWidgetCompositor::registerForAnimations(WebKit::WebLayer* layer) { +void RenderWidgetCompositor::registerForAnimations(blink::WebLayer* layer) { cc::Layer* cc_layer = static_cast<webkit::WebLayerImpl*>(layer)->layer(); cc_layer->layer_animation_controller()->SetAnimationRegistrar( layer_tree_host_->animation_registrar()); } void RenderWidgetCompositor::registerViewportLayers( - const WebKit::WebLayer* pageScaleLayer, - const WebKit::WebLayer* innerViewportScrollLayer, - const WebKit::WebLayer* outerViewportScrollLayer) { + const blink::WebLayer* pageScaleLayer, + const blink::WebLayer* innerViewportScrollLayer, + const blink::WebLayer* outerViewportScrollLayer) { layer_tree_host_->RegisterViewportLayers( static_cast<const webkit::WebLayerImpl*>(pageScaleLayer)->layer(), static_cast<const webkit::WebLayerImpl*>(innerViewportScrollLayer) diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h index 44a3e8a..c5fd2cc 100644 --- a/content/renderer/gpu/render_widget_compositor.h +++ b/content/renderer/gpu/render_widget_compositor.h @@ -31,7 +31,7 @@ class LayerTreeHost; namespace content { class RenderWidget; -class RenderWidgetCompositor : public WebKit::WebLayerTreeView, +class RenderWidgetCompositor : public blink::WebLayerTreeView, public cc::LayerTreeHostClient, public cc::LayerTreeHostSingleThreadClient { public: @@ -69,25 +69,25 @@ class RenderWidgetCompositor : public WebKit::WebLayerTreeView, // WebLayerTreeView implementation. virtual void setSurfaceReady(); - virtual void setRootLayer(const WebKit::WebLayer& layer); + virtual void setRootLayer(const blink::WebLayer& layer); virtual void clearRootLayer(); virtual void setViewportSize( - const WebKit::WebSize& unused_deprecated, - const WebKit::WebSize& device_viewport_size); - virtual WebKit::WebSize layoutViewportSize() const; - virtual WebKit::WebSize deviceViewportSize() const; - virtual WebKit::WebFloatPoint adjustEventPointForPinchZoom( - const WebKit::WebFloatPoint& point) const; + const blink::WebSize& unused_deprecated, + const blink::WebSize& device_viewport_size); + virtual blink::WebSize layoutViewportSize() const; + virtual blink::WebSize deviceViewportSize() const; + virtual blink::WebFloatPoint adjustEventPointForPinchZoom( + const blink::WebFloatPoint& point) const; virtual void setDeviceScaleFactor(float device_scale); virtual float deviceScaleFactor() const; - virtual void setBackgroundColor(WebKit::WebColor color); + virtual void setBackgroundColor(blink::WebColor color); virtual void setHasTransparentBackground(bool transparent); virtual void setOverhangBitmap(const SkBitmap& bitmap); virtual void setVisible(bool visible); virtual void setPageScaleFactorAndLimits(float page_scale_factor, float minimum, float maximum); - virtual void startPageScaleAnimation(const WebKit::WebPoint& destination, + virtual void startPageScaleAnimation(const blink::WebPoint& destination, bool use_anchor, float new_page_scale, double duration_sec); @@ -95,16 +95,16 @@ class RenderWidgetCompositor : public WebKit::WebLayerTreeView, virtual void setNeedsRedraw(); virtual bool commitRequested() const; virtual void didStopFlinging(); - virtual bool compositeAndReadback(void *pixels, const WebKit::WebRect& rect); + virtual bool compositeAndReadback(void *pixels, const blink::WebRect& rect); virtual void finishAllRendering(); virtual void setDeferCommits(bool defer_commits); - virtual void registerForAnimations(WebKit::WebLayer* layer); + virtual void registerForAnimations(blink::WebLayer* layer); virtual void registerViewportLayers( - const WebKit::WebLayer* pageScaleLayer, - const WebKit::WebLayer* innerViewportScrollLayer, - const WebKit::WebLayer* outerViewportScrollLayer) OVERRIDE; + const blink::WebLayer* pageScaleLayer, + const blink::WebLayer* innerViewportScrollLayer, + const blink::WebLayer* outerViewportScrollLayer) OVERRIDE; virtual void clearViewportLayers() OVERRIDE; - virtual void renderingStats(WebKit::WebRenderingStats& stats) const {} + virtual void renderingStats(blink::WebRenderingStats& stats) const {} virtual void setShowFPSCounter(bool show); virtual void setShowPaintRects(bool show); virtual void setShowDebugBorders(bool show); diff --git a/content/renderer/ico_image_decoder_unittest.cc b/content/renderer/ico_image_decoder_unittest.cc index 83f5a3f..4beca93 100644 --- a/content/renderer/ico_image_decoder_unittest.cc +++ b/content/renderer/ico_image_decoder_unittest.cc @@ -6,15 +6,15 @@ #include "content/test/image_decoder_test.h" #include "third_party/WebKit/public/web/WebImageDecoder.h" -using WebKit::WebImageDecoder; +using blink::WebImageDecoder; class ICOImageDecoderTest : public ImageDecoderTest { public: ICOImageDecoderTest() : ImageDecoderTest("ico") { } protected: - virtual WebKit::WebImageDecoder* CreateWebKitImageDecoder() const OVERRIDE { - return new WebKit::WebImageDecoder(WebKit::WebImageDecoder::TypeICO); + virtual blink::WebImageDecoder* CreateWebKitImageDecoder() const OVERRIDE { + return new blink::WebImageDecoder(blink::WebImageDecoder::TypeICO); } }; diff --git a/content/renderer/idle_user_detector.cc b/content/renderer/idle_user_detector.cc index 0f138a8..dff78d1 100644 --- a/content/renderer/idle_user_detector.cc +++ b/content/renderer/idle_user_detector.cc @@ -25,7 +25,7 @@ bool IdleUserDetector::OnMessageReceived(const IPC::Message& message) { return false; } -void IdleUserDetector::OnHandleInputEvent(const WebKit::WebInputEvent* event, +void IdleUserDetector::OnHandleInputEvent(const blink::WebInputEvent* event, const ui::LatencyInfo& latency_info, bool is_keyboard_shortcut) { if (GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { diff --git a/content/renderer/idle_user_detector.h b/content/renderer/idle_user_detector.h index 500d8f75..a5ee80b 100644 --- a/content/renderer/idle_user_detector.h +++ b/content/renderer/idle_user_detector.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "content/public/renderer/render_view_observer.h" -namespace WebKit { +namespace blink { class WebInputEvent; } @@ -29,7 +29,7 @@ class IdleUserDetector : public RenderViewObserver { // RenderViewObserver implementation: virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - void OnHandleInputEvent(const WebKit::WebInputEvent* event, + void OnHandleInputEvent(const blink::WebInputEvent* event, const ui::LatencyInfo& latency_info, bool is_keyboard_shortcut); diff --git a/content/renderer/image_loading_helper.cc b/content/renderer/image_loading_helper.cc index 22a36c8..ecdb0fc 100644 --- a/content/renderer/image_loading_helper.cc +++ b/content/renderer/image_loading_helper.cc @@ -22,10 +22,10 @@ #include "ui/gfx/skbitmap_operations.h" #include "webkit/glue/webkit_glue.h" -using WebKit::WebFrame; -using WebKit::WebVector; -using WebKit::WebURL; -using WebKit::WebURLRequest; +using blink::WebFrame; +using blink::WebVector; +using blink::WebURL; +using blink::WebURLRequest; namespace { diff --git a/content/renderer/input_tag_speech_dispatcher.cc b/content/renderer/input_tag_speech_dispatcher.cc index afce8c2..b9490ce7 100644 --- a/content/renderer/input_tag_speech_dispatcher.cc +++ b/content/renderer/input_tag_speech_dispatcher.cc @@ -18,18 +18,18 @@ #include "third_party/WebKit/public/web/WebSpeechInputListener.h" #include "third_party/WebKit/public/web/WebView.h" -using WebKit::WebDocument; -using WebKit::WebElement; -using WebKit::WebFrame; -using WebKit::WebInputElement; -using WebKit::WebNode; -using WebKit::WebView; +using blink::WebDocument; +using blink::WebElement; +using blink::WebFrame; +using blink::WebInputElement; +using blink::WebNode; +using blink::WebView; namespace content { InputTagSpeechDispatcher::InputTagSpeechDispatcher( RenderViewImpl* render_view, - WebKit::WebSpeechInputListener* listener) + blink::WebSpeechInputListener* listener) : RenderViewObserver(render_view), listener_(listener) { } @@ -53,10 +53,10 @@ bool InputTagSpeechDispatcher::OnMessageReceived( bool InputTagSpeechDispatcher::startRecognition( int request_id, - const WebKit::WebRect& element_rect, - const WebKit::WebString& language, - const WebKit::WebString& grammar, - const WebKit::WebSecurityOrigin& origin) { + const blink::WebRect& element_rect, + const blink::WebString& language, + const blink::WebString& grammar, + const blink::WebSecurityOrigin& origin) { DVLOG(1) << "InputTagSpeechDispatcher::startRecognition enter"; InputTagSpeechHostMsg_StartRecognition_Params params; @@ -92,7 +92,7 @@ void InputTagSpeechDispatcher::OnSpeechRecognitionResults( DCHECK_EQ(results.size(), 1U); const SpeechRecognitionResult& result = results[0]; - WebKit::WebSpeechInputResultArray webkit_result(result.hypotheses.size()); + blink::WebSpeechInputResultArray webkit_result(result.hypotheses.size()); for (size_t i = 0; i < result.hypotheses.size(); ++i) { webkit_result[i].assign(result.hypotheses[i].utterance, result.hypotheses[i].confidence); @@ -131,8 +131,8 @@ void InputTagSpeechDispatcher::OnSpeechRecognitionToggleSpeechInput() { if (focused_node.isNull() || !focused_node.isElementNode()) return; - WebKit::WebElement element = focused_node.to<WebKit::WebElement>(); - WebKit::WebInputElement* input_element = WebKit::toWebInputElement(&element); + blink::WebElement element = focused_node.to<blink::WebElement>(); + blink::WebInputElement* input_element = blink::toWebInputElement(&element); if (!input_element) return; if (!input_element->isSpeechInputEnabled()) diff --git a/content/renderer/input_tag_speech_dispatcher.h b/content/renderer/input_tag_speech_dispatcher.h index b51d723..ee9dda9 100644 --- a/content/renderer/input_tag_speech_dispatcher.h +++ b/content/renderer/input_tag_speech_dispatcher.h @@ -10,7 +10,7 @@ #include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/public/web/WebSpeechInputController.h" -namespace WebKit { +namespace blink { class WebSpeechInputListener; } @@ -21,21 +21,21 @@ struct SpeechRecognitionResult; // InputTagSpeechDispatcher is a delegate for messages used by WebKit. It's // the complement of InputTagSpeechDispatcherHost (owned by RenderViewHost). class InputTagSpeechDispatcher : public RenderViewObserver, - public WebKit::WebSpeechInputController { + public blink::WebSpeechInputController { public: InputTagSpeechDispatcher(RenderViewImpl* render_view, - WebKit::WebSpeechInputListener* listener); + blink::WebSpeechInputListener* listener); private: // RenderView::Observer implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - // WebKit::WebSpeechInputController. + // blink::WebSpeechInputController. virtual bool startRecognition(int request_id, - const WebKit::WebRect& element_rect, - const WebKit::WebString& language, - const WebKit::WebString& grammar, - const WebKit::WebSecurityOrigin& origin); + const blink::WebRect& element_rect, + const blink::WebString& language, + const blink::WebString& grammar, + const blink::WebSecurityOrigin& origin); virtual void cancelRecognition(int request_id); virtual void stopRecording(int request_id); @@ -46,7 +46,7 @@ class InputTagSpeechDispatcher : public RenderViewObserver, void OnSpeechRecognitionComplete(int request_id); void OnSpeechRecognitionToggleSpeechInput(); - WebKit::WebSpeechInputListener* listener_; + blink::WebSpeechInputListener* listener_; DISALLOW_COPY_AND_ASSIGN(InputTagSpeechDispatcher); }; diff --git a/content/renderer/internal_document_state_data.cc b/content/renderer/internal_document_state_data.cc index cd400f3..e3370dc 100644 --- a/content/renderer/internal_document_state_data.cc +++ b/content/renderer/internal_document_state_data.cc @@ -25,14 +25,14 @@ InternalDocumentStateData::InternalDocumentStateData() is_overriding_user_agent_(false), must_reset_scroll_and_scale_state_(false), cache_policy_override_set_(false), - cache_policy_override_(WebKit::WebURLRequest::UseProtocolCachePolicy), + cache_policy_override_(blink::WebURLRequest::UseProtocolCachePolicy), referrer_policy_set_(false), - referrer_policy_(WebKit::WebReferrerPolicyDefault) { + referrer_policy_(blink::WebReferrerPolicyDefault) { } // static InternalDocumentStateData* InternalDocumentStateData::FromDataSource( - WebKit::WebDataSource* ds) { + blink::WebDataSource* ds) { return FromDocumentState(static_cast<DocumentState*>(ds->extraData())); } diff --git a/content/renderer/internal_document_state_data.h b/content/renderer/internal_document_state_data.h index 9fba893..6d2f2bc 100644 --- a/content/renderer/internal_document_state_data.h +++ b/content/renderer/internal_document_state_data.h @@ -13,7 +13,7 @@ #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "url/gurl.h" -namespace WebKit { +namespace blink { class WebDataSource; } @@ -27,7 +27,7 @@ class InternalDocumentStateData : public base::SupportsUserData::Data { public: InternalDocumentStateData(); - static InternalDocumentStateData* FromDataSource(WebKit::WebDataSource* ds); + static InternalDocumentStateData* FromDataSource(blink::WebDataSource* ds); static InternalDocumentStateData* FromDocumentState(DocumentState* ds); // Set to true once RenderViewImpl::didFirstVisuallyNonEmptyLayout() is @@ -89,16 +89,16 @@ class InternalDocumentStateData : public base::SupportsUserData::Data { // by default is not set. You can mark a NavigationState as not having a cache // state by way of clear_cache_policy_override. void set_cache_policy_override( - WebKit::WebURLRequest::CachePolicy cache_policy) { + blink::WebURLRequest::CachePolicy cache_policy) { cache_policy_override_ = cache_policy; cache_policy_override_set_ = true; } - WebKit::WebURLRequest::CachePolicy cache_policy_override() const { + blink::WebURLRequest::CachePolicy cache_policy_override() const { return cache_policy_override_; } void clear_cache_policy_override() { cache_policy_override_set_ = false; - cache_policy_override_ = WebKit::WebURLRequest::UseProtocolCachePolicy; + cache_policy_override_ = blink::WebURLRequest::UseProtocolCachePolicy; } bool is_cache_policy_override_set() const { return cache_policy_override_set_; @@ -107,15 +107,15 @@ class InternalDocumentStateData : public base::SupportsUserData::Data { // Sets the referrer policy to use. This is only used for browser initiated // navigations, otherwise, the referrer policy is defined by the frame's // document. - WebKit::WebReferrerPolicy referrer_policy() const { + blink::WebReferrerPolicy referrer_policy() const { return referrer_policy_; } - void set_referrer_policy(WebKit::WebReferrerPolicy referrer_policy) { + void set_referrer_policy(blink::WebReferrerPolicy referrer_policy) { referrer_policy_ = referrer_policy; referrer_policy_set_ = true; } void clear_referrer_policy() { - referrer_policy_ = WebKit::WebReferrerPolicyDefault; + referrer_policy_ = blink::WebReferrerPolicyDefault; referrer_policy_set_ = false; } bool is_referrer_policy_set() const { return referrer_policy_set_; } @@ -138,9 +138,9 @@ class InternalDocumentStateData : public base::SupportsUserData::Data { bool is_overriding_user_agent_; bool must_reset_scroll_and_scale_state_; bool cache_policy_override_set_; - WebKit::WebURLRequest::CachePolicy cache_policy_override_; + blink::WebURLRequest::CachePolicy cache_policy_override_; bool referrer_policy_set_; - WebKit::WebReferrerPolicy referrer_policy_; + blink::WebReferrerPolicy referrer_policy_; scoped_ptr<AltErrorPageResourceFetcher> alt_error_page_fetcher_; DISALLOW_COPY_AND_ASSIGN(InternalDocumentStateData); diff --git a/content/renderer/java/java_bridge_channel.cc b/content/renderer/java/java_bridge_channel.cc index 235425a..0d6d3f6 100644 --- a/content/renderer/java/java_bridge_channel.cc +++ b/content/renderer/java/java_bridge_channel.cc @@ -27,12 +27,12 @@ JavaBridgeChannel::JavaBridgeChannel() : peer_owner_id_(new struct _NPP) { // Register the dummy owner Id for our peer (the Browser process) as an object // owner, and have all objects received from the peer owned by it. - WebKit::WebBindings::registerObjectOwner(peer_owner_id_.get()); + blink::WebBindings::registerObjectOwner(peer_owner_id_.get()); SetDefaultNPObjectOwner(peer_owner_id_.get()); } JavaBridgeChannel::~JavaBridgeChannel() { - WebKit::WebBindings::unregisterObjectOwner(peer_owner_id_.get()); + blink::WebBindings::unregisterObjectOwner(peer_owner_id_.get()); } int JavaBridgeChannel::GenerateRouteID() { diff --git a/content/renderer/java/java_bridge_dispatcher.cc b/content/renderer/java/java_bridge_dispatcher.cc index 376ecb1..633295a 100644 --- a/content/renderer/java/java_bridge_dispatcher.cc +++ b/content/renderer/java/java_bridge_dispatcher.cc @@ -36,7 +36,7 @@ void JavaBridgeDispatcher::EnsureChannelIsSetUp() { JavaBridgeDispatcher::~JavaBridgeDispatcher() { for (ObjectMap::const_iterator iter = objects_.begin(); iter != objects_.end(); ++iter) { - WebKit::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second)); + blink::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second)); } } @@ -51,7 +51,7 @@ bool JavaBridgeDispatcher::OnMessageReceived(const IPC::Message& msg) { return handled; } -void JavaBridgeDispatcher::DidClearWindowObject(WebKit::WebFrame* web_frame) { +void JavaBridgeDispatcher::DidClearWindowObject(blink::WebFrame* web_frame) { // Note that we have to (re)bind all objects, as they will have been unbound // when the window object was cleared. for (ObjectMap::const_iterator iter = objects_.begin(); @@ -90,7 +90,7 @@ void JavaBridgeDispatcher::OnAddNamedObject( // OnRemoveNamedObject() is called for that object. ObjectMap::iterator iter = objects_.find(name); if (iter != objects_.end()) { - WebKit::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second)); + blink::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second)); } objects_[name] = variant; } @@ -106,7 +106,7 @@ void JavaBridgeDispatcher::OnRemoveNamedObject(const string16& name) { // is present. ObjectMap::iterator iter = objects_.find(name); DCHECK(iter != objects_.end()); - WebKit::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second)); + blink::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second)); objects_.erase(iter); } diff --git a/content/renderer/java/java_bridge_dispatcher.h b/content/renderer/java/java_bridge_dispatcher.h index 29a10374..a50eb38 100644 --- a/content/renderer/java/java_bridge_dispatcher.h +++ b/content/renderer/java/java_bridge_dispatcher.h @@ -30,7 +30,7 @@ class JavaBridgeDispatcher : public RenderViewObserver { private: // RenderViewObserver override: virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void DidClearWindowObject(WebKit::WebFrame* frame) OVERRIDE; + virtual void DidClearWindowObject(blink::WebFrame* frame) OVERRIDE; // Message handlers void OnAddNamedObject(const string16& name, diff --git a/content/renderer/load_progress_tracker.cc b/content/renderer/load_progress_tracker.cc index 3a04b72..0cc26fd 100644 --- a/content/renderer/load_progress_tracker.cc +++ b/content/renderer/load_progress_tracker.cc @@ -38,7 +38,7 @@ void LoadProgressTracker::DidStopLoading() { ResetStates(); } -void LoadProgressTracker::DidChangeLoadProgress(WebKit::WebFrame* frame, +void LoadProgressTracker::DidChangeLoadProgress(blink::WebFrame* frame, double progress) { if (tracked_frame_ && frame != tracked_frame_) return; diff --git a/content/renderer/load_progress_tracker.h b/content/renderer/load_progress_tracker.h index a239350..c4ed37e 100644 --- a/content/renderer/load_progress_tracker.h +++ b/content/renderer/load_progress_tracker.h @@ -9,7 +9,7 @@ #include "base/memory/weak_ptr.h" #include "base/time/time.h" -namespace WebKit { +namespace blink { class WebFrame; } @@ -23,7 +23,7 @@ class LoadProgressTracker { void DidStopLoading(); - void DidChangeLoadProgress(WebKit::WebFrame* frame, double progress); + void DidChangeLoadProgress(blink::WebFrame* frame, double progress); private: void ResetStates(); @@ -32,7 +32,7 @@ class LoadProgressTracker { RenderViewImpl* render_view_; - WebKit::WebFrame* tracked_frame_; + blink::WebFrame* tracked_frame_; double progress_; diff --git a/content/renderer/media/active_loader.cc b/content/renderer/media/active_loader.cc index e7601ea..6951514 100644 --- a/content/renderer/media/active_loader.cc +++ b/content/renderer/media/active_loader.cc @@ -9,7 +9,7 @@ namespace content { -ActiveLoader::ActiveLoader(scoped_ptr<WebKit::WebURLLoader> loader) +ActiveLoader::ActiveLoader(scoped_ptr<blink::WebURLLoader> loader) : loader_(loader.Pass()), deferred_(false) { } diff --git a/content/renderer/media/active_loader.h b/content/renderer/media/active_loader.h index 751e6a9..1c30214 100644 --- a/content/renderer/media/active_loader.h +++ b/content/renderer/media/active_loader.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -namespace WebKit { +namespace blink { class WebURLLoader; } @@ -21,7 +21,7 @@ class ActiveLoader { public: // Creates an ActiveLoader with the given loader. It is assumed that the // initial state of |loader| is loading and not deferred. - explicit ActiveLoader(scoped_ptr<WebKit::WebURLLoader> loader); + explicit ActiveLoader(scoped_ptr<blink::WebURLLoader> loader); ~ActiveLoader(); // Starts or stops deferring the resource load. @@ -31,7 +31,7 @@ class ActiveLoader { private: friend class BufferedDataSourceTest; - scoped_ptr<WebKit::WebURLLoader> loader_; + scoped_ptr<blink::WebURLLoader> loader_; bool deferred_; DISALLOW_IMPLICIT_CONSTRUCTORS(ActiveLoader); diff --git a/content/renderer/media/android/audio_decoder_android.cc b/content/renderer/media/android/audio_decoder_android.cc index afc6dec..b589d67 100644 --- a/content/renderer/media/android/audio_decoder_android.cc +++ b/content/renderer/media/android/audio_decoder_android.cc @@ -113,7 +113,7 @@ class WAVEDecoder { // WAVE file, |destination_bus| is filled with the decoded data and // DecodeWAVEFile returns true. Otherwise, DecodeWAVEFile returns // false. - bool DecodeWAVEFile(WebKit::WebAudioBus* destination_bus); + bool DecodeWAVEFile(blink::WebAudioBus* destination_bus); private: // Minimum number of bytes in a WAVE file to hold all of the data we @@ -157,7 +157,7 @@ class WAVEDecoder { // Read data chunk and save it to |destination_bus|. Returns false // if the data chunk could not be read correctly. - bool CopyDataChunkToBus(WebKit::WebAudioBus* destination_bus); + bool CopyDataChunkToBus(blink::WebAudioBus* destination_bus); // The WAVE chunk ID that identifies the chunk. uint8_t chunk_id_[kChunkIDLength]; @@ -293,7 +293,7 @@ bool WAVEDecoder::ReadFMTChunk() { return false; } -bool WAVEDecoder::CopyDataChunkToBus(WebKit::WebAudioBus* destination_bus) { +bool WAVEDecoder::CopyDataChunkToBus(blink::WebAudioBus* destination_bus) { // The data chunk contains the audio data itself. if (!bytes_per_sample_ || bytes_per_sample_ > kMaximumBytesPerSample) { DVLOG(1) << "WARNING: data chunk without preceeding fmt chunk," @@ -326,7 +326,7 @@ bool WAVEDecoder::CopyDataChunkToBus(WebKit::WebAudioBus* destination_bus) { return true; } -bool WAVEDecoder::DecodeWAVEFile(WebKit::WebAudioBus* destination_bus) { +bool WAVEDecoder::DecodeWAVEFile(blink::WebAudioBus* destination_bus) { // Parse and decode WAVE file. If we can't parse it, return false. if (buffer_ + kMinimumWAVLength > buffer_end_) { @@ -395,7 +395,7 @@ bool WAVEDecoder::DecodeWAVEFile(WebKit::WebAudioBus* destination_bus) { // bus and copy the pcm data to the destination bus as it's being // received. static void CopyPcmDataToBus(int input_fd, - WebKit::WebAudioBus* destination_bus, + blink::WebAudioBus* destination_bus, size_t number_of_frames, unsigned number_of_channels, double file_sample_rate) { @@ -433,7 +433,7 @@ static void CopyPcmDataToBus(int input_fd, // until there's no more data and then copy the data to the // destination bus. static void BufferAndCopyPcmDataToBus(int input_fd, - WebKit::WebAudioBus* destination_bus, + blink::WebAudioBus* destination_bus, unsigned number_of_channels, double file_sample_rate) { int16_t pipe_data[PIPE_BUF / sizeof(int16_t)]; @@ -478,7 +478,7 @@ static void BufferAndCopyPcmDataToBus(int input_fd, destination_bus->resizeSmaller(decoded_frames); } -static bool TryWAVEFileDecoder(WebKit::WebAudioBus* destination_bus, +static bool TryWAVEFileDecoder(blink::WebAudioBus* destination_bus, const uint8_t* encoded_data, size_t data_size) { WAVEDecoder decoder(encoded_data, data_size); @@ -493,7 +493,7 @@ static bool TryWAVEFileDecoder(WebKit::WebAudioBus* destination_bus, // to the browser to start the decoder using this buffer and one end // of a pipe. The MediaCodec class will decode the data from the // shared memory and write the PCM samples back to us over a pipe. -bool DecodeAudioFileData(WebKit::WebAudioBus* destination_bus, const char* data, +bool DecodeAudioFileData(blink::WebAudioBus* destination_bus, const char* data, size_t data_size, double sample_rate, scoped_refptr<ThreadSafeSender> sender) { // Try to decode the data as a WAVE file first. If it can't be diff --git a/content/renderer/media/android/audio_decoder_android.h b/content/renderer/media/android/audio_decoder_android.h index c6c3b40..d2cac15 100644 --- a/content/renderer/media/android/audio_decoder_android.h +++ b/content/renderer/media/android/audio_decoder_android.h @@ -7,13 +7,13 @@ #include "content/child/thread_safe_sender.h" -namespace WebKit { +namespace blink { class WebAudioBus; } namespace content { -bool DecodeAudioFileData(WebKit::WebAudioBus* destination_bus, +bool DecodeAudioFileData(blink::WebAudioBus* destination_bus, const char* data, size_t data_size, double sample_rate, diff --git a/content/renderer/media/android/media_info_loader.cc b/content/renderer/media/android/media_info_loader.cc index 1025550..167de7c 100644 --- a/content/renderer/media/android/media_info_loader.cc +++ b/content/renderer/media/android/media_info_loader.cc @@ -12,12 +12,12 @@ #include "third_party/WebKit/public/platform/WebURLResponse.h" #include "third_party/WebKit/public/web/WebFrame.h" -using WebKit::WebFrame; -using WebKit::WebURLError; -using WebKit::WebURLLoader; -using WebKit::WebURLLoaderOptions; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; +using blink::WebFrame; +using blink::WebURLError; +using blink::WebURLLoader; +using blink::WebURLLoaderOptions; +using blink::WebURLRequest; +using blink::WebURLResponse; namespace content { @@ -25,7 +25,7 @@ static const int kHttpOK = 200; MediaInfoLoader::MediaInfoLoader( const GURL& url, - WebKit::WebMediaPlayer::CORSMode cors_mode, + blink::WebMediaPlayer::CORSMode cors_mode, const ReadyCB& ready_cb) : loader_failed_(false), url_(url), @@ -35,7 +35,7 @@ MediaInfoLoader::MediaInfoLoader( MediaInfoLoader::~MediaInfoLoader() {} -void MediaInfoLoader::Start(WebKit::WebFrame* frame) { +void MediaInfoLoader::Start(blink::WebFrame* frame) { // Make sure we have not started. DCHECK(!ready_cb_.is_null()); CHECK(frame); @@ -45,14 +45,14 @@ void MediaInfoLoader::Start(WebKit::WebFrame* frame) { // Prepare the request. WebURLRequest request(url_); request.setTargetType(WebURLRequest::TargetIsMedia); - frame->setReferrerForRequest(request, WebKit::WebURL()); + frame->setReferrerForRequest(request, blink::WebURL()); scoped_ptr<WebURLLoader> loader; if (test_loader_) { loader = test_loader_.Pass(); } else { WebURLLoaderOptions options; - if (cors_mode_ == WebKit::WebMediaPlayer::CORSModeUnspecified) { + if (cors_mode_ == blink::WebMediaPlayer::CORSModeUnspecified) { options.allowCredentials = true; options.crossOriginRequestPolicy = WebURLLoaderOptions::CrossOriginRequestPolicyAllow; @@ -60,7 +60,7 @@ void MediaInfoLoader::Start(WebKit::WebFrame* frame) { options.exposeAllResponseHeaders = true; options.crossOriginRequestPolicy = WebURLLoaderOptions::CrossOriginRequestPolicyUseAccessControl; - if (cors_mode_ == WebKit::WebMediaPlayer::CORSModeUseCredentials) + if (cors_mode_ == blink::WebMediaPlayer::CORSModeUseCredentials) options.allowCredentials = true; } loader.reset(frame->createAssociatedURLLoader(options)); @@ -72,7 +72,7 @@ void MediaInfoLoader::Start(WebKit::WebFrame* frame) { } ///////////////////////////////////////////////////////////////////////////// -// WebKit::WebURLLoaderClient implementation. +// blink::WebURLLoaderClient implementation. void MediaInfoLoader::willSendRequest( WebURLLoader* loader, WebURLRequest& newRequest, @@ -81,7 +81,7 @@ void MediaInfoLoader::willSendRequest( // In this case we shouldn't do anything. if (ready_cb_.is_null()) { // Set the url in the request to an invalid value (empty url). - newRequest.setURL(WebKit::WebURL()); + newRequest.setURL(blink::WebURL()); return; } @@ -126,7 +126,7 @@ void MediaInfoLoader::didReceiveData( } void MediaInfoLoader::didDownloadData( - WebKit::WebURLLoader* loader, + blink::WebURLLoader* loader, int dataLength, int encodedDataLength) { NOTIMPLEMENTED(); @@ -169,7 +169,7 @@ bool MediaInfoLoader::DidPassCORSAccessCheck() const { DCHECK(ready_cb_.is_null()) << "Must become ready before calling DidPassCORSAccessCheck()"; return !loader_failed_ && - cors_mode_ != WebKit::WebMediaPlayer::CORSModeUnspecified; + cors_mode_ != blink::WebMediaPlayer::CORSModeUnspecified; } ///////////////////////////////////////////////////////////////////////////// diff --git a/content/renderer/media/android/media_info_loader.h b/content/renderer/media/android/media_info_loader.h index 5a6fc05..600590b 100644 --- a/content/renderer/media/android/media_info_loader.h +++ b/content/renderer/media/android/media_info_loader.h @@ -16,7 +16,7 @@ #include "third_party/WebKit/public/web/WebMediaPlayer.h" #include "url/gurl.h" -namespace WebKit { +namespace blink { class WebFrame; class WebURLLoader; class WebURLRequest; @@ -27,7 +27,7 @@ namespace content { // This class provides additional information about a media URL. Currently it // can be used to determine if a media URL has a single security origin and // whether the URL passes a CORS access check. -class CONTENT_EXPORT MediaInfoLoader : private WebKit::WebURLLoaderClient { +class CONTENT_EXPORT MediaInfoLoader : private blink::WebURLLoaderClient { public: // Status codes for start operations on MediaInfoLoader. enum Status { @@ -51,12 +51,12 @@ class CONTENT_EXPORT MediaInfoLoader : private WebKit::WebURLLoaderClient { typedef base::Callback<void(Status)> ReadyCB; MediaInfoLoader( const GURL& url, - WebKit::WebMediaPlayer::CORSMode cors_mode, + blink::WebMediaPlayer::CORSMode cors_mode, const ReadyCB& ready_cb); virtual ~MediaInfoLoader(); // Start loading media info. - void Start(WebKit::WebFrame* frame); + void Start(blink::WebFrame* frame); // Returns true if the media resource has a single origin, false otherwise. // Only valid to call after the loader becomes ready. @@ -69,48 +69,48 @@ class CONTENT_EXPORT MediaInfoLoader : private WebKit::WebURLLoaderClient { private: friend class MediaInfoLoaderTest; - // WebKit::WebURLLoaderClient implementation. + // blink::WebURLLoaderClient implementation. virtual void willSendRequest( - WebKit::WebURLLoader* loader, - WebKit::WebURLRequest& newRequest, - const WebKit::WebURLResponse& redirectResponse); + blink::WebURLLoader* loader, + blink::WebURLRequest& newRequest, + const blink::WebURLResponse& redirectResponse); virtual void didSendData( - WebKit::WebURLLoader* loader, + blink::WebURLLoader* loader, unsigned long long bytesSent, unsigned long long totalBytesToBeSent); virtual void didReceiveResponse( - WebKit::WebURLLoader* loader, - const WebKit::WebURLResponse& response); + blink::WebURLLoader* loader, + const blink::WebURLResponse& response); virtual void didDownloadData( - WebKit::WebURLLoader* loader, + blink::WebURLLoader* loader, int data_length, int encodedDataLength); virtual void didReceiveData( - WebKit::WebURLLoader* loader, + blink::WebURLLoader* loader, const char* data, int data_length, int encoded_data_length); virtual void didReceiveCachedMetadata( - WebKit::WebURLLoader* loader, + blink::WebURLLoader* loader, const char* data, int dataLength); virtual void didFinishLoading( - WebKit::WebURLLoader* loader, + blink::WebURLLoader* loader, double finishTime); virtual void didFail( - WebKit::WebURLLoader* loader, - const WebKit::WebURLError&); + blink::WebURLLoader* loader, + const blink::WebURLError&); void DidBecomeReady(Status status); // Injected WebURLLoader instance for testing purposes. - scoped_ptr<WebKit::WebURLLoader> test_loader_; + scoped_ptr<blink::WebURLLoader> test_loader_; // Keeps track of an active WebURLLoader and associated state. scoped_ptr<ActiveLoader> active_loader_; bool loader_failed_; GURL url_; - WebKit::WebMediaPlayer::CORSMode cors_mode_; + blink::WebMediaPlayer::CORSMode cors_mode_; bool single_origin_; ReadyCB ready_cb_; diff --git a/content/renderer/media/android/media_info_loader_unittest.cc b/content/renderer/media/android/media_info_loader_unittest.cc index 7e47ba5..07a5429 100644 --- a/content/renderer/media/android/media_info_loader_unittest.cc +++ b/content/renderer/media/android/media_info_loader_unittest.cc @@ -17,10 +17,10 @@ using ::testing::_; using ::testing::InSequence; using ::testing::NiceMock; -using WebKit::WebString; -using WebKit::WebURLError; -using WebKit::WebURLResponse; -using WebKit::WebView; +using blink::WebString; +using blink::WebURLError; +using blink::WebURLResponse; +using blink::WebView; namespace content { @@ -45,7 +45,7 @@ class MediaInfoLoaderTest : public testing::Test { void Initialize( const char* url, - WebKit::WebMediaPlayer::CORSMode cors_mode) { + blink::WebMediaPlayer::CORSMode cors_mode) { gurl_ = GURL(url); loader_.reset(new MediaInfoLoader( @@ -55,7 +55,7 @@ class MediaInfoLoaderTest : public testing::Test { // |test_loader_| will be used when Start() is called. url_loader_ = new NiceMock<MockWebURLLoader>(); - loader_->test_loader_ = scoped_ptr<WebKit::WebURLLoader>(url_loader_); + loader_->test_loader_ = scoped_ptr<blink::WebURLLoader>(url_loader_); } void Start() { @@ -72,8 +72,8 @@ class MediaInfoLoaderTest : public testing::Test { void Redirect(const char* url) { GURL redirect_url(url); - WebKit::WebURLRequest new_request(redirect_url); - WebKit::WebURLResponse redirect_response(gurl_); + blink::WebURLRequest new_request(redirect_url); + blink::WebURLResponse redirect_response(gurl_); loader_->willSendRequest(url_loader_, new_request, redirect_response); @@ -116,20 +116,20 @@ class MediaInfoLoaderTest : public testing::Test { }; TEST_F(MediaInfoLoaderTest, StartStop) { - Initialize(kHttpUrl, WebKit::WebMediaPlayer::CORSModeUnspecified); + Initialize(kHttpUrl, blink::WebMediaPlayer::CORSModeUnspecified); Start(); Stop(); } TEST_F(MediaInfoLoaderTest, LoadFailure) { - Initialize(kHttpUrl, WebKit::WebMediaPlayer::CORSModeUnspecified); + Initialize(kHttpUrl, blink::WebMediaPlayer::CORSModeUnspecified); Start(); FailLoad(); } TEST_F(MediaInfoLoaderTest, HasSingleOriginNoRedirect) { // Make sure no redirect case works as expected. - Initialize(kHttpUrl, WebKit::WebMediaPlayer::CORSModeUnspecified); + Initialize(kHttpUrl, blink::WebMediaPlayer::CORSModeUnspecified); Start(); SendResponse(kHttpOK, MediaInfoLoader::kOk); EXPECT_TRUE(loader_->HasSingleOrigin()); @@ -137,7 +137,7 @@ TEST_F(MediaInfoLoaderTest, HasSingleOriginNoRedirect) { TEST_F(MediaInfoLoaderTest, HasSingleOriginSingleRedirect) { // Test redirect to the same domain. - Initialize(kHttpUrl, WebKit::WebMediaPlayer::CORSModeUnspecified); + Initialize(kHttpUrl, blink::WebMediaPlayer::CORSModeUnspecified); Start(); Redirect(kHttpRedirectToSameDomainUrl1); SendResponse(kHttpOK, MediaInfoLoader::kOk); @@ -146,7 +146,7 @@ TEST_F(MediaInfoLoaderTest, HasSingleOriginSingleRedirect) { TEST_F(MediaInfoLoaderTest, HasSingleOriginDoubleRedirect) { // Test redirect twice to the same domain. - Initialize(kHttpUrl, WebKit::WebMediaPlayer::CORSModeUnspecified); + Initialize(kHttpUrl, blink::WebMediaPlayer::CORSModeUnspecified); Start(); Redirect(kHttpRedirectToSameDomainUrl1); Redirect(kHttpRedirectToSameDomainUrl2); @@ -156,7 +156,7 @@ TEST_F(MediaInfoLoaderTest, HasSingleOriginDoubleRedirect) { TEST_F(MediaInfoLoaderTest, HasSingleOriginDifferentDomain) { // Test redirect to a different domain. - Initialize(kHttpUrl, WebKit::WebMediaPlayer::CORSModeUnspecified); + Initialize(kHttpUrl, blink::WebMediaPlayer::CORSModeUnspecified); Start(); Redirect(kHttpRedirectToDifferentDomainUrl1); SendResponse(kHttpOK, MediaInfoLoader::kOk); @@ -165,7 +165,7 @@ TEST_F(MediaInfoLoaderTest, HasSingleOriginDifferentDomain) { TEST_F(MediaInfoLoaderTest, HasSingleOriginMultipleDomains) { // Test redirect to the same domain and then to a different domain. - Initialize(kHttpUrl, WebKit::WebMediaPlayer::CORSModeUnspecified); + Initialize(kHttpUrl, blink::WebMediaPlayer::CORSModeUnspecified); Start(); Redirect(kHttpRedirectToSameDomainUrl1); Redirect(kHttpRedirectToDifferentDomainUrl1); @@ -174,14 +174,14 @@ TEST_F(MediaInfoLoaderTest, HasSingleOriginMultipleDomains) { } TEST_F(MediaInfoLoaderTest, CORSAccessCheckPassed) { - Initialize(kHttpUrl, WebKit::WebMediaPlayer::CORSModeUseCredentials); + Initialize(kHttpUrl, blink::WebMediaPlayer::CORSModeUseCredentials); Start(); SendResponse(kHttpOK, MediaInfoLoader::kOk); EXPECT_TRUE(loader_->DidPassCORSAccessCheck()); } TEST_F(MediaInfoLoaderTest, CORSAccessCheckFailed) { - Initialize(kHttpUrl, WebKit::WebMediaPlayer::CORSModeUseCredentials); + Initialize(kHttpUrl, blink::WebMediaPlayer::CORSModeUseCredentials); Start(); SendResponse(kHttpNotFound, MediaInfoLoader::kFailed); EXPECT_FALSE(loader_->DidPassCORSAccessCheck()); diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc index ad6aab2..7d7e917 100644 --- a/content/renderer/media/android/media_source_delegate.cc +++ b/content/renderer/media/android/media_source_delegate.cc @@ -25,8 +25,8 @@ using media::DemuxerStream; using media::DemuxerConfigs; using media::DemuxerData; -using WebKit::WebMediaPlayer; -using WebKit::WebString; +using blink::WebMediaPlayer; +using blink::WebString; namespace { @@ -202,7 +202,7 @@ void MediaSourceDelegate::InitializeMediaStream( } #endif -const WebKit::WebTimeRanges& MediaSourceDelegate::Buffered() { +const blink::WebTimeRanges& MediaSourceDelegate::Buffered() { buffered_web_time_ranges_ = ConvertToWebTimeRanges(buffered_time_ranges_); return buffered_web_time_ranges_; diff --git a/content/renderer/media/android/media_source_delegate.h b/content/renderer/media/android/media_source_delegate.h index 4c3564e..b9ae5be 100644 --- a/content/renderer/media/android/media_source_delegate.h +++ b/content/renderer/media/android/media_source_delegate.h @@ -38,9 +38,9 @@ class RendererDemuxerAndroid; class MediaSourceDelegate : public media::DemuxerHost { public: - typedef base::Callback<void(WebKit::WebMediaSource*)> + typedef base::Callback<void(blink::WebMediaSource*)> MediaSourceOpenedCB; - typedef base::Callback<void(WebKit::WebMediaPlayer::NetworkState)> + typedef base::Callback<void(blink::WebMediaPlayer::NetworkState)> UpdateNetworkStateCB; typedef base::Callback<void(const base::TimeDelta&)> DurationChangeCB; @@ -73,7 +73,7 @@ class MediaSourceDelegate : public media::DemuxerHost { const UpdateNetworkStateCB& update_network_state_cb); #endif - const WebKit::WebTimeRanges& Buffered(); + const blink::WebTimeRanges& Buffered(); size_t DecodedFrameCount() const; size_t DroppedFrameCount() const; size_t AudioDecodedByteCount() const; @@ -218,14 +218,14 @@ class MediaSourceDelegate : public media::DemuxerHost { media::PipelineStatistics statistics_; media::Ranges<base::TimeDelta> buffered_time_ranges_; // Keep a list of buffered time ranges. - WebKit::WebTimeRanges buffered_web_time_ranges_; + blink::WebTimeRanges buffered_web_time_ranges_; MediaSourceOpenedCB media_source_opened_cb_; media::Demuxer::NeedKeyCB need_key_cb_; // The currently selected key system. Empty string means that no key system // has been selected. - WebKit::WebString current_key_system_; + blink::WebString current_key_system_; // Temporary for EME v0.1. In the future the init data type should be passed // through GenerateKeyRequest() directly from WebKit. diff --git a/content/renderer/media/android/renderer_media_player_manager.cc b/content/renderer/media/android/renderer_media_player_manager.cc index d465a25..4750549 100644 --- a/content/renderer/media/android/renderer_media_player_manager.cc +++ b/content/renderer/media/android/renderer_media_player_manager.cc @@ -324,11 +324,11 @@ ProxyMediaKeys* RendererMediaPlayerManager::GetMediaKeys(int media_keys_id) { return (iter != media_keys_.end()) ? iter->second : NULL; } -bool RendererMediaPlayerManager::CanEnterFullscreen(WebKit::WebFrame* frame) { +bool RendererMediaPlayerManager::CanEnterFullscreen(blink::WebFrame* frame) { return !fullscreen_frame_ || IsInFullscreen(frame); } -void RendererMediaPlayerManager::DidEnterFullscreen(WebKit::WebFrame* frame) { +void RendererMediaPlayerManager::DidEnterFullscreen(blink::WebFrame* frame) { fullscreen_frame_ = frame; } @@ -336,7 +336,7 @@ void RendererMediaPlayerManager::DidExitFullscreen() { fullscreen_frame_ = NULL; } -bool RendererMediaPlayerManager::IsInFullscreen(WebKit::WebFrame* frame) { +bool RendererMediaPlayerManager::IsInFullscreen(blink::WebFrame* frame) { return fullscreen_frame_ == frame; } diff --git a/content/renderer/media/android/renderer_media_player_manager.h b/content/renderer/media/android/renderer_media_player_manager.h index 4a16b83..730eac4 100644 --- a/content/renderer/media/android/renderer_media_player_manager.h +++ b/content/renderer/media/android/renderer_media_player_manager.h @@ -21,7 +21,7 @@ #include "ui/gfx/rect_f.h" #endif -namespace WebKit { +namespace blink { class WebFrame; } @@ -117,14 +117,14 @@ class RendererMediaPlayerManager : public RenderViewObserver { void ReleaseVideoResources(); // Checks whether a player can enter fullscreen. - bool CanEnterFullscreen(WebKit::WebFrame* frame); + bool CanEnterFullscreen(blink::WebFrame* frame); // Called when a player entered or exited fullscreen. - void DidEnterFullscreen(WebKit::WebFrame* frame); + void DidEnterFullscreen(blink::WebFrame* frame); void DidExitFullscreen(); // Checks whether the Webframe is in fullscreen. - bool IsInFullscreen(WebKit::WebFrame* frame); + bool IsInFullscreen(blink::WebFrame* frame); // Gets the pointer to WebMediaPlayerAndroid given the |player_id|. WebMediaPlayerAndroid* GetMediaPlayer(int player_id); @@ -179,7 +179,7 @@ class RendererMediaPlayerManager : public RenderViewObserver { int next_media_player_id_; // WebFrame of the fullscreen video. - WebKit::WebFrame* fullscreen_frame_; + blink::WebFrame* fullscreen_frame_; DISALLOW_COPY_AND_ASSIGN(RendererMediaPlayerManager); }; diff --git a/content/renderer/media/android/stream_texture_factory_android.h b/content/renderer/media/android/stream_texture_factory_android.h index aa304de..849cc06 100644 --- a/content/renderer/media/android/stream_texture_factory_android.h +++ b/content/renderer/media/android/stream_texture_factory_android.h @@ -10,7 +10,7 @@ #include "gpu/command_buffer/common/mailbox.h" #include "ui/gfx/size.h" -namespace WebKit { +namespace blink { class WebGraphicsContext3D; } @@ -75,7 +75,7 @@ class StreamTextureFactory { virtual void SetStreamTextureSize(int32 texture_id, const gfx::Size& size) = 0; - virtual WebKit::WebGraphicsContext3D* Context3d() = 0; + virtual blink::WebGraphicsContext3D* Context3d() = 0; }; } // namespace content diff --git a/content/renderer/media/android/stream_texture_factory_android_impl.cc b/content/renderer/media/android/stream_texture_factory_android_impl.cc index 9c29203..3b421ca 100644 --- a/content/renderer/media/android/stream_texture_factory_android_impl.cc +++ b/content/renderer/media/android/stream_texture_factory_android_impl.cc @@ -80,7 +80,7 @@ void StreamTextureProxyImpl::OnMatrixChanged(const float matrix[16]) { } // namespace StreamTextureFactoryImpl::StreamTextureFactoryImpl( - WebKit::WebGraphicsContext3D* context, + blink::WebGraphicsContext3D* context, GpuChannelHost* channel, int view_id) : context_(context), channel_(channel), view_id_(view_id) { @@ -137,7 +137,7 @@ void StreamTextureFactoryImpl::SetStreamTextureSize( channel_->Send(new GpuChannelMsg_SetStreamTextureSize(stream_id, size)); } -WebKit::WebGraphicsContext3D* StreamTextureFactoryImpl::Context3d() { +blink::WebGraphicsContext3D* StreamTextureFactoryImpl::Context3d() { return context_; } diff --git a/content/renderer/media/android/stream_texture_factory_android_impl.h b/content/renderer/media/android/stream_texture_factory_android_impl.h index f55d23c..0cd3d58 100644 --- a/content/renderer/media/android/stream_texture_factory_android_impl.h +++ b/content/renderer/media/android/stream_texture_factory_android_impl.h @@ -7,7 +7,7 @@ #include "content/renderer/media/android/stream_texture_factory_android.h" -namespace WebKit { +namespace blink { class WebGraphicsContext3D; } @@ -17,7 +17,7 @@ class GpuChannelHost; class StreamTextureFactoryImpl : public StreamTextureFactory { public: - StreamTextureFactoryImpl(WebKit::WebGraphicsContext3D* context, + StreamTextureFactoryImpl(blink::WebGraphicsContext3D* context, GpuChannelHost* channel, int view_id); virtual ~StreamTextureFactoryImpl(); @@ -33,10 +33,10 @@ class StreamTextureFactoryImpl : public StreamTextureFactory { virtual void DestroyStreamTexture(unsigned texture_id) OVERRIDE; virtual void SetStreamTextureSize(int32 texture_id, const gfx::Size& size) OVERRIDE; - virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE; + virtual blink::WebGraphicsContext3D* Context3d() OVERRIDE; private: - WebKit::WebGraphicsContext3D* context_; + blink::WebGraphicsContext3D* context_; scoped_refptr<GpuChannelHost> channel_; int view_id_; diff --git a/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc b/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc index 3e99e88..c284328 100644 --- a/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc +++ b/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.cc @@ -154,7 +154,7 @@ unsigned StreamTextureFactorySynchronousImpl::CreateStreamTexture( gpu::Mailbox* texture_mailbox, unsigned* texture_mailbox_sync_point) { DCHECK(context_provider_); - WebKit::WebGraphicsContext3D* context = context_provider_->Context3d(); + blink::WebGraphicsContext3D* context = context_provider_->Context3d(); unsigned stream_id = 0; if (context->makeContextCurrent()) { *texture_id = context->createTexture(); @@ -173,7 +173,7 @@ unsigned StreamTextureFactorySynchronousImpl::CreateStreamTexture( void StreamTextureFactorySynchronousImpl::DestroyStreamTexture( unsigned texture_id) { DCHECK(context_provider_); - WebKit::WebGraphicsContext3D* context = context_provider_->Context3d(); + blink::WebGraphicsContext3D* context = context_provider_->Context3d(); if (context->makeContextCurrent()) { context->destroyStreamTextureCHROMIUM(texture_id); context->deleteTexture(texture_id); @@ -185,7 +185,7 @@ void StreamTextureFactorySynchronousImpl::SetStreamTextureSize( int32 stream_id, const gfx::Size& size) {} -WebKit::WebGraphicsContext3D* +blink::WebGraphicsContext3D* StreamTextureFactorySynchronousImpl::Context3d() { DCHECK(context_provider_); return context_provider_->Context3d(); diff --git a/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.h b/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.h index 807cc96..51c77e5 100644 --- a/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.h +++ b/content/renderer/media/android/stream_texture_factory_android_synchronous_impl.h @@ -13,7 +13,7 @@ namespace gfx { class SurfaceTexture; } -namespace WebKit { +namespace blink { class WebGraphicsContext3D; } @@ -27,7 +27,7 @@ class StreamTextureFactorySynchronousImpl : public StreamTextureFactory { virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture( uint32 stream_id) = 0; - virtual WebKit::WebGraphicsContext3D* Context3d() = 0; + virtual blink::WebGraphicsContext3D* Context3d() = 0; protected: friend class base::RefCountedThreadSafe<ContextProvider>; @@ -52,7 +52,7 @@ class StreamTextureFactorySynchronousImpl : public StreamTextureFactory { virtual void DestroyStreamTexture(unsigned texture_id) OVERRIDE; virtual void SetStreamTextureSize(int32 stream_id, const gfx::Size& size) OVERRIDE; - virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE; + virtual blink::WebGraphicsContext3D* Context3d() OVERRIDE; private: CreateContextProviderCallback create_context_provider_callback_; diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc index 9e83eb5..c0cc390 100644 --- a/content/renderer/media/android/webmediaplayer_android.cc +++ b/content/renderer/media/android/webmediaplayer_android.cc @@ -47,11 +47,11 @@ static const uint32 kGLTextureExternalOES = 0x8D65; -using WebKit::WebMediaPlayer; -using WebKit::WebSize; -using WebKit::WebString; -using WebKit::WebTimeRanges; -using WebKit::WebURL; +using blink::WebMediaPlayer; +using blink::WebSize; +using blink::WebString; +using blink::WebTimeRanges; +using blink::WebURL; using media::MediaPlayerAndroid; using media::VideoFrame; @@ -75,8 +75,8 @@ void WebMediaPlayerAndroid::OnReleaseRemotePlaybackTexture( } WebMediaPlayerAndroid::WebMediaPlayerAndroid( - WebKit::WebFrame* frame, - WebKit::WebMediaPlayerClient* client, + blink::WebFrame* frame, + blink::WebMediaPlayerClient* client, base::WeakPtr<WebMediaPlayerDelegate> delegate, RendererMediaPlayerManager* manager, StreamTextureFactory* factory, @@ -147,7 +147,7 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid( #endif TryCreateStreamTextureProxyIfNeeded(); - if (WebKit::WebRuntimeFeatures::isPrefixedEncryptedMediaEnabled()) { + if (blink::WebRuntimeFeatures::isPrefixedEncryptedMediaEnabled()) { // TODO(xhwang): Report an error when there is encrypted stream but EME is // not enabled. Currently the player just doesn't start and waits for ever. decryptor_.reset(new ProxyDecryptor( @@ -180,7 +180,7 @@ WebMediaPlayerAndroid::~WebMediaPlayerAndroid() { stream_texture_factory_->DestroyStreamTexture(texture_id_); if (remote_playback_texture_id_) { - WebKit::WebGraphicsContext3D* context = + blink::WebGraphicsContext3D* context = stream_texture_factory_->Context3d(); if (context->makeContextCurrent()) context->deleteTexture(remote_playback_texture_id_); @@ -212,7 +212,7 @@ WebMediaPlayerAndroid::~WebMediaPlayerAndroid() { } void WebMediaPlayerAndroid::load(LoadType load_type, - const WebKit::WebURL& url, + const blink::WebURL& url, CORSMode cors_mode) { switch (load_type) { case LoadTypeURL: @@ -508,14 +508,14 @@ bool WebMediaPlayerAndroid::didLoadingProgress() const { return ret; } -void WebMediaPlayerAndroid::paint(WebKit::WebCanvas* canvas, - const WebKit::WebRect& rect, +void WebMediaPlayerAndroid::paint(blink::WebCanvas* canvas, + const blink::WebRect& rect, unsigned char alpha) { NOTIMPLEMENTED(); } bool WebMediaPlayerAndroid::copyVideoTextureToPlatformTexture( - WebKit::WebGraphicsContext3D* web_graphics_context, + blink::WebGraphicsContext3D* web_graphics_context, unsigned int texture, unsigned int level, unsigned int internal_format, @@ -908,7 +908,7 @@ void WebMediaPlayerAndroid::DrawRemotePlaybackIcon() { DCHECK(main_thread_checker_.CalledOnValidThread()); if (!video_weblayer_) return; - WebKit::WebGraphicsContext3D* context = stream_texture_factory_->Context3d(); + blink::WebGraphicsContext3D* context = stream_texture_factory_->Context3d(); if (!context->makeContextCurrent()) return; @@ -1171,7 +1171,7 @@ bool WebMediaPlayerAndroid::RetrieveGeometryChange(gfx::RectF* rect) { // UMA_HISTOGRAM_COUNTS. The reason that we cannot use those macros directly is // that UMA_* macros require the names to be constant throughout the process' // lifetime. -static void EmeUMAHistogramEnumeration(const WebKit::WebString& key_system, +static void EmeUMAHistogramEnumeration(const blink::WebString& key_system, const std::string& method, int sample, int boundary_value) { @@ -1181,7 +1181,7 @@ static void EmeUMAHistogramEnumeration(const WebKit::WebString& key_system, base::Histogram::kUmaTargetedHistogramFlag)->Add(sample); } -static void EmeUMAHistogramCounts(const WebKit::WebString& key_system, +static void EmeUMAHistogramCounts(const blink::WebString& key_system, const std::string& method, int sample) { // Use the same parameters as UMA_HISTOGRAM_COUNTS. @@ -1351,7 +1351,7 @@ void WebMediaPlayerAndroid::OnKeyError(const std::string& session_id, client_->keyError( current_key_system_, WebString::fromUTF8(session_id), - static_cast<WebKit::WebMediaPlayerClient::MediaKeyErrorCode>(error_code), + static_cast<blink::WebMediaPlayerClient::MediaKeyErrorCode>(error_code), system_code); } @@ -1370,7 +1370,7 @@ void WebMediaPlayerAndroid::OnKeyMessage(const std::string& session_id, } void WebMediaPlayerAndroid::OnMediaSourceOpened( - WebKit::WebMediaSource* web_media_source) { + blink::WebMediaSource* web_media_source) { client_->mediaSourceOpened(web_media_source); } @@ -1378,8 +1378,8 @@ void WebMediaPlayerAndroid::OnNeedKey(const std::string& type, const std::vector<uint8>& init_data) { DCHECK(main_loop_->BelongsToCurrentThread()); // Do not fire NeedKey event if encrypted media is not enabled. - if (!WebKit::WebRuntimeFeatures::isEncryptedMediaEnabled() && - !WebKit::WebRuntimeFeatures::isPrefixedEncryptedMediaEnabled()) { + if (!blink::WebRuntimeFeatures::isEncryptedMediaEnabled() && + !blink::WebRuntimeFeatures::isPrefixedEncryptedMediaEnabled()) { return; } @@ -1414,7 +1414,7 @@ void WebMediaPlayerAndroid::DoReleaseRemotePlaybackTexture(uint32 sync_point) { DCHECK(main_thread_checker_.CalledOnValidThread()); DCHECK(remote_playback_texture_id_); - WebKit::WebGraphicsContext3D* context = + blink::WebGraphicsContext3D* context = stream_texture_factory_->Context3d(); if (sync_point) diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h index 0edc3ef..42fe04c 100644 --- a/content/renderer/media/android/webmediaplayer_android.h +++ b/content/renderer/media/android/webmediaplayer_android.h @@ -36,7 +36,7 @@ class Demuxer; class MediaLog; } -namespace WebKit { +namespace blink { class WebFrame; } @@ -53,12 +53,12 @@ class MediaStreamAudioRenderer; class MediaStreamClient; #endif -// This class implements WebKit::WebMediaPlayer by keeping the android +// This class implements blink::WebMediaPlayer by keeping the android // media player in the browser process. It listens to all the status changes // sent from the browser process and sends playback controls to the media // player. class WebMediaPlayerAndroid - : public WebKit::WebMediaPlayer, + : public blink::WebMediaPlayer, public cc::VideoFrameProvider, public base::MessageLoop::DestructionObserver, public base::SupportsWeakPtr<WebMediaPlayerAndroid> { @@ -71,8 +71,8 @@ class WebMediaPlayerAndroid // blink, so that enterFullscreen() will not be called if another video is // already in fullscreen. WebMediaPlayerAndroid( - WebKit::WebFrame* frame, - WebKit::WebMediaPlayerClient* client, + blink::WebFrame* frame, + blink::WebMediaPlayerClient* client, base::WeakPtr<WebMediaPlayerDelegate> delegate, RendererMediaPlayerManager* manager, StreamTextureFactory* factory, @@ -80,14 +80,14 @@ class WebMediaPlayerAndroid media::MediaLog* media_log); virtual ~WebMediaPlayerAndroid(); - // WebKit::WebMediaPlayer implementation. + // blink::WebMediaPlayer implementation. virtual void enterFullscreen(); virtual void exitFullscreen(); virtual bool canEnterFullscreen() const; // Resource loading. virtual void load(LoadType load_type, - const WebKit::WebURL& url, + const blink::WebURL& url, CORSMode cors_mode) OVERRIDE; // Playback controls. @@ -99,16 +99,16 @@ class WebMediaPlayerAndroid virtual bool supportsSave() const; virtual void setRate(double rate); virtual void setVolume(double volume); - virtual const WebKit::WebTimeRanges& buffered(); + virtual const blink::WebTimeRanges& buffered(); virtual double maxTimeSeekable() const; // Methods for painting. - virtual void paint(WebKit::WebCanvas* canvas, - const WebKit::WebRect& rect, + virtual void paint(blink::WebCanvas* canvas, + const blink::WebRect& rect, unsigned char alpha); virtual bool copyVideoTextureToPlatformTexture( - WebKit::WebGraphicsContext3D* web_graphics_context, + blink::WebGraphicsContext3D* web_graphics_context, unsigned int texture, unsigned int level, unsigned int internal_format, @@ -121,7 +121,7 @@ class WebMediaPlayerAndroid virtual bool hasAudio() const; // Dimensions of the video. - virtual WebKit::WebSize naturalSize() const; + virtual blink::WebSize naturalSize() const; // Getters of playback state. virtual bool paused() const; @@ -132,8 +132,8 @@ class WebMediaPlayerAndroid virtual bool didLoadingProgress() const; // Internal states of loading and network. - virtual WebKit::WebMediaPlayer::NetworkState networkState() const; - virtual WebKit::WebMediaPlayer::ReadyState readyState() const; + virtual blink::WebMediaPlayer::NetworkState networkState() const; + virtual blink::WebMediaPlayer::ReadyState readyState() const; virtual bool hasSingleSecurityOrigin() const; virtual bool didPassCORSAccessCheck() const; @@ -198,19 +198,19 @@ class WebMediaPlayerAndroid #endif virtual MediaKeyException generateKeyRequest( - const WebKit::WebString& key_system, + const blink::WebString& key_system, const unsigned char* init_data, unsigned init_data_length) OVERRIDE; virtual MediaKeyException addKey( - const WebKit::WebString& key_system, + const blink::WebString& key_system, const unsigned char* key, unsigned key_length, const unsigned char* init_data, unsigned init_data_length, - const WebKit::WebString& session_id) OVERRIDE; + const blink::WebString& session_id) OVERRIDE; virtual MediaKeyException cancelKeyRequest( - const WebKit::WebString& key_system, - const WebKit::WebString& session_id) OVERRIDE; + const blink::WebString& key_system, + const blink::WebString& session_id) OVERRIDE; void OnKeyAdded(const std::string& session_id); void OnKeyError(const std::string& session_id, @@ -220,7 +220,7 @@ class WebMediaPlayerAndroid const std::vector<uint8>& message, const std::string& destination_url); - void OnMediaSourceOpened(WebKit::WebMediaSource* web_media_source); + void OnMediaSourceOpened(blink::WebMediaSource* web_media_source); void OnNeedKey(const std::string& type, const std::vector<uint8>& init_data); @@ -242,8 +242,8 @@ class WebMediaPlayerAndroid void UpdatePlayingState(bool is_playing_); // Helper methods for posting task for setting states and update WebKit. - void UpdateNetworkState(WebKit::WebMediaPlayer::NetworkState state); - void UpdateReadyState(WebKit::WebMediaPlayer::ReadyState state); + void UpdateNetworkState(blink::WebMediaPlayer::NetworkState state); + void UpdateReadyState(blink::WebMediaPlayer::ReadyState state); void TryCreateStreamTextureProxyIfNeeded(); void DoCreateStreamTexture(); @@ -270,22 +270,22 @@ class WebMediaPlayerAndroid // Actually do the work for generateKeyRequest/addKey so they can easily // report results to UMA. MediaKeyException GenerateKeyRequestInternal( - const WebKit::WebString& key_system, + const blink::WebString& key_system, const unsigned char* init_data, unsigned init_data_length); - MediaKeyException AddKeyInternal(const WebKit::WebString& key_system, + MediaKeyException AddKeyInternal(const blink::WebString& key_system, const unsigned char* key, unsigned key_length, const unsigned char* init_data, unsigned init_data_length, - const WebKit::WebString& session_id); + const blink::WebString& session_id); MediaKeyException CancelKeyRequestInternal( - const WebKit::WebString& key_system, - const WebKit::WebString& session_id); + const blink::WebString& key_system, + const blink::WebString& session_id); - WebKit::WebFrame* const frame_; + blink::WebFrame* const frame_; - WebKit::WebMediaPlayerClient* const client_; + blink::WebMediaPlayerClient* const client_; // |delegate_| is used to notify the browser process of the player status, so // that the browser process can control screen locks. @@ -295,13 +295,13 @@ class WebMediaPlayerAndroid base::WeakPtr<WebMediaPlayerDelegate> delegate_; // Save the list of buffered time ranges. - WebKit::WebTimeRanges buffered_; + blink::WebTimeRanges buffered_; // Size of the video. - WebKit::WebSize natural_size_; + blink::WebSize natural_size_; // Size that has been sent to StreamTexture. - WebKit::WebSize cached_stream_texture_size_; + blink::WebSize cached_stream_texture_size_; // The video frame object used for rendering by the compositor. scoped_refptr<media::VideoFrame> current_frame_; @@ -346,8 +346,8 @@ class WebMediaPlayerAndroid int player_id_; // Current player states. - WebKit::WebMediaPlayer::NetworkState network_state_; - WebKit::WebMediaPlayer::ReadyState ready_state_; + blink::WebMediaPlayer::NetworkState network_state_; + blink::WebMediaPlayer::ReadyState ready_state_; // GL texture ID used to show the remote playback icon. unsigned int remote_playback_texture_id_; @@ -437,7 +437,7 @@ class WebMediaPlayerAndroid // The currently selected key system. Empty string means that no key system // has been selected. - WebKit::WebString current_key_system_; + blink::WebString current_key_system_; // Temporary for EME v0.1. In the future the init data type should be passed // through GenerateKeyRequest() directly from WebKit. diff --git a/content/renderer/media/audio_decoder.cc b/content/renderer/media/audio_decoder.cc index 64cf6dd..dd9f1fa 100644 --- a/content/renderer/media/audio_decoder.cc +++ b/content/renderer/media/audio_decoder.cc @@ -19,13 +19,13 @@ using media::AudioBus; using media::AudioFileReader; using media::InMemoryUrlProtocol; using std::vector; -using WebKit::WebAudioBus; +using blink::WebAudioBus; namespace content { // Decode in-memory audio file data. bool DecodeAudioFileData( - WebKit::WebAudioBus* destination_bus, + blink::WebAudioBus* destination_bus, const char* data, size_t data_size, double sample_rate) { DCHECK(destination_bus); if (!destination_bus) diff --git a/content/renderer/media/audio_decoder.h b/content/renderer/media/audio_decoder.h index bef404b..9c14ed9 100644 --- a/content/renderer/media/audio_decoder.h +++ b/content/renderer/media/audio_decoder.h @@ -7,12 +7,12 @@ #include "base/basictypes.h" -namespace WebKit { class WebAudioBus; } +namespace blink { class WebAudioBus; } namespace content { // Decode in-memory audio file data. -bool DecodeAudioFileData(WebKit::WebAudioBus* destination_bus, const char* data, +bool DecodeAudioFileData(blink::WebAudioBus* destination_bus, const char* data, size_t data_size, double sample_rate); } // namespace content diff --git a/content/renderer/media/buffered_data_source.cc b/content/renderer/media/buffered_data_source.cc index 861111e..98c58eb 100644 --- a/content/renderer/media/buffered_data_source.cc +++ b/content/renderer/media/buffered_data_source.cc @@ -10,7 +10,7 @@ #include "media/base/media_log.h" #include "net/base/net_errors.h" -using WebKit::WebFrame; +using blink::WebFrame; namespace { diff --git a/content/renderer/media/buffered_data_source.h b/content/renderer/media/buffered_data_source.h index 6b1d68c..4cad071 100644 --- a/content/renderer/media/buffered_data_source.h +++ b/content/renderer/media/buffered_data_source.h @@ -39,7 +39,7 @@ class CONTENT_EXPORT BufferedDataSource : public media::DataSource { // |downloading_cb| will be called whenever the downloading/paused state of // the source changes. BufferedDataSource(const scoped_refptr<base::MessageLoopProxy>& render_loop, - WebKit::WebFrame* frame, + blink::WebFrame* frame, media::MediaLog* media_log, const DownloadingCB& downloading_cb); virtual ~BufferedDataSource(); @@ -161,7 +161,7 @@ class CONTENT_EXPORT BufferedDataSource : public media::DataSource { bool streaming_; // A webframe for loading. - WebKit::WebFrame* frame_; + blink::WebFrame* frame_; // A resource loader for the media resource. scoped_ptr<BufferedResourceLoader> loader_; diff --git a/content/renderer/media/buffered_data_source_unittest.cc b/content/renderer/media/buffered_data_source_unittest.cc index e1ef766..b7808a8 100644 --- a/content/renderer/media/buffered_data_source_unittest.cc +++ b/content/renderer/media/buffered_data_source_unittest.cc @@ -22,11 +22,11 @@ using ::testing::InSequence; using ::testing::NiceMock; using ::testing::StrictMock; -using WebKit::WebFrame; -using WebKit::WebString; -using WebKit::WebURLLoader; -using WebKit::WebURLResponse; -using WebKit::WebView; +using blink::WebFrame; +using blink::WebString; +using blink::WebURLLoader; +using blink::WebURLResponse; +using blink::WebView; namespace content { diff --git a/content/renderer/media/buffered_resource_loader.cc b/content/renderer/media/buffered_resource_loader.cc index a99f7ec..278d5ba 100644 --- a/content/renderer/media/buffered_resource_loader.cc +++ b/content/renderer/media/buffered_resource_loader.cc @@ -20,13 +20,13 @@ #include "third_party/WebKit/public/web/WebKit.h" #include "third_party/WebKit/public/web/WebURLLoaderOptions.h" -using WebKit::WebFrame; -using WebKit::WebString; -using WebKit::WebURLError; -using WebKit::WebURLLoader; -using WebKit::WebURLLoaderOptions; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; +using blink::WebFrame; +using blink::WebString; +using blink::WebURLError; +using blink::WebURLLoader; +using blink::WebURLLoaderOptions; +using blink::WebURLRequest; +using blink::WebURLResponse; namespace content { @@ -169,7 +169,7 @@ void BufferedResourceLoader::Start( last_byte_position_))); } - frame->setReferrerForRequest(request, WebKit::WebURL()); + frame->setReferrerForRequest(request, blink::WebURL()); // Disable compression, compression for audio/video doesn't make sense... request.setHTTPHeaderField( @@ -322,7 +322,7 @@ bool BufferedResourceLoader::range_supported() { } ///////////////////////////////////////////////////////////////////////////// -// WebKit::WebURLLoaderClient implementation. +// blink::WebURLLoaderClient implementation. void BufferedResourceLoader::willSendRequest( WebURLLoader* loader, WebURLRequest& newRequest, @@ -332,7 +332,7 @@ void BufferedResourceLoader::willSendRequest( // In this case we shouldn't do anything. if (start_cb_.is_null()) { // Set the url in the request to an invalid value (empty url). - newRequest.setURL(WebKit::WebURL()); + newRequest.setURL(blink::WebURL()); return; } @@ -467,7 +467,7 @@ void BufferedResourceLoader::didReceiveData( } void BufferedResourceLoader::didDownloadData( - WebKit::WebURLLoader* loader, + blink::WebURLLoader* loader, int dataLength, int encoded_data_length) { NOTIMPLEMENTED(); diff --git a/content/renderer/media/buffered_resource_loader.h b/content/renderer/media/buffered_resource_loader.h index 24b5ad8..fffa44c 100644 --- a/content/renderer/media/buffered_resource_loader.h +++ b/content/renderer/media/buffered_resource_loader.h @@ -36,7 +36,7 @@ const char kHttpsScheme[] = "https"; // pausing resource loading when the in-memory buffer is full and resuming // resource loading when there is available capacity. class CONTENT_EXPORT BufferedResourceLoader - : NON_EXPORTED_BASE(public WebKit::WebURLLoaderClient) { + : NON_EXPORTED_BASE(public blink::WebURLLoaderClient) { public: // kNeverDefer - Aggresively buffer; never defer loading while paused. // kReadThenDefer - Request only enough data to fulfill read requests. @@ -106,7 +106,7 @@ class CONTENT_EXPORT BufferedResourceLoader void Start(const StartCB& start_cb, const LoadingStateChangedCB& loading_cb, const ProgressCB& progress_cb, - WebKit::WebFrame* frame); + blink::WebFrame* frame); // Stops everything associated with this loader, including active URL loads // and pending callbacks. @@ -138,36 +138,36 @@ class CONTENT_EXPORT BufferedResourceLoader // Returns true if the server supports byte range requests. bool range_supported(); - // WebKit::WebURLLoaderClient implementation. + // blink::WebURLLoaderClient implementation. virtual void willSendRequest( - WebKit::WebURLLoader* loader, - WebKit::WebURLRequest& newRequest, - const WebKit::WebURLResponse& redirectResponse); + blink::WebURLLoader* loader, + blink::WebURLRequest& newRequest, + const blink::WebURLResponse& redirectResponse); virtual void didSendData( - WebKit::WebURLLoader* loader, + blink::WebURLLoader* loader, unsigned long long bytesSent, unsigned long long totalBytesToBeSent); virtual void didReceiveResponse( - WebKit::WebURLLoader* loader, - const WebKit::WebURLResponse& response); + blink::WebURLLoader* loader, + const blink::WebURLResponse& response); virtual void didDownloadData( - WebKit::WebURLLoader* loader, + blink::WebURLLoader* loader, int data_length, int encoded_data_length); virtual void didReceiveData( - WebKit::WebURLLoader* loader, + blink::WebURLLoader* loader, const char* data, int data_length, int encoded_data_length); virtual void didReceiveCachedMetadata( - WebKit::WebURLLoader* loader, + blink::WebURLLoader* loader, const char* data, int dataLength); virtual void didFinishLoading( - WebKit::WebURLLoader* loader, + blink::WebURLLoader* loader, double finishTime); virtual void didFail( - WebKit::WebURLLoader* loader, - const WebKit::WebURLError&); + blink::WebURLLoader* loader, + const blink::WebURLError&); // Returns true if the media resource has a single origin, false otherwise. // Only valid to call after Start() has completed. @@ -235,7 +235,7 @@ class CONTENT_EXPORT BufferedResourceLoader void ReadInternal(); // If we have made a range request, verify the response from the server. - bool VerifyPartialResponse(const WebKit::WebURLResponse& response); + bool VerifyPartialResponse(const blink::WebURLResponse& response); // Returns the value for a range request header using parameters // |first_byte_position| and |last_byte_position|. Negative numbers other @@ -316,7 +316,7 @@ class CONTENT_EXPORT BufferedResourceLoader int last_offset_; // Injected WebURLLoader instance for testing purposes. - scoped_ptr<WebKit::WebURLLoader> test_loader_; + scoped_ptr<blink::WebURLLoader> test_loader_; // Bitrate of the media. Set to 0 if unknown. int bitrate_; diff --git a/content/renderer/media/buffered_resource_loader_unittest.cc b/content/renderer/media/buffered_resource_loader_unittest.cc index cd8a4b6..656f1e8 100644 --- a/content/renderer/media/buffered_resource_loader_unittest.cc +++ b/content/renderer/media/buffered_resource_loader_unittest.cc @@ -30,10 +30,10 @@ using ::testing::Return; using ::testing::Truly; using ::testing::NiceMock; -using WebKit::WebString; -using WebKit::WebURLError; -using WebKit::WebURLResponse; -using WebKit::WebView; +using blink::WebString; +using blink::WebURLError; +using blink::WebURLResponse; +using blink::WebView; namespace content { @@ -53,7 +53,7 @@ enum NetworkState { }; // Predicate that tests that request disallows compressed data. -static bool CorrectAcceptEncoding(const WebKit::WebURLRequest &request) { +static bool CorrectAcceptEncoding(const blink::WebURLRequest &request) { std::string value = request.httpHeaderField( WebString::fromUTF8(net::HttpRequestHeaders::kAcceptEncoding)).utf8(); return (value.find("identity;q=1") != std::string::npos) && @@ -88,7 +88,7 @@ class BufferedResourceLoaderTest : public testing::Test { // |test_loader_| will be used when Start() is called. url_loader_ = new NiceMock<MockWebURLLoader>(); - loader_->test_loader_ = scoped_ptr<WebKit::WebURLLoader>(url_loader_); + loader_->test_loader_ = scoped_ptr<blink::WebURLLoader>(url_loader_); } void SetLoaderBuffer(int forward_capacity, int backward_capacity) { @@ -187,8 +187,8 @@ class BufferedResourceLoaderTest : public testing::Test { void Redirect(const char* url) { GURL redirectUrl(url); - WebKit::WebURLRequest newRequest(redirectUrl); - WebKit::WebURLResponse redirectResponse(gurl_); + blink::WebURLRequest newRequest(redirectUrl); + blink::WebURLResponse redirectResponse(gurl_); loader_->willSendRequest(url_loader_, newRequest, redirectResponse); diff --git a/content/renderer/media/cache_util.cc b/content/renderer/media/cache_util.cc index f7326c1..2114ddd 100644 --- a/content/renderer/media/cache_util.cc +++ b/content/renderer/media/cache_util.cc @@ -18,7 +18,7 @@ using base::Time; using base::TimeDelta; using net::HttpVersion; -using WebKit::WebURLResponse; +using blink::WebURLResponse; namespace content { diff --git a/content/renderer/media/cache_util.h b/content/renderer/media/cache_util.h index 061e87a..aca8d8a 100644 --- a/content/renderer/media/cache_util.h +++ b/content/renderer/media/cache_util.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "content/common/content_export.h" -namespace WebKit { +namespace blink { class WebURLResponse; } @@ -34,7 +34,7 @@ enum UncacheableReason { // Return the logical OR of the reasons "response" cannot be used for a future // request (using the disk cache), or 0 if it might be useful. uint32 CONTENT_EXPORT GetReasonsForUncacheability( - const WebKit::WebURLResponse& response); + const blink::WebURLResponse& response); } // namespace content diff --git a/content/renderer/media/cache_util_unittest.cc b/content/renderer/media/cache_util_unittest.cc index 806b201..2db66b9 100644 --- a/content/renderer/media/cache_util_unittest.cc +++ b/content/renderer/media/cache_util_unittest.cc @@ -14,8 +14,8 @@ #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -using WebKit::WebString; -using WebKit::WebURLResponse; +using blink::WebString; +using blink::WebURLResponse; namespace content { diff --git a/content/renderer/media/crypto/content_decryption_module_factory.cc b/content/renderer/media/crypto/content_decryption_module_factory.cc index 34f0525..7bfa45b 100644 --- a/content/renderer/media/crypto/content_decryption_module_factory.cc +++ b/content/renderer/media/crypto/content_decryption_module_factory.cc @@ -28,13 +28,13 @@ namespace content { // closeHelperPluginSoon() when the Helper Plugin is no longer needed. static scoped_refptr<PepperPluginInstanceImpl> CreateHelperPlugin( const std::string& plugin_type, - WebKit::WebMediaPlayerClient* web_media_player_client, - WebKit::WebFrame* web_frame) { + blink::WebMediaPlayerClient* web_media_player_client, + blink::WebFrame* web_frame) { DCHECK(web_media_player_client); DCHECK(web_frame); - WebKit::WebPlugin* web_plugin = web_media_player_client->createHelperPlugin( - WebKit::WebString::fromUTF8(plugin_type), web_frame); + blink::WebPlugin* web_plugin = web_media_player_client->createHelperPlugin( + blink::WebString::fromUTF8(plugin_type), web_frame); if (!web_plugin) return NULL; @@ -51,8 +51,8 @@ static scoped_ptr<media::MediaKeys> CreatePpapiDecryptor( const media::KeyErrorCB& key_error_cb, const media::KeyMessageCB& key_message_cb, const base::Closure& destroy_plugin_cb, - WebKit::WebMediaPlayerClient* web_media_player_client, - WebKit::WebFrame* web_frame) { + blink::WebMediaPlayerClient* web_media_player_client, + blink::WebFrame* web_frame) { DCHECK(web_media_player_client); DCHECK(web_frame); @@ -81,8 +81,8 @@ static scoped_ptr<media::MediaKeys> CreatePpapiDecryptor( } void ContentDecryptionModuleFactory::DestroyHelperPlugin( - WebKit::WebMediaPlayerClient* web_media_player_client, - WebKit::WebFrame* web_frame) { + blink::WebMediaPlayerClient* web_media_player_client, + blink::WebFrame* web_frame) { web_media_player_client->closeHelperPluginSoon(web_frame); } #endif // defined(ENABLE_PEPPER_CDMS) @@ -90,8 +90,8 @@ void ContentDecryptionModuleFactory::DestroyHelperPlugin( scoped_ptr<media::MediaKeys> ContentDecryptionModuleFactory::Create( const std::string& key_system, #if defined(ENABLE_PEPPER_CDMS) - WebKit::WebMediaPlayerClient* web_media_player_client, - WebKit::WebFrame* web_frame, + blink::WebMediaPlayerClient* web_media_player_client, + blink::WebFrame* web_frame, const base::Closure& destroy_plugin_cb, #elif defined(OS_ANDROID) RendererMediaPlayerManager* manager, diff --git a/content/renderer/media/crypto/content_decryption_module_factory.h b/content/renderer/media/crypto/content_decryption_module_factory.h index 3d32832..6a84f0f 100644 --- a/content/renderer/media/crypto/content_decryption_module_factory.h +++ b/content/renderer/media/crypto/content_decryption_module_factory.h @@ -13,7 +13,7 @@ class GURL; #if defined(ENABLE_PEPPER_CDMS) -namespace WebKit { +namespace blink { class WebFrame; class WebMediaPlayerClient; } @@ -29,8 +29,8 @@ class ContentDecryptionModuleFactory { const std::string& key_system, #if defined(ENABLE_PEPPER_CDMS) // TODO(ddorwin): We need different pointers for the WD API. - WebKit::WebMediaPlayerClient* web_media_player_client, - WebKit::WebFrame* web_frame, + blink::WebMediaPlayerClient* web_media_player_client, + blink::WebFrame* web_frame, const base::Closure& destroy_plugin_cb, #elif defined(OS_ANDROID) RendererMediaPlayerManager* manager, @@ -43,8 +43,8 @@ class ContentDecryptionModuleFactory { #if defined(ENABLE_PEPPER_CDMS) static void DestroyHelperPlugin( - WebKit::WebMediaPlayerClient* web_media_player_client, - WebKit::WebFrame* web_frame); + blink::WebMediaPlayerClient* web_media_player_client, + blink::WebFrame* web_frame); #endif // defined(ENABLE_PEPPER_CDMS) }; diff --git a/content/renderer/media/crypto/key_systems.cc b/content/renderer/media/crypto/key_systems.cc index 4201533..cc7cdd1 100644 --- a/content/renderer/media/crypto/key_systems.cc +++ b/content/renderer/media/crypto/key_systems.cc @@ -21,7 +21,7 @@ namespace content { // Convert a WebString to ASCII, falling back on an empty string in the case // of a non-ASCII string. -static std::string ToASCIIOrEmpty(const WebKit::WebString& string) { +static std::string ToASCIIOrEmpty(const blink::WebString& string) { return IsStringASCII(string) ? UTF16ToASCII(string) : std::string(); } @@ -317,7 +317,7 @@ std::vector<uint8> KeySystems::GetUUID(const std::string& concrete_key_system) { //------------------------------------------------------------------------------ -bool IsConcreteSupportedKeySystem(const WebKit::WebString& key_system) { +bool IsConcreteSupportedKeySystem(const blink::WebString& key_system) { return KeySystems::GetInstance().IsConcreteSupportedKeySystem( ToASCIIOrEmpty(key_system)); } @@ -330,7 +330,7 @@ bool IsSupportedKeySystemWithMediaMimeType( mime_type, codecs, key_system); } -std::string KeySystemNameForUMA(const WebKit::WebString& key_system) { +std::string KeySystemNameForUMA(const blink::WebString& key_system) { return KeySystemNameForUMAInternal(key_system); } diff --git a/content/renderer/media/crypto/key_systems.h b/content/renderer/media/crypto/key_systems.h index 47dc06a..597395a 100644 --- a/content/renderer/media/crypto/key_systems.h +++ b/content/renderer/media/crypto/key_systems.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" -namespace WebKit { +namespace blink { class WebString; } @@ -24,7 +24,7 @@ namespace content { // |key_system| supports a specific type of media or to check parent key // systems. CONTENT_EXPORT bool IsConcreteSupportedKeySystem( - const WebKit::WebString& key_system); + const blink::WebString& key_system); // Returns whether |key_sytem| supports the specified media type and codec(s). CONTENT_EXPORT bool IsSupportedKeySystemWithMediaMimeType( @@ -34,7 +34,7 @@ CONTENT_EXPORT bool IsSupportedKeySystemWithMediaMimeType( // Returns a name for |key_system| suitable to UMA logging. CONTENT_EXPORT std::string KeySystemNameForUMA( - const WebKit::WebString& key_system); + const blink::WebString& key_system); // Returns whether AesDecryptor can be used for the given |concrete_key_system|. CONTENT_EXPORT bool CanUseAesDecryptor(const std::string& concrete_key_system); diff --git a/content/renderer/media/crypto/key_systems_info.cc b/content/renderer/media/crypto/key_systems_info.cc index 2b1828c..c6aa2b4 100644 --- a/content/renderer/media/crypto/key_systems_info.cc +++ b/content/renderer/media/crypto/key_systems_info.cc @@ -14,7 +14,7 @@ namespace content { static const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey"; -std::string KeySystemNameForUMAInternal(const WebKit::WebString& key_system) { +std::string KeySystemNameForUMAInternal(const blink::WebString& key_system) { if (key_system == kClearKeyKeySystem) return "ClearKey"; #if defined(WIDEVINE_CDM_AVAILABLE) diff --git a/content/renderer/media/crypto/key_systems_info.h b/content/renderer/media/crypto/key_systems_info.h index 086c318..e121e82 100644 --- a/content/renderer/media/crypto/key_systems_info.h +++ b/content/renderer/media/crypto/key_systems_info.h @@ -7,7 +7,7 @@ #include <string> -namespace WebKit { +namespace blink { class WebString; } @@ -17,7 +17,7 @@ namespace content { // This function can be called frequently. Hence this function should be // implemented not to impact performance and does not rely on the main // key system map. -std::string KeySystemNameForUMAInternal(const WebKit::WebString& key_system); +std::string KeySystemNameForUMAInternal(const blink::WebString& key_system); } // namespace content diff --git a/content/renderer/media/crypto/key_systems_unittest.cc b/content/renderer/media/crypto/key_systems_unittest.cc index 624b811..9333279 100644 --- a/content/renderer/media/crypto/key_systems_unittest.cc +++ b/content/renderer/media/crypto/key_systems_unittest.cc @@ -33,7 +33,7 @@ #endif // defined(NDEBUG) #endif // defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID) -using WebKit::WebString; +using blink::WebString; // These are the (fake) key systems that are registered for these tests. // kUsesAes uses the AesDecryptor like Clear Key. diff --git a/content/renderer/media/crypto/proxy_decryptor.cc b/content/renderer/media/crypto/proxy_decryptor.cc index d0b7084..a75e71c 100644 --- a/content/renderer/media/crypto/proxy_decryptor.cc +++ b/content/renderer/media/crypto/proxy_decryptor.cc @@ -23,8 +23,8 @@ void ProxyDecryptor::DestroyHelperPlugin() { ProxyDecryptor::ProxyDecryptor( #if defined(ENABLE_PEPPER_CDMS) - WebKit::WebMediaPlayerClient* web_media_player_client, - WebKit::WebFrame* web_frame, + blink::WebMediaPlayerClient* web_media_player_client, + blink::WebFrame* web_frame, #elif defined(OS_ANDROID) RendererMediaPlayerManager* manager, int media_keys_id, diff --git a/content/renderer/media/crypto/proxy_decryptor.h b/content/renderer/media/crypto/proxy_decryptor.h index 336819f..686270f 100644 --- a/content/renderer/media/crypto/proxy_decryptor.h +++ b/content/renderer/media/crypto/proxy_decryptor.h @@ -17,7 +17,7 @@ class GURL; -namespace WebKit { +namespace blink { #if defined(ENABLE_PEPPER_CDMS) class WebFrame; class WebMediaPlayerClient; @@ -40,8 +40,8 @@ class ProxyDecryptor : public media::MediaKeys { public: ProxyDecryptor( #if defined(ENABLE_PEPPER_CDMS) - WebKit::WebMediaPlayerClient* web_media_player_client, - WebKit::WebFrame* web_frame, + blink::WebMediaPlayerClient* web_media_player_client, + blink::WebFrame* web_frame, #elif defined(OS_ANDROID) RendererMediaPlayerManager* manager, int media_keys_id, @@ -91,8 +91,8 @@ class ProxyDecryptor : public media::MediaKeys { void DestroyHelperPlugin(); // Needed to create the PpapiDecryptor. - WebKit::WebMediaPlayerClient* web_media_player_client_; - WebKit::WebFrame* web_frame_; + blink::WebMediaPlayerClient* web_media_player_client_; + blink::WebFrame* web_frame_; #elif defined(OS_ANDROID) RendererMediaPlayerManager* manager_; int media_keys_id_; diff --git a/content/renderer/media/media_stream_center.cc b/content/renderer/media/media_stream_center.cc index c3ae47a..4a34a46 100644 --- a/content/renderer/media/media_stream_center.cc +++ b/content/renderer/media/media_stream_center.cc @@ -28,19 +28,19 @@ #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/libjingle/source/talk/app/webrtc/jsep.h" -using WebKit::WebFrame; -using WebKit::WebView; +using blink::WebFrame; +using blink::WebView; namespace content { -MediaStreamCenter::MediaStreamCenter(WebKit::WebMediaStreamCenterClient* client, +MediaStreamCenter::MediaStreamCenter(blink::WebMediaStreamCenterClient* client, MediaStreamDependencyFactory* factory) : rtc_factory_(factory), next_request_id_(0) {} MediaStreamCenter::~MediaStreamCenter() {} bool MediaStreamCenter::getMediaStreamTrackSources( - const WebKit::WebMediaStreamTrackSourcesRequest& request) { + const blink::WebMediaStreamTrackSourcesRequest& request) { if (!CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableDeviceEnumeration)) { int request_id = next_request_id_++; @@ -53,8 +53,8 @@ bool MediaStreamCenter::getMediaStreamTrackSources( } void MediaStreamCenter::didEnableMediaStreamTrack( - const WebKit::WebMediaStream& stream, - const WebKit::WebMediaStreamTrack& component) { + const blink::WebMediaStream& stream, + const blink::WebMediaStreamTrack& component) { webrtc::MediaStreamTrackInterface* track = MediaStreamDependencyFactory::GetNativeMediaStreamTrack(component); if (track) @@ -62,8 +62,8 @@ void MediaStreamCenter::didEnableMediaStreamTrack( } void MediaStreamCenter::didDisableMediaStreamTrack( - const WebKit::WebMediaStream& stream, - const WebKit::WebMediaStreamTrack& component) { + const blink::WebMediaStream& stream, + const blink::WebMediaStreamTrack& component) { webrtc::MediaStreamTrackInterface* track = MediaStreamDependencyFactory::GetNativeMediaStreamTrack(component); if (track) @@ -71,9 +71,9 @@ void MediaStreamCenter::didDisableMediaStreamTrack( } bool MediaStreamCenter::didStopMediaStreamTrack( - const WebKit::WebMediaStreamTrack& web_track) { + const blink::WebMediaStreamTrack& web_track) { DVLOG(1) << "MediaStreamCenter::didStopMediaStreamTrack"; - WebKit::WebMediaStreamSource web_source = web_track.source(); + blink::WebMediaStreamSource web_source = web_track.source(); MediaStreamSourceExtraData* extra_data = static_cast<MediaStreamSourceExtraData*>(web_source.extraData()); if (!extra_data) { @@ -86,7 +86,7 @@ bool MediaStreamCenter::didStopMediaStreamTrack( } void MediaStreamCenter::didStopLocalMediaStream( - const WebKit::WebMediaStream& stream) { + const blink::WebMediaStream& stream) { DVLOG(1) << "MediaStreamCenter::didStopLocalMediaStream"; MediaStreamExtraData* extra_data = static_cast<MediaStreamExtraData*>(stream.extraData()); @@ -101,12 +101,12 @@ void MediaStreamCenter::didStopLocalMediaStream( // MediaStreamTrack by disabling it if the same device is used as source by // multiple tracks. Note that disabling a track here, don't affect the // enabled property in JS. - WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_tracks; + blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; stream.audioTracks(audio_tracks); for (size_t i = 0; i < audio_tracks.size(); ++i) didDisableMediaStreamTrack(stream, audio_tracks[i]); - WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks; + blink::WebVector<blink::WebMediaStreamTrack> video_tracks; stream.videoTracks(video_tracks); for (size_t i = 0; i < video_tracks.size(); ++i) didDisableMediaStreamTrack(stream, video_tracks[i]); @@ -115,15 +115,15 @@ void MediaStreamCenter::didStopLocalMediaStream( } void MediaStreamCenter::didCreateMediaStream( - WebKit::WebMediaStream& stream) { + blink::WebMediaStream& stream) { if (!rtc_factory_) return; rtc_factory_->CreateNativeLocalMediaStream(&stream); } bool MediaStreamCenter::didAddMediaStreamTrack( - const WebKit::WebMediaStream& stream, - const WebKit::WebMediaStreamTrack& track) { + const blink::WebMediaStream& stream, + const blink::WebMediaStreamTrack& track) { if (!rtc_factory_) return false; @@ -131,8 +131,8 @@ bool MediaStreamCenter::didAddMediaStreamTrack( } bool MediaStreamCenter::didRemoveMediaStreamTrack( - const WebKit::WebMediaStream& stream, - const WebKit::WebMediaStreamTrack& track) { + const blink::WebMediaStream& stream, + const blink::WebMediaStreamTrack& track) { if (!rtc_factory_) return false; @@ -155,29 +155,29 @@ void MediaStreamCenter::OnGetSourcesComplete( RequestMap::iterator request_it = requests_.find(request_id); DCHECK(request_it != requests_.end()); - WebKit::WebVector<WebKit::WebSourceInfo> sourceInfos(devices.size()); + blink::WebVector<blink::WebSourceInfo> sourceInfos(devices.size()); for (size_t i = 0; i < devices.size(); ++i) { const MediaStreamDevice& device = devices[i].device; DCHECK(device.type == MEDIA_DEVICE_AUDIO_CAPTURE || device.type == MEDIA_DEVICE_VIDEO_CAPTURE); - WebKit::WebSourceInfo::VideoFacingMode video_facing; + blink::WebSourceInfo::VideoFacingMode video_facing; switch (device.video_facing) { case MEDIA_VIDEO_FACING_USER: - video_facing = WebKit::WebSourceInfo::VideoFacingModeUser; + video_facing = blink::WebSourceInfo::VideoFacingModeUser; break; case MEDIA_VIDEO_FACING_ENVIRONMENT: - video_facing = WebKit::WebSourceInfo::VideoFacingModeEnvironment; + video_facing = blink::WebSourceInfo::VideoFacingModeEnvironment; break; default: - video_facing = WebKit::WebSourceInfo::VideoFacingModeNone; + video_facing = blink::WebSourceInfo::VideoFacingModeNone; } sourceInfos[i] - .initialize(WebKit::WebString::fromUTF8(device.id), + .initialize(blink::WebString::fromUTF8(device.id), device.type == MEDIA_DEVICE_AUDIO_CAPTURE - ? WebKit::WebSourceInfo::SourceKindAudio - : WebKit::WebSourceInfo::SourceKindVideo, - WebKit::WebString::fromUTF8(device.name), + ? blink::WebSourceInfo::SourceKindAudio + : blink::WebSourceInfo::SourceKindVideo, + blink::WebString::fromUTF8(device.name), video_facing); } request_it->second.requestSucceeded(sourceInfos); diff --git a/content/renderer/media/media_stream_center.h b/content/renderer/media/media_stream_center.h index cc94979..c3f2c36 100644 --- a/content/renderer/media/media_stream_center.h +++ b/content/renderer/media/media_stream_center.h @@ -17,7 +17,7 @@ #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" #include "third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h" -namespace WebKit { +namespace blink { class WebMediaStreamCenterClient; } @@ -25,41 +25,41 @@ namespace content { class MediaStreamDependencyFactory; class CONTENT_EXPORT MediaStreamCenter - : NON_EXPORTED_BASE(public WebKit::WebMediaStreamCenter), + : NON_EXPORTED_BASE(public blink::WebMediaStreamCenter), public RenderProcessObserver { public: - MediaStreamCenter(WebKit::WebMediaStreamCenterClient* client, + MediaStreamCenter(blink::WebMediaStreamCenterClient* client, MediaStreamDependencyFactory* factory); virtual ~MediaStreamCenter(); private: virtual bool getMediaStreamTrackSources( - const WebKit::WebMediaStreamTrackSourcesRequest& request) OVERRIDE; + const blink::WebMediaStreamTrackSourcesRequest& request) OVERRIDE; virtual void didEnableMediaStreamTrack( - const WebKit::WebMediaStream& stream, - const WebKit::WebMediaStreamTrack& component) OVERRIDE; + const blink::WebMediaStream& stream, + const blink::WebMediaStreamTrack& component) OVERRIDE; virtual void didDisableMediaStreamTrack( - const WebKit::WebMediaStream& stream, - const WebKit::WebMediaStreamTrack& component) OVERRIDE; + const blink::WebMediaStream& stream, + const blink::WebMediaStreamTrack& component) OVERRIDE; virtual void didStopLocalMediaStream( - const WebKit::WebMediaStream& stream) OVERRIDE; + const blink::WebMediaStream& stream) OVERRIDE; virtual bool didStopMediaStreamTrack( - const WebKit::WebMediaStreamTrack& web_track) OVERRIDE; + const blink::WebMediaStreamTrack& web_track) OVERRIDE; virtual void didCreateMediaStream( - WebKit::WebMediaStream& stream) OVERRIDE; + blink::WebMediaStream& stream) OVERRIDE; virtual bool didAddMediaStreamTrack( - const WebKit::WebMediaStream& stream, - const WebKit::WebMediaStreamTrack& track) OVERRIDE; + const blink::WebMediaStream& stream, + const blink::WebMediaStreamTrack& track) OVERRIDE; virtual bool didRemoveMediaStreamTrack( - const WebKit::WebMediaStream& stream, - const WebKit::WebMediaStreamTrack& track) OVERRIDE; + const blink::WebMediaStream& stream, + const blink::WebMediaStreamTrack& track) OVERRIDE; // RenderProcessObserver implementation. virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; @@ -75,7 +75,7 @@ class CONTENT_EXPORT MediaStreamCenter // requests. int next_request_id_; - typedef std::map<int, WebKit::WebMediaStreamTrackSourcesRequest> RequestMap; + typedef std::map<int, blink::WebMediaStreamTrackSourcesRequest> RequestMap; // Maps request ids to request objects. RequestMap requests_; diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc index d1f6284..415f2bd 100644 --- a/content/renderer/media/media_stream_dependency_factory.cc +++ b/content/renderer/media/media_stream_dependency_factory.cc @@ -97,7 +97,7 @@ class P2PPortAllocatorFactory : public webrtc::PortAllocatorFactoryInterface { P2PSocketDispatcher* socket_dispatcher, talk_base::NetworkManager* network_manager, talk_base::PacketSocketFactory* socket_factory, - WebKit::WebFrame* web_frame) + blink::WebFrame* web_frame) : socket_dispatcher_(socket_dispatcher), network_manager_(network_manager), socket_factory_(socket_factory), @@ -146,14 +146,14 @@ class P2PPortAllocatorFactory : public webrtc::PortAllocatorFactoryInterface { talk_base::NetworkManager* network_manager_; talk_base::PacketSocketFactory* socket_factory_; // Raw ptr to the WebFrame that created the P2PPortAllocatorFactory. - WebKit::WebFrame* web_frame_; + blink::WebFrame* web_frame_; }; // SourceStateObserver is a help class used for observing the startup state // transition of webrtc media sources such as a camera or microphone. // An instance of the object deletes itself after use. // Usage: -// 1. Create an instance of the object with the WebKit::WebMediaStream +// 1. Create an instance of the object with the blink::WebMediaStream // the observed sources belongs to a callback. // 2. Add the sources to the observer using AddSource. // 3. Call StartObserving() @@ -163,7 +163,7 @@ class SourceStateObserver : public webrtc::ObserverInterface, public base::NonThreadSafe { public: SourceStateObserver( - WebKit::WebMediaStream* web_stream, + blink::WebMediaStream* web_stream, const MediaStreamDependencyFactory::MediaSourcesCreatedCallback& callback) : web_stream_(web_stream), ready_callback_(callback), @@ -217,7 +217,7 @@ class SourceStateObserver : public webrtc::ObserverInterface, } } - WebKit::WebMediaStream* web_stream_; + blink::WebMediaStream* web_stream_; MediaStreamDependencyFactory::MediaSourcesCreatedCallback ready_callback_; bool live_; typedef std::vector<scoped_refptr<webrtc::MediaSourceInterface> > @@ -243,9 +243,9 @@ MediaStreamDependencyFactory::~MediaStreamDependencyFactory() { CleanupPeerConnectionFactory(); } -WebKit::WebRTCPeerConnectionHandler* +blink::WebRTCPeerConnectionHandler* MediaStreamDependencyFactory::CreateRTCPeerConnectionHandler( - WebKit::WebRTCPeerConnectionHandlerClient* client) { + blink::WebRTCPeerConnectionHandlerClient* client) { // Save histogram data so we can see how much PeerConnetion is used. // The histogram counts the number of calls to the JS API // webKitRTCPeerConnection. @@ -259,9 +259,9 @@ MediaStreamDependencyFactory::CreateRTCPeerConnectionHandler( void MediaStreamDependencyFactory::CreateNativeMediaSources( int render_view_id, - const WebKit::WebMediaConstraints& audio_constraints, - const WebKit::WebMediaConstraints& video_constraints, - WebKit::WebMediaStream* web_stream, + const blink::WebMediaConstraints& audio_constraints, + const blink::WebMediaConstraints& video_constraints, + blink::WebMediaStream* web_stream, const MediaSourcesCreatedCallback& sources_created) { DVLOG(1) << "MediaStreamDependencyFactory::CreateNativeMediaSources()"; if (!EnsurePeerConnectionFactory()) { @@ -276,10 +276,10 @@ void MediaStreamDependencyFactory::CreateNativeMediaSources( // Create local video sources. RTCMediaConstraints native_video_constraints(video_constraints); - WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks; + blink::WebVector<blink::WebMediaStreamTrack> video_tracks; web_stream->videoTracks(video_tracks); for (size_t i = 0; i < video_tracks.size(); ++i) { - const WebKit::WebMediaStreamSource& source = video_tracks[i].source(); + const blink::WebMediaStreamSource& source = video_tracks[i].source(); MediaStreamSourceExtraData* source_data = static_cast<MediaStreamSourceExtraData*>(source.extraData()); @@ -303,10 +303,10 @@ void MediaStreamDependencyFactory::CreateNativeMediaSources( // microphone or tab audio. RTCMediaConstraints native_audio_constraints(audio_constraints); ApplyFixedAudioConstraints(&native_audio_constraints); - WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_tracks; + blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; web_stream->audioTracks(audio_tracks); for (size_t i = 0; i < audio_tracks.size(); ++i) { - const WebKit::WebMediaStreamSource& source = audio_tracks[i].source(); + const blink::WebMediaStreamSource& source = audio_tracks[i].source(); MediaStreamSourceExtraData* source_data = static_cast<MediaStreamSourceExtraData*>(source.extraData()); @@ -344,7 +344,7 @@ void MediaStreamDependencyFactory::CreateNativeMediaSources( } void MediaStreamDependencyFactory::CreateNativeLocalMediaStream( - WebKit::WebMediaStream* web_stream) { + blink::WebMediaStream* web_stream) { DVLOG(1) << "MediaStreamDependencyFactory::CreateNativeLocalMediaStream()"; if (!EnsurePeerConnectionFactory()) { DVLOG(1) << "EnsurePeerConnectionFactory() failed!"; @@ -359,14 +359,14 @@ void MediaStreamDependencyFactory::CreateNativeLocalMediaStream( web_stream->setExtraData(extra_data); // Add audio tracks. - WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_tracks; + blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; web_stream->audioTracks(audio_tracks); for (size_t i = 0; i < audio_tracks.size(); ++i) { AddNativeMediaStreamTrack(*web_stream, audio_tracks[i]); } // Add video tracks. - WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks; + blink::WebVector<blink::WebMediaStreamTrack> video_tracks; web_stream->videoTracks(video_tracks); for (size_t i = 0; i < video_tracks.size(); ++i) { AddNativeMediaStreamTrack(*web_stream, video_tracks[i]); @@ -374,7 +374,7 @@ void MediaStreamDependencyFactory::CreateNativeLocalMediaStream( } void MediaStreamDependencyFactory::CreateNativeLocalMediaStream( - WebKit::WebMediaStream* web_stream, + blink::WebMediaStream* web_stream, const MediaStreamExtraData::StreamStopCallback& stream_stop) { CreateNativeLocalMediaStream(web_stream); @@ -384,14 +384,14 @@ void MediaStreamDependencyFactory::CreateNativeLocalMediaStream( } bool MediaStreamDependencyFactory::AddNativeMediaStreamTrack( - const WebKit::WebMediaStream& stream, - const WebKit::WebMediaStreamTrack& track) { + const blink::WebMediaStream& stream, + const blink::WebMediaStreamTrack& track) { MediaStreamExtraData* extra_data = static_cast<MediaStreamExtraData*>(stream.extraData()); webrtc::MediaStreamInterface* native_stream = extra_data->stream().get(); DCHECK(native_stream); - WebKit::WebMediaStreamSource source = track.source(); + blink::WebMediaStreamSource source = track.source(); MediaStreamSourceExtraData* source_data = static_cast<MediaStreamSourceExtraData*>(source.extraData()); @@ -399,11 +399,11 @@ bool MediaStreamDependencyFactory::AddNativeMediaStreamTrack( // right now they're on the source, so we fetch them from there. RTCMediaConstraints track_constraints(source.constraints()); - WebKit::WebMediaStreamSource::Type type = track.source().type(); - DCHECK(type == WebKit::WebMediaStreamSource::TypeAudio || - type == WebKit::WebMediaStreamSource::TypeVideo); + blink::WebMediaStreamSource::Type type = track.source().type(); + DCHECK(type == blink::WebMediaStreamSource::TypeAudio || + type == blink::WebMediaStreamSource::TypeVideo); - if (type == WebKit::WebMediaStreamSource::TypeAudio) { + if (type == blink::WebMediaStreamSource::TypeAudio) { // Apply default audio constraints that enable echo cancellation, // automatic gain control, noise suppression and high-pass filter. ApplyFixedAudioConstraints(&track_constraints); @@ -426,7 +426,7 @@ bool MediaStreamDependencyFactory::AddNativeMediaStreamTrack( } std::string track_id = UTF16ToUTF8(track.id()); - if (source.type() == WebKit::WebMediaStreamSource::TypeAudio) { + if (source.type() == blink::WebMediaStreamSource::TypeAudio) { scoped_refptr<WebRtcAudioCapturer> capturer; if (GetWebRtcAudioDevice()) capturer = GetWebRtcAudioDevice()->GetDefaultCapturer(); @@ -441,12 +441,12 @@ bool MediaStreamDependencyFactory::AddNativeMediaStreamTrack( audio_track->set_enabled(track.isEnabled()); if (capturer.get()) { - WebKit::WebMediaStreamTrack writable_track = track; + blink::WebMediaStreamTrack writable_track = track; writable_track.setSourceProvider(capturer->audio_source_provider()); } return native_stream->AddTrack(audio_track.get()); } else { - DCHECK(source.type() == WebKit::WebMediaStreamSource::TypeVideo); + DCHECK(source.type() == blink::WebMediaStreamSource::TypeVideo); scoped_refptr<webrtc::VideoTrackInterface> video_track( CreateLocalVideoTrack(track_id, source_data->video_source())); AddNativeTrackToBlinkTrack(video_track.get(), track); @@ -457,7 +457,7 @@ bool MediaStreamDependencyFactory::AddNativeMediaStreamTrack( bool MediaStreamDependencyFactory::AddNativeVideoMediaTrack( const std::string& track_id, - WebKit::WebMediaStream* stream, + blink::WebMediaStream* stream, cricket::VideoCapturer* capturer) { if (!stream) { LOG(ERROR) << "AddNativeVideoMediaTrack called with null WebMediaStream."; @@ -476,11 +476,11 @@ bool MediaStreamDependencyFactory::AddNativeVideoMediaTrack( native_stream->AddTrack(native_track.get()); // Create a new webkit video track. - WebKit::WebMediaStreamTrack webkit_track; - WebKit::WebMediaStreamSource webkit_source; - WebKit::WebString webkit_track_id(UTF8ToUTF16(track_id)); - WebKit::WebMediaStreamSource::Type type = - WebKit::WebMediaStreamSource::TypeVideo; + blink::WebMediaStreamTrack webkit_track; + blink::WebMediaStreamSource webkit_source; + blink::WebString webkit_track_id(UTF8ToUTF16(track_id)); + blink::WebMediaStreamSource::Type type = + blink::WebMediaStreamSource::TypeVideo; webkit_source.initialize(webkit_track_id, type, webkit_track_id); webkit_track.initialize(webkit_track_id, webkit_source); @@ -492,28 +492,28 @@ bool MediaStreamDependencyFactory::AddNativeVideoMediaTrack( } bool MediaStreamDependencyFactory::RemoveNativeMediaStreamTrack( - const WebKit::WebMediaStream& stream, - const WebKit::WebMediaStreamTrack& track) { + const blink::WebMediaStream& stream, + const blink::WebMediaStreamTrack& track) { MediaStreamExtraData* extra_data = static_cast<MediaStreamExtraData*>(stream.extraData()); webrtc::MediaStreamInterface* native_stream = extra_data->stream().get(); DCHECK(native_stream); - WebKit::WebMediaStreamSource::Type type = track.source().type(); - DCHECK(type == WebKit::WebMediaStreamSource::TypeAudio || - type == WebKit::WebMediaStreamSource::TypeVideo); + blink::WebMediaStreamSource::Type type = track.source().type(); + DCHECK(type == blink::WebMediaStreamSource::TypeAudio || + type == blink::WebMediaStreamSource::TypeVideo); - WebKit::WebMediaStreamTrack writable_track = track; + blink::WebMediaStreamTrack writable_track = track; writable_track.setExtraData(NULL); std::string track_id = UTF16ToUTF8(track.id()); - if (type == WebKit::WebMediaStreamSource::TypeAudio) { + if (type == blink::WebMediaStreamSource::TypeAudio) { // Remove the source provider as the track is going away. writable_track.setSourceProvider(NULL); return native_stream->RemoveTrack(native_stream->FindAudioTrack(track_id)); } - CHECK_EQ(type, WebKit::WebMediaStreamSource::TypeVideo); + CHECK_EQ(type, blink::WebMediaStreamSource::TypeVideo); return native_stream->RemoveTrack(native_stream->FindVideoTrack(track_id)); } @@ -578,7 +578,7 @@ scoped_refptr<webrtc::PeerConnectionInterface> MediaStreamDependencyFactory::CreatePeerConnection( const webrtc::PeerConnectionInterface::IceServers& ice_servers, const webrtc::MediaConstraintsInterface* constraints, - WebKit::WebFrame* web_frame, + blink::WebFrame* web_frame, webrtc::PeerConnectionObserver* observer) { CHECK(web_frame); CHECK(observer); @@ -631,7 +631,7 @@ MediaStreamDependencyFactory::CreateLocalVideoSource( scoped_refptr<WebAudioCapturerSource> MediaStreamDependencyFactory::CreateWebAudioSource( - WebKit::WebMediaStreamSource* source, + blink::WebMediaStreamSource* source, RTCMediaConstraints* constraints) { DVLOG(1) << "MediaStreamDependencyFactory::CreateWebAudioSource()"; DCHECK(GetWebRtcAudioDevice()); @@ -861,15 +861,15 @@ MediaStreamDependencyFactory::MaybeCreateAudioCapturer( void MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack( webrtc::MediaStreamTrackInterface* native_track, - const WebKit::WebMediaStreamTrack& webkit_track) { + const blink::WebMediaStreamTrack& webkit_track) { DCHECK(!webkit_track.isNull() && !webkit_track.extraData()); - WebKit::WebMediaStreamTrack track = webkit_track; + blink::WebMediaStreamTrack track = webkit_track; track.setExtraData(new MediaStreamTrackExtraData(native_track)); } webrtc::MediaStreamInterface* MediaStreamDependencyFactory::GetNativeMediaStream( - const WebKit::WebMediaStream& stream) { + const blink::WebMediaStream& stream) { if (stream.isNull()) return NULL; MediaStreamExtraData* extra_data = @@ -879,7 +879,7 @@ MediaStreamDependencyFactory::GetNativeMediaStream( webrtc::MediaStreamTrackInterface* MediaStreamDependencyFactory::GetNativeMediaStreamTrack( - const WebKit::WebMediaStreamTrack& track) { + const blink::WebMediaStreamTrack& track) { if (track.isNull()) return NULL; MediaStreamTrackExtraData* extra_data = diff --git a/content/renderer/media/media_stream_dependency_factory.h b/content/renderer/media/media_stream_dependency_factory.h index f8420d3..bafeb75 100644 --- a/content/renderer/media/media_stream_dependency_factory.h +++ b/content/renderer/media/media_stream_dependency_factory.h @@ -30,7 +30,7 @@ namespace webrtc { class PeerConnection; } -namespace WebKit { +namespace blink { class WebFrame; class WebMediaConstraints; class WebMediaStream; @@ -60,7 +60,7 @@ class CONTENT_EXPORT MediaStreamDependencyFactory : NON_EXPORTED_BASE(public base::NonThreadSafe) { public: // MediaSourcesCreatedCallback is used in CreateNativeMediaSources. - typedef base::Callback<void(WebKit::WebMediaStream* web_stream, + typedef base::Callback<void(blink::WebMediaStream* web_stream, bool live)> MediaSourcesCreatedCallback; MediaStreamDependencyFactory( VideoCaptureImplManager* vc_manager, @@ -69,8 +69,8 @@ class CONTENT_EXPORT MediaStreamDependencyFactory // Create a RTCPeerConnectionHandler object that implements the // WebKit WebRTCPeerConnectionHandler interface. - WebKit::WebRTCPeerConnectionHandler* CreateRTCPeerConnectionHandler( - WebKit::WebRTCPeerConnectionHandlerClient* client); + blink::WebRTCPeerConnectionHandler* CreateRTCPeerConnectionHandler( + blink::WebRTCPeerConnectionHandlerClient* client); // CreateNativeMediaSources creates libjingle representations of // the underlying sources to the tracks in |web_stream|. @@ -81,37 +81,37 @@ class CONTENT_EXPORT MediaStreamDependencyFactory // |audio_constraints| and |video_constraints| set parameters for the sources. void CreateNativeMediaSources( int render_view_id, - const WebKit::WebMediaConstraints& audio_constraints, - const WebKit::WebMediaConstraints& video_constraints, - WebKit::WebMediaStream* web_stream, + const blink::WebMediaConstraints& audio_constraints, + const blink::WebMediaConstraints& video_constraints, + blink::WebMediaStream* web_stream, const MediaSourcesCreatedCallback& sources_created); // Creates a libjingle representation of a MediaStream and stores // it in the extra data field of |web_stream|. void CreateNativeLocalMediaStream( - WebKit::WebMediaStream* web_stream); + blink::WebMediaStream* web_stream); // Creates a libjingle representation of a MediaStream and stores // it in the extra data field of |web_stream|. // |stream_stopped| is a callback that is run when a MediaStream have been // stopped. void CreateNativeLocalMediaStream( - WebKit::WebMediaStream* web_stream, + blink::WebMediaStream* web_stream, const MediaStreamExtraData::StreamStopCallback& stream_stop); // Adds a libjingle representation of a MediaStreamTrack to |stream| based // on the source of |track|. - bool AddNativeMediaStreamTrack(const WebKit::WebMediaStream& stream, - const WebKit::WebMediaStreamTrack& track); + bool AddNativeMediaStreamTrack(const blink::WebMediaStream& stream, + const blink::WebMediaStreamTrack& track); // Creates and adds libjingle representation of a MediaStreamTrack to |stream| // based on the desired |track_id| and |capturer|. bool AddNativeVideoMediaTrack(const std::string& track_id, - WebKit::WebMediaStream* stream, + blink::WebMediaStream* stream, cricket::VideoCapturer* capturer); - bool RemoveNativeMediaStreamTrack(const WebKit::WebMediaStream& stream, - const WebKit::WebMediaStreamTrack& track); + bool RemoveNativeMediaStreamTrack(const blink::WebMediaStream& stream, + const blink::WebMediaStreamTrack& track); // Asks the libjingle PeerConnection factory to create a libjingle // PeerConnection object. @@ -120,7 +120,7 @@ class CONTENT_EXPORT MediaStreamDependencyFactory CreatePeerConnection( const webrtc::PeerConnectionInterface::IceServers& ice_servers, const webrtc::MediaConstraintsInterface* constraints, - WebKit::WebFrame* web_frame, + blink::WebFrame* web_frame, webrtc::PeerConnectionObserver* observer); // Creates a libjingle representation of a Session description. Used by a @@ -144,13 +144,13 @@ class CONTENT_EXPORT MediaStreamDependencyFactory static void AddNativeTrackToBlinkTrack( webrtc::MediaStreamTrackInterface* native_track, - const WebKit::WebMediaStreamTrack& webkit_track); + const blink::WebMediaStreamTrack& webkit_track); static webrtc::MediaStreamInterface* GetNativeMediaStream( - const WebKit::WebMediaStream& stream); + const blink::WebMediaStream& stream); static webrtc::MediaStreamTrackInterface* GetNativeMediaStreamTrack( - const WebKit::WebMediaStreamTrack& track); + const blink::WebMediaStreamTrack& track); protected: // Asks the PeerConnection factory to create a Local MediaStream object. @@ -176,7 +176,7 @@ class CONTENT_EXPORT MediaStreamDependencyFactory // The |constraints| will be modified to include the default, mandatory // WebAudio constraints. virtual scoped_refptr<WebAudioCapturerSource> CreateWebAudioSource( - WebKit::WebMediaStreamSource* source, RTCMediaConstraints* constraints); + blink::WebMediaStreamSource* source, RTCMediaConstraints* constraints); // Asks the PeerConnection factory to create a Local AudioTrack object. virtual scoped_refptr<webrtc::AudioTrackInterface> diff --git a/content/renderer/media/media_stream_dependency_factory_unittest.cc b/content/renderer/media/media_stream_dependency_factory_unittest.cc index 23ba8b3..352fa6e 100644 --- a/content/renderer/media/media_stream_dependency_factory_unittest.cc +++ b/content/renderer/media/media_stream_dependency_factory_unittest.cc @@ -27,20 +27,20 @@ class MediaSourceCreatedObserver { } void OnCreateNativeSourcesComplete( - WebKit::WebMediaStream* description, + blink::WebMediaStream* description, bool request_succeeded) { result_ = request_succeeded; description_ = description; } - WebKit::WebMediaStream* description() const { + blink::WebMediaStream* description() const { return description_; } bool result() const { return result_; } private: bool result_; - WebKit::WebMediaStream* description_; + blink::WebMediaStream* description_; }; class MediaStreamDependencyFactoryTest : public ::testing::Test { @@ -49,10 +49,10 @@ class MediaStreamDependencyFactoryTest : public ::testing::Test { dependency_factory_.reset(new MockMediaStreamDependencyFactory()); } - WebKit::WebMediaStream CreateWebKitMediaStream(bool audio, bool video) { - WebKit::WebVector<WebKit::WebMediaStreamSource> audio_sources( + blink::WebMediaStream CreateWebKitMediaStream(bool audio, bool video) { + blink::WebVector<blink::WebMediaStreamSource> audio_sources( audio ? static_cast<size_t>(1) : 0); - WebKit::WebVector<WebKit::WebMediaStreamSource> video_sources( + blink::WebVector<blink::WebMediaStreamSource> video_sources( video ? static_cast<size_t>(1) : 0); MediaStreamSourceExtraData::SourceStopCallback dummy_callback; @@ -62,7 +62,7 @@ class MediaStreamDependencyFactoryTest : public ::testing::Test { info.device.name = "audio"; info.session_id = 99; audio_sources[0].initialize("audio", - WebKit::WebMediaStreamSource::TypeAudio, + blink::WebMediaStreamSource::TypeAudio, "audio"); audio_sources[0].setExtraData( new MediaStreamSourceExtraData(info, dummy_callback)); @@ -74,21 +74,21 @@ class MediaStreamDependencyFactoryTest : public ::testing::Test { info.device.name = "video"; info.session_id = 98; video_sources[0].initialize("video", - WebKit::WebMediaStreamSource::TypeVideo, + blink::WebMediaStreamSource::TypeVideo, "video"); video_sources[0].setExtraData( new MediaStreamSourceExtraData(info, dummy_callback)); video_sources_.assign(video_sources); } - WebKit::WebMediaStream stream_desc; - WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_track_vector( + blink::WebMediaStream stream_desc; + blink::WebVector<blink::WebMediaStreamTrack> audio_track_vector( audio_sources.size()); for (size_t i = 0; i < audio_track_vector.size(); ++i) { audio_track_vector[i].initialize(audio_sources[i].id(), audio_sources[i]); } - WebKit::WebVector<WebKit::WebMediaStreamTrack> video_track_vector( + blink::WebVector<blink::WebMediaStreamTrack> video_track_vector( video_sources.size()); for (size_t i = 0; i < video_track_vector.size(); ++i) { video_track_vector[i].initialize(video_sources[i].id(), @@ -100,15 +100,15 @@ class MediaStreamDependencyFactoryTest : public ::testing::Test { return stream_desc; } - void CreateNativeSources(WebKit::WebMediaStream* descriptor) { + void CreateNativeSources(blink::WebMediaStream* descriptor) { static const int kRenderViewId = 1; MediaSourceCreatedObserver observer; - WebKit::WebMediaConstraints audio_constraints; + blink::WebMediaConstraints audio_constraints; dependency_factory_->CreateNativeMediaSources( kRenderViewId, - WebKit::WebMediaConstraints(), - WebKit::WebMediaConstraints(), + blink::WebMediaConstraints(), + blink::WebMediaConstraints(), descriptor, base::Bind( &MediaSourceCreatedObserver::OnCreateNativeSourcesComplete, @@ -125,7 +125,7 @@ class MediaStreamDependencyFactoryTest : public ::testing::Test { EXPECT_TRUE(observer.description() == descriptor); } - void VerifyMediaStream(const WebKit::WebMediaStream& stream_desc, + void VerifyMediaStream(const blink::WebMediaStream& stream_desc, size_t num_audio_tracks, size_t num_video_tracks) { content::MediaStreamExtraData* extra_data = @@ -138,19 +138,19 @@ class MediaStreamDependencyFactoryTest : public ::testing::Test { protected: scoped_ptr<MockMediaStreamDependencyFactory> dependency_factory_; - WebKit::WebVector<WebKit::WebMediaStreamSource> audio_sources_; - WebKit::WebVector<WebKit::WebMediaStreamSource> video_sources_; + blink::WebVector<blink::WebMediaStreamSource> audio_sources_; + blink::WebVector<blink::WebMediaStreamSource> video_sources_; }; TEST_F(MediaStreamDependencyFactoryTest, CreateRTCPeerConnectionHandler) { MockWebRTCPeerConnectionHandlerClient client_jsep; - scoped_ptr<WebKit::WebRTCPeerConnectionHandler> pc_handler( + scoped_ptr<blink::WebRTCPeerConnectionHandler> pc_handler( dependency_factory_->CreateRTCPeerConnectionHandler(&client_jsep)); EXPECT_TRUE(pc_handler.get() != NULL); } TEST_F(MediaStreamDependencyFactoryTest, CreateNativeMediaStream) { - WebKit::WebMediaStream stream_desc = CreateWebKitMediaStream(true, true); + blink::WebMediaStream stream_desc = CreateWebKitMediaStream(true, true); CreateNativeSources(&stream_desc); dependency_factory_->CreateNativeLocalMediaStream(&stream_desc); @@ -162,23 +162,23 @@ TEST_F(MediaStreamDependencyFactoryTest, CreateNativeMediaStream) { // remote tracks. TEST_F(MediaStreamDependencyFactoryTest, CreateNativeMediaStreamWithoutSource) { // Create a WebKit MediaStream description. - WebKit::WebMediaStreamSource audio_source; + blink::WebMediaStreamSource audio_source; audio_source.initialize("audio source", - WebKit::WebMediaStreamSource::TypeAudio, + blink::WebMediaStreamSource::TypeAudio, "something"); - WebKit::WebMediaStreamSource video_source; + blink::WebMediaStreamSource video_source; video_source.initialize("video source", - WebKit::WebMediaStreamSource::TypeVideo, + blink::WebMediaStreamSource::TypeVideo, "something"); - WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_tracks( + blink::WebVector<blink::WebMediaStreamTrack> audio_tracks( static_cast<size_t>(1)); audio_tracks[0].initialize(audio_source.id(), audio_source); - WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks( + blink::WebVector<blink::WebMediaStreamTrack> video_tracks( static_cast<size_t>(1)); video_tracks[0].initialize(video_source.id(), video_source); - WebKit::WebMediaStream stream_desc; + blink::WebMediaStream stream_desc; stream_desc.initialize("new stream", audio_tracks, video_tracks); EXPECT_TRUE(dependency_factory_->EnsurePeerConnectionFactory()); @@ -187,13 +187,13 @@ TEST_F(MediaStreamDependencyFactoryTest, CreateNativeMediaStreamWithoutSource) { } TEST_F(MediaStreamDependencyFactoryTest, AddAndRemoveNativeTrack) { - WebKit::WebMediaStream stream_desc = CreateWebKitMediaStream(true, true); + blink::WebMediaStream stream_desc = CreateWebKitMediaStream(true, true); CreateNativeSources(&stream_desc); dependency_factory_->CreateNativeLocalMediaStream(&stream_desc); VerifyMediaStream(stream_desc, 1, 1); - WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_tracks; + blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; stream_desc.audioTracks(audio_tracks); EXPECT_TRUE(dependency_factory_->RemoveNativeMediaStreamTrack( stream_desc, audio_tracks[0])); @@ -203,7 +203,7 @@ TEST_F(MediaStreamDependencyFactoryTest, AddAndRemoveNativeTrack) { stream_desc, audio_tracks[0])); VerifyMediaStream(stream_desc, 1, 1); - WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks; + blink::WebVector<blink::WebMediaStreamTrack> video_tracks; stream_desc.videoTracks(video_tracks); EXPECT_TRUE(dependency_factory_->RemoveNativeMediaStreamTrack( stream_desc, video_tracks[0])); diff --git a/content/renderer/media/media_stream_extra_data.h b/content/renderer/media/media_stream_extra_data.h index afac9c3..63bfca4 100644 --- a/content/renderer/media/media_stream_extra_data.h +++ b/content/renderer/media/media_stream_extra_data.h @@ -18,7 +18,7 @@ class MediaStreamInterface; namespace content { class CONTENT_EXPORT MediaStreamExtraData - : NON_EXPORTED_BASE(public WebKit::WebMediaStream::ExtraData) { + : NON_EXPORTED_BASE(public blink::WebMediaStream::ExtraData) { public: typedef base::Callback<void(const std::string& label)> StreamStopCallback; diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc index db5dc1e..52b3c9d 100644 --- a/content/renderer/media/media_stream_impl.cc +++ b/content/renderer/media/media_stream_impl.cc @@ -34,12 +34,12 @@ namespace content { namespace { std::string GetStreamConstraint( - const WebKit::WebMediaConstraints& constraints, const std::string& key, + const blink::WebMediaConstraints& constraints, const std::string& key, bool is_mandatory) { if (constraints.isNull()) return std::string(); - WebKit::WebString value; + blink::WebString value; if (is_mandatory) { constraints.getMandatoryConstraintValue(UTF8ToUTF16(key), value); } else { @@ -49,7 +49,7 @@ std::string GetStreamConstraint( } void UpdateRequestOptions( - const WebKit::WebUserMediaRequest& user_media_request, + const blink::WebUserMediaRequest& user_media_request, StreamOptions* options) { if (options->audio_type != content::MEDIA_NO_SERVICE) { std::string audio_stream_source = GetStreamConstraint( @@ -88,7 +88,7 @@ void UpdateRequestOptions( static int g_next_request_id = 0; webrtc::MediaStreamInterface* GetNativeMediaStream( - const WebKit::WebMediaStream& web_stream) { + const blink::WebMediaStream& web_stream) { content::MediaStreamExtraData* extra_data = static_cast<content::MediaStreamExtraData*>(web_stream.extraData()); if (!extra_data) @@ -105,9 +105,9 @@ void GetDefaultOutputDeviceParams( *output_buffer_size = hardware_config->GetOutputBufferSize(); } -void RemoveSource(const WebKit::WebMediaStreamSource& source, - std::vector<WebKit::WebMediaStreamSource>* sources) { - for (std::vector<WebKit::WebMediaStreamSource>::iterator it = +void RemoveSource(const blink::WebMediaStreamSource& source, + std::vector<blink::WebMediaStreamSource>* sources) { + for (std::vector<blink::WebMediaStreamSource>::iterator it = sources->begin(); it != sources->end(); ++it) { if (source.id() == it->id()) { @@ -132,7 +132,7 @@ MediaStreamImpl::~MediaStreamImpl() { } void MediaStreamImpl::requestUserMedia( - const WebKit::WebUserMediaRequest& user_media_request) { + const blink::WebUserMediaRequest& user_media_request) { // Save histogram data so we can see how much GetUserMedia is used. // The histogram counts the number of calls to the JS API // webGetUserMedia. @@ -140,7 +140,7 @@ void MediaStreamImpl::requestUserMedia( DCHECK(CalledOnValidThread()); int request_id = g_next_request_id++; StreamOptions options(MEDIA_NO_SERVICE, MEDIA_NO_SERVICE); - WebKit::WebFrame* frame = NULL; + blink::WebFrame* frame = NULL; GURL security_origin; bool enable_automatic_output_device_selection = false; @@ -200,7 +200,7 @@ void MediaStreamImpl::requestUserMedia( } void MediaStreamImpl::cancelUserMediaRequest( - const WebKit::WebUserMediaRequest& user_media_request) { + const blink::WebUserMediaRequest& user_media_request) { DCHECK(CalledOnValidThread()); UserMediaRequestInfo* request = FindUserMediaRequestInfo(user_media_request); if (request) { @@ -211,14 +211,14 @@ void MediaStreamImpl::cancelUserMediaRequest( } } -WebKit::WebMediaStream MediaStreamImpl::GetMediaStream( +blink::WebMediaStream MediaStreamImpl::GetMediaStream( const GURL& url) { - return WebKit::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url); + return blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url); } bool MediaStreamImpl::IsMediaStream(const GURL& url) { - WebKit::WebMediaStream web_stream( - WebKit::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url)); + blink::WebMediaStream web_stream( + blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url)); if (web_stream.isNull() || !web_stream.extraData()) return false; // This is not a valid stream. @@ -234,7 +234,7 @@ MediaStreamImpl::GetVideoFrameProvider( const base::Closure& error_cb, const VideoFrameProvider::RepaintCB& repaint_cb) { DCHECK(CalledOnValidThread()); - WebKit::WebMediaStream web_stream(GetMediaStream(url)); + blink::WebMediaStream web_stream(GetMediaStream(url)); if (web_stream.isNull() || !web_stream.extraData()) return NULL; // This is not a valid stream. @@ -252,7 +252,7 @@ MediaStreamImpl::GetVideoFrameProvider( scoped_refptr<MediaStreamAudioRenderer> MediaStreamImpl::GetAudioRenderer(const GURL& url) { DCHECK(CalledOnValidThread()); - WebKit::WebMediaStream web_stream(GetMediaStream(url)); + blink::WebMediaStream web_stream(GetMediaStream(url)); if (web_stream.isNull() || !web_stream.extraData()) return NULL; // This is not a valid stream. @@ -320,7 +320,7 @@ void MediaStreamImpl::OnStreamGenerated( } request_info->generated = true; - WebKit::WebVector<WebKit::WebMediaStreamSource> audio_source_vector( + blink::WebVector<blink::WebMediaStreamSource> audio_source_vector( audio_array.size()); StreamDeviceInfoArray overridden_audio_array = audio_array; @@ -335,28 +335,28 @@ void MediaStreamImpl::OnStreamGenerated( } } CreateWebKitSourceVector(label, overridden_audio_array, - WebKit::WebMediaStreamSource::TypeAudio, + blink::WebMediaStreamSource::TypeAudio, request_info->frame, audio_source_vector); - WebKit::WebVector<WebKit::WebMediaStreamSource> video_source_vector( + blink::WebVector<blink::WebMediaStreamSource> video_source_vector( video_array.size()); CreateWebKitSourceVector(label, video_array, - WebKit::WebMediaStreamSource::TypeVideo, + blink::WebMediaStreamSource::TypeVideo, request_info->frame, video_source_vector); - WebKit::WebUserMediaRequest* request = &(request_info->request); - WebKit::WebString webkit_id = UTF8ToUTF16(label); - WebKit::WebMediaStream* web_stream = &(request_info->web_stream); + blink::WebUserMediaRequest* request = &(request_info->request); + blink::WebString webkit_id = UTF8ToUTF16(label); + blink::WebMediaStream* web_stream = &(request_info->web_stream); - WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_track_vector( + blink::WebVector<blink::WebMediaStreamTrack> audio_track_vector( audio_array.size()); for (size_t i = 0; i < audio_track_vector.size(); ++i) { audio_track_vector[i].initialize(audio_source_vector[i]); request_info->sources.push_back(audio_source_vector[i]); } - WebKit::WebVector<WebKit::WebMediaStreamTrack> video_track_vector( + blink::WebVector<blink::WebMediaStreamTrack> video_track_vector( video_array.size()); for (size_t i = 0; i < video_track_vector.size(); ++i) { video_track_vector[i].initialize(video_source_vector[i]); @@ -368,10 +368,10 @@ void MediaStreamImpl::OnStreamGenerated( // WebUserMediaRequest don't have an implementation in unit tests. // Therefore we need to check for isNull here. - WebKit::WebMediaConstraints audio_constraints = request->isNull() ? - WebKit::WebMediaConstraints() : request->audioConstraints(); - WebKit::WebMediaConstraints video_constraints = request->isNull() ? - WebKit::WebMediaConstraints() : request->videoConstraints(); + blink::WebMediaConstraints audio_constraints = request->isNull() ? + blink::WebMediaConstraints() : request->audioConstraints(); + blink::WebMediaConstraints video_constraints = request->isNull() ? + blink::WebMediaConstraints() : request->videoConstraints(); dependency_factory_->CreateNativeMediaSources( RenderViewObserver::routing_id(), @@ -414,18 +414,18 @@ void MediaStreamImpl::OnStopGeneratedStream(const std::string& label) { void MediaStreamImpl::CreateWebKitSourceVector( const std::string& label, const StreamDeviceInfoArray& devices, - WebKit::WebMediaStreamSource::Type type, - WebKit::WebFrame* frame, - WebKit::WebVector<WebKit::WebMediaStreamSource>& webkit_sources) { + blink::WebMediaStreamSource::Type type, + blink::WebFrame* frame, + blink::WebVector<blink::WebMediaStreamSource>& webkit_sources) { CHECK_EQ(devices.size(), webkit_sources.size()); for (size_t i = 0; i < devices.size(); ++i) { const char* track_type = - (type == WebKit::WebMediaStreamSource::TypeAudio) ? "a" : "v"; + (type == blink::WebMediaStreamSource::TypeAudio) ? "a" : "v"; std::string source_id = base::StringPrintf("%s%s%u", label.c_str(), track_type, static_cast<unsigned int>(i)); - const WebKit::WebMediaStreamSource* existing_source = + const blink::WebMediaStreamSource* existing_source = FindLocalSource(devices[i]); if (existing_source) { webkit_sources[i] = *existing_source; @@ -452,7 +452,7 @@ void MediaStreamImpl::CreateWebKitSourceVector( // Callback from MediaStreamDependencyFactory when the sources in |web_stream| // have been generated. void MediaStreamImpl::OnCreateNativeSourcesComplete( - WebKit::WebMediaStream* web_stream, + blink::WebMediaStream* web_stream, bool request_succeeded) { UserMediaRequestInfo* request_info = FindUserMediaRequestInfo(web_stream); if (!request_info) { @@ -511,8 +511,8 @@ void MediaStreamImpl::OnDeviceOpenFailed(int request_id) { } void MediaStreamImpl::CompleteGetUserMediaRequest( - const WebKit::WebMediaStream& stream, - WebKit::WebUserMediaRequest* request_info, + const blink::WebMediaStream& stream, + blink::WebUserMediaRequest* request_info, bool request_succeeded) { if (request_succeeded) { request_info->requestSucceeded(stream); @@ -521,7 +521,7 @@ void MediaStreamImpl::CompleteGetUserMediaRequest( } } -const WebKit::WebMediaStreamSource* MediaStreamImpl::FindLocalSource( +const blink::WebMediaStreamSource* MediaStreamImpl::FindLocalSource( const StreamDeviceInfo& device) const { for (LocalStreamSources::const_iterator it = local_sources_.begin(); it != local_sources_.end(); ++it) { @@ -538,12 +538,12 @@ const WebKit::WebMediaStreamSource* MediaStreamImpl::FindLocalSource( } bool MediaStreamImpl::FindSourceInRequests( - const WebKit::WebMediaStreamSource& source) const { + const blink::WebMediaStreamSource& source) const { for (UserMediaRequests::const_iterator req_it = user_media_requests_.begin(); req_it != user_media_requests_.end(); ++req_it) { - const std::vector<WebKit::WebMediaStreamSource>& sources = + const std::vector<blink::WebMediaStreamSource>& sources = (*req_it)->sources; - for (std::vector<WebKit::WebMediaStreamSource>::const_iterator source_it = + for (std::vector<blink::WebMediaStreamSource>::const_iterator source_it = sources.begin(); source_it != sources.end(); ++source_it) { if (source_it->id() == source.id()) { @@ -566,7 +566,7 @@ MediaStreamImpl::FindUserMediaRequestInfo(int request_id) { MediaStreamImpl::UserMediaRequestInfo* MediaStreamImpl::FindUserMediaRequestInfo( - const WebKit::WebUserMediaRequest& request) { + const blink::WebUserMediaRequest& request) { UserMediaRequests::iterator it = user_media_requests_.begin(); for (; it != user_media_requests_.end(); ++it) { if ((*it)->request == request) @@ -587,7 +587,7 @@ MediaStreamImpl::FindUserMediaRequestInfo(const std::string& label) { MediaStreamImpl::UserMediaRequestInfo* MediaStreamImpl::FindUserMediaRequestInfo( - WebKit::WebMediaStream* web_stream) { + blink::WebMediaStream* web_stream) { UserMediaRequests::iterator it = user_media_requests_.begin(); for (; it != user_media_requests_.end(); ++it) { if (&((*it)->web_stream) == web_stream) @@ -608,12 +608,12 @@ void MediaStreamImpl::DeleteUserMediaRequestInfo( NOTREACHED(); } -void MediaStreamImpl::FrameDetached(WebKit::WebFrame* frame) { +void MediaStreamImpl::FrameDetached(blink::WebFrame* frame) { // Do same thing as FrameWillClose. FrameWillClose(frame); } -void MediaStreamImpl::FrameWillClose(WebKit::WebFrame* frame) { +void MediaStreamImpl::FrameWillClose(blink::WebFrame* frame) { // Loop through all UserMediaRequests and find the requests that belong to the // frame that is being closed. UserMediaRequests::iterator request_it = user_media_requests_.begin(); @@ -660,7 +660,7 @@ void MediaStreamImpl::OnLocalMediaStreamStop( } void MediaStreamImpl::OnLocalSourceStop( - const WebKit::WebMediaStreamSource& source) { + const blink::WebMediaStreamSource& source) { DCHECK(CalledOnValidThread()); StopLocalSource(source, true); @@ -691,7 +691,7 @@ void MediaStreamImpl::OnLocalSourceStop( } void MediaStreamImpl::StopLocalSource( - const WebKit::WebMediaStreamSource& source, + const blink::WebMediaStreamSource& source, bool notify_dispatcher) { MediaStreamSourceExtraData* extra_data = static_cast<MediaStreamSourceExtraData*> (source.extraData()); @@ -699,7 +699,7 @@ void MediaStreamImpl::StopLocalSource( DVLOG(1) << "MediaStreamImpl::StopLocalSource(" << "{device_id = " << extra_data->device_info().device.id << "})"; - if (source.type() == WebKit::WebMediaStreamSource::TypeAudio) { + if (source.type() == blink::WebMediaStreamSource::TypeAudio) { if (extra_data->GetAudioCapturer()) { extra_data->GetAudioCapturer()->Stop(); } @@ -708,9 +708,9 @@ void MediaStreamImpl::StopLocalSource( if (notify_dispatcher) media_stream_dispatcher_->StopStreamDevice(extra_data->device_info()); - WebKit::WebMediaStreamSource writable_source(source); + blink::WebMediaStreamSource writable_source(source); writable_source.setReadyState( - WebKit::WebMediaStreamSource::ReadyStateEnded); + blink::WebMediaStreamSource::ReadyStateEnded); writable_source.setExtraData(NULL); } @@ -855,8 +855,8 @@ void MediaStreamExtraData::OnLocalStreamStop() { MediaStreamImpl::UserMediaRequestInfo::UserMediaRequestInfo( int request_id, - WebKit::WebFrame* frame, - const WebKit::WebUserMediaRequest& request, + blink::WebFrame* frame, + const blink::WebUserMediaRequest& request, bool enable_automatic_output_device_selection) : request_id(request_id), generated(false), diff --git a/content/renderer/media/media_stream_impl.h b/content/renderer/media/media_stream_impl.h index 6005611..c9737d7 100644 --- a/content/renderer/media/media_stream_impl.h +++ b/content/renderer/media/media_stream_impl.h @@ -42,7 +42,7 @@ class WebRtcLocalAudioRenderer; // MediaStreamImpl have weak pointers to a MediaStreamDispatcher. class CONTENT_EXPORT MediaStreamImpl : public RenderViewObserver, - NON_EXPORTED_BASE(public WebKit::WebUserMediaClient), + NON_EXPORTED_BASE(public blink::WebUserMediaClient), NON_EXPORTED_BASE(public MediaStreamClient), public MediaStreamDispatcherEventHandler, public base::SupportsWeakPtr<MediaStreamImpl>, @@ -54,11 +54,11 @@ class CONTENT_EXPORT MediaStreamImpl MediaStreamDependencyFactory* dependency_factory); virtual ~MediaStreamImpl(); - // WebKit::WebUserMediaClient implementation + // blink::WebUserMediaClient implementation virtual void requestUserMedia( - const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE; + const blink::WebUserMediaRequest& user_media_request) OVERRIDE; virtual void cancelUserMediaRequest( - const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE; + const blink::WebUserMediaRequest& user_media_request) OVERRIDE; // MediaStreamClient implementation. virtual bool IsMediaStream(const GURL& url) OVERRIDE; @@ -88,11 +88,11 @@ class CONTENT_EXPORT MediaStreamImpl virtual void OnDeviceOpenFailed(int request_id) OVERRIDE; // RenderViewObserver OVERRIDE - virtual void FrameDetached(WebKit::WebFrame* frame) OVERRIDE; - virtual void FrameWillClose(WebKit::WebFrame* frame) OVERRIDE; + virtual void FrameDetached(blink::WebFrame* frame) OVERRIDE; + virtual void FrameWillClose(blink::WebFrame* frame) OVERRIDE; protected: - void OnLocalSourceStop(const WebKit::WebMediaStreamSource& source); + void OnLocalSourceStop(const blink::WebMediaStreamSource& source); void OnLocalMediaStreamStop(const std::string& label); @@ -102,28 +102,28 @@ class CONTENT_EXPORT MediaStreamImpl // UserMediaRequests::web_stream for which the underlying sources have been // created. void OnCreateNativeSourcesComplete( - WebKit::WebMediaStream* web_stream, + blink::WebMediaStream* web_stream, bool request_succeeded); // This function is virtual for test purposes. A test can override this to // test requesting local media streams. The function notifies WebKit that the // |request| have completed and generated the MediaStream |stream|. virtual void CompleteGetUserMediaRequest( - const WebKit::WebMediaStream& stream, - WebKit::WebUserMediaRequest* request_info, + const blink::WebMediaStream& stream, + blink::WebUserMediaRequest* request_info, bool request_succeeded); // Returns the WebKit representation of a MediaStream given an URL. // This is virtual for test purposes. - virtual WebKit::WebMediaStream GetMediaStream(const GURL& url); + virtual blink::WebMediaStream GetMediaStream(const GURL& url); private: // Structure for storing information about a WebKit request to create a // MediaStream. struct UserMediaRequestInfo { UserMediaRequestInfo(int request_id, - WebKit::WebFrame* frame, - const WebKit::WebUserMediaRequest& request, + blink::WebFrame* frame, + const blink::WebUserMediaRequest& request, bool enable_automatic_output_device_selection); ~UserMediaRequestInfo(); int request_id; @@ -131,22 +131,22 @@ class CONTENT_EXPORT MediaStreamImpl // OnStreamGenerated. bool generated; const bool enable_automatic_output_device_selection; - WebKit::WebFrame* frame; // WebFrame that requested the MediaStream. - WebKit::WebMediaStream web_stream; - WebKit::WebUserMediaRequest request; - std::vector<WebKit::WebMediaStreamSource> sources; + blink::WebFrame* frame; // WebFrame that requested the MediaStream. + blink::WebMediaStream web_stream; + blink::WebUserMediaRequest request; + std::vector<blink::WebMediaStreamSource> sources; }; typedef ScopedVector<UserMediaRequestInfo> UserMediaRequests; struct LocalStreamSource { - LocalStreamSource(WebKit::WebFrame* frame, - const WebKit::WebMediaStreamSource& source) + LocalStreamSource(blink::WebFrame* frame, + const blink::WebMediaStreamSource& source) : frame(frame), source(source) { } // |frame| is the WebFrame that requested |source|. NULL in unit tests. // TODO(perkj): Change so that |frame| is not NULL in unit tests. - WebKit::WebFrame* frame; - WebKit::WebMediaStreamSource source; + blink::WebFrame* frame; + blink::WebMediaStreamSource source; }; typedef std::vector<LocalStreamSource> LocalStreamSources; @@ -155,27 +155,27 @@ class CONTENT_EXPORT MediaStreamImpl void CreateWebKitSourceVector( const std::string& label, const StreamDeviceInfoArray& devices, - WebKit::WebMediaStreamSource::Type type, - WebKit::WebFrame* frame, - WebKit::WebVector<WebKit::WebMediaStreamSource>& webkit_sources); + blink::WebMediaStreamSource::Type type, + blink::WebFrame* frame, + blink::WebVector<blink::WebMediaStreamSource>& webkit_sources); UserMediaRequestInfo* FindUserMediaRequestInfo(int request_id); UserMediaRequestInfo* FindUserMediaRequestInfo( - WebKit::WebMediaStream* web_stream); + blink::WebMediaStream* web_stream); UserMediaRequestInfo* FindUserMediaRequestInfo( - const WebKit::WebUserMediaRequest& request); + const blink::WebUserMediaRequest& request); UserMediaRequestInfo* FindUserMediaRequestInfo(const std::string& label); void DeleteUserMediaRequestInfo(UserMediaRequestInfo* request); // Returns the source that use a device with |device.session_id| // and |device.device.id|. NULL if such source doesn't exist. - const WebKit::WebMediaStreamSource* FindLocalSource( + const blink::WebMediaStreamSource* FindLocalSource( const StreamDeviceInfo& device) const; // Returns true if |source| exists in |user_media_requests_| - bool FindSourceInRequests(const WebKit::WebMediaStreamSource& source) const; + bool FindSourceInRequests(const blink::WebMediaStreamSource& source) const; - void StopLocalSource(const WebKit::WebMediaStreamSource& source, + void StopLocalSource(const blink::WebMediaStreamSource& source, bool notify_dispatcher); // Stops all local sources that don't exist in exist in // |user_media_requests_|. diff --git a/content/renderer/media/media_stream_impl_unittest.cc b/content/renderer/media/media_stream_impl_unittest.cc index ed87f7a..644f2cd 100644 --- a/content/renderer/media/media_stream_impl_unittest.cc +++ b/content/renderer/media/media_stream_impl_unittest.cc @@ -34,20 +34,20 @@ class MediaStreamImplUnderTest : public MediaStreamImpl { } void RequestUserMedia() { - WebKit::WebUserMediaRequest user_media_request; + blink::WebUserMediaRequest user_media_request; state_ = REQUEST_NOT_COMPLETE; requestUserMedia(user_media_request); } virtual void CompleteGetUserMediaRequest( - const WebKit::WebMediaStream& stream, - WebKit::WebUserMediaRequest* request_info, + const blink::WebMediaStream& stream, + blink::WebUserMediaRequest* request_info, bool request_succeeded) OVERRIDE { last_generated_stream_ = stream; state_ = request_succeeded ? REQUEST_SUCCEEDED : REQUEST_FAILED; } - virtual WebKit::WebMediaStream GetMediaStream( + virtual blink::WebMediaStream GetMediaStream( const GURL& url) OVERRIDE { return last_generated_stream_; } @@ -55,14 +55,14 @@ class MediaStreamImplUnderTest : public MediaStreamImpl { using MediaStreamImpl::OnLocalMediaStreamStop; using MediaStreamImpl::OnLocalSourceStop; - const WebKit::WebMediaStream& last_generated_stream() { + const blink::WebMediaStream& last_generated_stream() { return last_generated_stream_; } RequestState request_state() const { return state_; } private: - WebKit::WebMediaStream last_generated_stream_; + blink::WebMediaStream last_generated_stream_; RequestState state_; }; @@ -76,7 +76,7 @@ class MediaStreamImplTest : public ::testing::Test { dependency_factory_.get())); } - WebKit::WebMediaStream RequestLocalMediaStream() { + blink::WebMediaStream RequestLocalMediaStream() { ms_impl_->RequestUserMedia(); FakeMediaStreamDispatcherComplete(); ChangeVideoSourceStateToLive(); @@ -85,7 +85,7 @@ class MediaStreamImplTest : public ::testing::Test { EXPECT_EQ(MediaStreamImplUnderTest::REQUEST_SUCCEEDED, ms_impl_->request_state()); - WebKit::WebMediaStream desc = ms_impl_->last_generated_stream(); + blink::WebMediaStream desc = ms_impl_->last_generated_stream(); content::MediaStreamExtraData* extra_data = static_cast<content::MediaStreamExtraData*>(desc.extraData()); if (!extra_data || !extra_data->stream().get()) { @@ -139,18 +139,18 @@ class MediaStreamImplTest : public ::testing::Test { TEST_F(MediaStreamImplTest, GenerateMediaStream) { // Generate a stream with both audio and video. - WebKit::WebMediaStream mixed_desc = RequestLocalMediaStream(); + blink::WebMediaStream mixed_desc = RequestLocalMediaStream(); } // Test that the same source object is used if two MediaStreams are generated // using the same source. TEST_F(MediaStreamImplTest, GenerateTwoMediaStreamsWithSameSource) { - WebKit::WebMediaStream desc1 = RequestLocalMediaStream(); - WebKit::WebMediaStream desc2 = RequestLocalMediaStream(); + blink::WebMediaStream desc1 = RequestLocalMediaStream(); + blink::WebMediaStream desc2 = RequestLocalMediaStream(); - WebKit::WebVector<WebKit::WebMediaStreamTrack> desc1_video_tracks; + blink::WebVector<blink::WebMediaStreamTrack> desc1_video_tracks; desc1.videoTracks(desc1_video_tracks); - WebKit::WebVector<WebKit::WebMediaStreamTrack> desc2_video_tracks; + blink::WebVector<blink::WebMediaStreamTrack> desc2_video_tracks; desc2.videoTracks(desc2_video_tracks); EXPECT_EQ(desc1_video_tracks[0].source().id(), desc2_video_tracks[0].source().id()); @@ -158,9 +158,9 @@ TEST_F(MediaStreamImplTest, GenerateTwoMediaStreamsWithSameSource) { EXPECT_EQ(desc1_video_tracks[0].source().extraData(), desc2_video_tracks[0].source().extraData()); - WebKit::WebVector<WebKit::WebMediaStreamTrack> desc1_audio_tracks; + blink::WebVector<blink::WebMediaStreamTrack> desc1_audio_tracks; desc1.audioTracks(desc1_audio_tracks); - WebKit::WebVector<WebKit::WebMediaStreamTrack> desc2_audio_tracks; + blink::WebVector<blink::WebMediaStreamTrack> desc2_audio_tracks; desc2.audioTracks(desc2_audio_tracks); EXPECT_EQ(desc1_audio_tracks[0].source().id(), desc2_audio_tracks[0].source().id()); @@ -172,15 +172,15 @@ TEST_F(MediaStreamImplTest, GenerateTwoMediaStreamsWithSameSource) { // Test that the same source object is not used if two MediaStreams are // generated using different sources. TEST_F(MediaStreamImplTest, GenerateTwoMediaStreamsWithDifferentSources) { - WebKit::WebMediaStream desc1 = RequestLocalMediaStream(); + blink::WebMediaStream desc1 = RequestLocalMediaStream(); // Make sure another device is selected (another |session_id|) in the next // gUM request. ms_dispatcher_->IncrementSessionId(); - WebKit::WebMediaStream desc2 = RequestLocalMediaStream(); + blink::WebMediaStream desc2 = RequestLocalMediaStream(); - WebKit::WebVector<WebKit::WebMediaStreamTrack> desc1_video_tracks; + blink::WebVector<blink::WebMediaStreamTrack> desc1_video_tracks; desc1.videoTracks(desc1_video_tracks); - WebKit::WebVector<WebKit::WebMediaStreamTrack> desc2_video_tracks; + blink::WebVector<blink::WebMediaStreamTrack> desc2_video_tracks; desc2.videoTracks(desc2_video_tracks); EXPECT_NE(desc1_video_tracks[0].source().id(), desc2_video_tracks[0].source().id()); @@ -188,9 +188,9 @@ TEST_F(MediaStreamImplTest, GenerateTwoMediaStreamsWithDifferentSources) { EXPECT_NE(desc1_video_tracks[0].source().extraData(), desc2_video_tracks[0].source().extraData()); - WebKit::WebVector<WebKit::WebMediaStreamTrack> desc1_audio_tracks; + blink::WebVector<blink::WebMediaStreamTrack> desc1_audio_tracks; desc1.audioTracks(desc1_audio_tracks); - WebKit::WebVector<WebKit::WebMediaStreamTrack> desc2_audio_tracks; + blink::WebVector<blink::WebMediaStreamTrack> desc2_audio_tracks; desc2.audioTracks(desc2_audio_tracks); EXPECT_NE(desc1_audio_tracks[0].source().id(), desc2_audio_tracks[0].source().id()); @@ -201,7 +201,7 @@ TEST_F(MediaStreamImplTest, GenerateTwoMediaStreamsWithDifferentSources) { TEST_F(MediaStreamImplTest, StopLocalMediaStream) { // Generate a stream with both audio and video. - WebKit::WebMediaStream mixed_desc = RequestLocalMediaStream(); + blink::WebMediaStream mixed_desc = RequestLocalMediaStream(); // Stop generated local streams. ms_impl_->OnLocalMediaStreamStop(mixed_desc.id().utf8()); @@ -214,8 +214,8 @@ TEST_F(MediaStreamImplTest, StopLocalMediaStream) { // if there are no more MediaStreams using the device. TEST_F(MediaStreamImplTest, StopLocalMediaStreamWhenTwoStreamUseSameDevices) { // Generate a stream with both audio and video. - WebKit::WebMediaStream desc1 = RequestLocalMediaStream(); - WebKit::WebMediaStream desc2 = RequestLocalMediaStream(); + blink::WebMediaStream desc1 = RequestLocalMediaStream(); + blink::WebMediaStream desc2 = RequestLocalMediaStream(); ms_impl_->OnLocalMediaStreamStop(desc2.id().utf8()); EXPECT_EQ(0, ms_dispatcher_->stop_audio_device_counter()); @@ -230,18 +230,18 @@ TEST_F(MediaStreamImplTest, StopLocalMediaStreamWhenTwoStreamUseSameDevices) { // the same source. TEST_F(MediaStreamImplTest, StopSource) { // Generate a stream with both audio and video. - WebKit::WebMediaStream desc1 = RequestLocalMediaStream(); - WebKit::WebMediaStream desc2 = RequestLocalMediaStream(); + blink::WebMediaStream desc1 = RequestLocalMediaStream(); + blink::WebMediaStream desc2 = RequestLocalMediaStream(); // Stop the video source. - WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks; + blink::WebVector<blink::WebMediaStreamTrack> video_tracks; desc1.videoTracks(video_tracks); ms_impl_->OnLocalSourceStop(video_tracks[0].source()); EXPECT_EQ(0, ms_dispatcher_->stop_audio_device_counter()); EXPECT_EQ(1, ms_dispatcher_->stop_video_device_counter()); // Stop the audio source. - WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_tracks; + blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; desc1.audioTracks(audio_tracks); ms_impl_->OnLocalSourceStop(audio_tracks[0].source()); EXPECT_EQ(1, ms_dispatcher_->stop_audio_device_counter()); @@ -252,7 +252,7 @@ TEST_F(MediaStreamImplTest, StopSource) { // In the unit test the owning frame is NULL. TEST_F(MediaStreamImplTest, FrameWillClose) { // Test a stream with both audio and video. - WebKit::WebMediaStream mixed_desc = RequestLocalMediaStream(); + blink::WebMediaStream mixed_desc = RequestLocalMediaStream(); // Test that the MediaStreams are deleted if the owning WebFrame is deleted. // In the unit test the owning frame is NULL. @@ -319,7 +319,7 @@ TEST_F(MediaStreamImplTest, ReloadFrameWhileGeneratingSources) { // This test what happens if stop is called on a stream after the frame has // been reloaded. TEST_F(MediaStreamImplTest, StopStreamAfterReload) { - WebKit::WebMediaStream mixed_desc = RequestLocalMediaStream(); + blink::WebMediaStream mixed_desc = RequestLocalMediaStream(); EXPECT_EQ(1, ms_dispatcher_->request_stream_counter()); ms_impl_->FrameWillClose(NULL); EXPECT_EQ(1, ms_dispatcher_->stop_audio_device_counter()); diff --git a/content/renderer/media/media_stream_registry_interface.h b/content/renderer/media/media_stream_registry_interface.h index af4c26a..ace11c5 100644 --- a/content/renderer/media/media_stream_registry_interface.h +++ b/content/renderer/media/media_stream_registry_interface.h @@ -14,7 +14,7 @@ namespace content { // Interface to get WebMediaStream from its url. class MediaStreamRegistryInterface { public: - virtual WebKit::WebMediaStream GetMediaStream(const std::string& url) = 0; + virtual blink::WebMediaStream GetMediaStream(const std::string& url) = 0; protected: virtual ~MediaStreamRegistryInterface() {} diff --git a/content/renderer/media/media_stream_source_extra_data.h b/content/renderer/media/media_stream_source_extra_data.h index 3b61809..4b88c14 100644 --- a/content/renderer/media/media_stream_source_extra_data.h +++ b/content/renderer/media/media_stream_source_extra_data.h @@ -17,9 +17,9 @@ namespace content { class CONTENT_EXPORT MediaStreamSourceExtraData - : NON_EXPORTED_BASE(public WebKit::WebMediaStreamSource::ExtraData) { + : NON_EXPORTED_BASE(public blink::WebMediaStreamSource::ExtraData) { public: - typedef base::Callback<void(const WebKit::WebMediaStreamSource& source)> + typedef base::Callback<void(const blink::WebMediaStreamSource& source)> SourceStopCallback; MediaStreamSourceExtraData(const StreamDeviceInfo& device_info, diff --git a/content/renderer/media/media_stream_source_observer.cc b/content/renderer/media/media_stream_source_observer.cc index 8a8cd0c..319327f 100644 --- a/content/renderer/media/media_stream_source_observer.cc +++ b/content/renderer/media/media_stream_source_observer.cc @@ -33,7 +33,7 @@ void MediaStreamSourceObserver::OnChanged() { if (state == state_) return; state_ = state; - WebKit::WebMediaStreamSource webkit_source(extra_data_->owner()); + blink::WebMediaStreamSource webkit_source(extra_data_->owner()); switch (state) { case webrtc::MediaSourceInterface::kInitializing: @@ -42,15 +42,15 @@ void MediaStreamSourceObserver::OnChanged() { break; case webrtc::MediaSourceInterface::kLive: webkit_source.setReadyState( - WebKit::WebMediaStreamSource::ReadyStateLive); + blink::WebMediaStreamSource::ReadyStateLive); break; case webrtc::MediaSourceInterface::kMuted: webkit_source.setReadyState( - WebKit::WebMediaStreamSource::ReadyStateMuted); + blink::WebMediaStreamSource::ReadyStateMuted); break; case webrtc::MediaSourceInterface::kEnded: webkit_source.setReadyState( - WebKit::WebMediaStreamSource::ReadyStateEnded); + blink::WebMediaStreamSource::ReadyStateEnded); webrtc_source_->UnregisterObserver(this); webrtc_source_ = NULL; break; diff --git a/content/renderer/media/media_stream_track_extra_data.h b/content/renderer/media/media_stream_track_extra_data.h index 4ab9cff..80c7a98 100644 --- a/content/renderer/media/media_stream_track_extra_data.h +++ b/content/renderer/media/media_stream_track_extra_data.h @@ -18,7 +18,7 @@ class MediaStreamTrackInterface; namespace content { class CONTENT_EXPORT MediaStreamTrackExtraData - : NON_EXPORTED_BASE(public WebKit::WebMediaStreamTrack::ExtraData) { + : NON_EXPORTED_BASE(public blink::WebMediaStreamTrack::ExtraData) { public: MediaStreamTrackExtraData(webrtc::MediaStreamTrackInterface* track); virtual ~MediaStreamTrackExtraData(); diff --git a/content/renderer/media/midi_dispatcher.cc b/content/renderer/media/midi_dispatcher.cc index b9aae33..e5dccf3 100644 --- a/content/renderer/media/midi_dispatcher.cc +++ b/content/renderer/media/midi_dispatcher.cc @@ -11,8 +11,8 @@ #include "third_party/WebKit/public/web/WebMIDIPermissionRequest.h" #include "third_party/WebKit/public/web/WebSecurityOrigin.h" -using WebKit::WebMIDIPermissionRequest; -using WebKit::WebSecurityOrigin; +using blink::WebMIDIPermissionRequest; +using blink::WebSecurityOrigin; namespace content { diff --git a/content/renderer/media/midi_dispatcher.h b/content/renderer/media/midi_dispatcher.h index 143d706..70f8125 100644 --- a/content/renderer/media/midi_dispatcher.h +++ b/content/renderer/media/midi_dispatcher.h @@ -9,7 +9,7 @@ #include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/public/web/WebMIDIClient.h" -namespace WebKit { +namespace blink { class WebMIDIPermissionRequest; } @@ -23,7 +23,7 @@ class RenderViewImpl; // MIDIDispatcherHost owned by RenderViewHost since permissions are managed in // the browser process. class MIDIDispatcher : public RenderViewObserver, - public WebKit::WebMIDIClient { + public blink::WebMIDIClient { public: explicit MIDIDispatcher(RenderViewImpl* render_view); virtual ~MIDIDispatcher(); @@ -32,11 +32,11 @@ class MIDIDispatcher : public RenderViewObserver, // RenderView::Observer implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - // WebKit::WebMIDIClient implementation. + // blink::WebMIDIClient implementation. virtual void requestSysExPermission( - const WebKit::WebMIDIPermissionRequest& request) OVERRIDE; + const blink::WebMIDIPermissionRequest& request) OVERRIDE; virtual void cancelSysExPermissionRequest( - const WebKit::WebMIDIPermissionRequest& request) OVERRIDE; + const blink::WebMIDIPermissionRequest& request) OVERRIDE; // Permission for using system exclusive messages has been set. void OnSysExPermissionApproved(int client_id, bool is_allowed); @@ -44,7 +44,7 @@ class MIDIDispatcher : public RenderViewObserver, // Each WebMIDIPermissionRequest object is valid until // cancelSysExPermissionRequest() is called with the object, or used to call // WebMIDIPermissionRequest::setIsAllowed(). - IDMap<WebKit::WebMIDIPermissionRequest> requests_; + IDMap<blink::WebMIDIPermissionRequest> requests_; DISALLOW_COPY_AND_ASSIGN(MIDIDispatcher); }; diff --git a/content/renderer/media/midi_message_filter.cc b/content/renderer/media/midi_message_filter.cc index 32e8bdd..d114618 100644 --- a/content/renderer/media/midi_message_filter.cc +++ b/content/renderer/media/midi_message_filter.cc @@ -72,7 +72,7 @@ void MIDIMessageFilter::OnChannelClosing() { channel_ = NULL; } -void MIDIMessageFilter::StartSession(WebKit::WebMIDIAccessorClient* client) { +void MIDIMessageFilter::StartSession(blink::WebMIDIAccessorClient* client) { // Generate and keep track of a "client id" which is sent to the browser // to ask permission to talk to MIDI hardware. // This id is handed back when we receive the answer in OnAccessApproved(). @@ -90,7 +90,7 @@ void MIDIMessageFilter::StartSessionOnIOThread(int client_id) { Send(new MIDIHostMsg_StartSession(client_id)); } -void MIDIMessageFilter::RemoveClient(WebKit::WebMIDIAccessorClient* client) { +void MIDIMessageFilter::RemoveClient(blink::WebMIDIAccessorClient* client) { ClientsMap::iterator i = clients_.find(client); if (i != clients_.end()) clients_.erase(i); @@ -115,7 +115,7 @@ void MIDIMessageFilter::HandleSessionStarted( bool success, MIDIPortInfoList inputs, MIDIPortInfoList outputs) { - WebKit::WebMIDIAccessorClient* client = GetClientFromId(client_id); + blink::WebMIDIAccessorClient* client = GetClientFromId(client_id); if (!client) return; @@ -140,7 +140,7 @@ void MIDIMessageFilter::HandleSessionStarted( client->didStartSession(success); } -WebKit::WebMIDIAccessorClient* +blink::WebMIDIAccessorClient* MIDIMessageFilter::GetClientFromId(int client_id) { // Iterating like this seems inefficient, but in practice there generally // will be very few clients (usually one). Additionally, this lookup diff --git a/content/renderer/media/midi_message_filter.h b/content/renderer/media/midi_message_filter.h index 4b8481f..c2e66ae 100644 --- a/content/renderer/media/midi_message_filter.h +++ b/content/renderer/media/midi_message_filter.h @@ -31,8 +31,8 @@ class CONTENT_EXPORT MIDIMessageFilter // If permission is granted, then the client's // addInputPort() and addOutputPort() methods will be called, // giving the client access to receive and send data. - void StartSession(WebKit::WebMIDIAccessorClient* client); - void RemoveClient(WebKit::WebMIDIAccessorClient* client); + void StartSession(blink::WebMIDIAccessorClient* client); + void RemoveClient(blink::WebMIDIAccessorClient* client); // A client will only be able to call this method if it has a suitable // output port (from addOutputPort()). @@ -92,7 +92,7 @@ class CONTENT_EXPORT MIDIMessageFilter const std::vector<uint8>& data, double timestamp); - WebKit::WebMIDIAccessorClient* GetClientFromId(int client_id); + blink::WebMIDIAccessorClient* GetClientFromId(int client_id); // IPC channel for Send(); must only be accessed on |io_message_loop_|. IPC::Channel* channel_; @@ -107,7 +107,7 @@ class CONTENT_EXPORT MIDIMessageFilter // We map client to "client id" used to track permission. // When access has been approved, we add the input and output ports to // the client, allowing it to actually receive and send MIDI data. - typedef std::map<WebKit::WebMIDIAccessorClient*, int> ClientsMap; + typedef std::map<blink::WebMIDIAccessorClient*, int> ClientsMap; ClientsMap clients_; // Dishes out client ids. diff --git a/content/renderer/media/mock_media_stream_dependency_factory.cc b/content/renderer/media/mock_media_stream_dependency_factory.cc index ec513ba..8de0e2b 100644 --- a/content/renderer/media/mock_media_stream_dependency_factory.cc +++ b/content/renderer/media/mock_media_stream_dependency_factory.cc @@ -386,7 +386,7 @@ scoped_refptr<webrtc::PeerConnectionInterface> MockMediaStreamDependencyFactory::CreatePeerConnection( const webrtc::PeerConnectionInterface::IceServers& ice_servers, const webrtc::MediaConstraintsInterface* constraints, - WebKit::WebFrame* frame, + blink::WebFrame* frame, webrtc::PeerConnectionObserver* observer) { DCHECK(mock_pc_factory_created_); return new talk_base::RefCountedObject<MockPeerConnectionImpl>(this); @@ -411,7 +411,7 @@ MockMediaStreamDependencyFactory::CreateLocalVideoSource( scoped_refptr<WebAudioCapturerSource> MockMediaStreamDependencyFactory::CreateWebAudioSource( - WebKit::WebMediaStreamSource* source, + blink::WebMediaStreamSource* source, RTCMediaConstraints* constraints) { return NULL; } diff --git a/content/renderer/media/mock_media_stream_dependency_factory.h b/content/renderer/media/mock_media_stream_dependency_factory.h index 7152d11..bd73ec7 100644 --- a/content/renderer/media/mock_media_stream_dependency_factory.h +++ b/content/renderer/media/mock_media_stream_dependency_factory.h @@ -118,7 +118,7 @@ class MockMediaStreamDependencyFactory : public MediaStreamDependencyFactory { virtual scoped_refptr<webrtc::PeerConnectionInterface> CreatePeerConnection( const webrtc::PeerConnectionInterface::IceServers& ice_servers, const webrtc::MediaConstraintsInterface* constraints, - WebKit::WebFrame* frame, + blink::WebFrame* frame, webrtc::PeerConnectionObserver* observer) OVERRIDE; virtual scoped_refptr<webrtc::AudioSourceInterface> CreateLocalAudioSource( @@ -129,7 +129,7 @@ class MockMediaStreamDependencyFactory : public MediaStreamDependencyFactory { bool is_screencast, const webrtc::MediaConstraintsInterface* constraints) OVERRIDE; virtual scoped_refptr<WebAudioCapturerSource> CreateWebAudioSource( - WebKit::WebMediaStreamSource* source, + blink::WebMediaStreamSource* source, RTCMediaConstraints* constraints) OVERRIDE; virtual scoped_refptr<webrtc::MediaStreamInterface> CreateLocalMediaStream(const std::string& label) OVERRIDE; diff --git a/content/renderer/media/mock_media_stream_registry.cc b/content/renderer/media/mock_media_stream_registry.cc index 0462123..cc29c05 100644 --- a/content/renderer/media/mock_media_stream_registry.cc +++ b/content/renderer/media/mock_media_stream_registry.cc @@ -26,9 +26,9 @@ void MockMediaStreamRegistry::Init(const std::string& stream_url) { stream_url_ = stream_url; scoped_refptr<webrtc::MediaStreamInterface> stream( factory_->CreateLocalMediaStream(kTestStreamLabel)); - WebKit::WebVector<WebKit::WebMediaStreamTrack> webkit_audio_tracks; - WebKit::WebVector<WebKit::WebMediaStreamTrack> webkit_video_tracks; - WebKit::WebString webkit_stream_label(UTF8ToUTF16(stream->label())); + blink::WebVector<blink::WebMediaStreamTrack> webkit_audio_tracks; + blink::WebVector<blink::WebMediaStreamTrack> webkit_video_tracks; + blink::WebString webkit_stream_label(UTF8ToUTF16(stream->label())); test_stream_.initialize(webkit_stream_label, webkit_audio_tracks, webkit_video_tracks); test_stream_.setExtraData(new MediaStreamExtraData(stream.get(), false)); @@ -39,15 +39,15 @@ bool MockMediaStreamRegistry::AddVideoTrack(const std::string& track_id) { return factory_->AddNativeVideoMediaTrack(track_id, &test_stream_, capturer); } -WebKit::WebMediaStream MockMediaStreamRegistry::GetMediaStream( +blink::WebMediaStream MockMediaStreamRegistry::GetMediaStream( const std::string& url) { if (url != stream_url_) { - return WebKit::WebMediaStream(); + return blink::WebMediaStream(); } return test_stream_; } -const WebKit::WebMediaStream MockMediaStreamRegistry::test_stream() const { +const blink::WebMediaStream MockMediaStreamRegistry::test_stream() const { return test_stream_; } diff --git a/content/renderer/media/mock_media_stream_registry.h b/content/renderer/media/mock_media_stream_registry.h index 4d77395..c0dba84 100644 --- a/content/renderer/media/mock_media_stream_registry.h +++ b/content/renderer/media/mock_media_stream_registry.h @@ -18,13 +18,13 @@ class MockMediaStreamRegistry : public MediaStreamRegistryInterface { void Init(const std::string& stream_label); bool AddVideoTrack(const std::string& track_id); - virtual WebKit::WebMediaStream GetMediaStream(const std::string& url) + virtual blink::WebMediaStream GetMediaStream(const std::string& url) OVERRIDE; - const WebKit::WebMediaStream test_stream() const; + const blink::WebMediaStream test_stream() const; private: MockMediaStreamDependencyFactory* factory_; - WebKit::WebMediaStream test_stream_; + blink::WebMediaStream test_stream_; std::string stream_url_; }; diff --git a/content/renderer/media/mock_web_rtc_peer_connection_handler_client.cc b/content/renderer/media/mock_web_rtc_peer_connection_handler_client.cc index 2eb8b08..a50525e 100644 --- a/content/renderer/media/mock_web_rtc_peer_connection_handler_client.cc +++ b/content/renderer/media/mock_web_rtc_peer_connection_handler_client.cc @@ -30,7 +30,7 @@ MockWebRTCPeerConnectionHandlerClient:: ~MockWebRTCPeerConnectionHandlerClient() {} void MockWebRTCPeerConnectionHandlerClient::didGenerateICECandidateWorker( - const WebKit::WebRTCICECandidate& candidate) { + const blink::WebRTCICECandidate& candidate) { if (!candidate.isNull()) { candidate_sdp_ = UTF16ToUTF8(candidate.candidate()); candidate_mline_index_ = candidate.sdpMLineIndex(); @@ -43,12 +43,12 @@ void MockWebRTCPeerConnectionHandlerClient::didGenerateICECandidateWorker( } void MockWebRTCPeerConnectionHandlerClient::didAddRemoteStreamWorker( - const WebKit::WebMediaStream& stream_descriptor) { + const blink::WebMediaStream& stream_descriptor) { remote_steam_ = stream_descriptor; } void MockWebRTCPeerConnectionHandlerClient::didRemoveRemoteStreamWorker( - const WebKit::WebMediaStream& stream_descriptor) { + const blink::WebMediaStream& stream_descriptor) { remote_steam_.reset(); } diff --git a/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h b/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h index 1bc5b2a..720a7cb 100644 --- a/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h +++ b/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h @@ -17,7 +17,7 @@ namespace content { class MockWebRTCPeerConnectionHandlerClient - : public WebKit::WebRTCPeerConnectionHandlerClient { + : public blink::WebRTCPeerConnectionHandlerClient { public: MockWebRTCPeerConnectionHandlerClient(); virtual ~MockWebRTCPeerConnectionHandlerClient(); @@ -25,33 +25,33 @@ class MockWebRTCPeerConnectionHandlerClient // WebRTCPeerConnectionHandlerClient implementation. MOCK_METHOD0(negotiationNeeded, void()); MOCK_METHOD1(didGenerateICECandidate, - void(const WebKit::WebRTCICECandidate& candidate)); + void(const blink::WebRTCICECandidate& candidate)); MOCK_METHOD1(didChangeSignalingState, void(SignalingState state)); MOCK_METHOD1(didChangeICEGatheringState, void(ICEGatheringState state)); MOCK_METHOD1(didChangeICEConnectionState, void(ICEConnectionState state)); MOCK_METHOD1(didAddRemoteStream, - void(const WebKit::WebMediaStream& stream_descriptor)); + void(const blink::WebMediaStream& stream_descriptor)); MOCK_METHOD1(didRemoveRemoteStream, - void(const WebKit::WebMediaStream& stream_descriptor)); + void(const blink::WebMediaStream& stream_descriptor)); MOCK_METHOD1(didAddRemoteDataChannel, - void(WebKit::WebRTCDataChannelHandler*)); + void(blink::WebRTCDataChannelHandler*)); void didGenerateICECandidateWorker( - const WebKit::WebRTCICECandidate& candidate); + const blink::WebRTCICECandidate& candidate); void didAddRemoteStreamWorker( - const WebKit::WebMediaStream& stream_descriptor); + const blink::WebMediaStream& stream_descriptor); void didRemoveRemoteStreamWorker( - const WebKit::WebMediaStream& stream_descriptor); + const blink::WebMediaStream& stream_descriptor); const std::string& candidate_sdp() const { return candidate_sdp_; } int candidate_mlineindex() const { return candidate_mline_index_; } const std::string& candidate_mid() const { return candidate_mid_ ; } - const WebKit::WebMediaStream& remote_stream() const { return remote_steam_;} + const blink::WebMediaStream& remote_stream() const { return remote_steam_;} private: - WebKit::WebMediaStream remote_steam_; + blink::WebMediaStream remote_steam_; std::string candidate_sdp_; int candidate_mline_index_; std::string candidate_mid_; diff --git a/content/renderer/media/peer_connection_handler_base.cc b/content/renderer/media/peer_connection_handler_base.cc index b65a3aa..05e71a6 100644 --- a/content/renderer/media/peer_connection_handler_base.cc +++ b/content/renderer/media/peer_connection_handler_base.cc @@ -25,7 +25,7 @@ PeerConnectionHandlerBase::~PeerConnectionHandlerBase() { } bool PeerConnectionHandlerBase::AddStream( - const WebKit::WebMediaStream& stream, + const blink::WebMediaStream& stream, const webrtc::MediaConstraintsInterface* constraints) { webrtc::MediaStreamInterface* native_stream = MediaStreamDependencyFactory::GetNativeMediaStream(stream); @@ -35,7 +35,7 @@ bool PeerConnectionHandlerBase::AddStream( } void PeerConnectionHandlerBase::RemoveStream( - const WebKit::WebMediaStream& stream) { + const blink::WebMediaStream& stream) { webrtc::MediaStreamInterface* native_stream = MediaStreamDependencyFactory::GetNativeMediaStream(stream); if (native_stream) diff --git a/content/renderer/media/peer_connection_handler_base.h b/content/renderer/media/peer_connection_handler_base.h index 7c62b22..db6c040 100644 --- a/content/renderer/media/peer_connection_handler_base.h +++ b/content/renderer/media/peer_connection_handler_base.h @@ -32,10 +32,10 @@ class CONTENT_EXPORT PeerConnectionHandlerBase protected: virtual ~PeerConnectionHandlerBase(); - void AddStream(const WebKit::WebMediaStream& stream); - bool AddStream(const WebKit::WebMediaStream& stream, + void AddStream(const blink::WebMediaStream& stream); + bool AddStream(const blink::WebMediaStream& stream, const webrtc::MediaConstraintsInterface* constraints); - void RemoveStream(const WebKit::WebMediaStream& stream); + void RemoveStream(const blink::WebMediaStream& stream); // dependency_factory_ is a raw pointer, and is valid for the lifetime of // MediaStreamImpl. diff --git a/content/renderer/media/peer_connection_tracker.cc b/content/renderer/media/peer_connection_tracker.cc index 597c645..b594ff8 100644 --- a/content/renderer/media/peer_connection_tracker.cc +++ b/content/renderer/media/peer_connection_tracker.cc @@ -18,7 +18,7 @@ using std::string; using webrtc::MediaConstraintsInterface; -using WebKit::WebRTCPeerConnectionHandlerClient; +using blink::WebRTCPeerConnectionHandlerClient; namespace content { @@ -63,16 +63,16 @@ static string SerializeMediaConstraints( } static string SerializeMediaStreamComponent( - const WebKit::WebMediaStreamTrack component) { + const blink::WebMediaStreamTrack component) { string id = UTF16ToUTF8(component.source().id()); return id; } static string SerializeMediaDescriptor( - const WebKit::WebMediaStream& stream) { + const blink::WebMediaStream& stream) { string label = UTF16ToUTF8(stream.id()); string result = "label: " + label; - WebKit::WebVector<WebKit::WebMediaStreamTrack> tracks; + blink::WebVector<blink::WebMediaStreamTrack> tracks; stream.audioTracks(tracks); if (!tracks.isEmpty()) { result += ", audio: ["; @@ -251,7 +251,7 @@ void PeerConnectionTracker::RegisterPeerConnection( RTCPeerConnectionHandler* pc_handler, const std::vector<webrtc::PeerConnectionInterface::IceServer>& servers, const RTCMediaConstraints& constraints, - const WebKit::WebFrame* frame) { + const blink::WebFrame* frame) { DVLOG(1) << "PeerConnectionTracker::RegisterPeerConnection()"; PeerConnectionInfo info; @@ -304,7 +304,7 @@ void PeerConnectionTracker::TrackCreateAnswer( void PeerConnectionTracker::TrackSetSessionDescription( RTCPeerConnectionHandler* pc_handler, - const WebKit::WebRTCSessionDescription& desc, + const blink::WebRTCSessionDescription& desc, Source source) { string sdp = UTF16ToUTF8(desc.sdp()); string type = UTF16ToUTF8(desc.type()); @@ -330,7 +330,7 @@ void PeerConnectionTracker::TrackUpdateIce( void PeerConnectionTracker::TrackAddIceCandidate( RTCPeerConnectionHandler* pc_handler, - const WebKit::WebRTCICECandidate& candidate, + const blink::WebRTCICECandidate& candidate, Source source) { string value = "mid: " + UTF16ToUTF8(candidate.sdpMid()) + ", " + "candidate: " + UTF16ToUTF8(candidate.candidate()); @@ -341,7 +341,7 @@ void PeerConnectionTracker::TrackAddIceCandidate( void PeerConnectionTracker::TrackAddStream( RTCPeerConnectionHandler* pc_handler, - const WebKit::WebMediaStream& stream, + const blink::WebMediaStream& stream, Source source){ SendPeerConnectionUpdate( pc_handler, source == SOURCE_LOCAL ? "addStream" : "onAddStream", @@ -350,7 +350,7 @@ void PeerConnectionTracker::TrackAddStream( void PeerConnectionTracker::TrackRemoveStream( RTCPeerConnectionHandler* pc_handler, - const WebKit::WebMediaStream& stream, + const blink::WebMediaStream& stream, Source source){ SendPeerConnectionUpdate( pc_handler, source == SOURCE_LOCAL ? "removeStream" : "onRemoveStream", @@ -429,7 +429,7 @@ void PeerConnectionTracker::TrackOnRenegotiationNeeded( void PeerConnectionTracker::TrackCreateDTMFSender( RTCPeerConnectionHandler* pc_handler, - const WebKit::WebMediaStreamTrack& track) { + const blink::WebMediaStreamTrack& track) { SendPeerConnectionUpdate(pc_handler, "createDTMFSender", UTF16ToUTF8(track.id())); } diff --git a/content/renderer/media/peer_connection_tracker.h b/content/renderer/media/peer_connection_tracker.h index 41c78d8..3bcda39 100644 --- a/content/renderer/media/peer_connection_tracker.h +++ b/content/renderer/media/peer_connection_tracker.h @@ -14,12 +14,12 @@ #include "third_party/WebKit/public/platform/WebRTCSessionDescription.h" #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h" -namespace WebKit { +namespace blink { class WebFrame; class WebRTCICECandidate; class WebString; class WebRTCSessionDescription; -} // namespace WebKit +} // namespace blink namespace webrtc { class DataChannelInterface; @@ -70,7 +70,7 @@ class CONTENT_EXPORT PeerConnectionTracker : public RenderProcessObserver { RTCPeerConnectionHandler* pc_handler, const std::vector<webrtc::PeerConnectionInterface::IceServer>& servers, const RTCMediaConstraints& constraints, - const WebKit::WebFrame* frame); + const blink::WebFrame* frame); // Sends an update when a PeerConnection has been destroyed. virtual void UnregisterPeerConnection(RTCPeerConnectionHandler* pc_handler); @@ -86,7 +86,7 @@ class CONTENT_EXPORT PeerConnectionTracker : public RenderProcessObserver { // Sends an update when setLocalDescription or setRemoteDescription is called. virtual void TrackSetSessionDescription( RTCPeerConnectionHandler* pc_handler, - const WebKit::WebRTCSessionDescription& desc, Source source); + const blink::WebRTCSessionDescription& desc, Source source); // Sends an update when Ice candidates are updated. virtual void TrackUpdateIce( @@ -97,17 +97,17 @@ class CONTENT_EXPORT PeerConnectionTracker : public RenderProcessObserver { // Sends an update when an Ice candidate is added. virtual void TrackAddIceCandidate( RTCPeerConnectionHandler* pc_handler, - const WebKit::WebRTCICECandidate& candidate, Source source); + const blink::WebRTCICECandidate& candidate, Source source); // Sends an update when a media stream is added. virtual void TrackAddStream( RTCPeerConnectionHandler* pc_handler, - const WebKit::WebMediaStream& stream, Source source); + const blink::WebMediaStream& stream, Source source); // Sends an update when a media stream is removed. virtual void TrackRemoveStream( RTCPeerConnectionHandler* pc_handler, - const WebKit::WebMediaStream& stream, Source source); + const blink::WebMediaStream& stream, Source source); // Sends an update when a DataChannel is created. virtual void TrackCreateDataChannel( @@ -120,19 +120,19 @@ class CONTENT_EXPORT PeerConnectionTracker : public RenderProcessObserver { // Sends an update when the signaling state of a PeerConnection has changed. virtual void TrackSignalingStateChange( RTCPeerConnectionHandler* pc_handler, - WebKit::WebRTCPeerConnectionHandlerClient::SignalingState state); + blink::WebRTCPeerConnectionHandlerClient::SignalingState state); // Sends an update when the Ice connection state // of a PeerConnection has changed. virtual void TrackIceConnectionStateChange( RTCPeerConnectionHandler* pc_handler, - WebKit::WebRTCPeerConnectionHandlerClient::ICEConnectionState state); + blink::WebRTCPeerConnectionHandlerClient::ICEConnectionState state); // Sends an update when the Ice gathering state // of a PeerConnection has changed. virtual void TrackIceGatheringStateChange( RTCPeerConnectionHandler* pc_handler, - WebKit::WebRTCPeerConnectionHandlerClient::ICEGatheringState state); + blink::WebRTCPeerConnectionHandlerClient::ICEGatheringState state); // Sends an update when the SetSessionDescription or CreateOffer or // CreateAnswer callbacks are called. @@ -146,7 +146,7 @@ class CONTENT_EXPORT PeerConnectionTracker : public RenderProcessObserver { // Sends an update when a DTMFSender is created. virtual void TrackCreateDTMFSender( RTCPeerConnectionHandler* pc_handler, - const WebKit::WebMediaStreamTrack& track); + const blink::WebMediaStreamTrack& track); private: // Assign a local ID to a peer connection so that the browser process can diff --git a/content/renderer/media/remote_media_stream_impl.cc b/content/renderer/media/remote_media_stream_impl.cc index e55d84f..da68411 100644 --- a/content/renderer/media/remote_media_stream_impl.cc +++ b/content/renderer/media/remote_media_stream_impl.cc @@ -22,13 +22,13 @@ class RemoteMediaStreamTrackObserver public: RemoteMediaStreamTrackObserver( webrtc::MediaStreamTrackInterface* webrtc_track, - const WebKit::WebMediaStreamTrack& webkit_track); + const blink::WebMediaStreamTrack& webkit_track); virtual ~RemoteMediaStreamTrackObserver(); webrtc::MediaStreamTrackInterface* observered_track() { return webrtc_track_.get(); } - const WebKit::WebMediaStreamTrack& webkit_track() { return webkit_track_; } + const blink::WebMediaStreamTrack& webkit_track() { return webkit_track_; } private: // webrtc::ObserverInterface implementation. @@ -36,7 +36,7 @@ class RemoteMediaStreamTrackObserver webrtc::MediaStreamTrackInterface::TrackState state_; scoped_refptr<webrtc::MediaStreamTrackInterface> webrtc_track_; - WebKit::WebMediaStreamTrack webkit_track_; + blink::WebMediaStreamTrack webkit_track_; DISALLOW_COPY_AND_ASSIGN(RemoteMediaStreamTrackObserver); }; @@ -46,10 +46,10 @@ class RemoteMediaStreamTrackObserver namespace { void InitializeWebkitTrack(webrtc::MediaStreamTrackInterface* track, - WebKit::WebMediaStreamTrack* webkit_track, - WebKit::WebMediaStreamSource::Type type) { - WebKit::WebMediaStreamSource webkit_source; - WebKit::WebString webkit_track_id(UTF8ToUTF16(track->id())); + blink::WebMediaStreamTrack* webkit_track, + blink::WebMediaStreamSource::Type type) { + blink::WebMediaStreamSource webkit_source; + blink::WebString webkit_track_id(UTF8ToUTF16(track->id())); webkit_source.initialize(webkit_track_id, type, webkit_track_id); webkit_track->initialize(webkit_track_id, webkit_source); @@ -75,7 +75,7 @@ namespace content { RemoteMediaStreamTrackObserver::RemoteMediaStreamTrackObserver( webrtc::MediaStreamTrackInterface* webrtc_track, - const WebKit::WebMediaStreamTrack& webkit_track) + const blink::WebMediaStreamTrack& webkit_track) : state_(webrtc_track->state()), webrtc_track_(webrtc_track), webkit_track_(webkit_track) { @@ -101,11 +101,11 @@ void RemoteMediaStreamTrackObserver::OnChanged() { break; case webrtc::MediaStreamTrackInterface::kLive: webkit_track_.source().setReadyState( - WebKit::WebMediaStreamSource::ReadyStateLive); + blink::WebMediaStreamSource::ReadyStateLive); break; case webrtc::MediaStreamTrackInterface::kEnded: webkit_track_.source().setReadyState( - WebKit::WebMediaStreamSource::ReadyStateEnded); + blink::WebMediaStreamSource::ReadyStateEnded); break; default: NOTREACHED(); @@ -120,7 +120,7 @@ RemoteMediaStreamImpl::RemoteMediaStreamImpl( webrtc::AudioTrackVector webrtc_audio_tracks = webrtc_stream_->GetAudioTracks(); - WebKit::WebVector<WebKit::WebMediaStreamTrack> webkit_audio_tracks( + blink::WebVector<blink::WebMediaStreamTrack> webkit_audio_tracks( webrtc_audio_tracks.size()); // Initialize WebKit audio tracks. @@ -129,7 +129,7 @@ RemoteMediaStreamImpl::RemoteMediaStreamImpl( webrtc::AudioTrackInterface* audio_track = webrtc_audio_tracks[i]; DCHECK(audio_track); InitializeWebkitTrack(audio_track, &webkit_audio_tracks[i], - WebKit::WebMediaStreamSource::TypeAudio); + blink::WebMediaStreamSource::TypeAudio); audio_track_observers_.push_back( new RemoteMediaStreamTrackObserver(audio_track, webkit_audio_tracks[i])); @@ -138,13 +138,13 @@ RemoteMediaStreamImpl::RemoteMediaStreamImpl( // Initialize WebKit video tracks. webrtc::VideoTrackVector webrtc_video_tracks = webrtc_stream_->GetVideoTracks(); - WebKit::WebVector<WebKit::WebMediaStreamTrack> webkit_video_tracks( + blink::WebVector<blink::WebMediaStreamTrack> webkit_video_tracks( webrtc_video_tracks.size()); for (i = 0; i < webrtc_video_tracks.size(); ++i) { webrtc::VideoTrackInterface* video_track = webrtc_video_tracks[i]; DCHECK(video_track); InitializeWebkitTrack(video_track, &webkit_video_tracks[i], - WebKit::WebMediaStreamSource::TypeVideo); + blink::WebMediaStreamSource::TypeVideo); video_track_observers_.push_back( new RemoteMediaStreamTrackObserver(video_track, webkit_video_tracks[i])); @@ -192,9 +192,9 @@ void RemoteMediaStreamImpl::OnChanged() { for (webrtc::AudioTrackVector::iterator it = webrtc_audio_tracks.begin(); it != webrtc_audio_tracks.end(); ++it) { if (!FindTrackObserver(*it, audio_track_observers_)) { - WebKit::WebMediaStreamTrack new_track; + blink::WebMediaStreamTrack new_track; InitializeWebkitTrack(*it, &new_track, - WebKit::WebMediaStreamSource::TypeAudio); + blink::WebMediaStreamSource::TypeAudio); audio_track_observers_.push_back( new RemoteMediaStreamTrackObserver(*it, new_track)); webkit_stream_.addTrack(new_track); @@ -207,9 +207,9 @@ void RemoteMediaStreamImpl::OnChanged() { for (webrtc::VideoTrackVector::iterator it = webrtc_video_tracks.begin(); it != webrtc_video_tracks.end(); ++it) { if (!FindTrackObserver(*it, video_track_observers_)) { - WebKit::WebMediaStreamTrack new_track; + blink::WebMediaStreamTrack new_track; InitializeWebkitTrack(*it, &new_track, - WebKit::WebMediaStreamSource::TypeVideo); + blink::WebMediaStreamSource::TypeVideo); video_track_observers_.push_back( new RemoteMediaStreamTrackObserver(*it, new_track)); webkit_stream_.addTrack(new_track); diff --git a/content/renderer/media/remote_media_stream_impl.h b/content/renderer/media/remote_media_stream_impl.h index cc711e4..3263ed4 100644 --- a/content/renderer/media/remote_media_stream_impl.h +++ b/content/renderer/media/remote_media_stream_impl.h @@ -32,7 +32,7 @@ class CONTENT_EXPORT RemoteMediaStreamImpl webrtc::MediaStreamInterface* webrtc_stream); virtual ~RemoteMediaStreamImpl(); - const WebKit::WebMediaStream& webkit_stream() { return webkit_stream_; } + const blink::WebMediaStream& webkit_stream() { return webkit_stream_; } private: // webrtc::ObserverInterface implementation. @@ -41,7 +41,7 @@ class CONTENT_EXPORT RemoteMediaStreamImpl scoped_refptr<webrtc::MediaStreamInterface> webrtc_stream_; ScopedVector<RemoteMediaStreamTrackObserver> audio_track_observers_; ScopedVector<RemoteMediaStreamTrackObserver> video_track_observers_; - WebKit::WebMediaStream webkit_stream_; + blink::WebMediaStream webkit_stream_; DISALLOW_COPY_AND_ASSIGN(RemoteMediaStreamImpl); }; diff --git a/content/renderer/media/renderer_webaudiodevice_impl.cc b/content/renderer/media/renderer_webaudiodevice_impl.cc index 3d23a9c..ec38769 100644 --- a/content/renderer/media/renderer_webaudiodevice_impl.cc +++ b/content/renderer/media/renderer_webaudiodevice_impl.cc @@ -13,10 +13,10 @@ #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebView.h" -using WebKit::WebAudioDevice; -using WebKit::WebFrame; -using WebKit::WebVector; -using WebKit::WebView; +using blink::WebAudioDevice; +using blink::WebFrame; +using blink::WebVector; +using blink::WebView; namespace content { diff --git a/content/renderer/media/renderer_webaudiodevice_impl.h b/content/renderer/media/renderer_webaudiodevice_impl.h index 5a8161f..962ec08 100644 --- a/content/renderer/media/renderer_webaudiodevice_impl.h +++ b/content/renderer/media/renderer_webaudiodevice_impl.h @@ -19,15 +19,15 @@ class AudioOutputDevice; namespace content { class RendererWebAudioDeviceImpl - : public WebKit::WebAudioDevice, + : public blink::WebAudioDevice, public media::AudioRendererSink::RenderCallback { public: RendererWebAudioDeviceImpl(const media::AudioParameters& params, - WebKit::WebAudioDevice::RenderCallback* callback, + blink::WebAudioDevice::RenderCallback* callback, int session_id); virtual ~RendererWebAudioDeviceImpl(); - // WebKit::WebAudioDevice implementation. + // blink::WebAudioDevice implementation. virtual void start(); virtual void stop(); virtual double sampleRate(); @@ -46,10 +46,10 @@ class RendererWebAudioDeviceImpl const media::AudioParameters params_; // Weak reference to the callback into WebKit code. - WebKit::WebAudioDevice::RenderCallback* const client_callback_; + blink::WebAudioDevice::RenderCallback* const client_callback_; // To avoid the need for locking, ensure the control methods of the - // WebKit::WebAudioDevice implementation are called on the same thread. + // blink::WebAudioDevice implementation are called on the same thread. base::ThreadChecker thread_checker_; // When non-NULL, we are started. When NULL, we are stopped. diff --git a/content/renderer/media/renderer_webmidiaccessor_impl.cc b/content/renderer/media/renderer_webmidiaccessor_impl.cc index de9db93..b121746 100644 --- a/content/renderer/media/renderer_webmidiaccessor_impl.cc +++ b/content/renderer/media/renderer_webmidiaccessor_impl.cc @@ -11,7 +11,7 @@ namespace content { RendererWebMIDIAccessorImpl::RendererWebMIDIAccessorImpl( - WebKit::WebMIDIAccessorClient* client) + blink::WebMIDIAccessorClient* client) : client_(client) { DCHECK(client_); } diff --git a/content/renderer/media/renderer_webmidiaccessor_impl.h b/content/renderer/media/renderer_webmidiaccessor_impl.h index 7032943..4ebaffd 100644 --- a/content/renderer/media/renderer_webmidiaccessor_impl.h +++ b/content/renderer/media/renderer_webmidiaccessor_impl.h @@ -15,13 +15,13 @@ namespace content { class MIDIMessageFilter; class RendererWebMIDIAccessorImpl - : public WebKit::WebMIDIAccessor { + : public blink::WebMIDIAccessor { public: explicit RendererWebMIDIAccessorImpl( - WebKit::WebMIDIAccessorClient* client); + blink::WebMIDIAccessorClient* client); virtual ~RendererWebMIDIAccessorImpl(); - // WebKit::WebMIDIAccessor implementation. + // blink::WebMIDIAccessor implementation. virtual void startSession(); virtual void sendMIDIData(unsigned port_index, const unsigned char* data, @@ -29,7 +29,7 @@ class RendererWebMIDIAccessorImpl double timestamp); private: - WebKit::WebMIDIAccessorClient* client_; + blink::WebMIDIAccessorClient* client_; MIDIMessageFilter* midi_message_filter(); diff --git a/content/renderer/media/rtc_data_channel_handler.cc b/content/renderer/media/rtc_data_channel_handler.cc index 713dc4c..3cd9a37 100644 --- a/content/renderer/media/rtc_data_channel_handler.cc +++ b/content/renderer/media/rtc_data_channel_handler.cc @@ -25,11 +25,11 @@ RtcDataChannelHandler::~RtcDataChannelHandler() { } void RtcDataChannelHandler::setClient( - WebKit::WebRTCDataChannelHandlerClient* client) { + blink::WebRTCDataChannelHandlerClient* client) { webkit_client_ = client; } -WebKit::WebString RtcDataChannelHandler::label() { +blink::WebString RtcDataChannelHandler::label() { return UTF8ToUTF16(channel_->label()); } @@ -49,7 +49,7 @@ unsigned short RtcDataChannelHandler::maxRetransmits() const { return channel_->maxRetransmits(); } -WebKit::WebString RtcDataChannelHandler::protocol() const { +blink::WebString RtcDataChannelHandler::protocol() const { return UTF8ToUTF16(channel_->protocol()); } @@ -65,7 +65,7 @@ unsigned long RtcDataChannelHandler::bufferedAmount() { return channel_->buffered_amount(); } -bool RtcDataChannelHandler::sendStringData(const WebKit::WebString& data) { +bool RtcDataChannelHandler::sendStringData(const blink::WebString& data) { std::string utf8_buffer = UTF16ToUTF8(data); talk_base::Buffer buffer(utf8_buffer.c_str(), utf8_buffer.length()); webrtc::DataBuffer data_buffer(buffer, false); @@ -91,19 +91,19 @@ void RtcDataChannelHandler::OnStateChange() { switch (channel_->state()) { case webrtc::DataChannelInterface::kConnecting: webkit_client_->didChangeReadyState( - WebKit::WebRTCDataChannelHandlerClient::ReadyStateConnecting); + blink::WebRTCDataChannelHandlerClient::ReadyStateConnecting); break; case webrtc::DataChannelInterface::kOpen: webkit_client_->didChangeReadyState( - WebKit::WebRTCDataChannelHandlerClient::ReadyStateOpen); + blink::WebRTCDataChannelHandlerClient::ReadyStateOpen); break; case webrtc::DataChannelInterface::kClosing: webkit_client_->didChangeReadyState( - WebKit::WebRTCDataChannelHandlerClient::ReadyStateClosing); + blink::WebRTCDataChannelHandlerClient::ReadyStateClosing); break; case webrtc::DataChannelInterface::kClosed: webkit_client_->didChangeReadyState( - WebKit::WebRTCDataChannelHandlerClient::ReadyStateClosed); + blink::WebRTCDataChannelHandlerClient::ReadyStateClosed); break; default: NOTREACHED(); diff --git a/content/renderer/media/rtc_data_channel_handler.h b/content/renderer/media/rtc_data_channel_handler.h index 8ec07e0..a552134 100644 --- a/content/renderer/media/rtc_data_channel_handler.h +++ b/content/renderer/media/rtc_data_channel_handler.h @@ -21,26 +21,26 @@ namespace content { // Callbacks to the webrtc::DataChannelObserver implementation also occur on // the main render thread. class CONTENT_EXPORT RtcDataChannelHandler - : NON_EXPORTED_BASE(public WebKit::WebRTCDataChannelHandler), + : NON_EXPORTED_BASE(public blink::WebRTCDataChannelHandler), NON_EXPORTED_BASE(public webrtc::DataChannelObserver), NON_EXPORTED_BASE(public base::NonThreadSafe) { public: explicit RtcDataChannelHandler(webrtc::DataChannelInterface* channel); virtual ~RtcDataChannelHandler(); - // WebKit::WebRTCDataChannelHandler implementation. + // blink::WebRTCDataChannelHandler implementation. virtual void setClient( - WebKit::WebRTCDataChannelHandlerClient* client) OVERRIDE; - virtual WebKit::WebString label() OVERRIDE; + blink::WebRTCDataChannelHandlerClient* client) OVERRIDE; + virtual blink::WebString label() OVERRIDE; virtual bool isReliable() OVERRIDE; virtual bool ordered() const OVERRIDE; virtual unsigned short maxRetransmitTime() const OVERRIDE; virtual unsigned short maxRetransmits() const OVERRIDE; - virtual WebKit::WebString protocol() const OVERRIDE; + virtual blink::WebString protocol() const OVERRIDE; virtual bool negotiated() const OVERRIDE; virtual unsigned short id() const OVERRIDE; virtual unsigned long bufferedAmount() OVERRIDE; - virtual bool sendStringData(const WebKit::WebString& data) OVERRIDE; + virtual bool sendStringData(const blink::WebString& data) OVERRIDE; virtual bool sendRawData(const char* data, size_t length) OVERRIDE; virtual void close() OVERRIDE; @@ -50,7 +50,7 @@ class CONTENT_EXPORT RtcDataChannelHandler private: scoped_refptr<webrtc::DataChannelInterface> channel_; - WebKit::WebRTCDataChannelHandlerClient* webkit_client_; + blink::WebRTCDataChannelHandlerClient* webkit_client_; }; } // namespace content diff --git a/content/renderer/media/rtc_dtmf_sender_handler.cc b/content/renderer/media/rtc_dtmf_sender_handler.cc index 72e75aa..3df592c 100644 --- a/content/renderer/media/rtc_dtmf_sender_handler.cc +++ b/content/renderer/media/rtc_dtmf_sender_handler.cc @@ -26,11 +26,11 @@ RtcDtmfSenderHandler::~RtcDtmfSenderHandler() { } void RtcDtmfSenderHandler::setClient( - WebKit::WebRTCDTMFSenderHandlerClient* client) { + blink::WebRTCDTMFSenderHandlerClient* client) { webkit_client_ = client; } -WebKit::WebString RtcDtmfSenderHandler::currentToneBuffer() { +blink::WebString RtcDtmfSenderHandler::currentToneBuffer() { return UTF8ToUTF16(dtmf_sender_->tones()); } @@ -38,7 +38,7 @@ bool RtcDtmfSenderHandler::canInsertDTMF() { return dtmf_sender_->CanInsertDtmf(); } -bool RtcDtmfSenderHandler::insertDTMF(const WebKit::WebString& tones, +bool RtcDtmfSenderHandler::insertDTMF(const blink::WebString& tones, long duration, long interToneGap) { std::string utf8_tones = UTF16ToUTF8(tones); diff --git a/content/renderer/media/rtc_dtmf_sender_handler.h b/content/renderer/media/rtc_dtmf_sender_handler.h index eeff5eb..3f77525 100644 --- a/content/renderer/media/rtc_dtmf_sender_handler.h +++ b/content/renderer/media/rtc_dtmf_sender_handler.h @@ -23,19 +23,19 @@ namespace content { // Callbacks to the webrtc::DtmfSenderObserverInterface implementation also // occur on the main render thread. class CONTENT_EXPORT RtcDtmfSenderHandler - : NON_EXPORTED_BASE(public WebKit::WebRTCDTMFSenderHandler), + : NON_EXPORTED_BASE(public blink::WebRTCDTMFSenderHandler), NON_EXPORTED_BASE(public webrtc::DtmfSenderObserverInterface), NON_EXPORTED_BASE(public base::NonThreadSafe) { public: explicit RtcDtmfSenderHandler(webrtc::DtmfSenderInterface* dtmf_sender); virtual ~RtcDtmfSenderHandler(); - // WebKit::WebRTCDTMFSenderHandler implementation. + // blink::WebRTCDTMFSenderHandler implementation. virtual void setClient( - WebKit::WebRTCDTMFSenderHandlerClient* client) OVERRIDE; - virtual WebKit::WebString currentToneBuffer() OVERRIDE; + blink::WebRTCDTMFSenderHandlerClient* client) OVERRIDE; + virtual blink::WebString currentToneBuffer() OVERRIDE; virtual bool canInsertDTMF() OVERRIDE; - virtual bool insertDTMF(const WebKit::WebString& tones, long duration, + virtual bool insertDTMF(const blink::WebString& tones, long duration, long interToneGap) OVERRIDE; // webrtc::DtmfSenderObserverInterface implementation. @@ -43,7 +43,7 @@ class CONTENT_EXPORT RtcDtmfSenderHandler private: scoped_refptr<webrtc::DtmfSenderInterface> dtmf_sender_; - WebKit::WebRTCDTMFSenderHandlerClient* webkit_client_; + blink::WebRTCDTMFSenderHandlerClient* webkit_client_; }; } // namespace content diff --git a/content/renderer/media/rtc_media_constraints.cc b/content/renderer/media/rtc_media_constraints.cc index 06d6715..235d9bd 100644 --- a/content/renderer/media/rtc_media_constraints.cc +++ b/content/renderer/media/rtc_media_constraints.cc @@ -16,7 +16,7 @@ namespace content { namespace { void GetNativeMediaConstraints( - const WebKit::WebVector<WebKit::WebMediaConstraint>& constraints, + const blink::WebVector<blink::WebMediaConstraint>& constraints, webrtc::MediaConstraintsInterface::Constraints* native_constraints) { DCHECK(native_constraints); for (size_t i = 0; i < constraints.size(); ++i) { @@ -48,13 +48,13 @@ void GetNativeMediaConstraints( RTCMediaConstraints::RTCMediaConstraints() {} RTCMediaConstraints::RTCMediaConstraints( - const WebKit::WebMediaConstraints& constraints) { + const blink::WebMediaConstraints& constraints) { if (constraints.isNull()) return; // Will happen in unit tests. - WebKit::WebVector<WebKit::WebMediaConstraint> mandatory; + blink::WebVector<blink::WebMediaConstraint> mandatory; constraints.getMandatoryConstraints(mandatory); GetNativeMediaConstraints(mandatory, &mandatory_); - WebKit::WebVector<WebKit::WebMediaConstraint> optional; + blink::WebVector<blink::WebMediaConstraint> optional; constraints.getOptionalConstraints(optional); GetNativeMediaConstraints(optional, &optional_); } diff --git a/content/renderer/media/rtc_media_constraints.h b/content/renderer/media/rtc_media_constraints.h index 58f8486..fd55e34 100644 --- a/content/renderer/media/rtc_media_constraints.h +++ b/content/renderer/media/rtc_media_constraints.h @@ -9,7 +9,7 @@ #include "content/common/content_export.h" #include "third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.h" -namespace WebKit { +namespace blink { class WebMediaConstraints; } @@ -23,7 +23,7 @@ class CONTENT_EXPORT RTCMediaConstraints public: RTCMediaConstraints(); explicit RTCMediaConstraints( - const WebKit::WebMediaConstraints& constraints); + const blink::WebMediaConstraints& constraints); virtual ~RTCMediaConstraints(); virtual const Constraints& GetMandatory() const OVERRIDE; virtual const Constraints& GetOptional() const OVERRIDE; diff --git a/content/renderer/media/rtc_peer_connection_handler.cc b/content/renderer/media/rtc_peer_connection_handler.cc index b5590f8..3342b676 100644 --- a/content/renderer/media/rtc_peer_connection_handler.cc +++ b/content/renderer/media/rtc_peer_connection_handler.cc @@ -41,10 +41,10 @@ namespace content { // Converter functions from libjingle types to WebKit types. -WebKit::WebRTCPeerConnectionHandlerClient::ICEGatheringState +blink::WebRTCPeerConnectionHandlerClient::ICEGatheringState GetWebKitIceGatheringState( webrtc::PeerConnectionInterface::IceGatheringState state) { - using WebKit::WebRTCPeerConnectionHandlerClient; + using blink::WebRTCPeerConnectionHandlerClient; switch (state) { case webrtc::PeerConnectionInterface::kIceGatheringNew: return WebRTCPeerConnectionHandlerClient::ICEGatheringStateNew; @@ -58,10 +58,10 @@ GetWebKitIceGatheringState( } } -static WebKit::WebRTCPeerConnectionHandlerClient::ICEConnectionState +static blink::WebRTCPeerConnectionHandlerClient::ICEConnectionState GetWebKitIceConnectionState( webrtc::PeerConnectionInterface::IceConnectionState ice_state) { - using WebKit::WebRTCPeerConnectionHandlerClient; + using blink::WebRTCPeerConnectionHandlerClient; switch (ice_state) { case webrtc::PeerConnectionInterface::kIceConnectionNew: return WebRTCPeerConnectionHandlerClient::ICEConnectionStateStarting; @@ -83,9 +83,9 @@ GetWebKitIceConnectionState( } } -static WebKit::WebRTCPeerConnectionHandlerClient::SignalingState +static blink::WebRTCPeerConnectionHandlerClient::SignalingState GetWebKitSignalingState(webrtc::PeerConnectionInterface::SignalingState state) { - using WebKit::WebRTCPeerConnectionHandlerClient; + using blink::WebRTCPeerConnectionHandlerClient; switch (state) { case webrtc::PeerConnectionInterface::kStable: return WebRTCPeerConnectionHandlerClient::SignalingStateStable; @@ -106,10 +106,10 @@ GetWebKitSignalingState(webrtc::PeerConnectionInterface::SignalingState state) { } } -static WebKit::WebRTCSessionDescription +static blink::WebRTCSessionDescription CreateWebKitSessionDescription( const webrtc::SessionDescriptionInterface* native_desc) { - WebKit::WebRTCSessionDescription description; + blink::WebRTCSessionDescription description; if (!native_desc) { LOG(ERROR) << "Native session description is null."; return description; @@ -128,13 +128,13 @@ CreateWebKitSessionDescription( // Converter functions from WebKit types to libjingle types. static void GetNativeIceServers( - const WebKit::WebRTCConfiguration& server_configuration, + const blink::WebRTCConfiguration& server_configuration, webrtc::PeerConnectionInterface::IceServers* servers) { if (server_configuration.isNull() || !servers) return; for (size_t i = 0; i < server_configuration.numberOfServers(); ++i) { webrtc::PeerConnectionInterface::IceServer server; - const WebKit::WebRTCICEServer& webkit_server = + const blink::WebRTCICEServer& webkit_server = server_configuration.server(i); server.username = UTF16ToUTF8(webkit_server.username()); server.password = UTF16ToUTF8(webkit_server.credential()); @@ -172,12 +172,12 @@ class SessionDescriptionRequestTracker { }; // Class mapping responses from calls to libjingle CreateOffer/Answer and -// the WebKit::WebRTCSessionDescriptionRequest. +// the blink::WebRTCSessionDescriptionRequest. class CreateSessionDescriptionRequest : public webrtc::CreateSessionDescriptionObserver { public: explicit CreateSessionDescriptionRequest( - const WebKit::WebRTCSessionDescriptionRequest& request, + const blink::WebRTCSessionDescriptionRequest& request, RTCPeerConnectionHandler* handler, PeerConnectionTracker::Action action) : webkit_request_(request), tracker_(handler, action) {} @@ -195,17 +195,17 @@ class CreateSessionDescriptionRequest virtual ~CreateSessionDescriptionRequest() {} private: - WebKit::WebRTCSessionDescriptionRequest webkit_request_; + blink::WebRTCSessionDescriptionRequest webkit_request_; SessionDescriptionRequestTracker tracker_; }; // Class mapping responses from calls to libjingle -// SetLocalDescription/SetRemoteDescription and a WebKit::WebRTCVoidRequest. +// SetLocalDescription/SetRemoteDescription and a blink::WebRTCVoidRequest. class SetSessionDescriptionRequest : public webrtc::SetSessionDescriptionObserver { public: explicit SetSessionDescriptionRequest( - const WebKit::WebRTCVoidRequest& request, + const blink::WebRTCVoidRequest& request, RTCPeerConnectionHandler* handler, PeerConnectionTracker::Action action) : webkit_request_(request), tracker_(handler, action) {} @@ -223,12 +223,12 @@ class SetSessionDescriptionRequest virtual ~SetSessionDescriptionRequest() {} private: - WebKit::WebRTCVoidRequest webkit_request_; + blink::WebRTCVoidRequest webkit_request_; SessionDescriptionRequestTracker tracker_; }; // Class mapping responses from calls to libjingle -// GetStats into a WebKit::WebRTCStatsCallback. +// GetStats into a blink::WebRTCStatsCallback. class StatsResponse : public webrtc::StatsObserver { public: explicit StatsResponse(const scoped_refptr<LocalRTCStatsRequest>& request) @@ -247,8 +247,8 @@ class StatsResponse : public webrtc::StatsObserver { private: void AddReport(const webrtc::StatsReport& report) { - int idx = response_->addReport(WebKit::WebString::fromUTF8(report.id), - WebKit::WebString::fromUTF8(report.type), + int idx = response_->addReport(blink::WebString::fromUTF8(report.id), + blink::WebString::fromUTF8(report.type), report.timestamp); for (webrtc::StatsReport::Values::const_iterator value_it = report.values.begin(); @@ -260,8 +260,8 @@ class StatsResponse : public webrtc::StatsObserver { void AddStatistic(int idx, const std::string& name, const std::string& value) { response_->addStatistic(idx, - WebKit::WebString::fromUTF8(name), - WebKit::WebString::fromUTF8(value)); + blink::WebString::fromUTF8(name), + blink::WebString::fromUTF8(value)); } talk_base::scoped_refptr<LocalRTCStatsRequest> request_; @@ -269,7 +269,7 @@ class StatsResponse : public webrtc::StatsObserver { }; // Implementation of LocalRTCStatsRequest. -LocalRTCStatsRequest::LocalRTCStatsRequest(WebKit::WebRTCStatsRequest impl) +LocalRTCStatsRequest::LocalRTCStatsRequest(blink::WebRTCStatsRequest impl) : impl_(impl), response_(NULL) { } @@ -281,7 +281,7 @@ bool LocalRTCStatsRequest::hasSelector() const { return impl_.hasSelector(); } -WebKit::WebMediaStreamTrack LocalRTCStatsRequest::component() const { +blink::WebMediaStreamTrack LocalRTCStatsRequest::component() const { return impl_.component(); } @@ -298,24 +298,24 @@ void LocalRTCStatsRequest::requestSucceeded( } // Implementation of LocalRTCStatsResponse. -WebKit::WebRTCStatsResponse LocalRTCStatsResponse::webKitStatsResponse() const { +blink::WebRTCStatsResponse LocalRTCStatsResponse::webKitStatsResponse() const { return impl_; } -size_t LocalRTCStatsResponse::addReport(WebKit::WebString type, - WebKit::WebString id, +size_t LocalRTCStatsResponse::addReport(blink::WebString type, + blink::WebString id, double timestamp) { return impl_.addReport(type, id, timestamp); } void LocalRTCStatsResponse::addStatistic(size_t report, - WebKit::WebString name, - WebKit::WebString value) { + blink::WebString name, + blink::WebString value) { impl_.addStatistic(report, name, value); } RTCPeerConnectionHandler::RTCPeerConnectionHandler( - WebKit::WebRTCPeerConnectionHandlerClient* client, + blink::WebRTCPeerConnectionHandlerClient* client, MediaStreamDependencyFactory* dependency_factory) : PeerConnectionHandlerBase(dependency_factory), client_(client), @@ -329,14 +329,14 @@ RTCPeerConnectionHandler::~RTCPeerConnectionHandler() { STLDeleteValues(&remote_streams_); } -void RTCPeerConnectionHandler::associateWithFrame(WebKit::WebFrame* frame) { +void RTCPeerConnectionHandler::associateWithFrame(blink::WebFrame* frame) { DCHECK(frame); frame_ = frame; } bool RTCPeerConnectionHandler::initialize( - const WebKit::WebRTCConfiguration& server_configuration, - const WebKit::WebMediaConstraints& options) { + const blink::WebRTCConfiguration& server_configuration, + const blink::WebMediaConstraints& options) { DCHECK(frame_); peer_connection_tracker_ = @@ -362,8 +362,8 @@ bool RTCPeerConnectionHandler::initialize( } bool RTCPeerConnectionHandler::InitializeForTest( - const WebKit::WebRTCConfiguration& server_configuration, - const WebKit::WebMediaConstraints& options, + const blink::WebRTCConfiguration& server_configuration, + const blink::WebMediaConstraints& options, PeerConnectionTracker* peer_connection_tracker) { webrtc::PeerConnectionInterface::IceServers servers; GetNativeIceServers(server_configuration, &servers); @@ -381,8 +381,8 @@ bool RTCPeerConnectionHandler::InitializeForTest( } void RTCPeerConnectionHandler::createOffer( - const WebKit::WebRTCSessionDescriptionRequest& request, - const WebKit::WebMediaConstraints& options) { + const blink::WebRTCSessionDescriptionRequest& request, + const blink::WebMediaConstraints& options) { scoped_refptr<CreateSessionDescriptionRequest> description_request( new talk_base::RefCountedObject<CreateSessionDescriptionRequest>( request, this, PeerConnectionTracker::ACTION_CREATE_OFFER)); @@ -394,8 +394,8 @@ void RTCPeerConnectionHandler::createOffer( } void RTCPeerConnectionHandler::createAnswer( - const WebKit::WebRTCSessionDescriptionRequest& request, - const WebKit::WebMediaConstraints& options) { + const blink::WebRTCSessionDescriptionRequest& request, + const blink::WebMediaConstraints& options) { scoped_refptr<CreateSessionDescriptionRequest> description_request( new talk_base::RefCountedObject<CreateSessionDescriptionRequest>( request, this, PeerConnectionTracker::ACTION_CREATE_ANSWER)); @@ -408,8 +408,8 @@ void RTCPeerConnectionHandler::createAnswer( } void RTCPeerConnectionHandler::setLocalDescription( - const WebKit::WebRTCVoidRequest& request, - const WebKit::WebRTCSessionDescription& description) { + const blink::WebRTCVoidRequest& request, + const blink::WebRTCSessionDescription& description) { webrtc::SdpParseError error; webrtc::SessionDescriptionInterface* native_desc = CreateNativeSessionDescription(description, &error); @@ -419,7 +419,7 @@ void RTCPeerConnectionHandler::setLocalDescription( reason_str.append(" "); reason_str.append(error.description); LOG(ERROR) << reason_str; - request.requestFailed(WebKit::WebString::fromUTF8(reason_str)); + request.requestFailed(blink::WebString::fromUTF8(reason_str)); return; } if (peer_connection_tracker_) @@ -433,8 +433,8 @@ void RTCPeerConnectionHandler::setLocalDescription( } void RTCPeerConnectionHandler::setRemoteDescription( - const WebKit::WebRTCVoidRequest& request, - const WebKit::WebRTCSessionDescription& description) { + const blink::WebRTCVoidRequest& request, + const blink::WebRTCSessionDescription& description) { webrtc::SdpParseError error; webrtc::SessionDescriptionInterface* native_desc = CreateNativeSessionDescription(description, &error); @@ -444,7 +444,7 @@ void RTCPeerConnectionHandler::setRemoteDescription( reason_str.append(" "); reason_str.append(error.description); LOG(ERROR) << reason_str; - request.requestFailed(WebKit::WebString::fromUTF8(reason_str)); + request.requestFailed(blink::WebString::fromUTF8(reason_str)); return; } if (peer_connection_tracker_) @@ -457,27 +457,27 @@ void RTCPeerConnectionHandler::setRemoteDescription( native_peer_connection_->SetRemoteDescription(set_request.get(), native_desc); } -WebKit::WebRTCSessionDescription +blink::WebRTCSessionDescription RTCPeerConnectionHandler::localDescription() { const webrtc::SessionDescriptionInterface* native_desc = native_peer_connection_->local_description(); - WebKit::WebRTCSessionDescription description = + blink::WebRTCSessionDescription description = CreateWebKitSessionDescription(native_desc); return description; } -WebKit::WebRTCSessionDescription +blink::WebRTCSessionDescription RTCPeerConnectionHandler::remoteDescription() { const webrtc::SessionDescriptionInterface* native_desc = native_peer_connection_->remote_description(); - WebKit::WebRTCSessionDescription description = + blink::WebRTCSessionDescription description = CreateWebKitSessionDescription(native_desc); return description; } bool RTCPeerConnectionHandler::updateICE( - const WebKit::WebRTCConfiguration& server_configuration, - const WebKit::WebMediaConstraints& options) { + const blink::WebRTCConfiguration& server_configuration, + const blink::WebMediaConstraints& options) { webrtc::PeerConnectionInterface::IceServers servers; GetNativeIceServers(server_configuration, &servers); RTCMediaConstraints constraints(options); @@ -490,7 +490,7 @@ bool RTCPeerConnectionHandler::updateICE( } bool RTCPeerConnectionHandler::addICECandidate( - const WebKit::WebRTCICECandidate& candidate) { + const blink::WebRTCICECandidate& candidate) { scoped_ptr<webrtc::IceCandidateInterface> native_candidate( dependency_factory_->CreateIceCandidate( UTF16ToUTF8(candidate.sdpMid()), @@ -513,8 +513,8 @@ bool RTCPeerConnectionHandler::addICECandidate( } bool RTCPeerConnectionHandler::addStream( - const WebKit::WebMediaStream& stream, - const WebKit::WebMediaConstraints& options) { + const blink::WebMediaStream& stream, + const blink::WebMediaConstraints& options) { RTCMediaConstraints constraints(options); if (peer_connection_tracker_) @@ -535,7 +535,7 @@ bool RTCPeerConnectionHandler::addStream( } void RTCPeerConnectionHandler::removeStream( - const WebKit::WebMediaStream& stream) { + const blink::WebMediaStream& stream) { RemoveStream(stream); if (peer_connection_tracker_) peer_connection_tracker_->TrackRemoveStream( @@ -543,7 +543,7 @@ void RTCPeerConnectionHandler::removeStream( } void RTCPeerConnectionHandler::getStats( - const WebKit::WebRTCStatsRequest& request) { + const blink::WebRTCStatsRequest& request) { scoped_refptr<LocalRTCStatsRequest> inner_request( new talk_base::RefCountedObject<LocalRTCStatsRequest>(request)); getStats(inner_request.get()); @@ -579,8 +579,8 @@ void RTCPeerConnectionHandler::GetStats( } } -WebKit::WebRTCDataChannelHandler* RTCPeerConnectionHandler::createDataChannel( - const WebKit::WebString& label, const WebKit::WebRTCDataChannelInit& init) { +blink::WebRTCDataChannelHandler* RTCPeerConnectionHandler::createDataChannel( + const blink::WebString& label, const blink::WebRTCDataChannelInit& init) { DVLOG(1) << "createDataChannel label " << UTF16ToUTF8(label); webrtc::DataChannelInit config; @@ -607,11 +607,11 @@ WebKit::WebRTCDataChannelHandler* RTCPeerConnectionHandler::createDataChannel( return new RtcDataChannelHandler(webrtc_channel); } -WebKit::WebRTCDTMFSenderHandler* RTCPeerConnectionHandler::createDTMFSender( - const WebKit::WebMediaStreamTrack& track) { +blink::WebRTCDTMFSenderHandler* RTCPeerConnectionHandler::createDTMFSender( + const blink::WebMediaStreamTrack& track) { DVLOG(1) << "createDTMFSender."; - if (track.source().type() != WebKit::WebMediaStreamSource::TypeAudio) { + if (track.source().type() != blink::WebMediaStreamSource::TypeAudio) { DLOG(ERROR) << "Could not create DTMF sender from a non-audio track."; return NULL; } @@ -647,7 +647,7 @@ void RTCPeerConnectionHandler::OnError() { void RTCPeerConnectionHandler::OnSignalingChange( webrtc::PeerConnectionInterface::SignalingState new_state) { - WebKit::WebRTCPeerConnectionHandlerClient::SignalingState state = + blink::WebRTCPeerConnectionHandlerClient::SignalingState state = GetWebKitSignalingState(new_state); if (peer_connection_tracker_) peer_connection_tracker_->TrackSignalingStateChange(this, state); @@ -657,7 +657,7 @@ void RTCPeerConnectionHandler::OnSignalingChange( // Called any time the IceConnectionState changes void RTCPeerConnectionHandler::OnIceConnectionChange( webrtc::PeerConnectionInterface::IceConnectionState new_state) { - WebKit::WebRTCPeerConnectionHandlerClient::ICEConnectionState state = + blink::WebRTCPeerConnectionHandlerClient::ICEConnectionState state = GetWebKitIceConnectionState(new_state); if (peer_connection_tracker_) peer_connection_tracker_->TrackIceConnectionStateChange(this, state); @@ -670,11 +670,11 @@ void RTCPeerConnectionHandler::OnIceGatheringChange( if (new_state == webrtc::PeerConnectionInterface::kIceGatheringComplete) { // If ICE gathering is completed, generate a NULL ICE candidate, // to signal end of candidates. - WebKit::WebRTCICECandidate null_candidate; + blink::WebRTCICECandidate null_candidate; client_->didGenerateICECandidate(null_candidate); } - WebKit::WebRTCPeerConnectionHandlerClient::ICEGatheringState state = + blink::WebRTCPeerConnectionHandlerClient::ICEGatheringState state = GetWebKitIceGatheringState(new_state); if (peer_connection_tracker_) peer_connection_tracker_->TrackIceGatheringStateChange(this, state); @@ -710,7 +710,7 @@ void RTCPeerConnectionHandler::OnRemoveStream( } scoped_ptr<RemoteMediaStreamImpl> remote_stream(it->second); - const WebKit::WebMediaStream& webkit_stream = remote_stream->webkit_stream(); + const blink::WebMediaStream& webkit_stream = remote_stream->webkit_stream(); DCHECK(!webkit_stream.isNull()); remote_streams_.erase(it); @@ -729,7 +729,7 @@ void RTCPeerConnectionHandler::OnIceCandidate( NOTREACHED() << "OnIceCandidate: Could not get SDP string."; return; } - WebKit::WebRTCICECandidate web_candidate; + blink::WebRTCICECandidate web_candidate; web_candidate.initialize(UTF8ToUTF16(sdp), UTF8ToUTF16(candidate->sdp_mid()), candidate->sdp_mline_index()); @@ -763,7 +763,7 @@ PeerConnectionTracker* RTCPeerConnectionHandler::peer_connection_tracker() { webrtc::SessionDescriptionInterface* RTCPeerConnectionHandler::CreateNativeSessionDescription( - const WebKit::WebRTCSessionDescription& description, + const blink::WebRTCSessionDescription& description, webrtc::SdpParseError* error) { std::string sdp = UTF16ToUTF8(description.sdp()); std::string type = UTF16ToUTF8(description.type()); diff --git a/content/renderer/media/rtc_peer_connection_handler.h b/content/renderer/media/rtc_peer_connection_handler.h index c1f70cb..fb8d2ca 100644 --- a/content/renderer/media/rtc_peer_connection_handler.h +++ b/content/renderer/media/rtc_peer_connection_handler.h @@ -13,7 +13,7 @@ #include "third_party/WebKit/public/platform/WebRTCStatsRequest.h" #include "third_party/WebKit/public/platform/WebRTCStatsResponse.h" -namespace WebKit { +namespace blink { class WebFrame; class WebRTCDataChannelHandler; } @@ -22,19 +22,19 @@ namespace content { class PeerConnectionTracker; -// Mockable wrapper for WebKit::WebRTCStatsResponse +// Mockable wrapper for blink::WebRTCStatsResponse class CONTENT_EXPORT LocalRTCStatsResponse : public NON_EXPORTED_BASE(talk_base::RefCountInterface) { public: - explicit LocalRTCStatsResponse(const WebKit::WebRTCStatsResponse& impl) + explicit LocalRTCStatsResponse(const blink::WebRTCStatsResponse& impl) : impl_(impl) { } - virtual WebKit::WebRTCStatsResponse webKitStatsResponse() const; - virtual size_t addReport(WebKit::WebString type, WebKit::WebString id, + virtual blink::WebRTCStatsResponse webKitStatsResponse() const; + virtual size_t addReport(blink::WebString type, blink::WebString id, double timestamp); virtual void addStatistic(size_t report, - WebKit::WebString name, WebKit::WebString value); + blink::WebString name, blink::WebString value); protected: virtual ~LocalRTCStatsResponse() {} @@ -42,19 +42,19 @@ class CONTENT_EXPORT LocalRTCStatsResponse LocalRTCStatsResponse() {} private: - WebKit::WebRTCStatsResponse impl_; + blink::WebRTCStatsResponse impl_; }; -// Mockable wrapper for WebKit::WebRTCStatsRequest +// Mockable wrapper for blink::WebRTCStatsRequest class CONTENT_EXPORT LocalRTCStatsRequest : public NON_EXPORTED_BASE(talk_base::RefCountInterface) { public: - explicit LocalRTCStatsRequest(WebKit::WebRTCStatsRequest impl); + explicit LocalRTCStatsRequest(blink::WebRTCStatsRequest impl); // Constructor for testing. LocalRTCStatsRequest(); virtual bool hasSelector() const; - virtual WebKit::WebMediaStreamTrack component() const; + virtual blink::WebMediaStreamTrack component() const; virtual void requestSucceeded(const LocalRTCStatsResponse* response); virtual scoped_refptr<LocalRTCStatsResponse> createResponse(); @@ -62,7 +62,7 @@ class CONTENT_EXPORT LocalRTCStatsRequest virtual ~LocalRTCStatsRequest(); private: - WebKit::WebRTCStatsRequest impl_; + blink::WebRTCStatsRequest impl_; talk_base::scoped_refptr<LocalRTCStatsResponse> response_; }; @@ -74,62 +74,62 @@ class CONTENT_EXPORT LocalRTCStatsRequest // the main render thread. class CONTENT_EXPORT RTCPeerConnectionHandler : public PeerConnectionHandlerBase, - NON_EXPORTED_BASE(public WebKit::WebRTCPeerConnectionHandler) { + NON_EXPORTED_BASE(public blink::WebRTCPeerConnectionHandler) { public: RTCPeerConnectionHandler( - WebKit::WebRTCPeerConnectionHandlerClient* client, + blink::WebRTCPeerConnectionHandlerClient* client, MediaStreamDependencyFactory* dependency_factory); virtual ~RTCPeerConnectionHandler(); - void associateWithFrame(WebKit::WebFrame* frame); + void associateWithFrame(blink::WebFrame* frame); // Initialize method only used for unit test. bool InitializeForTest( - const WebKit::WebRTCConfiguration& server_configuration, - const WebKit::WebMediaConstraints& options, + const blink::WebRTCConfiguration& server_configuration, + const blink::WebMediaConstraints& options, PeerConnectionTracker* peer_connection_tracker); - // WebKit::WebRTCPeerConnectionHandler implementation + // blink::WebRTCPeerConnectionHandler implementation virtual bool initialize( - const WebKit::WebRTCConfiguration& server_configuration, - const WebKit::WebMediaConstraints& options) OVERRIDE; + const blink::WebRTCConfiguration& server_configuration, + const blink::WebMediaConstraints& options) OVERRIDE; virtual void createOffer( - const WebKit::WebRTCSessionDescriptionRequest& request, - const WebKit::WebMediaConstraints& options) OVERRIDE; + const blink::WebRTCSessionDescriptionRequest& request, + const blink::WebMediaConstraints& options) OVERRIDE; virtual void createAnswer( - const WebKit::WebRTCSessionDescriptionRequest& request, - const WebKit::WebMediaConstraints& options) OVERRIDE; + const blink::WebRTCSessionDescriptionRequest& request, + const blink::WebMediaConstraints& options) OVERRIDE; virtual void setLocalDescription( - const WebKit::WebRTCVoidRequest& request, - const WebKit::WebRTCSessionDescription& description) OVERRIDE; + const blink::WebRTCVoidRequest& request, + const blink::WebRTCSessionDescription& description) OVERRIDE; virtual void setRemoteDescription( - const WebKit::WebRTCVoidRequest& request, - const WebKit::WebRTCSessionDescription& description) OVERRIDE; + const blink::WebRTCVoidRequest& request, + const blink::WebRTCSessionDescription& description) OVERRIDE; - virtual WebKit::WebRTCSessionDescription localDescription() + virtual blink::WebRTCSessionDescription localDescription() OVERRIDE; - virtual WebKit::WebRTCSessionDescription remoteDescription() + virtual blink::WebRTCSessionDescription remoteDescription() OVERRIDE; virtual bool updateICE( - const WebKit::WebRTCConfiguration& server_configuration, - const WebKit::WebMediaConstraints& options) OVERRIDE; + const blink::WebRTCConfiguration& server_configuration, + const blink::WebMediaConstraints& options) OVERRIDE; virtual bool addICECandidate( - const WebKit::WebRTCICECandidate& candidate) OVERRIDE; + const blink::WebRTCICECandidate& candidate) OVERRIDE; virtual bool addStream( - const WebKit::WebMediaStream& stream, - const WebKit::WebMediaConstraints& options) OVERRIDE; + const blink::WebMediaStream& stream, + const blink::WebMediaConstraints& options) OVERRIDE; virtual void removeStream( - const WebKit::WebMediaStream& stream) OVERRIDE; + const blink::WebMediaStream& stream) OVERRIDE; virtual void getStats( - const WebKit::WebRTCStatsRequest& request) OVERRIDE; - virtual WebKit::WebRTCDataChannelHandler* createDataChannel( - const WebKit::WebString& label, - const WebKit::WebRTCDataChannelInit& init) OVERRIDE; - virtual WebKit::WebRTCDTMFSenderHandler* createDTMFSender( - const WebKit::WebMediaStreamTrack& track) OVERRIDE; + const blink::WebRTCStatsRequest& request) OVERRIDE; + virtual blink::WebRTCDataChannelHandler* createDataChannel( + const blink::WebString& label, + const blink::WebRTCDataChannelInit& init) OVERRIDE; + virtual blink::WebRTCDTMFSenderHandler* createDTMFSender( + const blink::WebMediaStreamTrack& track) OVERRIDE; virtual void stop() OVERRIDE; // webrtc::PeerConnectionObserver implementation @@ -162,13 +162,13 @@ class CONTENT_EXPORT RTCPeerConnectionHandler private: webrtc::SessionDescriptionInterface* CreateNativeSessionDescription( - const WebKit::WebRTCSessionDescription& description, + const blink::WebRTCSessionDescription& description, webrtc::SdpParseError* error); // |client_| is a weak pointer, and is valid until stop() has returned. - WebKit::WebRTCPeerConnectionHandlerClient* client_; + blink::WebRTCPeerConnectionHandlerClient* client_; - WebKit::WebFrame* frame_; + blink::WebFrame* frame_; PeerConnectionTracker* peer_connection_tracker_; diff --git a/content/renderer/media/rtc_peer_connection_handler_unittest.cc b/content/renderer/media/rtc_peer_connection_handler_unittest.cc index ff4e7e5..e0f6885 100644 --- a/content/renderer/media/rtc_peer_connection_handler_unittest.cc +++ b/content/renderer/media/rtc_peer_connection_handler_unittest.cc @@ -38,7 +38,7 @@ static const char kDummySdp[] = "dummy sdp"; static const char kDummySdpType[] = "dummy type"; -using WebKit::WebRTCPeerConnectionHandlerClient; +using blink::WebRTCPeerConnectionHandlerClient; using testing::NiceMock; using testing::_; using testing::Ref; @@ -52,15 +52,15 @@ class MockRTCStatsResponse : public LocalRTCStatsResponse { statistic_count_(0) { } - virtual size_t addReport(WebKit::WebString type, - WebKit::WebString id, + virtual size_t addReport(blink::WebString type, + blink::WebString id, double timestamp) OVERRIDE { ++report_count_; return report_count_; } virtual void addStatistic(size_t report, - WebKit::WebString name, WebKit::WebString value) + blink::WebString name, blink::WebString value) OVERRIDE { ++statistic_count_; } @@ -71,7 +71,7 @@ class MockRTCStatsResponse : public LocalRTCStatsResponse { int statistic_count_; }; -// Mocked wrapper for WebKit::WebRTCStatsRequest +// Mocked wrapper for blink::WebRTCStatsRequest class MockRTCStatsRequest : public LocalRTCStatsRequest { public: MockRTCStatsRequest() @@ -81,7 +81,7 @@ class MockRTCStatsRequest : public LocalRTCStatsRequest { virtual bool hasSelector() const OVERRIDE { return has_selector_; } - virtual WebKit::WebMediaStreamTrack component() const OVERRIDE { + virtual blink::WebMediaStreamTrack component() const OVERRIDE { return component_; } virtual scoped_refptr<LocalRTCStatsResponse> createResponse() OVERRIDE { @@ -97,7 +97,7 @@ class MockRTCStatsRequest : public LocalRTCStatsRequest { } // Function for setting whether or not a selector is available. - void setSelector(const WebKit::WebMediaStreamTrack& component) { + void setSelector(const blink::WebMediaStreamTrack& component) { has_selector_ = true; component_ = component; } @@ -113,7 +113,7 @@ class MockRTCStatsRequest : public LocalRTCStatsRequest { private: bool has_selector_; - WebKit::WebMediaStreamTrack component_; + blink::WebMediaStreamTrack component_; scoped_refptr<MockRTCStatsResponse> response_; bool request_succeeded_called_; }; @@ -131,7 +131,7 @@ class MockPeerConnectionTracker : public PeerConnectionTracker { const RTCMediaConstraints& constraints)); MOCK_METHOD3(TrackSetSessionDescription, void(RTCPeerConnectionHandler* pc_handler, - const WebKit::WebRTCSessionDescription& desc, + const blink::WebRTCSessionDescription& desc, Source source)); MOCK_METHOD3( TrackUpdateIce, @@ -141,15 +141,15 @@ class MockPeerConnectionTracker : public PeerConnectionTracker { const RTCMediaConstraints& options)); MOCK_METHOD3(TrackAddIceCandidate, void(RTCPeerConnectionHandler* pc_handler, - const WebKit::WebRTCICECandidate& candidate, + const blink::WebRTCICECandidate& candidate, Source source)); MOCK_METHOD3(TrackAddStream, void(RTCPeerConnectionHandler* pc_handler, - const WebKit::WebMediaStream& stream, + const blink::WebMediaStream& stream, Source source)); MOCK_METHOD3(TrackRemoveStream, void(RTCPeerConnectionHandler* pc_handler, - const WebKit::WebMediaStream& stream, + const blink::WebMediaStream& stream, Source source)); MOCK_METHOD1(TrackOnIceComplete, void(RTCPeerConnectionHandler* pc_handler)); @@ -173,7 +173,7 @@ class MockPeerConnectionTracker : public PeerConnectionTracker { void(RTCPeerConnectionHandler* pc_handler)); MOCK_METHOD2(TrackCreateDTMFSender, void(RTCPeerConnectionHandler* pc_handler, - const WebKit::WebMediaStreamTrack& track)); + const blink::WebMediaStreamTrack& track)); }; class RTCPeerConnectionHandlerUnderTest : public RTCPeerConnectionHandler { @@ -202,8 +202,8 @@ class RTCPeerConnectionHandlerTest : public ::testing::Test { new RTCPeerConnectionHandlerUnderTest(mock_client_.get(), mock_dependency_factory_.get())); mock_tracker_.reset(new NiceMock<MockPeerConnectionTracker>()); - WebKit::WebRTCConfiguration config; - WebKit::WebMediaConstraints constraints; + blink::WebRTCConfiguration config; + blink::WebMediaConstraints constraints; EXPECT_TRUE(pc_handler_->InitializeForTest(config, constraints, mock_tracker_.get())); @@ -212,28 +212,28 @@ class RTCPeerConnectionHandlerTest : public ::testing::Test { } // Creates a WebKit local MediaStream. - WebKit::WebMediaStream CreateLocalMediaStream( + blink::WebMediaStream CreateLocalMediaStream( const std::string& stream_label) { std::string video_track_label("video-label"); std::string audio_track_label("audio-label"); - WebKit::WebMediaStreamSource audio_source; - audio_source.initialize(WebKit::WebString::fromUTF8(audio_track_label), - WebKit::WebMediaStreamSource::TypeAudio, - WebKit::WebString::fromUTF8("audio_track")); - WebKit::WebMediaStreamSource video_source; - video_source.initialize(WebKit::WebString::fromUTF8(video_track_label), - WebKit::WebMediaStreamSource::TypeVideo, - WebKit::WebString::fromUTF8("video_track")); + blink::WebMediaStreamSource audio_source; + audio_source.initialize(blink::WebString::fromUTF8(audio_track_label), + blink::WebMediaStreamSource::TypeAudio, + blink::WebString::fromUTF8("audio_track")); + blink::WebMediaStreamSource video_source; + video_source.initialize(blink::WebString::fromUTF8(video_track_label), + blink::WebMediaStreamSource::TypeVideo, + blink::WebString::fromUTF8("video_track")); - WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_tracks( + blink::WebVector<blink::WebMediaStreamTrack> audio_tracks( static_cast<size_t>(1)); audio_tracks[0].initialize(audio_source.id(), audio_source); - WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks( + blink::WebVector<blink::WebMediaStreamTrack> video_tracks( static_cast<size_t>(1)); video_tracks[0].initialize(video_source.id(), video_source); - WebKit::WebMediaStream local_stream; + blink::WebMediaStream local_stream; local_stream.initialize(UTF8ToUTF16(stream_label), audio_tracks, video_tracks); @@ -312,11 +312,11 @@ TEST_F(RTCPeerConnectionHandlerTest, Destruct) { } TEST_F(RTCPeerConnectionHandlerTest, CreateOffer) { - WebKit::WebRTCSessionDescriptionRequest request; - WebKit::WebMediaConstraints options; + blink::WebRTCSessionDescriptionRequest request; + blink::WebMediaConstraints options; EXPECT_CALL(*mock_tracker_.get(), TrackCreateOffer(pc_handler_.get(), _)); - // TODO(perkj): Can WebKit::WebRTCSessionDescriptionRequest be changed so + // TODO(perkj): Can blink::WebRTCSessionDescriptionRequest be changed so // the |reqest| requestSucceeded can be tested? Currently the |request| object // can not be initialized from a unit test. EXPECT_FALSE(mock_peer_connection_->created_session_description() != NULL); @@ -325,10 +325,10 @@ TEST_F(RTCPeerConnectionHandlerTest, CreateOffer) { } TEST_F(RTCPeerConnectionHandlerTest, CreateAnswer) { - WebKit::WebRTCSessionDescriptionRequest request; - WebKit::WebMediaConstraints options; + blink::WebRTCSessionDescriptionRequest request; + blink::WebMediaConstraints options; EXPECT_CALL(*mock_tracker_.get(), TrackCreateAnswer(pc_handler_.get(), _)); - // TODO(perkj): Can WebKit::WebRTCSessionDescriptionRequest be changed so + // TODO(perkj): Can blink::WebRTCSessionDescriptionRequest be changed so // the |reqest| requestSucceeded can be tested? Currently the |request| object // can not be initialized from a unit test. EXPECT_FALSE(mock_peer_connection_->created_session_description() != NULL); @@ -337,8 +337,8 @@ TEST_F(RTCPeerConnectionHandlerTest, CreateAnswer) { } TEST_F(RTCPeerConnectionHandlerTest, setLocalDescription) { - WebKit::WebRTCVoidRequest request; - WebKit::WebRTCSessionDescription description; + blink::WebRTCVoidRequest request; + blink::WebRTCSessionDescription description; description.initialize(kDummySdpType, kDummySdp); // PeerConnectionTracker::TrackSetSessionDescription is expected to be called // before |mock_peer_connection| is called. @@ -360,8 +360,8 @@ TEST_F(RTCPeerConnectionHandlerTest, setLocalDescription) { } TEST_F(RTCPeerConnectionHandlerTest, setRemoteDescription) { - WebKit::WebRTCVoidRequest request; - WebKit::WebRTCSessionDescription description; + blink::WebRTCVoidRequest request; + blink::WebRTCSessionDescription description; description.initialize(kDummySdpType, kDummySdp); // PeerConnectionTracker::TrackSetSessionDescription is expected to be called @@ -384,8 +384,8 @@ TEST_F(RTCPeerConnectionHandlerTest, setRemoteDescription) { } TEST_F(RTCPeerConnectionHandlerTest, updateICE) { - WebKit::WebRTCConfiguration config; - WebKit::WebMediaConstraints constraints; + blink::WebRTCConfiguration config; + blink::WebMediaConstraints constraints; EXPECT_CALL(*mock_tracker_.get(), TrackUpdateIce(pc_handler_.get(), _, _)); // TODO(perkj): Test that the parameters in |config| can be translated when a @@ -395,7 +395,7 @@ TEST_F(RTCPeerConnectionHandlerTest, updateICE) { } TEST_F(RTCPeerConnectionHandlerTest, addICECandidate) { - WebKit::WebRTCICECandidate candidate; + blink::WebRTCICECandidate candidate; candidate.initialize(kDummySdp, "mid", 1); EXPECT_CALL(*mock_tracker_.get(), @@ -410,9 +410,9 @@ TEST_F(RTCPeerConnectionHandlerTest, addICECandidate) { TEST_F(RTCPeerConnectionHandlerTest, addAndRemoveStream) { std::string stream_label = "local_stream"; - WebKit::WebMediaStream local_stream( + blink::WebMediaStream local_stream( CreateLocalMediaStream(stream_label)); - WebKit::WebMediaConstraints constraints; + blink::WebMediaConstraints constraints; EXPECT_CALL(*mock_tracker_.get(), TrackAddStream(pc_handler_.get(), @@ -453,11 +453,11 @@ TEST_F(RTCPeerConnectionHandlerTest, GetStatsAfterClose) { } TEST_F(RTCPeerConnectionHandlerTest, GetStatsWithLocalSelector) { - WebKit::WebMediaStream local_stream( + blink::WebMediaStream local_stream( CreateLocalMediaStream("local_stream")); - WebKit::WebMediaConstraints constraints; + blink::WebMediaConstraints constraints; pc_handler_->addStream(local_stream, constraints); - WebKit::WebVector<WebKit::WebMediaStreamTrack> tracks; + blink::WebVector<blink::WebMediaStreamTrack> tracks; local_stream.audioTracks(tracks); ASSERT_LE(1ul, tracks.size()); @@ -472,9 +472,9 @@ TEST_F(RTCPeerConnectionHandlerTest, GetStatsWithRemoteSelector) { scoped_refptr<webrtc::MediaStreamInterface> stream( AddRemoteMockMediaStream("remote_stream", "video", "audio")); pc_handler_->OnAddStream(stream.get()); - const WebKit::WebMediaStream& remote_stream = mock_client_->remote_stream(); + const blink::WebMediaStream& remote_stream = mock_client_->remote_stream(); - WebKit::WebVector<WebKit::WebMediaStreamTrack> tracks; + blink::WebVector<blink::WebMediaStreamTrack> tracks; remote_stream.audioTracks(tracks); ASSERT_LE(1ul, tracks.size()); @@ -488,13 +488,13 @@ TEST_F(RTCPeerConnectionHandlerTest, GetStatsWithRemoteSelector) { TEST_F(RTCPeerConnectionHandlerTest, GetStatsWithBadSelector) { // The setup is the same as GetStatsWithLocalSelector, but the stream is not // added to the PeerConnection. - WebKit::WebMediaStream local_stream( + blink::WebMediaStream local_stream( CreateLocalMediaStream("local_stream_2")); - WebKit::WebMediaConstraints constraints; - WebKit::WebVector<WebKit::WebMediaStreamTrack> tracks; + blink::WebMediaConstraints constraints; + blink::WebVector<blink::WebMediaStreamTrack> tracks; local_stream.audioTracks(tracks); - WebKit::WebMediaStreamTrack component = tracks[0]; + blink::WebMediaStreamTrack component = tracks[0]; mock_peer_connection_->SetGetStatsResult(false); scoped_refptr<MockRTCStatsRequest> request( @@ -652,20 +652,20 @@ TEST_F(RTCPeerConnectionHandlerTest, OnAddAndOnRemoveStream) { testing::InSequence sequence; EXPECT_CALL(*mock_tracker_.get(), TrackAddStream( pc_handler_.get(), - testing::Property(&WebKit::WebMediaStream::id, + testing::Property(&blink::WebMediaStream::id, UTF8ToUTF16(remote_stream_label)), PeerConnectionTracker::SOURCE_REMOTE)); EXPECT_CALL(*mock_client_.get(), didAddRemoteStream( - testing::Property(&WebKit::WebMediaStream::id, + testing::Property(&blink::WebMediaStream::id, UTF8ToUTF16(remote_stream_label)))); EXPECT_CALL(*mock_tracker_.get(), TrackRemoveStream( pc_handler_.get(), - testing::Property(&WebKit::WebMediaStream::id, + testing::Property(&blink::WebMediaStream::id, UTF8ToUTF16(remote_stream_label)), PeerConnectionTracker::SOURCE_REMOTE)); EXPECT_CALL(*mock_client_.get(), didRemoveRemoteStream( - testing::Property(&WebKit::WebMediaStream::id, + testing::Property(&blink::WebMediaStream::id, UTF8ToUTF16(remote_stream_label)))); pc_handler_->OnAddStream(remote_stream.get()); @@ -680,29 +680,29 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoteTrackState) { testing::InSequence sequence; EXPECT_CALL(*mock_client_.get(), didAddRemoteStream( - testing::Property(&WebKit::WebMediaStream::id, + testing::Property(&blink::WebMediaStream::id, UTF8ToUTF16(remote_stream_label)))); pc_handler_->OnAddStream(remote_stream.get()); - const WebKit::WebMediaStream& webkit_stream = mock_client_->remote_stream(); + const blink::WebMediaStream& webkit_stream = mock_client_->remote_stream(); - WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_tracks; + blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; webkit_stream.audioTracks(audio_tracks); - EXPECT_EQ(WebKit::WebMediaStreamSource::ReadyStateLive, + EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, audio_tracks[0].source().readyState()); - WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks; + blink::WebVector<blink::WebMediaStreamTrack> video_tracks; webkit_stream.videoTracks(video_tracks); - EXPECT_EQ(WebKit::WebMediaStreamSource::ReadyStateLive, + EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, video_tracks[0].source().readyState()); remote_stream->GetAudioTracks()[0]->set_state( webrtc::MediaStreamTrackInterface::kEnded); - EXPECT_EQ(WebKit::WebMediaStreamSource::ReadyStateEnded, + EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, audio_tracks[0].source().readyState()); remote_stream->GetVideoTracks()[0]->set_state( webrtc::MediaStreamTrackInterface::kEnded); - EXPECT_EQ(WebKit::WebMediaStreamSource::ReadyStateEnded, + EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, video_tracks[0].source().readyState()); } @@ -712,12 +712,12 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoveAndAddAudioTrackFromRemoteStream) { AddRemoteMockMediaStream(remote_stream_label, "video", "audio")); EXPECT_CALL(*mock_client_.get(), didAddRemoteStream( - testing::Property(&WebKit::WebMediaStream::id, + testing::Property(&blink::WebMediaStream::id, UTF8ToUTF16(remote_stream_label)))); pc_handler_->OnAddStream(remote_stream.get()); - const WebKit::WebMediaStream& webkit_stream = mock_client_->remote_stream(); + const blink::WebMediaStream& webkit_stream = mock_client_->remote_stream(); - WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_tracks; + blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; webkit_stream.audioTracks(audio_tracks); EXPECT_EQ(1u, audio_tracks.size()); @@ -725,13 +725,13 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoveAndAddAudioTrackFromRemoteStream) { scoped_refptr<webrtc::AudioTrackInterface> webrtc_track = remote_stream->GetAudioTracks()[0].get(); remote_stream->RemoveTrack(webrtc_track.get()); - WebKit::WebVector<WebKit::WebMediaStreamTrack> modified_audio_tracks1; + blink::WebVector<blink::WebMediaStreamTrack> modified_audio_tracks1; webkit_stream.audioTracks(modified_audio_tracks1); EXPECT_EQ(0u, modified_audio_tracks1.size()); // Add the WebRtc audio track again. remote_stream->AddTrack(webrtc_track.get()); - WebKit::WebVector<WebKit::WebMediaStreamTrack> modified_audio_tracks2; + blink::WebVector<blink::WebMediaStreamTrack> modified_audio_tracks2; webkit_stream.audioTracks(modified_audio_tracks2); EXPECT_EQ(1u, modified_audio_tracks2.size()); } @@ -742,12 +742,12 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoveAndAddVideoTrackFromRemoteStream) { AddRemoteMockMediaStream(remote_stream_label, "video", "video")); EXPECT_CALL(*mock_client_.get(), didAddRemoteStream( - testing::Property(&WebKit::WebMediaStream::id, + testing::Property(&blink::WebMediaStream::id, UTF8ToUTF16(remote_stream_label)))); pc_handler_->OnAddStream(remote_stream.get()); - const WebKit::WebMediaStream& webkit_stream = mock_client_->remote_stream(); + const blink::WebMediaStream& webkit_stream = mock_client_->remote_stream(); - WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks; + blink::WebVector<blink::WebMediaStreamTrack> video_tracks; webkit_stream.videoTracks(video_tracks); EXPECT_EQ(1u, video_tracks.size()); @@ -755,13 +755,13 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoveAndAddVideoTrackFromRemoteStream) { scoped_refptr<webrtc::VideoTrackInterface> webrtc_track = remote_stream->GetVideoTracks()[0].get(); remote_stream->RemoveTrack(webrtc_track.get()); - WebKit::WebVector<WebKit::WebMediaStreamTrack> modified_video_tracks1; + blink::WebVector<blink::WebMediaStreamTrack> modified_video_tracks1; webkit_stream.videoTracks(modified_video_tracks1); EXPECT_EQ(0u, modified_video_tracks1.size()); // Add the WebRtc video track again. remote_stream->AddTrack(webrtc_track.get()); - WebKit::WebVector<WebKit::WebMediaStreamTrack> modified_video_tracks2; + blink::WebVector<blink::WebMediaStreamTrack> modified_video_tracks2; webkit_stream.videoTracks(modified_video_tracks2); EXPECT_EQ(1u, modified_video_tracks2.size()); } @@ -790,24 +790,24 @@ TEST_F(RTCPeerConnectionHandlerTest, OnRenegotiationNeeded) { } TEST_F(RTCPeerConnectionHandlerTest, CreateDataChannel) { - WebKit::WebString label = "d1"; + blink::WebString label = "d1"; EXPECT_CALL(*mock_tracker_.get(), TrackCreateDataChannel(pc_handler_.get(), testing::NotNull(), PeerConnectionTracker::SOURCE_LOCAL)); - scoped_ptr<WebKit::WebRTCDataChannelHandler> channel( - pc_handler_->createDataChannel("d1", WebKit::WebRTCDataChannelInit())); + scoped_ptr<blink::WebRTCDataChannelHandler> channel( + pc_handler_->createDataChannel("d1", blink::WebRTCDataChannelInit())); EXPECT_TRUE(channel.get() != NULL); EXPECT_EQ(label, channel->label()); } TEST_F(RTCPeerConnectionHandlerTest, CreateDtmfSender) { std::string stream_label = "local_stream"; - WebKit::WebMediaStream local_stream(CreateLocalMediaStream(stream_label)); - WebKit::WebMediaConstraints constraints; + blink::WebMediaStream local_stream(CreateLocalMediaStream(stream_label)); + blink::WebMediaConstraints constraints; pc_handler_->addStream(local_stream, constraints); - WebKit::WebVector<WebKit::WebMediaStreamTrack> tracks; + blink::WebVector<blink::WebMediaStreamTrack> tracks; local_stream.videoTracks(tracks); ASSERT_LE(1ul, tracks.size()); @@ -820,7 +820,7 @@ TEST_F(RTCPeerConnectionHandlerTest, CreateDtmfSender) { TrackCreateDTMFSender(pc_handler_.get(), testing::Ref(tracks[0]))); - scoped_ptr<WebKit::WebRTCDTMFSenderHandler> sender( + scoped_ptr<blink::WebRTCDTMFSenderHandler> sender( pc_handler_->createDTMFSender(tracks[0])); EXPECT_TRUE(sender.get()); } diff --git a/content/renderer/media/test_response_generator.cc b/content/renderer/media/test_response_generator.cc index 1ced131..64f82e7 100644 --- a/content/renderer/media/test_response_generator.cc +++ b/content/renderer/media/test_response_generator.cc @@ -11,9 +11,9 @@ #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -using WebKit::WebString; -using WebKit::WebURLError; -using WebKit::WebURLResponse; +using blink::WebString; +using blink::WebURLError; +using blink::WebURLResponse; namespace content { diff --git a/content/renderer/media/test_response_generator.h b/content/renderer/media/test_response_generator.h index d8f1d5e..dcbcc05 100644 --- a/content/renderer/media/test_response_generator.h +++ b/content/renderer/media/test_response_generator.h @@ -28,29 +28,29 @@ class TestResponseGenerator { TestResponseGenerator(const GURL& gurl, int64 content_length); // Generates a WebURLError object. - WebKit::WebURLError GenerateError(); + blink::WebURLError GenerateError(); // Generates a regular HTTP 200 response. - WebKit::WebURLResponse Generate200(); + blink::WebURLResponse Generate200(); // Generates a regular HTTP 206 response starting from |first_byte_offset| // until the end of the resource. - WebKit::WebURLResponse Generate206(int64 first_byte_offset); + blink::WebURLResponse Generate206(int64 first_byte_offset); // Generates a custom HTTP 206 response starting from |first_byte_offset| // until the end of the resource. You can tweak what gets included in the // headers via |flags|. - WebKit::WebURLResponse Generate206(int64 first_byte_offset, Flags flags); + blink::WebURLResponse Generate206(int64 first_byte_offset, Flags flags); // Generates a regular HTTP 404 response. - WebKit::WebURLResponse Generate404(); + blink::WebURLResponse Generate404(); // Generates a file:// response starting from |first_byte_offset| until the // end of the resource. // // If |first_byte_offset| is negative a response containing no content length // will be returned. - WebKit::WebURLResponse GenerateFileResponse(int64 first_byte_offset); + blink::WebURLResponse GenerateFileResponse(int64 first_byte_offset); int64 content_length() { return content_length_; } diff --git a/content/renderer/media/texttrack_impl.cc b/content/renderer/media/texttrack_impl.cc index 7acf39a..8e30594 100644 --- a/content/renderer/media/texttrack_impl.cc +++ b/content/renderer/media/texttrack_impl.cc @@ -10,7 +10,7 @@ namespace content { -TextTrackImpl::TextTrackImpl(WebKit::WebMediaPlayerClient* client, +TextTrackImpl::TextTrackImpl(blink::WebMediaPlayerClient* client, WebInbandTextTrackImpl* text_track) : client_(client), text_track_(text_track) { client_->addTextTrack(text_track_.get()); @@ -26,12 +26,12 @@ void TextTrackImpl::addWebVTTCue(const base::TimeDelta& start, const std::string& id, const std::string& content, const std::string& settings) { - if (WebKit::WebInbandTextTrackClient* client = text_track_->client()) + if (blink::WebInbandTextTrackClient* client = text_track_->client()) client->addWebVTTCue(start.InSecondsF(), end.InSecondsF(), - WebKit::WebString::fromUTF8(id), - WebKit::WebString::fromUTF8(content), - WebKit::WebString::fromUTF8(settings)); + blink::WebString::fromUTF8(id), + blink::WebString::fromUTF8(content), + blink::WebString::fromUTF8(settings)); } } // namespace content diff --git a/content/renderer/media/texttrack_impl.h b/content/renderer/media/texttrack_impl.h index 09007c6..d7b5961 100644 --- a/content/renderer/media/texttrack_impl.h +++ b/content/renderer/media/texttrack_impl.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "media/base/text_track.h" -namespace WebKit { +namespace blink { class WebMediaPlayerClient; } @@ -22,7 +22,7 @@ class WebInbandTextTrackImpl; class TextTrackImpl : public media::TextTrack { public: // Constructor assumes ownership of the |text_track| object. - TextTrackImpl(WebKit::WebMediaPlayerClient* client, + TextTrackImpl(blink::WebMediaPlayerClient* client, WebInbandTextTrackImpl* text_track); virtual ~TextTrackImpl(); @@ -34,7 +34,7 @@ class TextTrackImpl : public media::TextTrack { const std::string& settings) OVERRIDE; private: - WebKit::WebMediaPlayerClient* client_; + blink::WebMediaPlayerClient* client_; scoped_ptr<WebInbandTextTrackImpl> text_track_; DISALLOW_COPY_AND_ASSIGN(TextTrackImpl); }; diff --git a/content/renderer/media/video_destination_handler.cc b/content/renderer/media/video_destination_handler.cc index 7438c49..692efef 100644 --- a/content/renderer/media/video_destination_handler.cc +++ b/content/renderer/media/video_destination_handler.cc @@ -168,12 +168,12 @@ bool VideoDestinationHandler::Open( factory = RenderThreadImpl::current()->GetMediaStreamDependencyFactory(); DCHECK(factory != NULL); } - WebKit::WebMediaStream stream; + blink::WebMediaStream stream; if (registry) { stream = registry->GetMediaStream(url); } else { stream = - WebKit::WebMediaStreamRegistry::lookupMediaStreamDescriptor(GURL(url)); + blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(GURL(url)); } if (stream.isNull() || !stream.extraData()) { LOG(ERROR) << "VideoDestinationHandler::Open - invalid url: " << url; diff --git a/content/renderer/media/video_destination_handler.h b/content/renderer/media/video_destination_handler.h index 087d3ac..578fe22 100644 --- a/content/renderer/media/video_destination_handler.h +++ b/content/renderer/media/video_destination_handler.h @@ -75,7 +75,7 @@ class CONTENT_EXPORT VideoDestinationHandler { // |frame_writer|. // If |factory| is NULL the MediaStreamDependencyFactory owned by // RenderThreadImpl::current() will be used. - // If |registry| is NULL the global WebKit::WebMediaStreamRegistry will be + // If |registry| is NULL the global blink::WebMediaStreamRegistry will be // used to look up the media stream. // The caller of the function takes the ownership of |frame_writer|. // Returns true on success and false on failure. diff --git a/content/renderer/media/video_destination_handler_unittest.cc b/content/renderer/media/video_destination_handler_unittest.cc index 110e115..a89ad61 100644 --- a/content/renderer/media/video_destination_handler_unittest.cc +++ b/content/renderer/media/video_destination_handler_unittest.cc @@ -106,8 +106,8 @@ TEST_F(VideoDestinationHandlerTest, Open) { EXPECT_TRUE(frame_writer); // Verify the video track has been added. - const WebKit::WebMediaStream test_stream = registry_.test_stream(); - WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks; + const blink::WebMediaStream test_stream = registry_.test_stream(); + blink::WebVector<blink::WebMediaStreamTrack> video_tracks; test_stream.videoTracks(video_tracks); EXPECT_EQ(1u, video_tracks.size()); diff --git a/content/renderer/media/video_source_handler.cc b/content/renderer/media/video_source_handler.cc index c0577fc..69b8355 100644 --- a/content/renderer/media/video_source_handler.cc +++ b/content/renderer/media/video_source_handler.cc @@ -103,12 +103,12 @@ bool VideoSourceHandler::Close(const std::string& url, scoped_refptr<VideoSourceInterface> VideoSourceHandler::GetFirstVideoSource( const std::string& url) { scoped_refptr<webrtc::VideoSourceInterface> source; - WebKit::WebMediaStream stream; + blink::WebMediaStream stream; if (registry_) { stream = registry_->GetMediaStream(url); } else { stream = - WebKit::WebMediaStreamRegistry::lookupMediaStreamDescriptor(GURL(url)); + blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(GURL(url)); } if (stream.isNull() || !stream.extraData()) { LOG(ERROR) << "GetFirstVideoSource - invalid url: " << url; diff --git a/content/renderer/media/video_source_handler.h b/content/renderer/media/video_source_handler.h index 3d3b4df..7025d92 100644 --- a/content/renderer/media/video_source_handler.h +++ b/content/renderer/media/video_source_handler.h @@ -40,7 +40,7 @@ class CONTENT_EXPORT FrameReaderInterface { class CONTENT_EXPORT VideoSourceHandler { public: // |registry| is used to look up the media stream by url. If a NULL |registry| - // is given, the global WebKit::WebMediaStreamRegistry will be used. + // is given, the global blink::WebMediaStreamRegistry will be used. explicit VideoSourceHandler(MediaStreamRegistryInterface* registry); virtual ~VideoSourceHandler(); // Connects to the first video track in the MediaStream specified by |url| and diff --git a/content/renderer/media/webaudio_capturer_source.cc b/content/renderer/media/webaudio_capturer_source.cc index f9bf084..9919b7f 100644 --- a/content/renderer/media/webaudio_capturer_source.cc +++ b/content/renderer/media/webaudio_capturer_source.cc @@ -85,7 +85,7 @@ void WebAudioCapturerSource::Stop() { } void WebAudioCapturerSource::consumeAudio( - const WebKit::WebVector<const float*>& audio_data, + const blink::WebVector<const float*>& audio_data, size_t number_of_frames) { base::AutoLock auto_lock(lock_); if (!track_) diff --git a/content/renderer/media/webaudio_capturer_source.h b/content/renderer/media/webaudio_capturer_source.h index b438a40..09a1911 100644 --- a/content/renderer/media/webaudio_capturer_source.h +++ b/content/renderer/media/webaudio_capturer_source.h @@ -28,7 +28,7 @@ class WebRtcLocalAudioSourceProvider; // audio stream to the WebRtcLocalAudioTrack::Capture() method. class WebAudioCapturerSource : public base::RefCountedThreadSafe<WebAudioCapturerSource>, - public WebKit::WebAudioDestinationConsumer { + public blink::WebAudioDestinationConsumer { public: WebAudioCapturerSource(); @@ -37,7 +37,7 @@ class WebAudioCapturerSource virtual void setFormat(size_t number_of_channels, float sample_rate) OVERRIDE; // MediaStreamAudioDestinationNode periodically calls consumeAudio(). // Called on the WebAudio audio thread. - virtual void consumeAudio(const WebKit::WebVector<const float*>& audio_data, + virtual void consumeAudio(const blink::WebVector<const float*>& audio_data, size_t number_of_frames) OVERRIDE; // Called when the WebAudioCapturerSource is hooking to a media audio track. diff --git a/content/renderer/media/webaudiosourceprovider_impl.cc b/content/renderer/media/webaudiosourceprovider_impl.cc index b722a33..29d7f4b 100644 --- a/content/renderer/media/webaudiosourceprovider_impl.cc +++ b/content/renderer/media/webaudiosourceprovider_impl.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "third_party/WebKit/public/web/WebAudioSourceProviderClient.h" -using WebKit::WebVector; +using blink::WebVector; namespace content { @@ -57,7 +57,7 @@ WebAudioSourceProviderImpl::WebAudioSourceProviderImpl( WebAudioSourceProviderImpl::~WebAudioSourceProviderImpl() {} void WebAudioSourceProviderImpl::setClient( - WebKit::WebAudioSourceProviderClient* client) { + blink::WebAudioSourceProviderClient* client) { base::AutoLock auto_lock(sink_lock_); if (client && client != client_) { // Detach the audio renderer from normal playback. diff --git a/content/renderer/media/webaudiosourceprovider_impl.h b/content/renderer/media/webaudiosourceprovider_impl.h index 8205ad2..4e93487 100644 --- a/content/renderer/media/webaudiosourceprovider_impl.h +++ b/content/renderer/media/webaudiosourceprovider_impl.h @@ -11,14 +11,14 @@ #include "third_party/WebKit/public/platform/WebAudioSourceProvider.h" #include "third_party/WebKit/public/platform/WebVector.h" -namespace WebKit { +namespace blink { class WebAudioSourceProviderClient; } namespace content { // WebAudioSourceProviderImpl provides a bridge between classes: -// WebKit::WebAudioSourceProvider <---> media::AudioRendererSink +// blink::WebAudioSourceProvider <---> media::AudioRendererSink // // WebAudioSourceProviderImpl wraps an existing audio sink that is used unless // WebKit has set a client via setClient(). While a client is set WebKit will @@ -27,15 +27,15 @@ namespace content { // // All calls are protected by a lock. class CONTENT_EXPORT WebAudioSourceProviderImpl - : NON_EXPORTED_BASE(public WebKit::WebAudioSourceProvider), + : NON_EXPORTED_BASE(public blink::WebAudioSourceProvider), NON_EXPORTED_BASE(public media::AudioRendererSink) { public: explicit WebAudioSourceProviderImpl( const scoped_refptr<media::AudioRendererSink>& sink); - // WebKit::WebAudioSourceProvider implementation. - virtual void setClient(WebKit::WebAudioSourceProviderClient* client); - virtual void provideInput(const WebKit::WebVector<float*>& audio_data, + // blink::WebAudioSourceProvider implementation. + virtual void setClient(blink::WebAudioSourceProviderClient* client); + virtual void provideInput(const blink::WebVector<float*>& audio_data, size_t number_of_frames); // media::AudioRendererSink implementation. @@ -64,7 +64,7 @@ class CONTENT_EXPORT WebAudioSourceProviderImpl media::AudioRendererSink::RenderCallback* renderer_; // When set via setClient() it overrides |sink_| for consuming audio. - WebKit::WebAudioSourceProviderClient* client_; + blink::WebAudioSourceProviderClient* client_; // Where audio ends up unless overridden by |client_|. base::Lock sink_lock_; diff --git a/content/renderer/media/webaudiosourceprovider_impl_unittest.cc b/content/renderer/media/webaudiosourceprovider_impl_unittest.cc index 9b893c7..9fc3b11 100644 --- a/content/renderer/media/webaudiosourceprovider_impl_unittest.cc +++ b/content/renderer/media/webaudiosourceprovider_impl_unittest.cc @@ -18,7 +18,7 @@ const float kTestVolume = 0.25; class WebAudioSourceProviderImplTest : public testing::Test, - public WebKit::WebAudioSourceProviderClient { + public blink::WebAudioSourceProviderClient { public: WebAudioSourceProviderImplTest() : params_(media::AudioParameters::AUDIO_PCM_LINEAR, @@ -51,7 +51,7 @@ class WebAudioSourceProviderImplTest testing::Mock::VerifyAndClear(mock_sink_.get()); } - void SetClient(WebKit::WebAudioSourceProviderClient* client) { + void SetClient(blink::WebAudioSourceProviderClient* client) { testing::InSequence s; if (client) { @@ -76,7 +76,7 @@ class WebAudioSourceProviderImplTest return true; } - // WebKit::WebAudioSourceProviderClient implementation. + // blink::WebAudioSourceProviderClient implementation. MOCK_METHOD2(setFormat, void(size_t numberOfChannels, float sampleRate)); protected: @@ -153,7 +153,7 @@ TEST_F(WebAudioSourceProviderImplTest, ProvideInput) { scoped_ptr<media::AudioBus> bus2 = media::AudioBus::Create(params_); // Point the WebVector into memory owned by |bus1|. - WebKit::WebVector<float*> audio_data(static_cast<size_t>(bus1->channels())); + blink::WebVector<float*> audio_data(static_cast<size_t>(bus1->channels())); for (size_t i = 0; i < audio_data.size(); ++i) audio_data[i] = bus1->channel(i); diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.cc b/content/renderer/media/webcontentdecryptionmodule_impl.cc index a70ad2a..a46b5ee 100644 --- a/content/renderer/media/webcontentdecryptionmodule_impl.cc +++ b/content/renderer/media/webcontentdecryptionmodule_impl.cc @@ -170,9 +170,9 @@ WebContentDecryptionModuleImpl::~WebContentDecryptionModuleImpl() { } // The caller owns the created session. -WebKit::WebContentDecryptionModuleSession* +blink::WebContentDecryptionModuleSession* WebContentDecryptionModuleImpl::createSession( - WebKit::WebContentDecryptionModuleSession::Client* client) { + blink::WebContentDecryptionModuleSession::Client* client) { DCHECK(media_keys_); WebContentDecryptionModuleSessionImpl* session = new WebContentDecryptionModuleSessionImpl( diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.h b/content/renderer/media/webcontentdecryptionmodule_impl.h index d2aa01f..442b657 100644 --- a/content/renderer/media/webcontentdecryptionmodule_impl.h +++ b/content/renderer/media/webcontentdecryptionmodule_impl.h @@ -21,15 +21,15 @@ class WebContentDecryptionModuleSessionImpl; class SessionIdAdapter; class WebContentDecryptionModuleImpl - : public WebKit::WebContentDecryptionModule { + : public blink::WebContentDecryptionModule { public: static WebContentDecryptionModuleImpl* Create(const string16& key_system); virtual ~WebContentDecryptionModuleImpl(); - // WebKit::WebContentDecryptionModule implementation. - virtual WebKit::WebContentDecryptionModuleSession* createSession( - WebKit::WebContentDecryptionModuleSession::Client* client); + // blink::WebContentDecryptionModule implementation. + virtual blink::WebContentDecryptionModuleSession* createSession( + blink::WebContentDecryptionModuleSession::Client* client); private: // Takes ownership of |media_keys| and |adapter|. diff --git a/content/renderer/media/webcontentdecryptionmodulesession_impl.cc b/content/renderer/media/webcontentdecryptionmodulesession_impl.cc index b1dea74..b991ad1 100644 --- a/content/renderer/media/webcontentdecryptionmodulesession_impl.cc +++ b/content/renderer/media/webcontentdecryptionmodulesession_impl.cc @@ -26,12 +26,12 @@ WebContentDecryptionModuleSessionImpl:: ~WebContentDecryptionModuleSessionImpl() { } -WebKit::WebString WebContentDecryptionModuleSessionImpl::sessionId() const { - return WebKit::WebString::fromUTF8(session_id_); +blink::WebString WebContentDecryptionModuleSessionImpl::sessionId() const { + return blink::WebString::fromUTF8(session_id_); } void WebContentDecryptionModuleSessionImpl::generateKeyRequest( - const WebKit::WebString& mime_type, + const blink::WebString& mime_type, const uint8* init_data, size_t init_data_length) { // TODO(ddorwin): Guard against this in supported types check and remove this. // Chromium only supports ASCII MIME types. diff --git a/content/renderer/media/webcontentdecryptionmodulesession_impl.h b/content/renderer/media/webcontentdecryptionmodulesession_impl.h index df76f08..126c232 100644 --- a/content/renderer/media/webcontentdecryptionmodulesession_impl.h +++ b/content/renderer/media/webcontentdecryptionmodulesession_impl.h @@ -21,7 +21,7 @@ class MediaKeys; namespace content { class WebContentDecryptionModuleSessionImpl - : public WebKit::WebContentDecryptionModuleSession { + : public blink::WebContentDecryptionModuleSession { public: typedef base::Callback<void(const std::string& session_id)> SessionClosedCB; @@ -31,9 +31,9 @@ class WebContentDecryptionModuleSessionImpl const SessionClosedCB& session_closed_cb); virtual ~WebContentDecryptionModuleSessionImpl(); - // WebKit::WebContentDecryptionModuleSession implementation. - virtual WebKit::WebString sessionId() const OVERRIDE; - virtual void generateKeyRequest(const WebKit::WebString& mime_type, + // blink::WebContentDecryptionModuleSession implementation. + virtual blink::WebString sessionId() const OVERRIDE; + virtual void generateKeyRequest(const blink::WebString& mime_type, const uint8* init_data, size_t init_data_length) OVERRIDE; virtual void update(const uint8* key, size_t key_length) OVERRIDE; diff --git a/content/renderer/media/webinbandtexttrack_impl.cc b/content/renderer/media/webinbandtexttrack_impl.cc index 6d1de26..3d80286 100644 --- a/content/renderer/media/webinbandtexttrack_impl.cc +++ b/content/renderer/media/webinbandtexttrack_impl.cc @@ -10,8 +10,8 @@ namespace content { WebInbandTextTrackImpl::WebInbandTextTrackImpl( Kind kind, - const WebKit::WebString& label, - const WebKit::WebString& language, + const blink::WebString& label, + const blink::WebString& language, int index) : client_(NULL), mode_(ModeDisabled), @@ -26,11 +26,11 @@ WebInbandTextTrackImpl::~WebInbandTextTrackImpl() { } void WebInbandTextTrackImpl::setClient( - WebKit::WebInbandTextTrackClient* client) { + blink::WebInbandTextTrackClient* client) { client_ = client; } -WebKit::WebInbandTextTrackClient* WebInbandTextTrackImpl::client() { +blink::WebInbandTextTrackClient* WebInbandTextTrackImpl::client() { return client_; } @@ -57,11 +57,11 @@ bool WebInbandTextTrackImpl::isClosedCaptions() const { } } -WebKit::WebString WebInbandTextTrackImpl::label() const { +blink::WebString WebInbandTextTrackImpl::label() const { return label_; } -WebKit::WebString WebInbandTextTrackImpl::language() const { +blink::WebString WebInbandTextTrackImpl::language() const { return language_; } diff --git a/content/renderer/media/webinbandtexttrack_impl.h b/content/renderer/media/webinbandtexttrack_impl.h index 82b94ad..c9083b5 100644 --- a/content/renderer/media/webinbandtexttrack_impl.h +++ b/content/renderer/media/webinbandtexttrack_impl.h @@ -10,16 +10,16 @@ namespace content { -class WebInbandTextTrackImpl : public WebKit::WebInbandTextTrack { +class WebInbandTextTrackImpl : public blink::WebInbandTextTrack { public: WebInbandTextTrackImpl(Kind kind, - const WebKit::WebString& label, - const WebKit::WebString& language, + const blink::WebString& label, + const blink::WebString& language, int index); virtual ~WebInbandTextTrackImpl(); - virtual void setClient(WebKit::WebInbandTextTrackClient* client); - virtual WebKit::WebInbandTextTrackClient* client(); + virtual void setClient(blink::WebInbandTextTrackClient* client); + virtual blink::WebInbandTextTrackClient* client(); virtual void setMode(Mode mode); virtual Mode mode() const; @@ -27,18 +27,18 @@ class WebInbandTextTrackImpl : public WebKit::WebInbandTextTrack { virtual Kind kind() const; virtual bool isClosedCaptions() const; - virtual WebKit::WebString label() const; - virtual WebKit::WebString language() const; + virtual blink::WebString label() const; + virtual blink::WebString language() const; virtual bool isDefault() const; virtual int textTrackIndex() const; private: - WebKit::WebInbandTextTrackClient* client_; + blink::WebInbandTextTrackClient* client_; Mode mode_; Kind kind_; - WebKit::WebString label_; - WebKit::WebString language_; + blink::WebString label_; + blink::WebString language_; int index_; DISALLOW_COPY_AND_ASSIGN(WebInbandTextTrackImpl); }; diff --git a/content/renderer/media/webmediaplayer_delegate.h b/content/renderer/media/webmediaplayer_delegate.h index 63492f8..868abce 100644 --- a/content/renderer/media/webmediaplayer_delegate.h +++ b/content/renderer/media/webmediaplayer_delegate.h @@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_DELEGATE_H_ #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_DELEGATE_H_ -namespace WebKit { +namespace blink { class WebMediaPlayer; } namespace content { @@ -17,13 +17,13 @@ class WebMediaPlayerDelegate { WebMediaPlayerDelegate() {} // The specified player started playing media. - virtual void DidPlay(WebKit::WebMediaPlayer* player) = 0; + virtual void DidPlay(blink::WebMediaPlayer* player) = 0; // The specified player stopped playing media. - virtual void DidPause(WebKit::WebMediaPlayer* player) = 0; + virtual void DidPause(blink::WebMediaPlayer* player) = 0; // The specified player was destroyed. Do not call any methods on it. - virtual void PlayerGone(WebKit::WebMediaPlayer* player) = 0; + virtual void PlayerGone(blink::WebMediaPlayer* player) = 0; protected: virtual ~WebMediaPlayerDelegate() {} diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc index f6c347c..85561a4 100644 --- a/content/renderer/media/webmediaplayer_impl.cc +++ b/content/renderer/media/webmediaplayer_impl.cc @@ -60,11 +60,11 @@ #include "v8/include/v8.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" -using WebKit::WebCanvas; -using WebKit::WebMediaPlayer; -using WebKit::WebRect; -using WebKit::WebSize; -using WebKit::WebString; +using blink::WebCanvas; +using blink::WebMediaPlayer; +using blink::WebRect; +using blink::WebSize; +using blink::WebString; using media::PipelineStatus; namespace { @@ -129,8 +129,8 @@ static void LogMediaSourceError(const scoped_refptr<media::MediaLog>& media_log, } WebMediaPlayerImpl::WebMediaPlayerImpl( - WebKit::WebFrame* frame, - WebKit::WebMediaPlayerClient* client, + blink::WebFrame* frame, + blink::WebMediaPlayerClient* client, base::WeakPtr<WebMediaPlayerDelegate> delegate, const WebMediaPlayerParams& params) : frame_(frame), @@ -184,7 +184,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl( // Also we want to be notified of |main_loop_| destruction. base::MessageLoop::current()->AddDestructionObserver(this); - if (WebKit::WebRuntimeFeatures::isPrefixedEncryptedMediaEnabled()) { + if (blink::WebRuntimeFeatures::isPrefixedEncryptedMediaEnabled()) { decryptor_.reset(new ProxyDecryptor( #if defined(ENABLE_PEPPER_CDMS) client, @@ -255,7 +255,7 @@ URLSchemeForHistogram URLScheme(const GURL& url) { } // anonymous namespace -void WebMediaPlayerImpl::load(LoadType load_type, const WebKit::WebURL& url, +void WebMediaPlayerImpl::load(LoadType load_type, const blink::WebURL& url, CORSMode cors_mode) { if (!defer_load_cb_.is_null()) { defer_load_cb_.Run(base::Bind( @@ -266,7 +266,7 @@ void WebMediaPlayerImpl::load(LoadType load_type, const WebKit::WebURL& url, } void WebMediaPlayerImpl::DoLoad(LoadType load_type, - const WebKit::WebURL& url, + const blink::WebURL& url, CORSMode cors_mode) { DCHECK(main_loop_->BelongsToCurrentThread()); @@ -435,12 +435,12 @@ bool WebMediaPlayerImpl::hasAudio() const { return pipeline_->HasAudio(); } -WebKit::WebSize WebMediaPlayerImpl::naturalSize() const { +blink::WebSize WebMediaPlayerImpl::naturalSize() const { DCHECK(main_loop_->BelongsToCurrentThread()); gfx::Size size; pipeline_->GetNaturalVideoSize(&size); - return WebKit::WebSize(size); + return blink::WebSize(size); } bool WebMediaPlayerImpl::paused() const { @@ -482,9 +482,9 @@ WebMediaPlayer::ReadyState WebMediaPlayerImpl::readyState() const { return ready_state_; } -const WebKit::WebTimeRanges& WebMediaPlayerImpl::buffered() { +const blink::WebTimeRanges& WebMediaPlayerImpl::buffered() { DCHECK(main_loop_->BelongsToCurrentThread()); - WebKit::WebTimeRanges web_ranges( + blink::WebTimeRanges web_ranges( ConvertToWebTimeRanges(pipeline_->GetBufferedTimeRanges())); buffered_.swap(web_ranges); return buffered_; @@ -614,7 +614,7 @@ void WebMediaPlayerImpl::PutCurrentFrame( } bool WebMediaPlayerImpl::copyVideoTextureToPlatformTexture( - WebKit::WebGraphicsContext3D* web_graphics_context, + blink::WebGraphicsContext3D* web_graphics_context, unsigned int texture, unsigned int level, unsigned int internal_format, @@ -693,7 +693,7 @@ bool WebMediaPlayerImpl::copyVideoTextureToPlatformTexture( // UMA_HISTOGRAM_COUNTS. The reason that we cannot use those macros directly is // that UMA_* macros require the names to be constant throughout the process' // lifetime. -static void EmeUMAHistogramEnumeration(const WebKit::WebString& key_system, +static void EmeUMAHistogramEnumeration(const blink::WebString& key_system, const std::string& method, int sample, int boundary_value) { @@ -703,7 +703,7 @@ static void EmeUMAHistogramEnumeration(const WebKit::WebString& key_system, base::Histogram::kUmaTargetedHistogramFlag)->Add(sample); } -static void EmeUMAHistogramCounts(const WebKit::WebString& key_system, +static void EmeUMAHistogramCounts(const blink::WebString& key_system, const std::string& method, int sample) { // Use the same parameters as UMA_HISTOGRAM_COUNTS. @@ -999,8 +999,8 @@ WebMediaPlayerImpl::OnTextTrack(media::TextKind kind, const std::string& language) { typedef WebInbandTextTrackImpl::Kind webkind_t; const webkind_t webkind = static_cast<webkind_t>(kind); - const WebKit::WebString weblabel = WebKit::WebString::fromUTF8(label); - const WebKit::WebString weblanguage = WebKit::WebString::fromUTF8(language); + const blink::WebString weblabel = blink::WebString::fromUTF8(label); + const blink::WebString weblanguage = blink::WebString::fromUTF8(language); WebInbandTextTrackImpl* const text_track = new WebInbandTextTrackImpl(webkind, weblabel, weblanguage, @@ -1021,7 +1021,7 @@ void WebMediaPlayerImpl::OnKeyError(const std::string& session_id, GetClient()->keyError( current_key_system_, WebString::fromUTF8(session_id), - static_cast<WebKit::WebMediaPlayerClient::MediaKeyErrorCode>(error_code), + static_cast<blink::WebMediaPlayerClient::MediaKeyErrorCode>(error_code), system_code); } @@ -1239,13 +1239,13 @@ void WebMediaPlayerImpl::Destroy() { data_source_.reset(); } -WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { +blink::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { DCHECK(main_loop_->BelongsToCurrentThread()); DCHECK(client_); return client_; } -WebKit::WebAudioSourceProvider* WebMediaPlayerImpl::audioSourceProvider() { +blink::WebAudioSourceProvider* WebMediaPlayerImpl::audioSourceProvider() { return audio_source_provider_.get(); } diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h index a174393..c1de8f0 100644 --- a/content/renderer/media/webmediaplayer_impl.h +++ b/content/renderer/media/webmediaplayer_impl.h @@ -45,7 +45,7 @@ class RenderAudioSourceProvider; -namespace WebKit { +namespace blink { class WebFrame; } @@ -72,7 +72,7 @@ class WebMediaPlayerParams; class WebTextTrackImpl; class WebMediaPlayerImpl - : public WebKit::WebMediaPlayer, + : public blink::WebMediaPlayer, public cc::VideoFrameProvider, public base::MessageLoop::DestructionObserver, public base::SupportsWeakPtr<WebMediaPlayerImpl> { @@ -81,14 +81,14 @@ class WebMediaPlayerImpl // // |delegate| may be null. WebMediaPlayerImpl( - WebKit::WebFrame* frame, - WebKit::WebMediaPlayerClient* client, + blink::WebFrame* frame, + blink::WebMediaPlayerClient* client, base::WeakPtr<WebMediaPlayerDelegate> delegate, const WebMediaPlayerParams& params); virtual ~WebMediaPlayerImpl(); virtual void load(LoadType load_type, - const WebKit::WebURL& url, + const blink::WebURL& url, CORSMode cors_mode) OVERRIDE; // Playback controls. @@ -99,13 +99,13 @@ class WebMediaPlayerImpl virtual void seek(double seconds); virtual void setRate(double rate); virtual void setVolume(double volume); - virtual void setPreload(WebKit::WebMediaPlayer::Preload preload); - virtual const WebKit::WebTimeRanges& buffered(); + virtual void setPreload(blink::WebMediaPlayer::Preload preload); + virtual const blink::WebTimeRanges& buffered(); virtual double maxTimeSeekable() const; // Methods for painting. - virtual void paint(WebKit::WebCanvas* canvas, - const WebKit::WebRect& rect, + virtual void paint(blink::WebCanvas* canvas, + const blink::WebRect& rect, unsigned char alpha); // True if the loaded media has a playable video/audio track. @@ -113,7 +113,7 @@ class WebMediaPlayerImpl virtual bool hasAudio() const; // Dimensions of the video. - virtual WebKit::WebSize naturalSize() const; + virtual blink::WebSize naturalSize() const; // Getters of playback state. virtual bool paused() const; @@ -124,8 +124,8 @@ class WebMediaPlayerImpl // Internal states of loading and network. // TODO(hclam): Ask the pipeline about the state rather than having reading // them from members which would cause race conditions. - virtual WebKit::WebMediaPlayer::NetworkState networkState() const; - virtual WebKit::WebMediaPlayer::ReadyState readyState() const; + virtual blink::WebMediaPlayer::NetworkState networkState() const; + virtual blink::WebMediaPlayer::ReadyState readyState() const; virtual bool didLoadingProgress() const; @@ -147,7 +147,7 @@ class WebMediaPlayerImpl OVERRIDE; virtual bool copyVideoTextureToPlatformTexture( - WebKit::WebGraphicsContext3D* web_graphics_context, + blink::WebGraphicsContext3D* web_graphics_context, unsigned int texture, unsigned int level, unsigned int internal_format, @@ -155,23 +155,23 @@ class WebMediaPlayerImpl bool premultiply_alpha, bool flip_y); - virtual WebKit::WebAudioSourceProvider* audioSourceProvider(); + virtual blink::WebAudioSourceProvider* audioSourceProvider(); virtual MediaKeyException generateKeyRequest( - const WebKit::WebString& key_system, + const blink::WebString& key_system, const unsigned char* init_data, unsigned init_data_length); - virtual MediaKeyException addKey(const WebKit::WebString& key_system, + virtual MediaKeyException addKey(const blink::WebString& key_system, const unsigned char* key, unsigned key_length, const unsigned char* init_data, unsigned init_data_length, - const WebKit::WebString& session_id); + const blink::WebString& session_id); virtual MediaKeyException cancelKeyRequest( - const WebKit::WebString& key_system, - const WebKit::WebString& session_id); + const blink::WebString& key_system, + const blink::WebString& session_id); // As we are closing the tab or even the browser, |main_loop_| is destroyed // even before this object gets destructed, so we need to know when @@ -205,7 +205,7 @@ class WebMediaPlayerImpl // Called after |defer_load_cb_| has decided to allow the load. If // |defer_load_cb_| is null this is called immediately. void DoLoad(LoadType load_type, - const WebKit::WebURL& url, + const blink::WebURL& url, CORSMode cors_mode); // Called after asynchronous initialization of a data source completed. @@ -219,14 +219,14 @@ class WebMediaPlayerImpl // Helpers that set the network/ready state and notifies the client if // they've changed. - void SetNetworkState(WebKit::WebMediaPlayer::NetworkState state); - void SetReadyState(WebKit::WebMediaPlayer::ReadyState state); + void SetNetworkState(blink::WebMediaPlayer::NetworkState state); + void SetReadyState(blink::WebMediaPlayer::ReadyState state); // Destroy resources held. void Destroy(); // Getter method to |client_|. - WebKit::WebMediaPlayerClient* GetClient(); + blink::WebMediaPlayerClient* GetClient(); // Lets V8 know that player uses extra resources not managed by V8. void IncrementExternallyAllocatedMemory(); @@ -234,18 +234,18 @@ class WebMediaPlayerImpl // Actually do the work for generateKeyRequest/addKey so they can easily // report results to UMA. MediaKeyException GenerateKeyRequestInternal( - const WebKit::WebString& key_system, + const blink::WebString& key_system, const unsigned char* init_data, unsigned init_data_length); - MediaKeyException AddKeyInternal(const WebKit::WebString& key_system, + MediaKeyException AddKeyInternal(const blink::WebString& key_system, const unsigned char* key, unsigned key_length, const unsigned char* init_data, unsigned init_data_length, - const WebKit::WebString& session_id); + const blink::WebString& session_id); MediaKeyException CancelKeyRequestInternal( - const WebKit::WebString& key_system, - const WebKit::WebString& session_id); + const blink::WebString& key_system, + const blink::WebString& session_id); // Gets the duration value reported by the pipeline. double GetPipelineDuration() const; @@ -263,14 +263,14 @@ class WebMediaPlayerImpl // False indicates |current_frame_| is being replaced with a new frame. void DoneWaitingForPaint(bool painting_frame); - WebKit::WebFrame* frame_; + blink::WebFrame* frame_; // TODO(hclam): get rid of these members and read from the pipeline directly. - WebKit::WebMediaPlayer::NetworkState network_state_; - WebKit::WebMediaPlayer::ReadyState ready_state_; + blink::WebMediaPlayer::NetworkState network_state_; + blink::WebMediaPlayer::ReadyState ready_state_; // Keep a list of buffered time ranges. - WebKit::WebTimeRanges buffered_; + blink::WebTimeRanges buffered_; // Message loops for posting tasks on Chrome's main thread. Also used // for DCHECKs so methods calls won't execute in the wrong thread. @@ -281,7 +281,7 @@ class WebMediaPlayerImpl // The currently selected key system. Empty string means that no key system // has been selected. - WebKit::WebString current_key_system_; + blink::WebString current_key_system_; // The LoadType passed in the |load_type| parameter of the load() call. LoadType load_type_; @@ -308,7 +308,7 @@ class WebMediaPlayerImpl bool pending_seek_; double pending_seek_seconds_; - WebKit::WebMediaPlayerClient* client_; + blink::WebMediaPlayerClient* client_; base::WeakPtr<WebMediaPlayerDelegate> delegate_; diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc index eb28f7b..e372317 100644 --- a/content/renderer/media/webmediaplayer_ms.cc +++ b/content/renderer/media/webmediaplayer_ms.cc @@ -26,16 +26,16 @@ #include "third_party/WebKit/public/web/WebView.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" -using WebKit::WebCanvas; -using WebKit::WebMediaPlayer; -using WebKit::WebRect; -using WebKit::WebSize; +using blink::WebCanvas; +using blink::WebMediaPlayer; +using blink::WebRect; +using blink::WebSize; namespace content { WebMediaPlayerMS::WebMediaPlayerMS( - WebKit::WebFrame* frame, - WebKit::WebMediaPlayerClient* client, + blink::WebFrame* frame, + blink::WebMediaPlayerClient* client, base::WeakPtr<WebMediaPlayerDelegate> delegate, MediaStreamClient* media_stream_client, media::MediaLog* media_log) @@ -82,7 +82,7 @@ WebMediaPlayerMS::~WebMediaPlayerMS() { } void WebMediaPlayerMS::load(LoadType load_type, - const WebKit::WebURL& url, + const blink::WebURL& url, CORSMode cors_mode) { DVLOG(1) << "WebMediaPlayerMS::load"; DCHECK(thread_checker_.CalledOnValidThread()); @@ -204,14 +204,14 @@ bool WebMediaPlayerMS::hasAudio() const { return (audio_renderer_.get() != NULL); } -WebKit::WebSize WebMediaPlayerMS::naturalSize() const { +blink::WebSize WebMediaPlayerMS::naturalSize() const { DCHECK(thread_checker_.CalledOnValidThread()); gfx::Size size; if (current_frame_.get()) size = current_frame_->natural_size(); DVLOG(3) << "WebMediaPlayerMS::naturalSize, " << size.ToString(); - return WebKit::WebSize(size); + return blink::WebSize(size); } bool WebMediaPlayerMS::paused() const { @@ -251,7 +251,7 @@ WebMediaPlayer::ReadyState WebMediaPlayerMS::readyState() const { return ready_state_; } -const WebKit::WebTimeRanges& WebMediaPlayerMS::buffered() { +const blink::WebTimeRanges& WebMediaPlayerMS::buffered() { DCHECK(thread_checker_.CalledOnValidThread()); return buffered_; } @@ -423,7 +423,7 @@ void WebMediaPlayerMS::SetReadyState(WebMediaPlayer::ReadyState state) { GetClient()->readyStateChanged(); } -WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { +blink::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(client_); return client_; diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h index 1ed75a3..23185a3 100644 --- a/content/renderer/media/webmediaplayer_ms.h +++ b/content/renderer/media/webmediaplayer_ms.h @@ -16,7 +16,7 @@ #include "third_party/WebKit/public/web/WebMediaPlayer.h" #include "url/gurl.h" -namespace WebKit { +namespace blink { class WebFrame; class WebMediaPlayerClient; } @@ -47,24 +47,24 @@ class WebMediaPlayerDelegate; // AudioPlayer // plays audio streams. // -// WebKit::WebMediaPlayerClient +// blink::WebMediaPlayerClient // WebKit client of this media player object. class WebMediaPlayerMS - : public WebKit::WebMediaPlayer, + : public blink::WebMediaPlayer, public cc::VideoFrameProvider, public base::SupportsWeakPtr<WebMediaPlayerMS> { public: // Construct a WebMediaPlayerMS with reference to the client, and // a MediaStreamClient which provides VideoFrameProvider. - WebMediaPlayerMS(WebKit::WebFrame* frame, - WebKit::WebMediaPlayerClient* client, + WebMediaPlayerMS(blink::WebFrame* frame, + blink::WebMediaPlayerClient* client, base::WeakPtr<WebMediaPlayerDelegate> delegate, MediaStreamClient* media_stream_client, media::MediaLog* media_log); virtual ~WebMediaPlayerMS(); virtual void load(LoadType load_type, - const WebKit::WebURL& url, + const blink::WebURL& url, CORSMode cors_mode) OVERRIDE; // Playback controls. @@ -75,13 +75,13 @@ class WebMediaPlayerMS virtual void seek(double seconds); virtual void setRate(double rate); virtual void setVolume(double volume); - virtual void setPreload(WebKit::WebMediaPlayer::Preload preload) OVERRIDE; - virtual const WebKit::WebTimeRanges& buffered() OVERRIDE; + virtual void setPreload(blink::WebMediaPlayer::Preload preload) OVERRIDE; + virtual const blink::WebTimeRanges& buffered() OVERRIDE; virtual double maxTimeSeekable() const; // Methods for painting. - virtual void paint(WebKit::WebCanvas* canvas, - const WebKit::WebRect& rect, + virtual void paint(blink::WebCanvas* canvas, + const blink::WebRect& rect, unsigned char alpha) OVERRIDE; // True if the loaded media has a playable video/audio track. @@ -89,7 +89,7 @@ class WebMediaPlayerMS virtual bool hasAudio() const OVERRIDE; // Dimensions of the video. - virtual WebKit::WebSize naturalSize() const OVERRIDE; + virtual blink::WebSize naturalSize() const OVERRIDE; // Getters of playback state. virtual bool paused() const OVERRIDE; @@ -98,8 +98,8 @@ class WebMediaPlayerMS virtual double currentTime() const; // Internal states of loading and network. - virtual WebKit::WebMediaPlayer::NetworkState networkState() const OVERRIDE; - virtual WebKit::WebMediaPlayer::ReadyState readyState() const OVERRIDE; + virtual blink::WebMediaPlayer::NetworkState networkState() const OVERRIDE; + virtual blink::WebMediaPlayer::ReadyState readyState() const OVERRIDE; virtual bool didLoadingProgress() const OVERRIDE; @@ -131,23 +131,23 @@ class WebMediaPlayerMS // Helpers that set the network/ready state and notifies the client if // they've changed. - void SetNetworkState(WebKit::WebMediaPlayer::NetworkState state); - void SetReadyState(WebKit::WebMediaPlayer::ReadyState state); + void SetNetworkState(blink::WebMediaPlayer::NetworkState state); + void SetReadyState(blink::WebMediaPlayer::ReadyState state); // Getter method to |client_|. - WebKit::WebMediaPlayerClient* GetClient(); + blink::WebMediaPlayerClient* GetClient(); - WebKit::WebFrame* frame_; + blink::WebFrame* frame_; - WebKit::WebMediaPlayer::NetworkState network_state_; - WebKit::WebMediaPlayer::ReadyState ready_state_; + blink::WebMediaPlayer::NetworkState network_state_; + blink::WebMediaPlayer::ReadyState ready_state_; - WebKit::WebTimeRanges buffered_; + blink::WebTimeRanges buffered_; // Used for DCHECKs to ensure methods calls executed in the correct thread. base::ThreadChecker thread_checker_; - WebKit::WebMediaPlayerClient* client_; + blink::WebMediaPlayerClient* client_; base::WeakPtr<WebMediaPlayerDelegate> delegate_; diff --git a/content/renderer/media/webmediaplayer_util.cc b/content/renderer/media/webmediaplayer_util.cc index 741239a..ef2dc67 100644 --- a/content/renderer/media/webmediaplayer_util.cc +++ b/content/renderer/media/webmediaplayer_util.cc @@ -15,7 +15,7 @@ namespace content { #define COMPILE_ASSERT_MATCHING_ENUM(name) \ COMPILE_ASSERT( \ - static_cast<int>(WebKit::WebMediaPlayerClient::MediaKeyErrorCode ## name) == \ + static_cast<int>(blink::WebMediaPlayerClient::MediaKeyErrorCode ## name) == \ static_cast<int>(media::MediaKeys::k ## name ## Error), \ mismatching_enums) COMPILE_ASSERT_MATCHING_ENUM(Unknown); @@ -28,9 +28,9 @@ base::TimeDelta ConvertSecondsToTimestamp(double seconds) { microseconds > 0 ? microseconds + 0.5 : ceil(microseconds - 0.5)); } -WebKit::WebTimeRanges ConvertToWebTimeRanges( +blink::WebTimeRanges ConvertToWebTimeRanges( const media::Ranges<base::TimeDelta>& ranges) { - WebKit::WebTimeRanges result(ranges.size()); + blink::WebTimeRanges result(ranges.size()); for (size_t i = 0; i < ranges.size(); i++) { result[i].start = ranges.start(i).InSecondsF(); result[i].end = ranges.end(i).InSecondsF(); @@ -38,14 +38,14 @@ WebKit::WebTimeRanges ConvertToWebTimeRanges( return result; } -WebKit::WebMediaPlayer::NetworkState PipelineErrorToNetworkState( +blink::WebMediaPlayer::NetworkState PipelineErrorToNetworkState( media::PipelineStatus error) { DCHECK_NE(error, media::PIPELINE_OK); switch (error) { case media::PIPELINE_ERROR_NETWORK: case media::PIPELINE_ERROR_READ: - return WebKit::WebMediaPlayer::NetworkStateNetworkError; + return blink::WebMediaPlayer::NetworkStateNetworkError; // TODO(vrk): Because OnPipelineInitialize() directly reports the // NetworkStateFormatError instead of calling OnPipelineError(), I believe @@ -57,24 +57,24 @@ WebKit::WebMediaPlayer::NetworkState PipelineErrorToNetworkState( case media::DEMUXER_ERROR_COULD_NOT_PARSE: case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS: case media::DECODER_ERROR_NOT_SUPPORTED: - return WebKit::WebMediaPlayer::NetworkStateFormatError; + return blink::WebMediaPlayer::NetworkStateFormatError; case media::PIPELINE_ERROR_DECODE: case media::PIPELINE_ERROR_ABORT: case media::PIPELINE_ERROR_OPERATION_PENDING: case media::PIPELINE_ERROR_INVALID_STATE: - return WebKit::WebMediaPlayer::NetworkStateDecodeError; + return blink::WebMediaPlayer::NetworkStateDecodeError; case media::PIPELINE_ERROR_DECRYPT: // TODO(xhwang): Change to use NetworkStateDecryptError once it's added in // Webkit (see http://crbug.com/124486). - return WebKit::WebMediaPlayer::NetworkStateDecodeError; + return blink::WebMediaPlayer::NetworkStateDecodeError; case media::PIPELINE_OK: case media::PIPELINE_STATUS_MAX: NOTREACHED() << "Unexpected status! " << error; } - return WebKit::WebMediaPlayer::NetworkStateFormatError; + return blink::WebMediaPlayer::NetworkStateFormatError; } } // namespace content diff --git a/content/renderer/media/webmediaplayer_util.h b/content/renderer/media/webmediaplayer_util.h index 007980c..c774e7d 100644 --- a/content/renderer/media/webmediaplayer_util.h +++ b/content/renderer/media/webmediaplayer_util.h @@ -19,10 +19,10 @@ namespace content { // Refer to https://bugs.webkit.org/show_bug.cgi?id=52697 for details. base::TimeDelta ConvertSecondsToTimestamp(double seconds); -WebKit::WebTimeRanges ConvertToWebTimeRanges( +blink::WebTimeRanges ConvertToWebTimeRanges( const media::Ranges<base::TimeDelta>& ranges); -WebKit::WebMediaPlayer::NetworkState PipelineErrorToNetworkState( +blink::WebMediaPlayer::NetworkState PipelineErrorToNetworkState( media::PipelineStatus error); } // namespace content diff --git a/content/renderer/media/webmediasource_impl.cc b/content/renderer/media/webmediasource_impl.cc index a420f9d..d1a2dfb 100644 --- a/content/renderer/media/webmediasource_impl.cc +++ b/content/renderer/media/webmediasource_impl.cc @@ -10,8 +10,8 @@ #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/platform/WebString.h" -using ::WebKit::WebString; -using ::WebKit::WebMediaSource; +using ::blink::WebString; +using ::blink::WebMediaSource; namespace content { @@ -34,9 +34,9 @@ WebMediaSourceImpl::WebMediaSourceImpl( WebMediaSourceImpl::~WebMediaSourceImpl() {} WebMediaSource::AddStatus WebMediaSourceImpl::addSourceBuffer( - const WebKit::WebString& type, - const WebKit::WebVector<WebKit::WebString>& codecs, - WebKit::WebSourceBuffer** source_buffer) { + const blink::WebString& type, + const blink::WebVector<blink::WebString>& codecs, + blink::WebSourceBuffer** source_buffer) { std::string id = base::GenerateGUID(); std::vector<std::string> new_codecs(codecs.size()); for (size_t i = 0; i < codecs.size(); ++i) diff --git a/content/renderer/media/webmediasource_impl.h b/content/renderer/media/webmediasource_impl.h index 8d67994..42d5eef9 100644 --- a/content/renderer/media/webmediasource_impl.h +++ b/content/renderer/media/webmediasource_impl.h @@ -17,16 +17,16 @@ class ChunkDemuxer; namespace content { -class WebMediaSourceImpl : public WebKit::WebMediaSource { +class WebMediaSourceImpl : public blink::WebMediaSource { public: WebMediaSourceImpl(media::ChunkDemuxer* demuxer, media::LogCB log_cb); virtual ~WebMediaSourceImpl(); - // WebKit::WebMediaSource implementation. + // blink::WebMediaSource implementation. virtual AddStatus addSourceBuffer( - const WebKit::WebString& type, - const WebKit::WebVector<WebKit::WebString>& codecs, - WebKit::WebSourceBuffer** source_buffer) OVERRIDE; + const blink::WebString& type, + const blink::WebVector<blink::WebString>& codecs, + blink::WebSourceBuffer** source_buffer) OVERRIDE; virtual double duration() OVERRIDE; virtual void setDuration(double duration) OVERRIDE; virtual void markEndOfStream(EndOfStreamStatus status) OVERRIDE; diff --git a/content/renderer/media/webrtc_audio_capturer.h b/content/renderer/media/webrtc_audio_capturer.h index cf9b83e..1e835c5 100644 --- a/content/renderer/media/webrtc_audio_capturer.h +++ b/content/renderer/media/webrtc_audio_capturer.h @@ -107,7 +107,7 @@ class CONTENT_EXPORT WebRtcAudioCapturer const std::string& device_id() const { return device_id_; } int session_id() const { return session_id_; } - WebKit::WebAudioSourceProvider* audio_source_provider() const { + blink::WebAudioSourceProvider* audio_source_provider() const { return source_provider_.get(); } diff --git a/content/renderer/media/webrtc_local_audio_source_provider.cc b/content/renderer/media/webrtc_local_audio_source_provider.cc index cc70c78..c1e4eae 100644 --- a/content/renderer/media/webrtc_local_audio_source_provider.cc +++ b/content/renderer/media/webrtc_local_audio_source_provider.cc @@ -11,7 +11,7 @@ #include "media/base/audio_hardware_config.h" #include "third_party/WebKit/public/web/WebAudioSourceProviderClient.h" -using WebKit::WebVector; +using blink::WebVector; namespace content { @@ -107,7 +107,7 @@ void WebRtcLocalAudioSourceProvider::GetAudioProcessingParams( } void WebRtcLocalAudioSourceProvider::setClient( - WebKit::WebAudioSourceProviderClient* client) { + blink::WebAudioSourceProviderClient* client) { NOTREACHED(); } diff --git a/content/renderer/media/webrtc_local_audio_source_provider.h b/content/renderer/media/webrtc_local_audio_source_provider.h index 1d600b7..cbb7331 100644 --- a/content/renderer/media/webrtc_local_audio_source_provider.h +++ b/content/renderer/media/webrtc_local_audio_source_provider.h @@ -21,14 +21,14 @@ class AudioFifo; class AudioParameters; } -namespace WebKit { +namespace blink { class WebAudioSourceProviderClient; } namespace content { // WebRtcLocalAudioSourceProvider provides a bridge between classes: -// WebRtcAudioCapturer ---> WebKit::WebAudioSourceProvider +// WebRtcAudioCapturer ---> blink::WebAudioSourceProvider // // WebRtcLocalAudioSourceProvider works as a sink to the WebRtcAudiocapturer // and store the capture data to a FIFO. When the media stream is connected to @@ -38,7 +38,7 @@ namespace content { // All calls are protected by a lock. class CONTENT_EXPORT WebRtcLocalAudioSourceProvider : NON_EXPORTED_BASE(public media::AudioConverter::InputCallback), - NON_EXPORTED_BASE(public WebKit::WebAudioSourceProvider) { + NON_EXPORTED_BASE(public blink::WebAudioSourceProvider) { public: static const size_t kWebAudioRenderBufferSize; @@ -61,9 +61,9 @@ class CONTENT_EXPORT WebRtcLocalAudioSourceProvider // so it has been under the protection of |lock_|. void GetAudioProcessingParams(int* delay_ms, int* volume, bool* key_pressed); - // WebKit::WebAudioSourceProvider implementation. - virtual void setClient(WebKit::WebAudioSourceProviderClient* client) OVERRIDE; - virtual void provideInput(const WebKit::WebVector<float*>& audio_data, + // blink::WebAudioSourceProvider implementation. + virtual void setClient(blink::WebAudioSourceProviderClient* client) OVERRIDE; + virtual void provideInput(const blink::WebVector<float*>& audio_data, size_t number_of_frames) OVERRIDE; // media::AudioConverter::Inputcallback implementation. diff --git a/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc b/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc index c23ce0e..6ee052b 100644 --- a/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc +++ b/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc @@ -35,7 +35,7 @@ class WebRtcLocalAudioSourceProviderTest : public testing::Test { TEST_F(WebRtcLocalAudioSourceProviderTest, VerifyDataFlow) { // Point the WebVector into memory owned by |sink_bus_|. - WebKit::WebVector<float*> audio_data( + blink::WebVector<float*> audio_data( static_cast<size_t>(sink_bus_->channels())); for (size_t i = 0; i < audio_data.size(); ++i) audio_data[i] = sink_bus_->channel(i); @@ -85,7 +85,7 @@ TEST_F(WebRtcLocalAudioSourceProviderTest, VerifyDataFlow) { TEST_F(WebRtcLocalAudioSourceProviderTest, VerifyAudioProcessingParams) { // Point the WebVector into memory owned by |sink_bus_|. - WebKit::WebVector<float*> audio_data( + blink::WebVector<float*> audio_data( static_cast<size_t>(sink_bus_->channels())); for (size_t i = 0; i < audio_data.size(); ++i) audio_data[i] = sink_bus_->channel(i); diff --git a/content/renderer/media/websourcebuffer_impl.cc b/content/renderer/media/websourcebuffer_impl.cc index dc56857..c942977 100644 --- a/content/renderer/media/websourcebuffer_impl.cc +++ b/content/renderer/media/websourcebuffer_impl.cc @@ -36,9 +36,9 @@ WebSourceBufferImpl::~WebSourceBufferImpl() { DCHECK(!demuxer_) << "Object destroyed w/o removedFromMediaSource() call"; } -WebKit::WebTimeRanges WebSourceBufferImpl::buffered() { +blink::WebTimeRanges WebSourceBufferImpl::buffered() { media::Ranges<base::TimeDelta> ranges = demuxer_->GetBufferedRanges(id_); - WebKit::WebTimeRanges result(ranges.size()); + blink::WebTimeRanges result(ranges.size()); for (size_t i = 0; i < ranges.size(); i++) { result[i].start = ranges.start(i).InSecondsF(); result[i].end = ranges.end(i).InSecondsF(); diff --git a/content/renderer/media/websourcebuffer_impl.h b/content/renderer/media/websourcebuffer_impl.h index 1f05f3b..894fb64 100644 --- a/content/renderer/media/websourcebuffer_impl.h +++ b/content/renderer/media/websourcebuffer_impl.h @@ -17,13 +17,13 @@ class ChunkDemuxer; namespace content { -class WebSourceBufferImpl : public WebKit::WebSourceBuffer { +class WebSourceBufferImpl : public blink::WebSourceBuffer { public: WebSourceBufferImpl(const std::string& id, media::ChunkDemuxer* demuxer); virtual ~WebSourceBufferImpl(); - // WebKit::WebSourceBuffer implementation. - virtual WebKit::WebTimeRanges buffered() OVERRIDE; + // blink::WebSourceBuffer implementation. + virtual blink::WebTimeRanges buffered() OVERRIDE; virtual void append(const unsigned char* data, unsigned length) OVERRIDE; virtual void abort() OVERRIDE; // TODO(acolwell): Add OVERRIDE when Blink-side changes land. diff --git a/content/renderer/menu_item_builder.cc b/content/renderer/menu_item_builder.cc index 5946c41..0bbd5d8 100644 --- a/content/renderer/menu_item_builder.cc +++ b/content/renderer/menu_item_builder.cc @@ -8,14 +8,14 @@ namespace content { -MenuItem MenuItemBuilder::Build(const WebKit::WebMenuItemInfo& item) { +MenuItem MenuItemBuilder::Build(const blink::WebMenuItemInfo& item) { MenuItem result; result.label = item.label; result.tool_tip = item.toolTip; result.type = static_cast<MenuItem::Type>(item.type); result.action = item.action; - result.rtl = (item.textDirection == WebKit::WebTextDirectionRightToLeft); + result.rtl = (item.textDirection == blink::WebTextDirectionRightToLeft); result.has_directional_override = item.hasTextDirectionOverride; result.enabled = item.enabled; result.checked = item.checked; diff --git a/content/renderer/menu_item_builder.h b/content/renderer/menu_item_builder.h index 8f007bd..f82a458 100644 --- a/content/renderer/menu_item_builder.h +++ b/content/renderer/menu_item_builder.h @@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_MENU_ITEM_BUILDER_H_ #define CONTENT_RENDERER_MENU_ITEM_BUILDER_H_ -namespace WebKit { +namespace blink { struct WebMenuItemInfo; } @@ -14,7 +14,7 @@ struct MenuItem; class MenuItemBuilder { public: - static MenuItem Build(const WebKit::WebMenuItemInfo& item); + static MenuItem Build(const blink::WebMenuItemInfo& item); }; } // namespace content diff --git a/content/renderer/mhtml_generator.cc b/content/renderer/mhtml_generator.cc index 0a1c785..9530044 100644 --- a/content/renderer/mhtml_generator.cc +++ b/content/renderer/mhtml_generator.cc @@ -48,8 +48,8 @@ void MHTMLGenerator::NotifyBrowser(int job_id, int64 data_size) { // TODO(jcivelli): write the chunks in deferred tasks to give a chance to the // message loop to process other events. int64 MHTMLGenerator::GenerateMHTML() { - WebKit::WebCString mhtml = - WebKit::WebPageSerializer::serializeToMHTML(render_view()->GetWebView()); + blink::WebCString mhtml = + blink::WebPageSerializer::serializeToMHTML(render_view()->GetWebView()); const size_t chunk_size = 1024; const char* data = mhtml.data(); size_t total_bytes_written = 0; diff --git a/content/renderer/mouse_lock_dispatcher.cc b/content/renderer/mouse_lock_dispatcher.cc index 56ec66d..f72e1e0 100644 --- a/content/renderer/mouse_lock_dispatcher.cc +++ b/content/renderer/mouse_lock_dispatcher.cc @@ -58,7 +58,7 @@ bool MouseLockDispatcher::IsMouseLockedTo(LockTarget* target) { } bool MouseLockDispatcher::WillHandleMouseEvent( - const WebKit::WebMouseEvent& event) { + const blink::WebMouseEvent& event) { if (mouse_locked_ && target_) return target_->HandleMouseLockedInputEvent(event); return false; diff --git a/content/renderer/mouse_lock_dispatcher.h b/content/renderer/mouse_lock_dispatcher.h index 6423b7d..29b8e4f 100644 --- a/content/renderer/mouse_lock_dispatcher.h +++ b/content/renderer/mouse_lock_dispatcher.h @@ -8,9 +8,9 @@ #include "base/basictypes.h" #include "content/common/content_export.h" -namespace WebKit { +namespace blink { class WebMouseEvent; -} // namespace WebKit +} // namespace blink namespace content { @@ -28,7 +28,7 @@ class CONTENT_EXPORT MouseLockDispatcher { virtual void OnMouseLockLost() = 0; // A mouse lock is enabled and mouse events are being delievered. virtual bool HandleMouseLockedInputEvent( - const WebKit::WebMouseEvent& event) = 0; + const blink::WebMouseEvent& event) = 0; }; // Locks the mouse to the |target|. If true is returned, an asynchronous @@ -43,7 +43,7 @@ class CONTENT_EXPORT MouseLockDispatcher { bool IsMouseLockedTo(LockTarget* target); // Allow lock target to consumed a mouse event, if it does return true. - bool WillHandleMouseEvent(const WebKit::WebMouseEvent& event); + bool WillHandleMouseEvent(const blink::WebMouseEvent& event); // Subclasses or users have to call these methods to report mouse lock events // from the browser. diff --git a/content/renderer/mouse_lock_dispatcher_browsertest.cc b/content/renderer/mouse_lock_dispatcher_browsertest.cc index f9c44c2..ef18331 100644 --- a/content/renderer/mouse_lock_dispatcher_browsertest.cc +++ b/content/renderer/mouse_lock_dispatcher_browsertest.cc @@ -21,7 +21,7 @@ class MockLockTarget : public MouseLockDispatcher::LockTarget { MOCK_METHOD1(OnLockMouseACK, void(bool)); MOCK_METHOD0(OnMouseLockLost, void()); MOCK_METHOD1(HandleMouseLockedInputEvent, - bool(const WebKit::WebMouseEvent&)); + bool(const blink::WebMouseEvent&)); }; // MouseLockDispatcher is a RenderViewObserver, and we test it by creating a @@ -90,7 +90,7 @@ TEST_F(MouseLockDispatcherTest, BasicMockLockTarget) { EXPECT_TRUE(dispatcher()->IsMouseLockedTo(target_)); // Receive mouse event. - dispatcher()->WillHandleMouseEvent(WebKit::WebMouseEvent()); + dispatcher()->WillHandleMouseEvent(blink::WebMouseEvent()); // Unlock. dispatcher()->UnlockMouse(target_); @@ -120,7 +120,7 @@ TEST_F(MouseLockDispatcherTest, DeleteAndUnlock) { dispatcher()->OnLockTargetDestroyed(target_); delete target_; target_ = NULL; - dispatcher()->WillHandleMouseEvent(WebKit::WebMouseEvent()); + dispatcher()->WillHandleMouseEvent(blink::WebMouseEvent()); view()->OnMessageReceived(ViewMsg_MouseLockLost(route_id_)); EXPECT_FALSE(dispatcher()->IsMouseLockedTo(target_)); } @@ -171,7 +171,7 @@ TEST_F(MouseLockDispatcherTest, MouseEventsNotReceived) { EXPECT_CALL(*target_, HandleMouseLockedInputEvent(_)).Times(0); // (Don't) receive mouse event. - dispatcher()->WillHandleMouseEvent(WebKit::WebMouseEvent()); + dispatcher()->WillHandleMouseEvent(blink::WebMouseEvent()); // Lock. EXPECT_TRUE(dispatcher()->LockMouse(target_)); @@ -179,7 +179,7 @@ TEST_F(MouseLockDispatcherTest, MouseEventsNotReceived) { EXPECT_TRUE(dispatcher()->IsMouseLockedTo(target_)); // Receive mouse event. - dispatcher()->WillHandleMouseEvent(WebKit::WebMouseEvent()); + dispatcher()->WillHandleMouseEvent(blink::WebMouseEvent()); // Unlock. dispatcher()->UnlockMouse(target_); @@ -187,7 +187,7 @@ TEST_F(MouseLockDispatcherTest, MouseEventsNotReceived) { EXPECT_FALSE(dispatcher()->IsMouseLockedTo(target_)); // (Don't) receive mouse event. - dispatcher()->WillHandleMouseEvent(WebKit::WebMouseEvent()); + dispatcher()->WillHandleMouseEvent(blink::WebMouseEvent()); } // Test multiple targets @@ -216,7 +216,7 @@ TEST_F(MouseLockDispatcherTest, MultipleTargets) { EXPECT_FALSE(dispatcher()->LockMouse(alternate_target_)); // Receive mouse event to only one target. - dispatcher()->WillHandleMouseEvent(WebKit::WebMouseEvent()); + dispatcher()->WillHandleMouseEvent(blink::WebMouseEvent()); // Unlock alternate target has no effect. dispatcher()->UnlockMouse(alternate_target_); diff --git a/content/renderer/notification_provider.cc b/content/renderer/notification_provider.cc index fc75042..03bd13f 100644 --- a/content/renderer/notification_provider.cc +++ b/content/renderer/notification_provider.cc @@ -15,14 +15,14 @@ #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" #include "third_party/WebKit/public/web/WebView.h" -using WebKit::WebDocument; -using WebKit::WebNotification; -using WebKit::WebNotificationPresenter; -using WebKit::WebNotificationPermissionCallback; -using WebKit::WebSecurityOrigin; -using WebKit::WebString; -using WebKit::WebURL; -using WebKit::WebUserGestureIndicator; +using blink::WebDocument; +using blink::WebNotification; +using blink::WebNotificationPresenter; +using blink::WebNotificationPermissionCallback; +using blink::WebSecurityOrigin; +using blink::WebString; +using blink::WebURL; +using blink::WebUserGestureIndicator; namespace content { diff --git a/content/renderer/notification_provider.h b/content/renderer/notification_provider.h index ababece..e2c99ce 100644 --- a/content/renderer/notification_provider.h +++ b/content/renderer/notification_provider.h @@ -10,7 +10,7 @@ #include "third_party/WebKit/public/web/WebNotification.h" #include "third_party/WebKit/public/web/WebNotificationPresenter.h" -namespace WebKit { +namespace blink { class WebNotificationPermissionCallback; } @@ -20,7 +20,7 @@ class RenderViewImpl; // NotificationProvider class is owned by the RenderView. Only // to be used on the main thread. class NotificationProvider : public RenderViewObserver, - public WebKit::WebNotificationPresenter { + public blink::WebNotificationPresenter { public: explicit NotificationProvider(RenderViewImpl* render_view); virtual ~NotificationProvider(); @@ -29,22 +29,22 @@ class NotificationProvider : public RenderViewObserver, // RenderView::Observer implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - // WebKit::WebNotificationPresenter interface. - virtual bool show(const WebKit::WebNotification& proxy); - virtual void cancel(const WebKit::WebNotification& proxy); - virtual void objectDestroyed(const WebKit::WebNotification& proxy); - virtual WebKit::WebNotificationPresenter::Permission checkPermission( - const WebKit::WebSecurityOrigin& origin); - virtual void requestPermission(const WebKit::WebSecurityOrigin& origin, - WebKit::WebNotificationPermissionCallback* callback); + // blink::WebNotificationPresenter interface. + virtual bool show(const blink::WebNotification& proxy); + virtual void cancel(const blink::WebNotification& proxy); + virtual void objectDestroyed(const blink::WebNotification& proxy); + virtual blink::WebNotificationPresenter::Permission checkPermission( + const blink::WebSecurityOrigin& origin); + virtual void requestPermission(const blink::WebSecurityOrigin& origin, + blink::WebNotificationPermissionCallback* callback); // Internal methods used to show notifications. - bool ShowHTML(const WebKit::WebNotification& notification, int id); - bool ShowText(const WebKit::WebNotification& notification, int id); + bool ShowHTML(const blink::WebNotification& notification, int id); + bool ShowText(const blink::WebNotification& notification, int id); // IPC handlers. void OnDisplay(int id); - void OnError(int id, const WebKit::WebString& message); + void OnError(int id, const blink::WebString& message); void OnClose(int id, bool by_user); void OnClick(int id); void OnPermissionRequestComplete(int id); diff --git a/content/renderer/npapi/plugin_channel_host.cc b/content/renderer/npapi/plugin_channel_host.cc index c276d33..679288f5 100644 --- a/content/renderer/npapi/plugin_channel_host.cc +++ b/content/renderer/npapi/plugin_channel_host.cc @@ -127,7 +127,7 @@ bool PluginChannelHost::OnControlMessageReceived(const IPC::Message& message) { } void PluginChannelHost::OnSetException(const std::string& message) { - WebKit::WebBindings::setException(NULL, message.c_str()); + blink::WebBindings::setException(NULL, message.c_str()); } void PluginChannelHost::OnPluginShuttingDown() { diff --git a/content/renderer/npapi/webplugin_delegate_proxy.cc b/content/renderer/npapi/webplugin_delegate_proxy.cc index 80cb2ea..7d5bf54 100644 --- a/content/renderer/npapi/webplugin_delegate_proxy.cc +++ b/content/renderer/npapi/webplugin_delegate_proxy.cc @@ -67,12 +67,12 @@ #include "content/public/common/sandbox_init.h" #endif -using WebKit::WebBindings; -using WebKit::WebCursorInfo; -using WebKit::WebDragData; -using WebKit::WebInputEvent; -using WebKit::WebString; -using WebKit::WebView; +using blink::WebBindings; +using blink::WebCursorInfo; +using blink::WebDragData; +using blink::WebInputEvent; +using blink::WebString; +using blink::WebView; namespace content { @@ -848,7 +848,7 @@ void WebPluginDelegateProxy::SetContainerVisibility(bool is_visible) { if (is_visible) { gfx::Rect window_frame = render_view_->rootWindowRect(); gfx::Rect view_frame = render_view_->windowRect(); - WebKit::WebView* webview = render_view_->webview(); + blink::WebView* webview = render_view_->webview(); msg = new PluginMsg_ContainerShown(instance_id_, window_frame, view_frame, webview && webview->isActive()); } else { @@ -935,7 +935,7 @@ void WebPluginDelegateProxy::OnNotifyIMEStatus(int input_type, ViewHostMsg_SelectionBounds_Params bounds_params; bounds_params.anchor_rect = bounds_params.focus_rect = caret_rect; bounds_params.anchor_dir = bounds_params.focus_dir = - WebKit::WebTextDirectionLeftToRight; + blink::WebTextDirectionLeftToRight; bounds_params.is_anchor_first = true; render_view_->Send(new ViewHostMsg_SelectionBoundsChanged( render_view_->routing_id(), diff --git a/content/renderer/npapi/webplugin_delegate_proxy.h b/content/renderer/npapi/webplugin_delegate_proxy.h index 542986f..679bc6d 100644 --- a/content/renderer/npapi/webplugin_delegate_proxy.h +++ b/content/renderer/npapi/webplugin_delegate_proxy.h @@ -68,7 +68,7 @@ class WebPluginDelegateProxy virtual void DidFinishLoadWithReason(const GURL& url, NPReason reason, int notify_id) OVERRIDE; virtual void SetFocus(bool focused) OVERRIDE; - virtual bool HandleInputEvent(const WebKit::WebInputEvent& event, + virtual bool HandleInputEvent(const blink::WebInputEvent& event, WebCursor::CursorInfo* cursor) OVERRIDE; virtual int GetProcessId() OVERRIDE; diff --git a/content/renderer/npapi/webplugin_impl.cc b/content/renderer/npapi/webplugin_impl.cc index 5d97e4e..79541b6 100644 --- a/content/renderer/npapi/webplugin_impl.cc +++ b/content/renderer/npapi/webplugin_impl.cc @@ -57,32 +57,32 @@ #include "webkit/child/multipart_response_delegate.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" -using WebKit::WebCanvas; -using WebKit::WebConsoleMessage; -using WebKit::WebCookieJar; -using WebKit::WebCString; -using WebKit::WebCursorInfo; -using WebKit::WebData; -using WebKit::WebDataSource; -using WebKit::WebFrame; -using WebKit::WebHTTPBody; -using WebKit::WebHTTPHeaderVisitor; -using WebKit::WebInputEvent; -using WebKit::WebKeyboardEvent; -using WebKit::WebMouseEvent; -using WebKit::WebPluginContainer; -using WebKit::WebPluginParams; -using WebKit::WebRect; -using WebKit::WebString; -using WebKit::WebURL; -using WebKit::WebURLError; -using WebKit::WebURLLoader; -using WebKit::WebURLLoaderClient; -using WebKit::WebURLLoaderOptions; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; -using WebKit::WebVector; -using WebKit::WebView; +using blink::WebCanvas; +using blink::WebConsoleMessage; +using blink::WebCookieJar; +using blink::WebCString; +using blink::WebCursorInfo; +using blink::WebData; +using blink::WebDataSource; +using blink::WebFrame; +using blink::WebHTTPBody; +using blink::WebHTTPHeaderVisitor; +using blink::WebInputEvent; +using blink::WebKeyboardEvent; +using blink::WebMouseEvent; +using blink::WebPluginContainer; +using blink::WebPluginParams; +using blink::WebRect; +using blink::WebString; +using blink::WebURL; +using blink::WebURLError; +using blink::WebURLLoader; +using blink::WebURLLoaderClient; +using blink::WebURLLoaderOptions; +using blink::WebURLRequest; +using blink::WebURLResponse; +using blink::WebVector; +using blink::WebView; using webkit_glue::MultipartResponseDelegate; namespace content { @@ -212,14 +212,14 @@ void GetResponseInfo(const WebURLResponse& response, } // namespace -// WebKit::WebPlugin ---------------------------------------------------------- +// blink::WebPlugin ---------------------------------------------------------- struct WebPluginImpl::ClientInfo { unsigned long id; WebPluginResourceClient* client; - WebKit::WebURLRequest request; + blink::WebURLRequest request; bool pending_failure_notification; - linked_ptr<WebKit::WebURLLoader> loader; + linked_ptr<blink::WebURLLoader> loader; bool notify_redirects; bool is_plugin_src_load; int64 data_offset; @@ -249,7 +249,7 @@ bool WebPluginImpl::initialize(WebPluginContainer* container) { if (!ok) { plugin_delegate->PluginDestroyed(); - WebKit::WebPlugin* replacement_plugin = + blink::WebPlugin* replacement_plugin = GetContentClient()->renderer()->CreatePluginReplacement( render_view_.get(), file_path_); if (!replacement_plugin) @@ -286,7 +286,7 @@ NPP WebPluginImpl::pluginNPP() { return npp_; } -bool WebPluginImpl::getFormValue(WebKit::WebString& value) { +bool WebPluginImpl::getFormValue(blink::WebString& value) { if (!delegate_) return false; base::string16 form_value; @@ -1487,7 +1487,7 @@ void WebPluginImpl::TearDownPluginInstance( weak_factory_.InvalidateWeakPtrs(); } -void WebPluginImpl::SetReferrer(WebKit::WebURLRequest* request, +void WebPluginImpl::SetReferrer(blink::WebURLRequest* request, Referrer referrer_flag) { switch (referrer_flag) { case DOCUMENT_URL: diff --git a/content/renderer/npapi/webplugin_impl.h b/content/renderer/npapi/webplugin_impl.h index 9c7bf01..4d8bd40 100644 --- a/content/renderer/npapi/webplugin_impl.h +++ b/content/renderer/npapi/webplugin_impl.h @@ -29,7 +29,7 @@ namespace cc { class IOSurfaceLayer; } -namespace WebKit { +namespace blink { class WebFrame; class WebLayer; class WebPluginContainer; @@ -51,50 +51,50 @@ class WebPluginDelegate; // after changing out of WebCore types, to a delegate. The delegate may // be in a different process. class WebPluginImpl : public WebPlugin, - public WebKit::WebPlugin, - public WebKit::WebURLLoaderClient { + public blink::WebPlugin, + public blink::WebURLLoaderClient { public: WebPluginImpl( - WebKit::WebFrame* frame, - const WebKit::WebPluginParams& params, + blink::WebFrame* frame, + const blink::WebPluginParams& params, const base::FilePath& file_path, const base::WeakPtr<RenderViewImpl>& render_view); virtual ~WebPluginImpl(); // Helper function for sorting post data. - CONTENT_EXPORT static bool SetPostData(WebKit::WebURLRequest* request, + CONTENT_EXPORT static bool SetPostData(blink::WebURLRequest* request, const char* buf, uint32 length); - WebKit::WebFrame* webframe() { return webframe_; } + blink::WebFrame* webframe() { return webframe_; } WebPluginDelegate* delegate() { return delegate_; } - // WebKit::WebPlugin methods: + // blink::WebPlugin methods: virtual bool initialize( - WebKit::WebPluginContainer* container); + blink::WebPluginContainer* container); virtual void destroy(); virtual NPObject* scriptableObject(); virtual struct _NPP* pluginNPP(); - virtual bool getFormValue(WebKit::WebString& value); + virtual bool getFormValue(blink::WebString& value); virtual void paint( - WebKit::WebCanvas* canvas, const WebKit::WebRect& paint_rect); + blink::WebCanvas* canvas, const blink::WebRect& paint_rect); virtual void updateGeometry( - const WebKit::WebRect& frame_rect, const WebKit::WebRect& clip_rect, - const WebKit::WebVector<WebKit::WebRect>& cut_outs, bool is_visible); + const blink::WebRect& frame_rect, const blink::WebRect& clip_rect, + const blink::WebVector<blink::WebRect>& cut_outs, bool is_visible); virtual void updateFocus(bool focused); virtual void updateVisibility(bool visible); virtual bool acceptsInputEvents(); virtual bool handleInputEvent( - const WebKit::WebInputEvent& event, WebKit::WebCursorInfo& cursor_info); - virtual void didReceiveResponse(const WebKit::WebURLResponse& response); + const blink::WebInputEvent& event, blink::WebCursorInfo& cursor_info); + virtual void didReceiveResponse(const blink::WebURLResponse& response); virtual void didReceiveData(const char* data, int data_length); virtual void didFinishLoading(); - virtual void didFailLoading(const WebKit::WebURLError& error); + virtual void didFailLoading(const blink::WebURLError& error); virtual void didFinishLoadingFrameRequest( - const WebKit::WebURL& url, void* notify_data); + const blink::WebURL& url, void* notify_data); virtual void didFailLoadingFrameRequest( - const WebKit::WebURL& url, void* notify_data, - const WebKit::WebURLError& error); + const blink::WebURL& url, void* notify_data, + const blink::WebURLError& error); virtual bool isPlaceholder() OVERRIDE; // WebPlugin implementation: @@ -200,31 +200,31 @@ class WebPluginImpl : public WebPlugin, gfx::Rect GetWindowClipRect(const gfx::Rect& rect); // Sets the actual Widget for the plugin. - void SetContainer(WebKit::WebPluginContainer* container); + void SetContainer(blink::WebPluginContainer* container); // Destroys the plugin instance. // The response_handle_to_ignore parameter if not NULL indicates the // resource handle to be left valid during plugin shutdown. - void TearDownPluginInstance(WebKit::WebURLLoader* loader_to_ignore); + void TearDownPluginInstance(blink::WebURLLoader* loader_to_ignore); // WebURLLoaderClient implementation. We implement this interface in the // renderer process, and then use the simple WebPluginResourceClient interface // to relay the callbacks to the plugin. - virtual void willSendRequest(WebKit::WebURLLoader* loader, - WebKit::WebURLRequest& request, - const WebKit::WebURLResponse& response); - virtual void didSendData(WebKit::WebURLLoader* loader, + virtual void willSendRequest(blink::WebURLLoader* loader, + blink::WebURLRequest& request, + const blink::WebURLResponse& response); + virtual void didSendData(blink::WebURLLoader* loader, unsigned long long bytes_sent, unsigned long long total_bytes_to_be_sent); - virtual void didReceiveResponse(WebKit::WebURLLoader* loader, - const WebKit::WebURLResponse& response); + virtual void didReceiveResponse(blink::WebURLLoader* loader, + const blink::WebURLResponse& response); - virtual void didReceiveData(WebKit::WebURLLoader* loader, const char *buffer, + virtual void didReceiveData(blink::WebURLLoader* loader, const char *buffer, int data_length, int encoded_data_length); - virtual void didFinishLoading(WebKit::WebURLLoader* loader, + virtual void didFinishLoading(blink::WebURLLoader* loader, double finishTime); - virtual void didFail(WebKit::WebURLLoader* loader, - const WebKit::WebURLError& error); + virtual void didFail(blink::WebURLLoader* loader, + const blink::WebURLError& error); // Helper function to remove the stored information about a resource // request given its index in m_clients. @@ -232,13 +232,13 @@ class WebPluginImpl : public WebPlugin, // Helper function to remove the stored information about a resource // request given a handle. - void RemoveClient(WebKit::WebURLLoader* loader); + void RemoveClient(blink::WebURLLoader* loader); // Handles HTTP multipart responses, i.e. responses received with a HTTP // status code of 206. // Returns false if response is not multipart (may be if we requested // single range). - bool HandleHttpMultipartResponse(const WebKit::WebURLResponse& response, + bool HandleHttpMultipartResponse(const blink::WebURLResponse& response, WebPluginResourceClient* client); void HandleURLRequestInternal(const char* url, @@ -254,7 +254,7 @@ class WebPluginImpl : public WebPlugin, // Tears down the existing plugin instance and creates a new plugin instance // to handle the response identified by the loader parameter. - bool ReinitializePluginForResponse(WebKit::WebURLLoader* loader); + bool ReinitializePluginForResponse(blink::WebURLLoader* loader); // Delayed task for downloading the plugin source URL. void OnDownloadPluginSrcUrl(); @@ -262,11 +262,11 @@ class WebPluginImpl : public WebPlugin, struct ClientInfo; // Helper functions - WebPluginResourceClient* GetClientFromLoader(WebKit::WebURLLoader* loader); - ClientInfo* GetClientInfoFromLoader(WebKit::WebURLLoader* loader); + WebPluginResourceClient* GetClientFromLoader(blink::WebURLLoader* loader); + ClientInfo* GetClientInfoFromLoader(blink::WebURLLoader* loader); // Helper function to set the referrer on the request passed in. - void SetReferrer(WebKit::WebURLRequest* request, Referrer referrer_flag); + void SetReferrer(blink::WebURLRequest* request, Referrer referrer_flag); // Check for invalid chars like @, ;, \ before the first / (in path). bool IsValidUrl(const GURL& url, Referrer referrer_flag); @@ -283,16 +283,16 @@ class WebPluginImpl : public WebPlugin, int32 next_io_surface_height_; uint32 next_io_surface_id_; scoped_refptr<cc::IOSurfaceLayer> io_surface_layer_; - scoped_ptr<WebKit::WebLayer> web_layer_; + scoped_ptr<blink::WebLayer> web_layer_; #endif bool accepts_input_events_; base::WeakPtr<RenderViewImpl> render_view_; - WebKit::WebFrame* webframe_; + blink::WebFrame* webframe_; WebPluginDelegate* delegate_; // This is just a weak reference. - WebKit::WebPluginContainer* container_; + blink::WebPluginContainer* container_; // Unique identifier for this plugin, used to track script objects. struct _NPP* npp_; diff --git a/content/renderer/npapi/webplugin_impl_unittest.cc b/content/renderer/npapi/webplugin_impl_unittest.cc index df1371c..dd3b83e 100644 --- a/content/renderer/npapi/webplugin_impl_unittest.cc +++ b/content/renderer/npapi/webplugin_impl_unittest.cc @@ -9,9 +9,9 @@ #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" -using WebKit::WebHTTPBody; -using WebKit::WebString; -using WebKit::WebURLRequest; +using blink::WebHTTPBody; +using blink::WebString; +using blink::WebURLRequest; namespace content { diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc index 2c5b8e4..280e04d 100644 --- a/content/renderer/p2p/port_allocator.cc +++ b/content/renderer/p2p/port_allocator.cc @@ -21,12 +21,12 @@ #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebURLLoaderOptions.h" -using WebKit::WebString; -using WebKit::WebURL; -using WebKit::WebURLLoader; -using WebKit::WebURLLoaderOptions; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; +using blink::WebString; +using blink::WebURL; +using blink::WebURLLoader; +using blink::WebURLLoaderOptions; +using blink::WebURLRequest; +using blink::WebURLResponse; namespace content { @@ -69,7 +69,7 @@ P2PPortAllocator::Config::RelayServerConfig::~RelayServerConfig() { } P2PPortAllocator::P2PPortAllocator( - WebKit::WebFrame* web_frame, + blink::WebFrame* web_frame, P2PSocketDispatcher* socket_dispatcher, talk_base::NetworkManager* network_manager, talk_base::PacketSocketFactory* socket_factory, @@ -153,8 +153,8 @@ void P2PPortAllocatorSession::didFinishLoading(WebURLLoader* loader, ParseRelayResponse(); } -void P2PPortAllocatorSession::didFail(WebKit::WebURLLoader* loader, - const WebKit::WebURLError& error) { +void P2PPortAllocatorSession::didFail(blink::WebURLLoader* loader, + const blink::WebURLError& error) { DCHECK_EQ(loader, relay_session_request_.get()); DCHECK_NE(error.reason, 0); diff --git a/content/renderer/p2p/port_allocator.h b/content/renderer/p2p/port_allocator.h index 5c0a4fc..eb50aef 100644 --- a/content/renderer/p2p/port_allocator.h +++ b/content/renderer/p2p/port_allocator.h @@ -11,10 +11,10 @@ #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" #include "third_party/libjingle/source/talk/p2p/client/basicportallocator.h" -namespace WebKit { +namespace blink { class WebFrame; class WebURLLoader; -} // namespace WebKit +} // namespace blink namespace content { @@ -54,7 +54,7 @@ class P2PPortAllocator : public cricket::BasicPortAllocator { bool disable_tcp_transport; }; - P2PPortAllocator(WebKit::WebFrame* web_frame, + P2PPortAllocator(blink::WebFrame* web_frame, P2PSocketDispatcher* socket_dispatcher, talk_base::NetworkManager* network_manager, talk_base::PacketSocketFactory* socket_factory, @@ -70,7 +70,7 @@ class P2PPortAllocator : public cricket::BasicPortAllocator { private: friend class P2PPortAllocatorSession; - WebKit::WebFrame* web_frame_; + blink::WebFrame* web_frame_; P2PSocketDispatcher* socket_dispatcher_; Config config_; @@ -78,7 +78,7 @@ class P2PPortAllocator : public cricket::BasicPortAllocator { }; class P2PPortAllocatorSession : public cricket::BasicPortAllocatorSession, - public WebKit::WebURLLoaderClient { + public blink::WebURLLoaderClient { public: P2PPortAllocatorSession( P2PPortAllocator* allocator, @@ -88,15 +88,15 @@ class P2PPortAllocatorSession : public cricket::BasicPortAllocatorSession, const std::string& ice_password); virtual ~P2PPortAllocatorSession(); - // WebKit::WebURLLoaderClient overrides. - virtual void didReceiveData(WebKit::WebURLLoader* loader, + // blink::WebURLLoaderClient overrides. + virtual void didReceiveData(blink::WebURLLoader* loader, const char* data, int data_length, int encoded_data_length) OVERRIDE; - virtual void didFinishLoading(WebKit::WebURLLoader* loader, + virtual void didFinishLoading(blink::WebURLLoader* loader, double finish_time) OVERRIDE; - virtual void didFail(WebKit::WebURLLoader* loader, - const WebKit::WebURLError& error) OVERRIDE; + virtual void didFail(blink::WebURLLoader* loader, + const blink::WebURLError& error) OVERRIDE; protected: // Overrides for cricket::BasicPortAllocatorSession. @@ -134,7 +134,7 @@ class P2PPortAllocatorSession : public cricket::BasicPortAllocatorSession, std::vector<RelayServer> relay_info_; - scoped_ptr<WebKit::WebURLLoader> relay_session_request_; + scoped_ptr<blink::WebURLLoader> relay_session_request_; int relay_session_attempts_; std::string relay_session_response_; talk_base::SocketAddress relay_ip_; diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.cc b/content/renderer/pepper/content_renderer_pepper_host_factory.cc index 0b59503..5877439 100644 --- a/content/renderer/pepper/content_renderer_pepper_host_factory.cc +++ b/content/renderer/pepper/content_renderer_pepper_host_factory.cc @@ -39,7 +39,7 @@ namespace { bool CanUseMediaStreamAPI(const RendererPpapiHost* host, PP_Instance instance) { - WebKit::WebPluginContainer* container = + blink::WebPluginContainer* container = host->GetContainerForInstance(instance); if (!container) return false; diff --git a/content/renderer/pepper/event_conversion.cc b/content/renderer/pepper/event_conversion.cc index 0df4895..b7c0601 100644 --- a/content/renderer/pepper/event_conversion.cc +++ b/content/renderer/pepper/event_conversion.cc @@ -26,14 +26,14 @@ using ppapi::EventTimeToPPTimeTicks; using ppapi::InputEventData; using ppapi::PPTimeTicksToEventTime; -using WebKit::WebInputEvent; -using WebKit::WebKeyboardEvent; -using WebKit::WebMouseEvent; -using WebKit::WebMouseWheelEvent; -using WebKit::WebString; -using WebKit::WebTouchEvent; -using WebKit::WebTouchPoint; -using WebKit::WebUChar; +using blink::WebInputEvent; +using blink::WebKeyboardEvent; +using blink::WebMouseEvent; +using blink::WebMouseWheelEvent; +using blink::WebString; +using blink::WebTouchEvent; +using blink::WebTouchPoint; +using blink::WebUChar; namespace content { diff --git a/content/renderer/pepper/event_conversion.h b/content/renderer/pepper/event_conversion.h index edaa730..81aa6b3 100644 --- a/content/renderer/pepper/event_conversion.h +++ b/content/renderer/pepper/event_conversion.h @@ -17,7 +17,7 @@ namespace ppapi { struct InputEventData; } -namespace WebKit { +namespace blink { class WebGamepads; class WebInputEvent; } @@ -27,24 +27,24 @@ namespace content { // Converts the given WebKit event to one or possibly multiple PP_InputEvents. // The generated events will be filled into the given vector. On failure, no // events will ge generated and the vector will be empty. -void CreateInputEventData(const WebKit::WebInputEvent& event, +void CreateInputEventData(const blink::WebInputEvent& event, std::vector<ppapi::InputEventData >* pp_events); // Creates a WebInputEvent from the given PP_InputEvent. If it fails, returns // NULL. The caller owns the created object on success. -WebKit::WebInputEvent* CreateWebInputEvent(const ppapi::InputEventData& event); +blink::WebInputEvent* CreateWebInputEvent(const ppapi::InputEventData& event); // Creates an array of WebInputEvents to make the given event look like a user // input event on all platforms. |plugin_x| and |plugin_y| should be the // coordinates of a point within the plugin's area on the page. -std::vector<linked_ptr<WebKit::WebInputEvent> > CreateSimulatedWebInputEvents( +std::vector<linked_ptr<blink::WebInputEvent> > CreateSimulatedWebInputEvents( const ppapi::InputEventData& event, int plugin_x, int plugin_y); // Returns the PPAPI event class for the given WebKit event type. The given // type should not be "Undefined" since there's no corresponding PPAPI class. -PP_InputEvent_Class ClassifyInputEvent(WebKit::WebInputEvent::Type type); +PP_InputEvent_Class ClassifyInputEvent(blink::WebInputEvent::Type type); } // namespace content diff --git a/content/renderer/pepper/fullscreen_container.h b/content/renderer/pepper/fullscreen_container.h index 81ee53d..d91cc66 100644 --- a/content/renderer/pepper/fullscreen_container.h +++ b/content/renderer/pepper/fullscreen_container.h @@ -5,11 +5,11 @@ #ifndef CONTENT_RENDERER_PEPPER_PPB_FULLSCREEN_CONTAINER_IMPL_H_ #define CONTENT_RENDERER_PEPPER_PPB_FULLSCREEN_CONTAINER_IMPL_H_ -namespace WebKit { +namespace blink { class WebLayer; struct WebCursorInfo; struct WebRect; -} // namespace WebKit +} // namespace blink namespace content { @@ -21,19 +21,19 @@ class FullscreenContainer { virtual void Invalidate() = 0; // Invalidates a partial region of the plugin. - virtual void InvalidateRect(const WebKit::WebRect&) = 0; + virtual void InvalidateRect(const blink::WebRect&) = 0; // Scrolls a partial region of the plugin in the given direction. - virtual void ScrollRect(int dx, int dy, const WebKit::WebRect&) = 0; + virtual void ScrollRect(int dx, int dy, const blink::WebRect&) = 0; // Destroys the fullscreen window. This also destroys the FullscreenContainer // instance. virtual void Destroy() = 0; // Notifies the container that the mouse cursor has changed. - virtual void DidChangeCursor(const WebKit::WebCursorInfo& cursor) = 0; + virtual void DidChangeCursor(const blink::WebCursorInfo& cursor) = 0; - virtual void SetLayer(WebKit::WebLayer* layer) = 0; + virtual void SetLayer(blink::WebLayer* layer) = 0; protected: virtual ~FullscreenContainer() {} diff --git a/content/renderer/pepper/host_array_buffer_var.cc b/content/renderer/pepper/host_array_buffer_var.cc index b6b719d..d8d4cec 100644 --- a/content/renderer/pepper/host_array_buffer_var.cc +++ b/content/renderer/pepper/host_array_buffer_var.cc @@ -18,7 +18,7 @@ #include "ppapi/c/pp_instance.h" using ppapi::ArrayBufferVar; -using WebKit::WebArrayBuffer; +using blink::WebArrayBuffer; namespace content { diff --git a/content/renderer/pepper/host_array_buffer_var.h b/content/renderer/pepper/host_array_buffer_var.h index 9ba1d7c..13bd806 100644 --- a/content/renderer/pepper/host_array_buffer_var.h +++ b/content/renderer/pepper/host_array_buffer_var.h @@ -17,7 +17,7 @@ namespace content { class HostArrayBufferVar : public ppapi::ArrayBufferVar { public: explicit HostArrayBufferVar(uint32 size_in_bytes); - explicit HostArrayBufferVar(const WebKit::WebArrayBuffer& buffer); + explicit HostArrayBufferVar(const blink::WebArrayBuffer& buffer); explicit HostArrayBufferVar(uint32 size_in_bytes, base::SharedMemoryHandle handle); @@ -30,12 +30,12 @@ class HostArrayBufferVar : public ppapi::ArrayBufferVar { int* host_shm_handle_id, base::SharedMemoryHandle* plugin_shm_handle) OVERRIDE; - WebKit::WebArrayBuffer& webkit_buffer() { return buffer_; } + blink::WebArrayBuffer& webkit_buffer() { return buffer_; } private: virtual ~HostArrayBufferVar(); - WebKit::WebArrayBuffer buffer_; + blink::WebArrayBuffer buffer_; // Tracks whether the data in the buffer is valid. bool valid_; diff --git a/content/renderer/pepper/host_globals.cc b/content/renderer/pepper/host_globals.cc index 1fbbaf8..31c5f0b 100644 --- a/content/renderer/pepper/host_globals.cc +++ b/content/renderer/pepper/host_globals.cc @@ -29,14 +29,14 @@ using ppapi::CheckIdType; using ppapi::MakeTypedId; using ppapi::PPIdType; using ppapi::ResourceTracker; -using WebKit::WebConsoleMessage; -using WebKit::WebString; +using blink::WebConsoleMessage; +using blink::WebString; namespace content { namespace { -typedef std::set<WebKit::WebPluginContainer*> ContainerSet; +typedef std::set<blink::WebPluginContainer*> ContainerSet; // Adds all WebPluginContainers associated with the given module to the set. void GetAllContainersForModule(PluginModule* module, diff --git a/content/renderer/pepper/host_var_tracker_unittest.cc b/content/renderer/pepper/host_var_tracker_unittest.cc index 24932db..0486805 100644 --- a/content/renderer/pepper/host_var_tracker_unittest.cc +++ b/content/renderer/pepper/host_var_tracker_unittest.cc @@ -59,7 +59,7 @@ NPObject* NewTrackedNPObject() { class ReleaseNPObject { public: void operator()(NPObject* o) const { - WebKit::WebBindings::releaseObject(o); + blink::WebBindings::releaseObject(o); } }; diff --git a/content/renderer/pepper/message_channel.cc b/content/renderer/pepper/message_channel.cc index 32f21a4..8516777 100644 --- a/content/renderer/pepper/message_channel.cc +++ b/content/renderer/pepper/message_channel.cc @@ -32,12 +32,12 @@ using ppapi::ArrayBufferVar; using ppapi::PpapiGlobals; using ppapi::StringVar; -using WebKit::WebBindings; -using WebKit::WebElement; -using WebKit::WebDOMEvent; -using WebKit::WebDOMMessageEvent; -using WebKit::WebPluginContainer; -using WebKit::WebSerializedScriptValue; +using blink::WebBindings; +using blink::WebElement; +using blink::WebDOMEvent; +using blink::WebDOMMessageEvent; +using blink::WebPluginContainer; +using blink::WebSerializedScriptValue; namespace content { diff --git a/content/renderer/pepper/message_channel.h b/content/renderer/pepper/message_channel.h index f577224..c7eb215 100644 --- a/content/renderer/pepper/message_channel.h +++ b/content/renderer/pepper/message_channel.h @@ -111,7 +111,7 @@ class MessageChannel { // Post a message to the onmessage handler for this channel's instance // synchronously. This is used by PostMessageToJavaScript. void PostMessageToJavaScriptImpl( - const WebKit::WebSerializedScriptValue& message_data); + const blink::WebSerializedScriptValue& message_data); // Post a message to the PPP_Instance HandleMessage function for this // channel's instance. This is used by PostMessageToNative. void PostMessageToNativeImpl(PP_Var message_data); @@ -120,7 +120,7 @@ class MessageChannel { // TODO(teravest): Remove all the tricky DRAIN_CANCELLED logic once // PluginInstance::ResetAsProxied() is gone. - std::deque<WebKit::WebSerializedScriptValue> early_message_queue_; + std::deque<blink::WebSerializedScriptValue> early_message_queue_; enum EarlyMessageQueueState { QUEUE_MESSAGES, // Queue JS messages. SEND_DIRECTLY, // Post JS messages directly. diff --git a/content/renderer/pepper/mock_renderer_ppapi_host.cc b/content/renderer/pepper/mock_renderer_ppapi_host.cc index 76231778..69a4e80 100644 --- a/content/renderer/pepper/mock_renderer_ppapi_host.cc +++ b/content/renderer/pepper/mock_renderer_ppapi_host.cc @@ -41,7 +41,7 @@ RenderView* MockRendererPpapiHost::GetRenderViewForInstance( return NULL; } -WebKit::WebPluginContainer* MockRendererPpapiHost::GetContainerForInstance( +blink::WebPluginContainer* MockRendererPpapiHost::GetContainerForInstance( PP_Instance instance) const { NOTIMPLEMENTED(); return NULL; diff --git a/content/renderer/pepper/mock_renderer_ppapi_host.h b/content/renderer/pepper/mock_renderer_ppapi_host.h index 5a85a1b..2d534787 100644 --- a/content/renderer/pepper/mock_renderer_ppapi_host.h +++ b/content/renderer/pepper/mock_renderer_ppapi_host.h @@ -37,7 +37,7 @@ class MockRendererPpapiHost : public RendererPpapiHost { PP_Instance instance) const OVERRIDE; virtual RenderView* GetRenderViewForInstance( PP_Instance instance) const OVERRIDE; - virtual WebKit::WebPluginContainer* GetContainerForInstance( + virtual blink::WebPluginContainer* GetContainerForInstance( PP_Instance instance) const OVERRIDE; virtual base::ProcessId GetPluginPID() const OVERRIDE; virtual bool HasUserGesture(PP_Instance instance) const OVERRIDE; diff --git a/content/renderer/pepper/npapi_glue.cc b/content/renderer/pepper/npapi_glue.cc index 678a410..8489c4d 100644 --- a/content/renderer/pepper/npapi_glue.cc +++ b/content/renderer/pepper/npapi_glue.cc @@ -28,10 +28,10 @@ using ppapi::NPObjectVar; using ppapi::PpapiGlobals; using ppapi::StringVar; using ppapi::Var; -using WebKit::WebArrayBuffer; -using WebKit::WebBindings; -using WebKit::WebFrame; -using WebKit::WebPluginContainer; +using blink::WebArrayBuffer; +using blink::WebBindings; +using blink::WebFrame; +using blink::WebPluginContainer; namespace content { diff --git a/content/renderer/pepper/npobject_var.cc b/content/renderer/pepper/npobject_var.cc index 690dd22..c45d0d2 100644 --- a/content/renderer/pepper/npobject_var.cc +++ b/content/renderer/pepper/npobject_var.cc @@ -10,7 +10,7 @@ #include "ppapi/c/pp_var.h" #include "third_party/WebKit/public/web/WebBindings.h" -using WebKit::WebBindings; +using blink::WebBindings; namespace ppapi { diff --git a/content/renderer/pepper/pepper_file_chooser_host.cc b/content/renderer/pepper/pepper_file_chooser_host.cc index e73694a..ca13f5a 100644 --- a/content/renderer/pepper/pepper_file_chooser_host.cc +++ b/content/renderer/pepper/pepper_file_chooser_host.cc @@ -22,7 +22,7 @@ namespace content { class PepperFileChooserHost::CompletionHandler - : public WebKit::WebFileChooserCompletion { + : public blink::WebFileChooserCompletion { public: CompletionHandler(const base::WeakPtr<PepperFileChooserHost>& host) : host_(host) { @@ -31,7 +31,7 @@ class PepperFileChooserHost::CompletionHandler virtual ~CompletionHandler() {} virtual void didChooseFile( - const WebKit::WebVector<WebKit::WebString>& file_names) { + const blink::WebVector<blink::WebString>& file_names) { if (host_.get()) { std::vector<PepperFileChooserHost::ChosenFileInfo> files; for (size_t i = 0; i < file_names.size(); i++) { @@ -45,7 +45,7 @@ class PepperFileChooserHost::CompletionHandler delete this; } virtual void didChooseFile( - const WebKit::WebVector<SelectedFileInfo>& file_names) { + const blink::WebVector<SelectedFileInfo>& file_names) { if (host_.get()) { std::vector<PepperFileChooserHost::ChosenFileInfo> files; for (size_t i = 0; i < file_names.size(); i++) { @@ -145,17 +145,17 @@ int32_t PepperFileChooserHost::OnShow( return PP_ERROR_NO_USER_GESTURE; } - WebKit::WebFileChooserParams params; + blink::WebFileChooserParams params; if (save_as) { params.saveAs = true; - params.initialValue = WebKit::WebString::fromUTF8( + params.initialValue = blink::WebString::fromUTF8( suggested_file_name.data(), suggested_file_name.size()); } else { params.multiSelect = open_multiple; } - std::vector<WebKit::WebString> mine_types(accept_mime_types.size()); + std::vector<blink::WebString> mine_types(accept_mime_types.size()); for (size_t i = 0; i < accept_mime_types.size(); i++) { - mine_types[i] = WebKit::WebString::fromUTF8( + mine_types[i] = blink::WebString::fromUTF8( accept_mime_types[i].data(), accept_mime_types[i].size()); } params.acceptTypes = mine_types; diff --git a/content/renderer/pepper/pepper_graphics_2d_host.cc b/content/renderer/pepper/pepper_graphics_2d_host.cc index c13931d..fc108c7 100644 --- a/content/renderer/pepper/pepper_graphics_2d_host.cc +++ b/content/renderer/pepper/pepper_graphics_2d_host.cc @@ -322,7 +322,7 @@ bool PepperGraphics2DHost::BindToInstance( // The |backing_bitmap| must be clipped to the |plugin_rect| to avoid painting // outside the plugin area. This can happen if the plugin has been resized since // PaintImageData verified the image is within the plugin size. -void PepperGraphics2DHost::Paint(WebKit::WebCanvas* canvas, +void PepperGraphics2DHost::Paint(blink::WebCanvas* canvas, const gfx::Rect& plugin_rect, const gfx::Rect& paint_rect) { TRACE_EVENT0("pepper", "PepperGraphics2DHost::Paint"); diff --git a/content/renderer/pepper/pepper_graphics_2d_host.h b/content/renderer/pepper/pepper_graphics_2d_host.h index eff359d..0ad0594 100644 --- a/content/renderer/pepper/pepper_graphics_2d_host.h +++ b/content/renderer/pepper/pepper_graphics_2d_host.h @@ -58,7 +58,7 @@ class CONTENT_EXPORT PepperGraphics2DHost // is already bound to a different instance, and nothing will happen. bool BindToInstance(PepperPluginInstanceImpl* new_instance); // Paints the current backing store to the web page. - void Paint(WebKit::WebCanvas* canvas, + void Paint(blink::WebCanvas* canvas, const gfx::Rect& plugin_rect, const gfx::Rect& paint_rect); diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc index 056a356..4793ab1 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.cc +++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc @@ -152,27 +152,27 @@ using ppapi::thunk::PPB_ImageData_API; using ppapi::Var; using ppapi::ArrayBufferVar; using ppapi::ViewData; -using WebKit::WebBindings; -using WebKit::WebCanvas; -using WebKit::WebCursorInfo; -using WebKit::WebDocument; -using WebKit::WebElement; -using WebKit::WebFrame; -using WebKit::WebInputEvent; -using WebKit::WebPlugin; -using WebKit::WebPluginContainer; -using WebKit::WebPrintParams; -using WebKit::WebPrintScalingOption; -using WebKit::WebScopedUserGesture; -using WebKit::WebString; -using WebKit::WebURLError; -using WebKit::WebURLLoader; -using WebKit::WebURLLoaderClient; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; -using WebKit::WebUserGestureIndicator; -using WebKit::WebUserGestureToken; -using WebKit::WebView; +using blink::WebBindings; +using blink::WebCanvas; +using blink::WebCursorInfo; +using blink::WebDocument; +using blink::WebElement; +using blink::WebFrame; +using blink::WebInputEvent; +using blink::WebPlugin; +using blink::WebPluginContainer; +using blink::WebPrintParams; +using blink::WebPrintScalingOption; +using blink::WebScopedUserGesture; +using blink::WebString; +using blink::WebURLError; +using blink::WebURLLoader; +using blink::WebURLLoaderClient; +using blink::WebURLRequest; +using blink::WebURLResponse; +using blink::WebUserGestureIndicator; +using blink::WebUserGestureToken; +using blink::WebView; namespace content { @@ -302,20 +302,20 @@ COMPILE_ASSERT_MATCHING_ENUM(TypeGrabbing, PP_MOUSECURSOR_TYPE_GRABBING); // Do not assert WebCursorInfo::TypeCustom == PP_CURSORTYPE_CUSTOM; // PP_CURSORTYPE_CUSTOM is pinned to allow new cursor types. -COMPILE_ASSERT_PRINT_SCALING_MATCHING_ENUM(WebKit::WebPrintScalingOptionNone, +COMPILE_ASSERT_PRINT_SCALING_MATCHING_ENUM(blink::WebPrintScalingOptionNone, PP_PRINTSCALINGOPTION_NONE); COMPILE_ASSERT_PRINT_SCALING_MATCHING_ENUM( - WebKit::WebPrintScalingOptionFitToPrintableArea, + blink::WebPrintScalingOptionFitToPrintableArea, PP_PRINTSCALINGOPTION_FIT_TO_PRINTABLE_AREA); COMPILE_ASSERT_PRINT_SCALING_MATCHING_ENUM( - WebKit::WebPrintScalingOptionSourceSize, PP_PRINTSCALINGOPTION_SOURCE_SIZE); + blink::WebPrintScalingOptionSourceSize, PP_PRINTSCALINGOPTION_SOURCE_SIZE); // Sets |*security_origin| to be the WebKit security origin associated with the // document containing the given plugin instance. On success, returns true. If // the instance is invalid, returns false and |*security_origin| will be // unchanged. bool SecurityOriginForInstance(PP_Instance instance_id, - WebKit::WebSecurityOrigin* security_origin) { + blink::WebSecurityOrigin* security_origin) { PepperPluginInstanceImpl* instance = HostGlobals::Get()->GetInstance(instance_id); if (!instance) @@ -341,13 +341,13 @@ scoped_ptr<const char*[]> StringVectorToArgArray( // a plugin. Some poorly behaving plugins (like Flash) incorrectly report that // they handle all keys sent to them. This can prevent keystrokes from working // for things like screen brightness and volume control. -bool IsReservedSystemInputEvent(const WebKit::WebInputEvent& event) { +bool IsReservedSystemInputEvent(const blink::WebInputEvent& event) { #if defined(OS_CHROMEOS) if (event.type != WebInputEvent::KeyDown && event.type != WebInputEvent::KeyUp) return false; - const WebKit::WebKeyboardEvent& key_event = - static_cast<const WebKit::WebKeyboardEvent&>(event); + const blink::WebKeyboardEvent& key_event = + static_cast<const blink::WebKeyboardEvent&>(event); switch (key_event.windowsKeyCode) { case ui::VKEY_BRIGHTNESS_DOWN: case ui::VKEY_BRIGHTNESS_UP: @@ -378,7 +378,7 @@ class PluginInstanceLockTarget : public MouseLockDispatcher::LockTarget { } virtual bool HandleMouseLockedInputEvent( - const WebKit::WebMouseEvent &event) OVERRIDE { + const blink::WebMouseEvent &event) OVERRIDE { plugin_->HandleMouseLockedInputEvent(event); return true; } @@ -466,7 +466,7 @@ PPB_Gamepad_API* PepperPluginInstanceImpl::GamepadImpl::AsPPB_Gamepad_API() { void PepperPluginInstanceImpl::GamepadImpl::Sample( PP_Instance instance, PP_GamepadsSampleData* data) { - WebKit::WebGamepads webkit_data; + blink::WebGamepads webkit_data; RenderThreadImpl::current()->SampleGamepads(&webkit_data); ConvertWebKitGamepadData( bit_cast<ppapi::WebKitGamepads>(webkit_data), data); @@ -769,7 +769,7 @@ bool PepperPluginInstanceImpl::Initialize( } bool PepperPluginInstanceImpl::HandleDocumentLoad( - const WebKit::WebURLResponse& response) { + const blink::WebURLResponse& response) { DCHECK(!document_loader_); if (external_document_load_) { // The external proxy isn't available, so save the response and record @@ -825,7 +825,7 @@ bool PepperPluginInstanceImpl::HandleDocumentLoad( bool PepperPluginInstanceImpl::SendCompositionEventToPlugin( PP_InputEvent_Type type, const base::string16& text) { - std::vector<WebKit::WebCompositionUnderline> empty; + std::vector<blink::WebCompositionUnderline> empty; return SendCompositionEventWithUnderlineInformationToPlugin( type, text, empty, static_cast<int>(text.size()), static_cast<int>(text.size())); @@ -835,7 +835,7 @@ bool PepperPluginInstanceImpl:: SendCompositionEventWithUnderlineInformationToPlugin( PP_InputEvent_Type type, const base::string16& text, - const std::vector<WebKit::WebCompositionUnderline>& underlines, + const std::vector<blink::WebCompositionUnderline>& underlines, int selection_start, int selection_end) { // Keep a reference on the stack. See NOTE above. @@ -924,7 +924,7 @@ bool PepperPluginInstanceImpl::HandleCompositionStart( bool PepperPluginInstanceImpl::HandleCompositionUpdate( const base::string16& text, - const std::vector<WebKit::WebCompositionUnderline>& underlines, + const std::vector<blink::WebCompositionUnderline>& underlines, int selection_start, int selection_end) { return SendCompositionEventWithUnderlineInformationToPlugin( @@ -979,7 +979,7 @@ gfx::Rect PepperPluginInstanceImpl::GetCaretBounds() const { } bool PepperPluginInstanceImpl::HandleInputEvent( - const WebKit::WebInputEvent& event, + const blink::WebInputEvent& event, WebCursorInfo* cursor_info) { TRACE_EVENT0("ppapi", "PepperPluginInstanceImpl::HandleInputEvent"); @@ -1448,8 +1448,8 @@ void PepperPluginInstanceImpl::UpdateTouchEventRequest() { bool raw_touch = (filtered_input_event_mask_ & PP_INPUTEVENT_CLASS_TOUCH) || (input_event_mask_ & PP_INPUTEVENT_CLASS_TOUCH); container_->requestTouchEventType(raw_touch ? - WebKit::WebPluginContainer::TouchEventRequestTypeRaw : - WebKit::WebPluginContainer::TouchEventRequestTypeSynthesizedMouse); + blink::WebPluginContainer::TouchEventRequestTypeRaw : + blink::WebPluginContainer::TouchEventRequestTypeSynthesizedMouse); } bool PepperPluginInstanceImpl::IsAcceptingWheelEvents() const { @@ -1575,7 +1575,7 @@ int PepperPluginInstanceImpl::PrintBegin(const WebPrintParams& print_params) { } bool PepperPluginInstanceImpl::PrintPage(int page_number, - WebKit::WebCanvas* canvas) { + blink::WebCanvas* canvas) { #if defined(ENABLE_FULL_PRINTING) DCHECK(plugin_print_interface_); PP_PrintPageNumberRange_Dev page_range; @@ -1601,7 +1601,7 @@ bool PepperPluginInstanceImpl::PrintPage(int page_number, bool PepperPluginInstanceImpl::PrintPageHelper( PP_PrintPageNumberRange_Dev* page_ranges, int num_ranges, - WebKit::WebCanvas* canvas) { + blink::WebCanvas* canvas) { // Keep a reference on the stack. See NOTE above. scoped_refptr<PepperPluginInstanceImpl> ref(this); DCHECK(plugin_print_interface_); @@ -1755,7 +1755,7 @@ bool PepperPluginInstanceImpl::IsViewAccelerated() { } bool PepperPluginInstanceImpl::PrintPDFOutput(PP_Resource print_output, - WebKit::WebCanvas* canvas) { + blink::WebCanvas* canvas) { #if defined(ENABLE_FULL_PRINTING) ppapi::thunk::EnterResourceNoLock<PPB_Buffer_API> enter(print_output, true); if (enter.failed()) @@ -1959,9 +1959,9 @@ void PepperPluginInstanceImpl::OnMouseLockLost() { } void PepperPluginInstanceImpl::HandleMouseLockedInputEvent( - const WebKit::WebMouseEvent& event) { + const blink::WebMouseEvent& event) { // |cursor_info| is ignored since it is hidden when the mouse is locked. - WebKit::WebCursorInfo cursor_info; + blink::WebCursorInfo cursor_info; HandleInputEvent(event, &cursor_info); } @@ -2021,9 +2021,9 @@ void PepperPluginInstanceImpl::SimulateImeSetCompositionEvent( base::string16 utf16_text = base::UTF8ToUTF16AndAdjustOffsets(input_event.character_text, &offsets); - std::vector<WebKit::WebCompositionUnderline> underlines; + std::vector<blink::WebCompositionUnderline> underlines; for (size_t i = 2; i + 1 < offsets.size(); ++i) { - WebKit::WebCompositionUnderline underline; + blink::WebCompositionUnderline underline; underline.startOffset = offsets[i]; underline.endOffset = offsets[i + 1]; if (input_event.composition_target_segment == static_cast<int32_t>(i - 2)) @@ -2175,7 +2175,7 @@ PP_Var PepperPluginInstanceImpl::ExecuteScript(PP_Instance instance, NPVariant result; bool ok = false; if (IsProcessingUserGesture()) { - WebKit::WebScopedUserGesture user_gesture(CurrentUserGestureToken()); + blink::WebScopedUserGesture user_gesture(CurrentUserGestureToken()); ok = WebBindings::evaluate(NULL, frame->windowObject(), &np_script, &result); } else { @@ -2299,7 +2299,7 @@ void PepperPluginInstanceImpl::SelectedFindResultChanged(PP_Instance instance, int32_t index) { DCHECK_NE(find_identifier_, -1); render_view_->reportFindInPageSelection( - find_identifier_, index + 1, WebKit::WebRect()); + find_identifier_, index + 1, blink::WebRect()); } PP_Bool PepperPluginInstanceImpl::IsFullscreen(PP_Instance instance) { @@ -2313,7 +2313,7 @@ PP_Bool PepperPluginInstanceImpl::SetFullscreen(PP_Instance instance, PP_Bool PepperPluginInstanceImpl::GetScreenSize(PP_Instance instance, PP_Size* size) { - WebKit::WebScreenInfo info = render_view_->screenInfo(); + blink::WebScreenInfo info = render_view_->screenInfo(); *size = PP_MakeSize(info.rect.width, info.rect.height); return PP_TRUE; } @@ -2537,7 +2537,7 @@ PP_Bool PepperPluginInstanceImpl::DocumentCanRequest(PP_Instance instance, if (!url_string) return PP_FALSE; - WebKit::WebSecurityOrigin security_origin; + blink::WebSecurityOrigin security_origin; if (!SecurityOriginForInstance(instance, &security_origin)) return PP_FALSE; @@ -2551,11 +2551,11 @@ PP_Bool PepperPluginInstanceImpl::DocumentCanRequest(PP_Instance instance, PP_Bool PepperPluginInstanceImpl::DocumentCanAccessDocument( PP_Instance instance, PP_Instance target) { - WebKit::WebSecurityOrigin our_origin; + blink::WebSecurityOrigin our_origin; if (!SecurityOriginForInstance(instance, &our_origin)) return PP_FALSE; - WebKit::WebSecurityOrigin target_origin; + blink::WebSecurityOrigin target_origin; if (!SecurityOriginForInstance(instance, &target_origin)) return PP_FALSE; @@ -2565,7 +2565,7 @@ PP_Bool PepperPluginInstanceImpl::DocumentCanAccessDocument( PP_Var PepperPluginInstanceImpl::GetDocumentURL( PP_Instance instance, PP_URLComponents_Dev* components) { - WebKit::WebDocument document = container()->element().document(); + blink::WebDocument document = container()->element().document(); return ppapi::PPB_URLUtil_Shared::GenerateURLReturn(document.url(), components); } @@ -2580,7 +2580,7 @@ PP_Var PepperPluginInstanceImpl::GetPluginInstanceURL( PP_Var PepperPluginInstanceImpl::GetPluginReferrerURL( PP_Instance instance, PP_URLComponents_Dev* components) { - WebKit::WebDocument document = container()->element().document(); + blink::WebDocument document = container()->element().document(); if (!full_frame_) return ppapi::PPB_URLUtil_Shared::GenerateURLReturn(document.url(), components); @@ -2657,7 +2657,7 @@ PP_ExternalPluginResult PepperPluginInstanceImpl::ResetAsProxied( document_loader_ = NULL; // Pass the response to the new proxy. HandleDocumentLoad(external_document_response_); - external_document_response_ = WebKit::WebURLResponse(); + external_document_response_ = blink::WebURLResponse(); // Replay any document load events we've received to the real loader. external_document_loader_->ReplayReceivedData(document_loader_); external_document_loader_.reset(NULL); @@ -2684,7 +2684,7 @@ RenderView* PepperPluginInstanceImpl::GetRenderView() { return render_view_; } -WebKit::WebPluginContainer* PepperPluginInstanceImpl::GetContainer() { +blink::WebPluginContainer* PepperPluginInstanceImpl::GetContainer() { return container_; } @@ -2889,14 +2889,14 @@ int PepperPluginInstanceImpl::MakePendingFileRefRendererHost( bool PepperPluginInstanceImpl::CanAccessMainFrame() const { if (!container_) return false; - WebKit::WebDocument containing_document = container_->element().document(); + blink::WebDocument containing_document = container_->element().document(); if (!containing_document.frame() || !containing_document.frame()->view() || !containing_document.frame()->view()->mainFrame()) { return false; } - WebKit::WebDocument main_document = + blink::WebDocument main_document = containing_document.frame()->view()->mainFrame()->document(); return containing_document.securityOrigin().canAccess( @@ -2914,7 +2914,7 @@ void PepperPluginInstanceImpl::KeepSizeAttributesBeforeFullscreen() { } void PepperPluginInstanceImpl::SetSizeAttributesForFullscreen() { - WebKit::WebScreenInfo info = render_view_->screenInfo(); + blink::WebScreenInfo info = render_view_->screenInfo(); screen_size_for_fullscreen_ = gfx::Size(info.rect.width, info.rect.height); std::string width = StringPrintf("%d", screen_size_for_fullscreen_.width()); std::string height = StringPrintf("%d", screen_size_for_fullscreen_.height()); @@ -2981,7 +2981,7 @@ void PepperPluginInstanceImpl::UnSetAndDeleteLockTargetAdapter() { } void PepperPluginInstanceImpl::DidDataFromWebURLResponse( - const WebKit::WebURLResponse& response, + const blink::WebURLResponse& response, int pending_host_id, const ppapi::URLResponseInfoData& data) { RendererPpapiHostImpl* host_impl = module_->renderer_ppapi_host(); diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.h b/content/renderer/pepper/pepper_plugin_instance_impl.h index 7fd13bc..cd41917 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.h +++ b/content/renderer/pepper/pepper_plugin_instance_impl.h @@ -63,7 +63,7 @@ struct _NPP; class SkBitmap; class TransportDIB; -namespace WebKit { +namespace blink { class WebInputEvent; class WebLayer; class WebMouseEvent; @@ -125,13 +125,13 @@ class CONTENT_EXPORT PepperPluginInstanceImpl static PepperPluginInstanceImpl* Create( RenderViewImpl* render_view, PluginModule* module, - WebKit::WebPluginContainer* container, + blink::WebPluginContainer* container, const GURL& plugin_url); RenderViewImpl* render_view() const { return render_view_; } PluginModule* module() const { return module_.get(); } MessageChannel& message_channel() { return *message_channel_; } - WebKit::WebPluginContainer* container() const { return container_; } + blink::WebPluginContainer* container() const { return container_; } // Returns the PP_Instance uniquely identifying this instance. Guaranteed // nonzero. @@ -148,7 +148,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl void Delete(); // Paints the current backing store to the web page. - void Paint(WebKit::WebCanvas* canvas, + void Paint(blink::WebCanvas* canvas, const gfx::Rect& plugin_rect, const gfx::Rect& paint_rect); @@ -178,9 +178,9 @@ class CONTENT_EXPORT PepperPluginInstanceImpl bool Initialize(const std::vector<std::string>& arg_names, const std::vector<std::string>& arg_values, bool full_frame); - bool HandleDocumentLoad(const WebKit::WebURLResponse& response); - bool HandleInputEvent(const WebKit::WebInputEvent& event, - WebKit::WebCursorInfo* cursor_info); + bool HandleDocumentLoad(const blink::WebURLResponse& response); + bool HandleInputEvent(const blink::WebInputEvent& event, + blink::WebCursorInfo* cursor_info); PP_Var GetInstanceObject(); void ViewChanged(const gfx::Rect& position, const gfx::Rect& clip, const std::vector<gfx::Rect>& cut_outs_rects); @@ -189,7 +189,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl bool HandleCompositionStart(const base::string16& text); bool HandleCompositionUpdate( const base::string16& text, - const std::vector<WebKit::WebCompositionUnderline>& underlines, + const std::vector<blink::WebCompositionUnderline>& underlines, int selection_start, int selection_end); bool HandleCompositionEnd(const base::string16& text); @@ -241,12 +241,12 @@ class CONTENT_EXPORT PepperPluginInstanceImpl bool SupportsPrintInterface(); bool IsPrintScalingDisabled(); - int PrintBegin(const WebKit::WebPrintParams& print_params); - bool PrintPage(int page_number, WebKit::WebCanvas* canvas); + int PrintBegin(const blink::WebPrintParams& print_params); + bool PrintPage(int page_number, blink::WebCanvas* canvas); void PrintEnd(); bool CanRotateView(); - void RotateView(WebKit::WebPlugin::RotationType type); + void RotateView(blink::WebPlugin::RotationType type); // There are 2 implementations of the fullscreen interface // PPB_FlashFullscreen is used by Pepper Flash. @@ -310,14 +310,14 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // Returns the user gesture token to use for creating a WebScopedUserGesture, // if IsProcessingUserGesture returned true. - WebKit::WebUserGestureToken CurrentUserGestureToken(); + blink::WebUserGestureToken CurrentUserGestureToken(); // A mouse lock request was pending and this reports success or failure. void OnLockMouseACK(bool succeeded); // A mouse lock was in place, but has been lost. void OnMouseLockLost(); // A mouse lock is enabled and mouse events are being delivered. - void HandleMouseLockedInputEvent(const WebKit::WebMouseEvent& event); + void HandleMouseLockedInputEvent(const blink::WebMouseEvent& event); // Simulates an input event to the plugin by passing it down to WebKit, // which sends it back up to the plugin as if it came from the user. @@ -333,10 +333,10 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // case is non-NULL as long as the corresponding loader resource is alive. // This pointer is non-owning, so the loader must use set_document_loader to // clear itself when it is destroyed. - WebKit::WebURLLoaderClient* document_loader() const { + blink::WebURLLoaderClient* document_loader() const { return document_loader_; } - void set_document_loader(WebKit::WebURLLoaderClient* loader) { + void set_document_loader(blink::WebURLLoaderClient* loader) { document_loader_ = loader; } @@ -344,7 +344,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // PluginInstance implementation virtual RenderView* GetRenderView() OVERRIDE; - virtual WebKit::WebPluginContainer* GetContainer() OVERRIDE; + virtual blink::WebPluginContainer* GetContainer() OVERRIDE; virtual v8::Isolate* GetIsolate() const OVERRIDE; virtual ppapi::VarTracker* GetVarTracker() OVERRIDE; virtual const GURL& GetPluginURL() OVERRIDE; @@ -510,27 +510,27 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // Class to record document load notifications and play them back once the // real document loader becomes available. Used only by external instances. - class ExternalDocumentLoader : public WebKit::WebURLLoaderClient { + class ExternalDocumentLoader : public blink::WebURLLoaderClient { public: ExternalDocumentLoader(); virtual ~ExternalDocumentLoader(); void ReplayReceivedData(WebURLLoaderClient* document_loader); - // WebKit::WebURLLoaderClient implementation. - virtual void didReceiveData(WebKit::WebURLLoader* loader, + // blink::WebURLLoaderClient implementation. + virtual void didReceiveData(blink::WebURLLoader* loader, const char* data, int data_length, int encoded_data_length); - virtual void didFinishLoading(WebKit::WebURLLoader* loader, + virtual void didFinishLoading(blink::WebURLLoader* loader, double finish_time); - virtual void didFail(WebKit::WebURLLoader* loader, - const WebKit::WebURLError& error); + virtual void didFail(blink::WebURLLoader* loader, + const blink::WebURLError& error); private: std::list<std::string> data_; bool finished_loading_; - scoped_ptr<WebKit::WebURLError> error_; + scoped_ptr<blink::WebURLError> error_; }; // Implements PPB_Gamepad_API. This is just to avoid having an excessive @@ -554,7 +554,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl PepperPluginInstanceImpl(RenderViewImpl* render_view, PluginModule* module, ppapi::PPP_Instance_Combined* instance_interface, - WebKit::WebPluginContainer* container, + blink::WebPluginContainer* container, const GURL& plugin_url); bool LoadFindInterface(); @@ -590,7 +590,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // best format to use. Returns false if the plugin does not support any // print format that we can handle (we can handle only PDF). bool GetPreferredPrintOutputFormat(PP_PrintOutputFormat_Dev* format); - bool PrintPDFOutput(PP_Resource print_output, WebKit::WebCanvas* canvas); + bool PrintPDFOutput(PP_Resource print_output, blink::WebCanvas* canvas); // Updates the layer for compositing. This creates a layer and attaches to the // container if: @@ -604,9 +604,9 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // Internal helper function for PrintPage(). bool PrintPageHelper(PP_PrintPageNumberRange_Dev* page_ranges, int num_ranges, - WebKit::WebCanvas* canvas); + blink::WebCanvas* canvas); - void DoSetCursor(WebKit::WebCursorInfo* cursor); + void DoSetCursor(blink::WebCursorInfo* cursor); // Internal helper functions for HandleCompositionXXX(). bool SendCompositionEventToPlugin( @@ -615,7 +615,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl bool SendCompositionEventWithUnderlineInformationToPlugin( PP_InputEvent_Type type, const base::string16& text, - const std::vector<WebKit::WebCompositionUnderline>& underlines, + const std::vector<blink::WebCompositionUnderline>& underlines, int selection_start, int selection_end); @@ -643,7 +643,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl void UnSetAndDeleteLockTargetAdapter(); void DidDataFromWebURLResponse( - const WebKit::WebURLResponse& response, + const blink::WebURLResponse& response, int pending_host_id, const ppapi::URLResponseInfoData& data); @@ -659,9 +659,9 @@ class CONTENT_EXPORT PepperPluginInstanceImpl PP_Instance pp_instance_; // NULL until we have been initialized. - WebKit::WebPluginContainer* container_; + blink::WebPluginContainer* container_; scoped_refptr<cc::TextureLayer> texture_layer_; - scoped_ptr<WebKit::WebLayer> web_layer_; + scoped_ptr<blink::WebLayer> web_layer_; bool layer_bound_to_fullscreen_; bool layer_is_hardware_; @@ -737,7 +737,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // to generate the entire PDF given the variables below: // // The most recently used WebCanvas, guaranteed to be valid. - skia::RefPtr<WebKit::WebCanvas> canvas_; + skia::RefPtr<blink::WebCanvas> canvas_; // An array of page ranges. std::vector<PP_PrintPageNumberRange_Dev> ranges_; @@ -750,7 +750,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl const PPP_Graphics3D* plugin_graphics_3d_interface_; // Contains the cursor if it's set by the plugin. - scoped_ptr<WebKit::WebCursorInfo> cursor_; + scoped_ptr<blink::WebCursorInfo> cursor_; // Set to true if this plugin thinks it will always be on top. This allows us // to use a more optimized painting path in some cases. @@ -783,10 +783,10 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // WebKit does not resize the plugin when going into fullscreen mode, so we do // this here by modifying the various plugin attributes and then restoring // them on exit. - WebKit::WebString width_before_fullscreen_; - WebKit::WebString height_before_fullscreen_; - WebKit::WebString border_before_fullscreen_; - WebKit::WebString style_before_fullscreen_; + blink::WebString width_before_fullscreen_; + blink::WebString height_before_fullscreen_; + blink::WebString border_before_fullscreen_; + blink::WebString style_before_fullscreen_; gfx::Size screen_size_for_fullscreen_; // The MessageChannel used to implement bidirectional postMessage for the @@ -820,7 +820,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl // Track pending user gestures so out-of-process plugins can respond to // a user gesture after it has been processed. PP_TimeTicks pending_user_gesture_; - WebKit::WebUserGestureToken pending_user_gesture_token_; + blink::WebUserGestureToken pending_user_gesture_token_; // We store the arguments so we can re-send them if we are reset to talk to // NaCl via the IPC NaCl proxy. @@ -828,9 +828,9 @@ class CONTENT_EXPORT PepperPluginInstanceImpl std::vector<std::string> argv_; // Non-owning pointer to the document loader, if any. - WebKit::WebURLLoaderClient* document_loader_; + blink::WebURLLoaderClient* document_loader_; // State for deferring document loads. Used only by external instances. - WebKit::WebURLResponse external_document_response_; + blink::WebURLResponse external_document_response_; scoped_ptr<ExternalDocumentLoader> external_document_loader_; bool external_document_load_; diff --git a/content/renderer/pepper/pepper_url_loader_host.cc b/content/renderer/pepper/pepper_url_loader_host.cc index 3f0dbc9..178548e 100644 --- a/content/renderer/pepper/pepper_url_loader_host.cc +++ b/content/renderer/pepper/pepper_url_loader_host.cc @@ -27,14 +27,14 @@ #include "third_party/WebKit/public/web/WebSecurityOrigin.h" #include "third_party/WebKit/public/web/WebURLLoaderOptions.h" -using WebKit::WebFrame; -using WebKit::WebString; -using WebKit::WebURL; -using WebKit::WebURLError; -using WebKit::WebURLLoader; -using WebKit::WebURLLoaderOptions; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; +using blink::WebFrame; +using blink::WebString; +using blink::WebURL; +using blink::WebURLError; +using blink::WebURLLoader; +using blink::WebURLLoaderOptions; +using blink::WebURLRequest; +using blink::WebURLResponse; #ifdef _MSC_VER // Do not warn about use of std::copy with raw pointers. @@ -98,7 +98,7 @@ PepperURLLoaderHost::~PepperURLLoaderHost() { // re-entering the scoped_ptr destructor with the same scoped_ptr object // via loader_.reset(). Be sure that loader_ is first NULL then destroy // the scoped_ptr. See http://crbug.com/159429. - scoped_ptr<WebKit::WebURLLoader> for_destruction_only(loader_.release()); + scoped_ptr<blink::WebURLLoader> for_destruction_only(loader_.release()); } int32_t PepperURLLoaderHost::OnResourceMessageReceived( @@ -367,7 +367,7 @@ void PepperURLLoaderHost::Close() { GetFrame()->stopLoading(); } -WebKit::WebFrame* PepperURLLoaderHost::GetFrame() { +blink::WebFrame* PepperURLLoaderHost::GetFrame() { PepperPluginInstance* instance_object = renderer_ppapi_host_->GetPluginInstance(pp_instance()); if (!instance_object) diff --git a/content/renderer/pepper/pepper_url_loader_host.h b/content/renderer/pepper/pepper_url_loader_host.h index e515174..2790c78 100644 --- a/content/renderer/pepper/pepper_url_loader_host.h +++ b/content/renderer/pepper/pepper_url_loader_host.h @@ -16,7 +16,7 @@ #include "ppapi/shared_impl/url_response_info_data.h" #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" -namespace WebKit { +namespace blink { class WebFrame; class WebURLLoader; } @@ -27,7 +27,7 @@ class RendererPpapiHostImpl; class PepperURLLoaderHost : public ppapi::host::ResourceHost, - public WebKit::WebURLLoaderClient { + public blink::WebURLLoaderClient { public: // If main_document_loader is true, PP_Resource must be 0 since it will be // pending until the plugin resource attaches to it. @@ -42,26 +42,26 @@ class PepperURLLoaderHost const IPC::Message& msg, ppapi::host::HostMessageContext* context) OVERRIDE; - // WebKit::WebURLLoaderClient implementation. - virtual void willSendRequest(WebKit::WebURLLoader* loader, - WebKit::WebURLRequest& new_request, - const WebKit::WebURLResponse& redir_response); - virtual void didSendData(WebKit::WebURLLoader* loader, + // blink::WebURLLoaderClient implementation. + virtual void willSendRequest(blink::WebURLLoader* loader, + blink::WebURLRequest& new_request, + const blink::WebURLResponse& redir_response); + virtual void didSendData(blink::WebURLLoader* loader, unsigned long long bytes_sent, unsigned long long total_bytes_to_be_sent); - virtual void didReceiveResponse(WebKit::WebURLLoader* loader, - const WebKit::WebURLResponse& response); - virtual void didDownloadData(WebKit::WebURLLoader* loader, + virtual void didReceiveResponse(blink::WebURLLoader* loader, + const blink::WebURLResponse& response); + virtual void didDownloadData(blink::WebURLLoader* loader, int data_length, int encoded_data_length); - virtual void didReceiveData(WebKit::WebURLLoader* loader, + virtual void didReceiveData(blink::WebURLLoader* loader, const char* data, int data_length, int encoded_data_length); - virtual void didFinishLoading(WebKit::WebURLLoader* loader, + virtual void didFinishLoading(blink::WebURLLoader* loader, double finish_time); - virtual void didFail(WebKit::WebURLLoader* loader, - const WebKit::WebURLError& error); + virtual void didFail(blink::WebURLLoader* loader, + const blink::WebURLError& error); private: // ResourceHost protected overrides. @@ -96,14 +96,14 @@ class PepperURLLoaderHost void Close(); // Returns the frame for the current request. - WebKit::WebFrame* GetFrame(); + blink::WebFrame* GetFrame(); // Calls SetDefersLoading on the current load. This encapsulates the logic // differences between document loads and regular ones. void SetDefersLoading(bool defers_loading); // Converts a WebURLResponse to a URLResponseInfo and saves it. - void SaveResponse(const WebKit::WebURLResponse& response); + void SaveResponse(const blink::WebURLResponse& response); void DidDataFromWebURLResponse(const ppapi::URLResponseInfoData& data); // Sends the UpdateProgress message (if necessary) to the plugin. @@ -129,7 +129,7 @@ class PepperURLLoaderHost // always NULL check this value before using it. In the case of a main // document load, you would call the functions on the document to cancel the // load, etc. since there is no loader. - scoped_ptr<WebKit::WebURLLoader> loader_; + scoped_ptr<blink::WebURLLoader> loader_; int64_t bytes_sent_; int64_t total_bytes_to_be_sent_; diff --git a/content/renderer/pepper/pepper_url_request_unittest.cc b/content/renderer/pepper/pepper_url_request_unittest.cc index 00a2c6b..4f171ff 100644 --- a/content/renderer/pepper/pepper_url_request_unittest.cc +++ b/content/renderer/pepper/pepper_url_request_unittest.cc @@ -24,13 +24,13 @@ // test it by making sure the conversion routines actually work at the same // time. -using WebKit::WebCString; -using WebKit::WebFrame; -using WebKit::WebFrameClient; -using WebKit::WebString; -using WebKit::WebView; -using WebKit::WebURL; -using WebKit::WebURLRequest; +using blink::WebCString; +using blink::WebFrame; +using blink::WebFrameClient; +using blink::WebString; +using blink::WebView; +using blink::WebURL; +using blink::WebURLRequest; namespace { diff --git a/content/renderer/pepper/pepper_webplugin_impl.cc b/content/renderer/pepper/pepper_webplugin_impl.cc index acbe838..a1a39c3 100644 --- a/content/renderer/pepper/pepper_webplugin_impl.cc +++ b/content/renderer/pepper/pepper_webplugin_impl.cc @@ -32,17 +32,17 @@ #include "url/gurl.h" using ppapi::NPObjectVar; -using WebKit::WebCanvas; -using WebKit::WebPlugin; -using WebKit::WebPluginContainer; -using WebKit::WebPluginParams; -using WebKit::WebPoint; -using WebKit::WebPrintParams; -using WebKit::WebRect; -using WebKit::WebSize; -using WebKit::WebString; -using WebKit::WebURL; -using WebKit::WebVector; +using blink::WebCanvas; +using blink::WebPlugin; +using blink::WebPluginContainer; +using blink::WebPluginParams; +using blink::WebPoint; +using blink::WebPrintParams; +using blink::WebRect; +using blink::WebSize; +using blink::WebString; +using blink::WebURL; +using blink::WebVector; namespace content { @@ -78,7 +78,7 @@ PepperWebPluginImpl::PepperWebPluginImpl( PepperWebPluginImpl::~PepperWebPluginImpl() { } -WebKit::WebPluginContainer* PepperWebPluginImpl::container() const { +blink::WebPluginContainer* PepperWebPluginImpl::container() const { return container_; } @@ -99,7 +99,7 @@ bool PepperWebPluginImpl::initialize(WebPluginContainer* container) { instance_->Delete(); instance_ = NULL; - WebKit::WebPlugin* replacement_plugin = + blink::WebPlugin* replacement_plugin = GetContentClient()->renderer()->CreatePluginReplacement( init_data_->render_view.get(), init_data_->module->path()); if (!replacement_plugin || !replacement_plugin->initialize(container)) @@ -147,7 +147,7 @@ NPObject* PepperWebPluginImpl::scriptableObject() { } NPObject* message_channel_np_object(instance_->message_channel().np_object()); // The object is expected to be retained before it is returned. - WebKit::WebBindings::retainObject(message_channel_np_object); + blink::WebBindings::retainObject(message_channel_np_object); return message_channel_np_object; } @@ -189,46 +189,46 @@ bool PepperWebPluginImpl::acceptsInputEvents() { return true; } -bool PepperWebPluginImpl::handleInputEvent(const WebKit::WebInputEvent& event, - WebKit::WebCursorInfo& cursor_info) { +bool PepperWebPluginImpl::handleInputEvent(const blink::WebInputEvent& event, + blink::WebCursorInfo& cursor_info) { if (instance_->FlashIsFullscreenOrPending()) return false; return instance_->HandleInputEvent(event, &cursor_info); } void PepperWebPluginImpl::didReceiveResponse( - const WebKit::WebURLResponse& response) { + const blink::WebURLResponse& response) { DCHECK(!instance_->document_loader()); instance_->HandleDocumentLoad(response); } void PepperWebPluginImpl::didReceiveData(const char* data, int data_length) { - WebKit::WebURLLoaderClient* document_loader = instance_->document_loader(); + blink::WebURLLoaderClient* document_loader = instance_->document_loader(); if (document_loader) document_loader->didReceiveData(NULL, data, data_length, 0); } void PepperWebPluginImpl::didFinishLoading() { - WebKit::WebURLLoaderClient* document_loader = instance_->document_loader(); + blink::WebURLLoaderClient* document_loader = instance_->document_loader(); if (document_loader) document_loader->didFinishLoading(NULL, 0.0); } -void PepperWebPluginImpl::didFailLoading(const WebKit::WebURLError& error) { - WebKit::WebURLLoaderClient* document_loader = instance_->document_loader(); +void PepperWebPluginImpl::didFailLoading(const blink::WebURLError& error) { + blink::WebURLLoaderClient* document_loader = instance_->document_loader(); if (document_loader) document_loader->didFail(NULL, error); } void PepperWebPluginImpl::didFinishLoadingFrameRequest( - const WebKit::WebURL& url, + const blink::WebURL& url, void* notify_data) { } void PepperWebPluginImpl::didFailLoadingFrameRequest( - const WebKit::WebURL& url, + const blink::WebURL& url, void* notify_data, - const WebKit::WebURLError& error) { + const blink::WebURLError& error) { } bool PepperWebPluginImpl::hasSelection() const { @@ -251,7 +251,7 @@ void PepperWebPluginImpl::setZoomLevel(double level, bool text_only) { instance_->Zoom(content::ZoomLevelToZoomFactor(level), text_only); } -bool PepperWebPluginImpl::startFind(const WebKit::WebString& search_text, +bool PepperWebPluginImpl::startFind(const blink::WebString& search_text, bool case_sensitive, int identifier) { return instance_->StartFind(search_text, case_sensitive, identifier); @@ -278,7 +278,7 @@ int PepperWebPluginImpl::printBegin(const WebPrintParams& print_params) { } bool PepperWebPluginImpl::printPage(int page_number, - WebKit::WebCanvas* canvas) { + blink::WebCanvas* canvas) { return instance_->PrintPage(page_number, canvas); } diff --git a/content/renderer/pepper/pepper_webplugin_impl.h b/content/renderer/pepper/pepper_webplugin_impl.h index c96b44e..77208f5 100644 --- a/content/renderer/pepper/pepper_webplugin_impl.h +++ b/content/renderer/pepper/pepper_webplugin_impl.h @@ -17,7 +17,7 @@ struct _NPP; -namespace WebKit { +namespace blink { struct WebPluginParams; struct WebPrintParams; } @@ -29,47 +29,47 @@ class PluginModule; class PPB_URLLoader_Impl; class RenderViewImpl; -class PepperWebPluginImpl : public WebKit::WebPlugin { +class PepperWebPluginImpl : public blink::WebPlugin { public: PepperWebPluginImpl(PluginModule* module, - const WebKit::WebPluginParams& params, + const blink::WebPluginParams& params, const base::WeakPtr<RenderViewImpl>& render_view); PepperPluginInstanceImpl* instance() { return instance_.get(); } - // WebKit::WebPlugin implementation. - virtual WebKit::WebPluginContainer* container() const; - virtual bool initialize(WebKit::WebPluginContainer* container); + // blink::WebPlugin implementation. + virtual blink::WebPluginContainer* container() const; + virtual bool initialize(blink::WebPluginContainer* container); virtual void destroy(); virtual NPObject* scriptableObject(); virtual struct _NPP* pluginNPP(); - virtual bool getFormValue(WebKit::WebString& value); - virtual void paint(WebKit::WebCanvas* canvas, const WebKit::WebRect& rect); + virtual bool getFormValue(blink::WebString& value); + virtual void paint(blink::WebCanvas* canvas, const blink::WebRect& rect); virtual void updateGeometry( - const WebKit::WebRect& frame_rect, - const WebKit::WebRect& clip_rect, - const WebKit::WebVector<WebKit::WebRect>& cut_outs_rects, + const blink::WebRect& frame_rect, + const blink::WebRect& clip_rect, + const blink::WebVector<blink::WebRect>& cut_outs_rects, bool is_visible); virtual void updateFocus(bool focused); virtual void updateVisibility(bool visible); virtual bool acceptsInputEvents(); - virtual bool handleInputEvent(const WebKit::WebInputEvent& event, - WebKit::WebCursorInfo& cursor_info); - virtual void didReceiveResponse(const WebKit::WebURLResponse& response); + virtual bool handleInputEvent(const blink::WebInputEvent& event, + blink::WebCursorInfo& cursor_info); + virtual void didReceiveResponse(const blink::WebURLResponse& response); virtual void didReceiveData(const char* data, int data_length); virtual void didFinishLoading(); - virtual void didFailLoading(const WebKit::WebURLError&); - virtual void didFinishLoadingFrameRequest(const WebKit::WebURL& url, + virtual void didFailLoading(const blink::WebURLError&); + virtual void didFinishLoadingFrameRequest(const blink::WebURL& url, void* notify_data); - virtual void didFailLoadingFrameRequest(const WebKit::WebURL& url, + virtual void didFailLoadingFrameRequest(const blink::WebURL& url, void* notify_data, - const WebKit::WebURLError& error); + const blink::WebURLError& error); virtual bool hasSelection() const; - virtual WebKit::WebString selectionAsText() const; - virtual WebKit::WebString selectionAsMarkup() const; - virtual WebKit::WebURL linkAtPosition(const WebKit::WebPoint& position) const; + virtual blink::WebString selectionAsText() const; + virtual blink::WebString selectionAsMarkup() const; + virtual blink::WebURL linkAtPosition(const blink::WebPoint& position) const; virtual void setZoomLevel(double level, bool text_only); - virtual bool startFind(const WebKit::WebString& search_text, + virtual bool startFind(const blink::WebString& search_text, bool case_sensitive, int identifier); virtual void selectFindResult(bool forward); @@ -77,8 +77,8 @@ class PepperWebPluginImpl : public WebKit::WebPlugin { virtual bool supportsPaginatedPrint() OVERRIDE; virtual bool isPrintScalingDisabled() OVERRIDE; - virtual int printBegin(const WebKit::WebPrintParams& print_params) OVERRIDE; - virtual bool printPage(int page_number, WebKit::WebCanvas* canvas) OVERRIDE; + virtual int printBegin(const blink::WebPrintParams& print_params) OVERRIDE; + virtual bool printPage(int page_number, blink::WebCanvas* canvas) OVERRIDE; virtual void printEnd() OVERRIDE; virtual bool canRotateView() OVERRIDE; @@ -98,7 +98,7 @@ class PepperWebPluginImpl : public WebKit::WebPlugin { scoped_refptr<PepperPluginInstanceImpl> instance_; gfx::Rect plugin_rect_; PP_Var instance_object_; - WebKit::WebPluginContainer* container_; + blink::WebPluginContainer* container_; DISALLOW_COPY_AND_ASSIGN(PepperWebPluginImpl); }; diff --git a/content/renderer/pepper/pepper_websocket_host.cc b/content/renderer/pepper/pepper_websocket_host.cc index 78870ef..a88fdb5 100644 --- a/content/renderer/pepper/pepper_websocket_host.cc +++ b/content/renderer/pepper/pepper_websocket_host.cc @@ -22,11 +22,11 @@ #include "third_party/WebKit/public/web/WebPluginContainer.h" #include "third_party/WebKit/public/web/WebSocket.h" -using WebKit::WebArrayBuffer; -using WebKit::WebDocument; -using WebKit::WebString; -using WebKit::WebSocket; -using WebKit::WebURL; +using blink::WebArrayBuffer; +using blink::WebDocument; +using blink::WebString; +using blink::WebSocket; +using blink::WebURL; namespace content { @@ -77,7 +77,7 @@ void PepperWebSocketHost::didConnect() { protocol)); } -void PepperWebSocketHost::didReceiveMessage(const WebKit::WebString& message) { +void PepperWebSocketHost::didReceiveMessage(const blink::WebString& message) { // Dispose packets after receiving an error. if (error_was_received_) return; @@ -90,7 +90,7 @@ void PepperWebSocketHost::didReceiveMessage(const WebKit::WebString& message) { } void PepperWebSocketHost::didReceiveArrayBuffer( - const WebKit::WebArrayBuffer& binaryData) { + const blink::WebArrayBuffer& binaryData) { // Dispose packets after receiving an error. if (error_was_received_) return; @@ -135,7 +135,7 @@ void PepperWebSocketHost::didStartClosingHandshake() { void PepperWebSocketHost::didClose(unsigned long unhandled_buffered_amount, ClosingHandshakeCompletionStatus status, unsigned short code, - const WebKit::WebString& reason) { + const blink::WebString& reason) { if (connecting_) { connecting_ = false; connect_reply_.params.set_result(PP_ERROR_FAILED); @@ -224,8 +224,8 @@ int32_t PepperWebSocketHost::OnHostMsgConnect( // Convert protocols to WebString. WebString web_protocols = WebString::fromUTF8(protocol_string); - // Create WebKit::WebSocket object and connect. - WebKit::WebPluginContainer* container = + // Create blink::WebSocket object and connect. + blink::WebPluginContainer* container = renderer_ppapi_host_->GetContainerForInstance(pp_instance()); if (!container) return PP_ERROR_BADARGUMENT; diff --git a/content/renderer/pepper/pepper_websocket_host.h b/content/renderer/pepper/pepper_websocket_host.h index 7c8d5b2..3447fcf 100644 --- a/content/renderer/pepper/pepper_websocket_host.h +++ b/content/renderer/pepper/pepper_websocket_host.h @@ -27,7 +27,7 @@ class RendererPpapiHost; class CONTENT_EXPORT PepperWebSocketHost : public ppapi::host::ResourceHost, - public NON_EXPORTED_BASE(::WebKit::WebSocketClient) { + public NON_EXPORTED_BASE(::blink::WebSocketClient) { public: explicit PepperWebSocketHost(RendererPpapiHost* host, PP_Instance instance, @@ -40,15 +40,15 @@ class CONTENT_EXPORT PepperWebSocketHost // WebSocketClient implementation. virtual void didConnect(); - virtual void didReceiveMessage(const WebKit::WebString& message); - virtual void didReceiveArrayBuffer(const WebKit::WebArrayBuffer& binaryData); + virtual void didReceiveMessage(const blink::WebString& message); + virtual void didReceiveArrayBuffer(const blink::WebArrayBuffer& binaryData); virtual void didReceiveMessageError(); virtual void didUpdateBufferedAmount(unsigned long buffered_amount); virtual void didStartClosingHandshake(); virtual void didClose(unsigned long unhandled_buffered_amount, ClosingHandshakeCompletionStatus status, unsigned short code, - const WebKit::WebString& reason); + const blink::WebString& reason); private: // IPC message handlers. int32_t OnHostMsgConnect(ppapi::host::HostMessageContext* context, @@ -89,7 +89,7 @@ class CONTENT_EXPORT PepperWebSocketHost // Keeps the WebKit side WebSocket object. This is used for calling WebKit // side functions via WebKit API. - scoped_ptr<WebKit::WebSocket> websocket_; + scoped_ptr<blink::WebSocket> websocket_; DISALLOW_COPY_AND_ASSIGN(PepperWebSocketHost); }; diff --git a/content/renderer/pepper/plugin_module.cc b/content/renderer/pepper/plugin_module.cc index 1835e0c..bdc6d15 100644 --- a/content/renderer/pepper/plugin_module.cc +++ b/content/renderer/pepper/plugin_module.cc @@ -553,7 +553,7 @@ bool PluginModule::SupportsInterface(const char* name) { PepperPluginInstanceImpl* PluginModule::CreateInstance( RenderViewImpl* render_view, - WebKit::WebPluginContainer* container, + blink::WebPluginContainer* container, const GURL& plugin_url) { PepperPluginInstanceImpl* instance = PepperPluginInstanceImpl::Create( render_view, this, container, plugin_url); diff --git a/content/renderer/pepper/plugin_module.h b/content/renderer/pepper/plugin_module.h index daadf3c..a782e3f 100644 --- a/content/renderer/pepper/plugin_module.h +++ b/content/renderer/pepper/plugin_module.h @@ -41,9 +41,9 @@ namespace IPC { struct ChannelHandle; } -namespace WebKit { +namespace blink { class WebPluginContainer; -} // namespace WebKit +} // namespace blink namespace content { class HostDispatcherWrapper; @@ -140,7 +140,7 @@ class CONTENT_EXPORT PluginModule : PepperPluginInstanceImpl* CreateInstance( RenderViewImpl* render_view, - WebKit::WebPluginContainer* container, + blink::WebPluginContainer* container, const GURL& plugin_url); // Returns "some" plugin instance associated with this module. This is not diff --git a/content/renderer/pepper/plugin_object.cc b/content/renderer/pepper/plugin_object.cc index 7746846..55e4c6c 100644 --- a/content/renderer/pepper/plugin_object.cc +++ b/content/renderer/pepper/plugin_object.cc @@ -27,7 +27,7 @@ using ppapi::PpapiGlobals; using ppapi::StringVar; using ppapi::Var; -using WebKit::WebBindings; +using blink::WebBindings; namespace content { diff --git a/content/renderer/pepper/ppb_graphics_3d_impl.cc b/content/renderer/pepper/ppb_graphics_3d_impl.cc index 252e013..1d614dd 100644 --- a/content/renderer/pepper/ppb_graphics_3d_impl.cc +++ b/content/renderer/pepper/ppb_graphics_3d_impl.cc @@ -27,10 +27,10 @@ using ppapi::thunk::EnterResourceNoLock; using ppapi::thunk::PPB_Graphics3D_API; -using WebKit::WebConsoleMessage; -using WebKit::WebFrame; -using WebKit::WebPluginContainer; -using WebKit::WebString; +using blink::WebConsoleMessage; +using blink::WebFrame; +using blink::WebPluginContainer; +using blink::WebString; namespace content { diff --git a/content/renderer/pepper/ppb_scrollbar_impl.cc b/content/renderer/pepper/ppb_scrollbar_impl.cc index fb01c59..326c700 100644 --- a/content/renderer/pepper/ppb_scrollbar_impl.cc +++ b/content/renderer/pepper/ppb_scrollbar_impl.cc @@ -27,10 +27,10 @@ #endif using ppapi::thunk::PPB_Scrollbar_API; -using WebKit::WebInputEvent; -using WebKit::WebRect; -using WebKit::WebScrollbar; -using WebKit::WebPluginScrollbar; +using blink::WebInputEvent; +using blink::WebRect; +using blink::WebScrollbar; +using blink::WebPluginScrollbar; namespace content { @@ -59,7 +59,7 @@ void PPB_Scrollbar_Impl::Init(bool vertical) { scrollbar_.reset(WebPluginScrollbar::createForPlugin( vertical ? WebScrollbar::Vertical : WebScrollbar::Horizontal, plugin_instance->container(), - static_cast<WebKit::WebPluginScrollbarClient*>(this))); + static_cast<blink::WebPluginScrollbarClient*>(this))); } PPB_Scrollbar_API* PPB_Scrollbar_Impl::AsPPB_Scrollbar_API() { @@ -168,7 +168,7 @@ void PPB_Scrollbar_Impl::SetLocationInternal(const PP_Rect* location) { location->size.height)); } -void PPB_Scrollbar_Impl::valueChanged(WebKit::WebPluginScrollbar* scrollbar) { +void PPB_Scrollbar_Impl::valueChanged(blink::WebPluginScrollbar* scrollbar) { PluginModule* plugin_module = HostGlobals::Get()->GetInstance(pp_instance())->module(); if (!plugin_module) @@ -206,8 +206,8 @@ void PPB_Scrollbar_Impl::overlayChanged(WebPluginScrollbar* scrollbar) { } void PPB_Scrollbar_Impl::invalidateScrollbarRect( - WebKit::WebPluginScrollbar* scrollbar, - const WebKit::WebRect& rect) { + blink::WebPluginScrollbar* scrollbar, + const blink::WebRect& rect) { gfx::Rect gfx_rect(rect.x, rect.y, rect.width, @@ -217,8 +217,8 @@ void PPB_Scrollbar_Impl::invalidateScrollbarRect( // since the PPB_Scrollbar_Impl code is still in the middle of updating its // internal state. // Note: we use a WeakPtrFactory here so that a lingering callback can not - // modify the lifetime of this object. Otherwise, WebKit::WebPluginScrollbar - // could outlive WebKit::WebPluginContainer, which is against its contract. + // modify the lifetime of this object. Otherwise, blink::WebPluginScrollbar + // could outlive blink::WebPluginContainer, which is against its contract. base::MessageLoop::current()->PostTask( FROM_HERE, base::Bind(&PPB_Scrollbar_Impl::NotifyInvalidate, @@ -226,8 +226,8 @@ void PPB_Scrollbar_Impl::invalidateScrollbarRect( } void PPB_Scrollbar_Impl::getTickmarks( - WebKit::WebPluginScrollbar* scrollbar, - WebKit::WebVector<WebKit::WebRect>* tick_marks) const { + blink::WebPluginScrollbar* scrollbar, + blink::WebVector<blink::WebRect>* tick_marks) const { if (tickmarks_.empty()) { WebRect* rects = NULL; tick_marks->assign(rects, 0); diff --git a/content/renderer/pepper/ppb_scrollbar_impl.h b/content/renderer/pepper/ppb_scrollbar_impl.h index eb7906b..f649c81 100644 --- a/content/renderer/pepper/ppb_scrollbar_impl.h +++ b/content/renderer/pepper/ppb_scrollbar_impl.h @@ -20,7 +20,7 @@ namespace content { class PPB_Scrollbar_Impl : public PPB_Widget_Impl, public ppapi::thunk::PPB_Scrollbar_API, - public WebKit::WebPluginScrollbarClient { + public blink::WebPluginScrollbarClient { public: static PP_Resource Create(PP_Instance instance, bool vertical); @@ -50,20 +50,20 @@ class PPB_Scrollbar_Impl : public PPB_Widget_Impl, const ppapi::InputEventData& data) OVERRIDE; virtual void SetLocationInternal(const PP_Rect* location) OVERRIDE; - // WebKit::WebPluginScrollbarClient implementation. - virtual void valueChanged(WebKit::WebPluginScrollbar* scrollbar) OVERRIDE; - virtual void overlayChanged(WebKit::WebPluginScrollbar* scrollbar) OVERRIDE; - virtual void invalidateScrollbarRect(WebKit::WebPluginScrollbar* scrollbar, - const WebKit::WebRect& rect) OVERRIDE; + // blink::WebPluginScrollbarClient implementation. + virtual void valueChanged(blink::WebPluginScrollbar* scrollbar) OVERRIDE; + virtual void overlayChanged(blink::WebPluginScrollbar* scrollbar) OVERRIDE; + virtual void invalidateScrollbarRect(blink::WebPluginScrollbar* scrollbar, + const blink::WebRect& rect) OVERRIDE; virtual void getTickmarks( - WebKit::WebPluginScrollbar* scrollbar, - WebKit::WebVector<WebKit::WebRect>* tick_marks) const OVERRIDE; + blink::WebPluginScrollbar* scrollbar, + blink::WebVector<blink::WebRect>* tick_marks) const OVERRIDE; void NotifyInvalidate(); gfx::Rect dirty_; - std::vector<WebKit::WebRect> tickmarks_; - scoped_ptr<WebKit::WebPluginScrollbar> scrollbar_; + std::vector<blink::WebRect> tickmarks_; + scoped_ptr<blink::WebPluginScrollbar> scrollbar_; // Used so that the post task for Invalidate doesn't keep an extra reference. base::WeakPtrFactory<PPB_Scrollbar_Impl> weak_ptr_factory_; diff --git a/content/renderer/pepper/ppb_var_deprecated_impl.cc b/content/renderer/pepper/ppb_var_deprecated_impl.cc index 23472fa..6f12733 100644 --- a/content/renderer/pepper/ppb_var_deprecated_impl.cc +++ b/content/renderer/pepper/ppb_var_deprecated_impl.cc @@ -24,7 +24,7 @@ using ppapi::NPObjectVar; using ppapi::PpapiGlobals; using ppapi::StringVar; using ppapi::Var; -using WebKit::WebBindings; +using blink::WebBindings; namespace content { @@ -333,7 +333,7 @@ PP_Var CallDeprecated(PP_Var var, return PP_MakeUndefined(); PepperPluginInstanceImpl* plugin = accessor.GetPluginInstance(); if (plugin && plugin->IsProcessingUserGesture()) { - WebKit::WebScopedUserGesture user_gesture( + blink::WebScopedUserGesture user_gesture( plugin->CurrentUserGestureToken()); return InternalCallDeprecated(&accessor, method_name, argc, argv, exception); diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.cc b/content/renderer/pepper/renderer_ppapi_host_impl.cc index 2b8193b..65061cf 100644 --- a/content/renderer/pepper/renderer_ppapi_host_impl.cc +++ b/content/renderer/pepper/renderer_ppapi_host_impl.cc @@ -152,7 +152,7 @@ PepperPluginInstance* RendererPpapiHostImpl::GetPluginInstance( return GetAndValidateInstance(instance); } -WebKit::WebPluginContainer* RendererPpapiHostImpl::GetContainerForInstance( +blink::WebPluginContainer* RendererPpapiHostImpl::GetContainerForInstance( PP_Instance instance) const { PepperPluginInstanceImpl* instance_object = GetAndValidateInstance(instance); if (!instance_object) @@ -199,8 +199,8 @@ gfx::Point RendererPpapiHostImpl::PluginPointToRenderView( GetRenderViewForInstance(instance)); if (plugin_instance->view_data().is_fullscreen || plugin_instance->flash_fullscreen()) { - WebKit::WebRect window_rect = render_view->windowRect(); - WebKit::WebRect screen_rect = render_view->screenInfo().rect; + blink::WebRect window_rect = render_view->windowRect(); + blink::WebRect screen_rect = render_view->screenInfo().rect; return gfx::Point(pt.x() - window_rect.x + screen_rect.x, pt.y() - window_rect.y + screen_rect.y); } diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.h b/content/renderer/pepper/renderer_ppapi_host_impl.h index 07f56a0..4735e7f 100644 --- a/content/renderer/pepper/renderer_ppapi_host_impl.h +++ b/content/renderer/pepper/renderer_ppapi_host_impl.h @@ -80,7 +80,7 @@ class RendererPpapiHostImpl : public RendererPpapiHost { PP_Instance instance) const OVERRIDE; virtual RenderView* GetRenderViewForInstance( PP_Instance instance) const OVERRIDE; - virtual WebKit::WebPluginContainer* GetContainerForInstance( + virtual blink::WebPluginContainer* GetContainerForInstance( PP_Instance instance) const OVERRIDE; virtual base::ProcessId GetPluginPID() const OVERRIDE; virtual bool HasUserGesture(PP_Instance instance) const OVERRIDE; diff --git a/content/renderer/pepper/resource_converter.cc b/content/renderer/pepper/resource_converter.cc index e9a0c77..5054c2d 100644 --- a/content/renderer/pepper/resource_converter.cc +++ b/content/renderer/pepper/resource_converter.cc @@ -30,16 +30,16 @@ void FlushComplete( callback.Run(true); } -// Converts a WebKit::WebFileSystem::Type to a PP_FileSystemType. -PP_FileSystemType WebFileSystemTypeToPPAPI(WebKit::WebFileSystem::Type type) { +// Converts a blink::WebFileSystem::Type to a PP_FileSystemType. +PP_FileSystemType WebFileSystemTypeToPPAPI(blink::WebFileSystem::Type type) { switch (type) { - case WebKit::WebFileSystem::TypeTemporary: + case blink::WebFileSystem::TypeTemporary: return PP_FILESYSTEMTYPE_LOCALTEMPORARY; - case WebKit::WebFileSystem::TypePersistent: + case blink::WebFileSystem::TypePersistent: return PP_FILESYSTEMTYPE_LOCALPERSISTENT; - case WebKit::WebFileSystem::TypeIsolated: + case blink::WebFileSystem::TypeIsolated: return PP_FILESYSTEMTYPE_ISOLATED; - case WebKit::WebFileSystem::TypeExternal: + case blink::WebFileSystem::TypeExternal: return PP_FILESYSTEMTYPE_EXTERNAL; default: NOTREACHED(); @@ -53,7 +53,7 @@ PP_FileSystemType WebFileSystemTypeToPPAPI(WebKit::WebFileSystem::Type type) { bool DOMFileSystemToResource( PP_Instance instance, content::RendererPpapiHost* host, - const WebKit::WebDOMFileSystem& dom_file_system, + const blink::WebDOMFileSystem& dom_file_system, int* pending_renderer_id, scoped_ptr<IPC::Message>* create_message, scoped_ptr<IPC::Message>* browser_host_create_message) { @@ -112,8 +112,8 @@ bool ResourceConverterImpl::FromV8Value(v8::Handle<v8::Object> val, *was_resource = false; - WebKit::WebDOMFileSystem dom_file_system = - WebKit::WebDOMFileSystem::fromV8Value(val); + blink::WebDOMFileSystem dom_file_system = + blink::WebDOMFileSystem::fromV8Value(val); if (!dom_file_system.isNull()) { int pending_renderer_id; scoped_ptr<IPC::Message> create_message; diff --git a/content/renderer/pepper/url_request_info_util.cc b/content/renderer/pepper/url_request_info_util.cc index 92ecdfb..500b7bd 100644 --- a/content/renderer/pepper/url_request_info_util.cc +++ b/content/renderer/pepper/url_request_info_util.cc @@ -32,12 +32,12 @@ using ppapi::Resource; using ppapi::URLRequestInfoData; using ppapi::thunk::EnterResourceNoLock; -using WebKit::WebData; -using WebKit::WebHTTPBody; -using WebKit::WebString; -using WebKit::WebFrame; -using WebKit::WebURL; -using WebKit::WebURLRequest; +using blink::WebData; +using blink::WebHTTPBody; +using blink::WebString; +using blink::WebFrame; +using blink::WebURL; +using blink::WebURLRequest; namespace content { @@ -177,7 +177,7 @@ bool CreateWebURLRequest(PP_Instance instance, if (data->has_custom_user_agent) { bool was_after_preconnect_request = false; dest->setExtraData(new webkit_glue::WebURLRequestExtraDataImpl( - WebKit::WebReferrerPolicyDefault, // Ignored. + blink::WebReferrerPolicyDefault, // Ignored. WebString::fromUTF8(data->custom_user_agent), was_after_preconnect_request)); } diff --git a/content/renderer/pepper/url_request_info_util.h b/content/renderer/pepper/url_request_info_util.h index 2fb40e6..aaafb23 100644 --- a/content/renderer/pepper/url_request_info_util.h +++ b/content/renderer/pepper/url_request_info_util.h @@ -13,7 +13,7 @@ namespace ppapi { struct URLRequestInfoData; } -namespace WebKit { +namespace blink { class WebFrame; class WebURLRequest; } @@ -26,8 +26,8 @@ namespace content { // pointers) will be populated by this function on success. CONTENT_EXPORT bool CreateWebURLRequest(PP_Instance instance, ppapi::URLRequestInfoData* data, - WebKit::WebFrame* frame, - WebKit::WebURLRequest* dest); + blink::WebFrame* frame, + blink::WebURLRequest* dest); // Returns true if universal access is required to use the given request. CONTENT_EXPORT bool URLRequestRequiresUniversalAccess( diff --git a/content/renderer/pepper/url_response_info_util.cc b/content/renderer/pepper/url_response_info_util.cc index eda54d4..6349226 100644 --- a/content/renderer/pepper/url_response_info_util.cc +++ b/content/renderer/pepper/url_response_info_util.cc @@ -19,9 +19,9 @@ #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -using WebKit::WebHTTPHeaderVisitor; -using WebKit::WebString; -using WebKit::WebURLResponse; +using blink::WebHTTPHeaderVisitor; +using blink::WebString; +using blink::WebURLResponse; namespace content { diff --git a/content/renderer/pepper/url_response_info_util.h b/content/renderer/pepper/url_response_info_util.h index ee0c2383..d757062 100644 --- a/content/renderer/pepper/url_response_info_util.h +++ b/content/renderer/pepper/url_response_info_util.h @@ -9,7 +9,7 @@ #include "ppapi/c/pp_instance.h" #include "ppapi/shared_impl/url_response_info_data.h" -namespace WebKit { +namespace blink { class WebURLResponse; } @@ -24,7 +24,7 @@ typedef base::Callback<void(const ppapi::URLResponseInfoData&)> // passed to the plugin. void DataFromWebURLResponse(RendererPpapiHostImpl* host_impl, PP_Instance pp_instance, - const WebKit::WebURLResponse& response, + const blink::WebURLResponse& response, const DataFromWebURLResponseCallback& callback); } // namespace content diff --git a/content/renderer/pepper/usb_key_code_conversion.cc b/content/renderer/pepper/usb_key_code_conversion.cc index a166593..129e663 100644 --- a/content/renderer/pepper/usb_key_code_conversion.cc +++ b/content/renderer/pepper/usb_key_code_conversion.cc @@ -6,7 +6,7 @@ #include "build/build_config.h" -using WebKit::WebKeyboardEvent; +using blink::WebKeyboardEvent; namespace content { diff --git a/content/renderer/pepper/usb_key_code_conversion.h b/content/renderer/pepper/usb_key_code_conversion.h index 1fcd04a..9554c572 100644 --- a/content/renderer/pepper/usb_key_code_conversion.h +++ b/content/renderer/pepper/usb_key_code_conversion.h @@ -7,9 +7,9 @@ #include "ppapi/c/pp_stdint.h" -namespace WebKit { +namespace blink { class WebKeyboardEvent; -} // namespace WebKit +} // namespace blink namespace content { @@ -18,11 +18,11 @@ namespace content { // The code consists of the USB Page (in the high-order 16-bit word) and // USB Usage Id of the key. If no translation can be performed then zero // is returned. -uint32_t UsbKeyCodeForKeyboardEvent(const WebKit::WebKeyboardEvent& key_event); +uint32_t UsbKeyCodeForKeyboardEvent(const blink::WebKeyboardEvent& key_event); // Returns a string that represents the UI Event |code| parameter as specified // in http://www.w3.org/TR/uievents/ -const char* CodeForKeyboardEvent(const WebKit::WebKeyboardEvent& key_event); +const char* CodeForKeyboardEvent(const blink::WebKeyboardEvent& key_event); } // namespace content diff --git a/content/renderer/pepper/usb_key_code_conversion_linux.cc b/content/renderer/pepper/usb_key_code_conversion_linux.cc index c50fe4e..7c12b61 100644 --- a/content/renderer/pepper/usb_key_code_conversion_linux.cc +++ b/content/renderer/pepper/usb_key_code_conversion_linux.cc @@ -8,7 +8,7 @@ #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/keycodes/keycode_converter.h" -using WebKit::WebKeyboardEvent; +using blink::WebKeyboardEvent; namespace content { diff --git a/content/renderer/pepper/usb_key_code_conversion_mac.cc b/content/renderer/pepper/usb_key_code_conversion_mac.cc index bcead0e..4a02d7b 100644 --- a/content/renderer/pepper/usb_key_code_conversion_mac.cc +++ b/content/renderer/pepper/usb_key_code_conversion_mac.cc @@ -8,7 +8,7 @@ #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/keycodes/keycode_converter.h" -using WebKit::WebKeyboardEvent; +using blink::WebKeyboardEvent; namespace content { diff --git a/content/renderer/pepper/usb_key_code_conversion_win.cc b/content/renderer/pepper/usb_key_code_conversion_win.cc index b04cd73..17cad77 100644 --- a/content/renderer/pepper/usb_key_code_conversion_win.cc +++ b/content/renderer/pepper/usb_key_code_conversion_win.cc @@ -8,7 +8,7 @@ #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/keycodes/keycode_converter.h" -using WebKit::WebKeyboardEvent; +using blink::WebKeyboardEvent; namespace content { diff --git a/content/renderer/pepper/v8_var_converter.cc b/content/renderer/pepper/v8_var_converter.cc index db4690a..4d57553 100644 --- a/content/renderer/pepper/v8_var_converter.cc +++ b/content/renderer/pepper/v8_var_converter.cc @@ -206,8 +206,8 @@ bool GetOrCreateVar(v8::Handle<v8::Value> val, } else if (val->IsArray()) { *result = (new ArrayVar())->GetPPVar(); } else if (val->IsObject()) { - scoped_ptr<WebKit::WebArrayBuffer> web_array_buffer( - WebKit::WebArrayBuffer::createFromV8Value(val)); + scoped_ptr<blink::WebArrayBuffer> web_array_buffer( + blink::WebArrayBuffer::createFromV8Value(val)); if (web_array_buffer.get()) { scoped_refptr<HostArrayBufferVar> buffer_var(new HostArrayBufferVar( *web_array_buffer)); diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index f3a78fa..48da615 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -56,24 +56,24 @@ #include "content/renderer/media/rtc_peer_connection_handler.h" #endif -using WebKit::WebDataSource; -using WebKit::WebDocument; -using WebKit::WebFrame; -using WebKit::WebNavigationPolicy; -using WebKit::WebPluginParams; -using WebKit::WebReferrerPolicy; -using WebKit::WebSearchableFormData; -using WebKit::WebSecurityOrigin; -using WebKit::WebServiceWorkerProvider; -using WebKit::WebStorageQuotaCallbacks; -using WebKit::WebString; -using WebKit::WebURL; -using WebKit::WebURLError; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; -using WebKit::WebUserGestureIndicator; -using WebKit::WebVector; -using WebKit::WebView; +using blink::WebDataSource; +using blink::WebDocument; +using blink::WebFrame; +using blink::WebNavigationPolicy; +using blink::WebPluginParams; +using blink::WebReferrerPolicy; +using blink::WebSearchableFormData; +using blink::WebSecurityOrigin; +using blink::WebServiceWorkerProvider; +using blink::WebStorageQuotaCallbacks; +using blink::WebString; +using blink::WebURL; +using blink::WebURLError; +using blink::WebURLRequest; +using blink::WebURLResponse; +using blink::WebUserGestureIndicator; +using blink::WebVector; +using blink::WebView; using base::Time; using base::TimeDelta; using webkit_glue::WebURLResponseExtraDataImpl; @@ -82,7 +82,7 @@ namespace content { namespace { -typedef std::map<WebKit::WebFrame*, RenderFrameImpl*> FrameMap; +typedef std::map<blink::WebFrame*, RenderFrameImpl*> FrameMap; base::LazyInstance<FrameMap> g_child_frame_map = LAZY_INSTANCE_INITIALIZER; } // namespace @@ -140,12 +140,12 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) { return false; } -// WebKit::WebFrameClient implementation ------------------------------------- +// blink::WebFrameClient implementation ------------------------------------- -WebKit::WebPlugin* RenderFrameImpl::createPlugin( - WebKit::WebFrame* frame, - const WebKit::WebPluginParams& params) { - WebKit::WebPlugin* plugin = NULL; +blink::WebPlugin* RenderFrameImpl::createPlugin( + blink::WebFrame* frame, + const blink::WebPluginParams& params) { + blink::WebPlugin* plugin = NULL; if (GetContentClient()->renderer()->OverrideCreatePlugin( render_view_, frame, params, &plugin)) { return plugin; @@ -173,19 +173,19 @@ WebKit::WebPlugin* RenderFrameImpl::createPlugin( #endif // defined(ENABLE_PLUGINS) } -WebKit::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( - WebKit::WebFrame* frame, - const WebKit::WebURL& url, - WebKit::WebMediaPlayerClient* client) { +blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( + blink::WebFrame* frame, + const blink::WebURL& url, + blink::WebMediaPlayerClient* client) { // TODO(nasko): Moving the implementation here involves moving a few media // related client objects here or referencing them in the RenderView. Needs // more work to understand where the proper place for those objects is. return render_view_->createMediaPlayer(frame, url, client); } -WebKit::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( - WebKit::WebFrame* frame, - WebKit::WebApplicationCacheHostClient* client) { +blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( + blink::WebFrame* frame, + blink::WebApplicationCacheHostClient* client) { if (!frame || !frame->view()) return NULL; return new RendererWebApplicationCacheHostImpl( @@ -193,7 +193,7 @@ WebKit::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy()); } -WebKit::WebWorkerPermissionClientProxy* +blink::WebWorkerPermissionClientProxy* RenderFrameImpl::createWorkerPermissionClientProxy(WebFrame* frame) { if (!frame || !frame->view()) return NULL; @@ -201,13 +201,13 @@ RenderFrameImpl::createWorkerPermissionClientProxy(WebFrame* frame) { RenderViewImpl::FromWebView(frame->view()), frame); } -WebKit::WebCookieJar* RenderFrameImpl::cookieJar(WebKit::WebFrame* frame) { +blink::WebCookieJar* RenderFrameImpl::cookieJar(blink::WebFrame* frame) { return render_view_->cookieJar(frame); } -WebKit::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider( - WebKit::WebFrame* frame, - WebKit::WebServiceWorkerProviderClient* client) { +blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider( + blink::WebFrame* frame, + blink::WebServiceWorkerProviderClient* client) { return new WebServiceWorkerProviderImpl( ChildThread::current()->thread_safe_sender(), ChildThread::current()->service_worker_message_filter(), @@ -215,13 +215,13 @@ WebKit::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider( make_scoped_ptr(client)); } -void RenderFrameImpl::didAccessInitialDocument(WebKit::WebFrame* frame) { +void RenderFrameImpl::didAccessInitialDocument(blink::WebFrame* frame) { render_view_->didAccessInitialDocument(frame); } -WebKit::WebFrame* RenderFrameImpl::createChildFrame( - WebKit::WebFrame* parent, - const WebKit::WebString& name) { +blink::WebFrame* RenderFrameImpl::createChildFrame( + blink::WebFrame* parent, + const blink::WebString& name) { RenderFrameImpl* child_render_frame = this; long long child_frame_identifier = WebFrame::generateEmbedderIdentifier(); if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess)) { @@ -236,7 +236,7 @@ WebKit::WebFrame* RenderFrameImpl::createChildFrame( child_render_frame = RenderFrameImpl::Create(render_view_, routing_id); } - WebKit::WebFrame* web_frame = WebFrame::create(child_render_frame, + blink::WebFrame* web_frame = WebFrame::create(child_render_frame, child_frame_identifier); if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess)) { @@ -247,11 +247,11 @@ WebKit::WebFrame* RenderFrameImpl::createChildFrame( return web_frame; } -void RenderFrameImpl::didDisownOpener(WebKit::WebFrame* frame) { +void RenderFrameImpl::didDisownOpener(blink::WebFrame* frame) { render_view_->didDisownOpener(frame); } -void RenderFrameImpl::frameDetached(WebKit::WebFrame* frame) { +void RenderFrameImpl::frameDetached(blink::WebFrame* frame) { // Currently multiple WebCore::Frames can send frameDetached to a single // RenderFrameImpl. This is legacy behavior from when RenderViewImpl served // as a shared WebFrameClient for multiple Webcore::Frame objects. It also @@ -286,14 +286,14 @@ void RenderFrameImpl::frameDetached(WebKit::WebFrame* frame) { frame->close(); } -void RenderFrameImpl::willClose(WebKit::WebFrame* frame) { +void RenderFrameImpl::willClose(blink::WebFrame* frame) { // Call back to RenderViewImpl for observers to be notified. // TODO(nasko): Remove once we have RenderFrameObserver. render_view_->willClose(frame); } -void RenderFrameImpl::didChangeName(WebKit::WebFrame* frame, - const WebKit::WebString& name) { +void RenderFrameImpl::didChangeName(blink::WebFrame* frame, + const blink::WebString& name) { if (!render_view_->renderer_preferences_.report_frame_name_changes) return; @@ -305,26 +305,26 @@ void RenderFrameImpl::didChangeName(WebKit::WebFrame* frame, } void RenderFrameImpl::didMatchCSS( - WebKit::WebFrame* frame, - const WebKit::WebVector<WebKit::WebString>& newly_matching_selectors, - const WebKit::WebVector<WebKit::WebString>& stopped_matching_selectors) { + blink::WebFrame* frame, + const blink::WebVector<blink::WebString>& newly_matching_selectors, + const blink::WebVector<blink::WebString>& stopped_matching_selectors) { render_view_->didMatchCSS( frame, newly_matching_selectors, stopped_matching_selectors); } -void RenderFrameImpl::loadURLExternally(WebKit::WebFrame* frame, - const WebKit::WebURLRequest& request, - WebKit::WebNavigationPolicy policy) { +void RenderFrameImpl::loadURLExternally(blink::WebFrame* frame, + const blink::WebURLRequest& request, + blink::WebNavigationPolicy policy) { loadURLExternally(frame, request, policy, WebString()); } void RenderFrameImpl::loadURLExternally( - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& request, - WebKit::WebNavigationPolicy policy, - const WebKit::WebString& suggested_name) { + blink::WebFrame* frame, + const blink::WebURLRequest& request, + blink::WebNavigationPolicy policy, + const blink::WebString& suggested_name) { Referrer referrer(RenderViewImpl::GetReferrerFromRequest(frame, request)); - if (policy == WebKit::WebNavigationPolicyDownload) { + if (policy == blink::WebNavigationPolicyDownload) { render_view_->Send(new ViewHostMsg_DownloadUrl(render_view_->GetRoutingID(), request.url(), referrer, suggested_name)); @@ -333,36 +333,36 @@ void RenderFrameImpl::loadURLExternally( } } -WebKit::WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( - WebKit::WebFrame* frame, - WebKit::WebDataSource::ExtraData* extra_data, - const WebKit::WebURLRequest& request, - WebKit::WebNavigationType type, - WebKit::WebNavigationPolicy default_policy, +blink::WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( + blink::WebFrame* frame, + blink::WebDataSource::ExtraData* extra_data, + const blink::WebURLRequest& request, + blink::WebNavigationType type, + blink::WebNavigationPolicy default_policy, bool is_redirect) { return render_view_->decidePolicyForNavigation( frame, extra_data, request, type, default_policy, is_redirect); } -WebKit::WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& request, - WebKit::WebNavigationType type, - WebKit::WebNavigationPolicy default_policy, +blink::WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( + blink::WebFrame* frame, + const blink::WebURLRequest& request, + blink::WebNavigationType type, + blink::WebNavigationPolicy default_policy, bool is_redirect) { return render_view_->decidePolicyForNavigation( frame, request, type, default_policy, is_redirect); } -void RenderFrameImpl::willSendSubmitEvent(WebKit::WebFrame* frame, - const WebKit::WebFormElement& form) { +void RenderFrameImpl::willSendSubmitEvent(blink::WebFrame* frame, + const blink::WebFormElement& form) { // Call back to RenderViewImpl for observers to be notified. // TODO(nasko): Remove once we have RenderFrameObserver. render_view_->willSendSubmitEvent(frame, form); } -void RenderFrameImpl::willSubmitForm(WebKit::WebFrame* frame, - const WebKit::WebFormElement& form) { +void RenderFrameImpl::willSubmitForm(blink::WebFrame* frame, + const blink::WebFormElement& form) { DocumentState* document_state = DocumentState::FromDataSource(frame->provisionalDataSource()); NavigationState* navigation_state = document_state->navigation_state(); @@ -385,8 +385,8 @@ void RenderFrameImpl::willSubmitForm(WebKit::WebFrame* frame, render_view_->willSubmitForm(frame, form); } -void RenderFrameImpl::didCreateDataSource(WebKit::WebFrame* frame, - WebKit::WebDataSource* datasource) { +void RenderFrameImpl::didCreateDataSource(blink::WebFrame* frame, + blink::WebDataSource* datasource) { // TODO(nasko): Move implementation here. Needed state: // * pending_navigation_params_ // * webview @@ -396,7 +396,7 @@ void RenderFrameImpl::didCreateDataSource(WebKit::WebFrame* frame, render_view_->didCreateDataSource(frame, datasource); } -void RenderFrameImpl::didStartProvisionalLoad(WebKit::WebFrame* frame) { +void RenderFrameImpl::didStartProvisionalLoad(blink::WebFrame* frame) { WebDataSource* ds = frame->provisionalDataSource(); // In fast/loader/stop-provisional-loads.html, we abort the load before this @@ -445,15 +445,15 @@ void RenderFrameImpl::didStartProvisionalLoad(WebKit::WebFrame* frame) { } void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad( - WebKit::WebFrame* frame) { + blink::WebFrame* frame) { // TODO(nasko): Move implementation here. Needed state: // * page_id_ render_view_->didReceiveServerRedirectForProvisionalLoad(frame); } void RenderFrameImpl::didFailProvisionalLoad( - WebKit::WebFrame* frame, - const WebKit::WebURLError& error) { + blink::WebFrame* frame, + const blink::WebURLError& error) { // TODO(nasko): Move implementation here. Needed state: // * page_id_ // * pending_navigation_params_ @@ -463,7 +463,7 @@ void RenderFrameImpl::didFailProvisionalLoad( render_view_->didFailProvisionalLoad(frame, error); } -void RenderFrameImpl::didCommitProvisionalLoad(WebKit::WebFrame* frame, +void RenderFrameImpl::didCommitProvisionalLoad(blink::WebFrame* frame, bool is_new_navigation) { // TODO(nasko): Move implementation here. Needed state: // * page_id_ @@ -478,7 +478,7 @@ void RenderFrameImpl::didCommitProvisionalLoad(WebKit::WebFrame* frame, render_view_->didCommitProvisionalLoad(frame, is_new_navigation); } -void RenderFrameImpl::didClearWindowObject(WebKit::WebFrame* frame) { +void RenderFrameImpl::didClearWindowObject(blink::WebFrame* frame) { // TODO(nasko): Move implementation here. Needed state: // * enabled_bindings_ // * dom_automation_controller_ @@ -486,7 +486,7 @@ void RenderFrameImpl::didClearWindowObject(WebKit::WebFrame* frame) { render_view_->didClearWindowObject(frame); } -void RenderFrameImpl::didCreateDocumentElement(WebKit::WebFrame* frame) { +void RenderFrameImpl::didCreateDocumentElement(blink::WebFrame* frame) { // Notify the browser about non-blank documents loading in the top frame. GURL url = frame->document().url(); if (url.is_valid() && url.spec() != kAboutBlankURL) { @@ -503,60 +503,60 @@ void RenderFrameImpl::didCreateDocumentElement(WebKit::WebFrame* frame) { render_view_->didCreateDocumentElement(frame); } -void RenderFrameImpl::didReceiveTitle(WebKit::WebFrame* frame, - const WebKit::WebString& title, - WebKit::WebTextDirection direction) { +void RenderFrameImpl::didReceiveTitle(blink::WebFrame* frame, + const blink::WebString& title, + blink::WebTextDirection direction) { // TODO(nasko): Investigate wheather implementation should move here. render_view_->didReceiveTitle(frame, title, direction); } -void RenderFrameImpl::didChangeIcon(WebKit::WebFrame* frame, - WebKit::WebIconURL::Type icon_type) { +void RenderFrameImpl::didChangeIcon(blink::WebFrame* frame, + blink::WebIconURL::Type icon_type) { // TODO(nasko): Investigate wheather implementation should move here. render_view_->didChangeIcon(frame, icon_type); } -void RenderFrameImpl::didFinishDocumentLoad(WebKit::WebFrame* frame) { +void RenderFrameImpl::didFinishDocumentLoad(blink::WebFrame* frame) { // TODO(nasko): Move implementation here. No state needed, just observers // notification in before updating encoding. render_view_->didFinishDocumentLoad(frame); } -void RenderFrameImpl::didHandleOnloadEvents(WebKit::WebFrame* frame) { +void RenderFrameImpl::didHandleOnloadEvents(blink::WebFrame* frame) { // TODO(nasko): Move implementation here. Needed state: // * page_id_ render_view_->didHandleOnloadEvents(frame); } -void RenderFrameImpl::didFailLoad(WebKit::WebFrame* frame, - const WebKit::WebURLError& error) { +void RenderFrameImpl::didFailLoad(blink::WebFrame* frame, + const blink::WebURLError& error) { // TODO(nasko): Move implementation here. No state needed. render_view_->didFailLoad(frame, error); } -void RenderFrameImpl::didFinishLoad(WebKit::WebFrame* frame) { +void RenderFrameImpl::didFinishLoad(blink::WebFrame* frame) { // TODO(nasko): Move implementation here. No state needed, just observers // notification before sending message to the browser process. render_view_->didFinishLoad(frame); } -void RenderFrameImpl::didNavigateWithinPage(WebKit::WebFrame* frame, +void RenderFrameImpl::didNavigateWithinPage(blink::WebFrame* frame, bool is_new_navigation) { // TODO(nasko): Move implementation here. No state needed, just observers // notification before sending message to the browser process. render_view_->didNavigateWithinPage(frame, is_new_navigation); } -void RenderFrameImpl::didUpdateCurrentHistoryItem(WebKit::WebFrame* frame) { +void RenderFrameImpl::didUpdateCurrentHistoryItem(blink::WebFrame* frame) { // TODO(nasko): Move implementation here. Needed methods: // * StartNavStateSyncTimerIfNecessary render_view_->didUpdateCurrentHistoryItem(frame); } void RenderFrameImpl::willRequestAfterPreconnect( - WebKit::WebFrame* frame, - WebKit::WebURLRequest& request) { - WebKit::WebReferrerPolicy referrer_policy = WebKit::WebReferrerPolicyDefault; + blink::WebFrame* frame, + blink::WebURLRequest& request) { + blink::WebReferrerPolicy referrer_policy = blink::WebReferrerPolicyDefault; WebString custom_user_agent; if (request.extraData()) { @@ -578,10 +578,10 @@ void RenderFrameImpl::willRequestAfterPreconnect( } void RenderFrameImpl::willSendRequest( - WebKit::WebFrame* frame, + blink::WebFrame* frame, unsigned identifier, - WebKit::WebURLRequest& request, - const WebKit::WebURLResponse& redirect_response) { + blink::WebURLRequest& request, + const blink::WebURLResponse& redirect_response) { // The request my be empty during tests. if (request.url().isEmpty()) return; @@ -616,7 +616,7 @@ void RenderFrameImpl::willSendRequest( if (internal_data->is_cache_policy_override_set()) request.setCachePolicy(internal_data->cache_policy_override()); - WebKit::WebReferrerPolicy referrer_policy; + blink::WebReferrerPolicy referrer_policy; if (internal_data->is_referrer_policy_set()) { referrer_policy = internal_data->referrer_policy(); internal_data->clear_referrer_policy(); @@ -693,9 +693,9 @@ void RenderFrameImpl::willSendRequest( } void RenderFrameImpl::didReceiveResponse( - WebKit::WebFrame* frame, + blink::WebFrame* frame, unsigned identifier, - const WebKit::WebURLResponse& response) { + const blink::WebURLResponse& response) { // Only do this for responses that correspond to a provisional data source // of the top-most frame. If we have a provisional data source, then we // can't have any sub-resources yet, so we know that this response must @@ -738,7 +738,7 @@ void RenderFrameImpl::didReceiveResponse( internal_data->set_use_error_page(true); } -void RenderFrameImpl::didFinishResourceLoad(WebKit::WebFrame* frame, +void RenderFrameImpl::didFinishResourceLoad(blink::WebFrame* frame, unsigned identifier) { // TODO(nasko): Move implementation here. Needed state: // * devtools_agent_ @@ -748,9 +748,9 @@ void RenderFrameImpl::didFinishResourceLoad(WebKit::WebFrame* frame, } void RenderFrameImpl::didLoadResourceFromMemoryCache( - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& request, - const WebKit::WebURLResponse& response) { + blink::WebFrame* frame, + const blink::WebURLRequest& request, + const blink::WebURLResponse& response) { // The recipients of this message have no use for data: URLs: they don't // affect the page's insecure content list and are not in the disk cache. To // prevent large (1M+) data: URLs from crashing in the IPC system, we simply @@ -770,22 +770,22 @@ void RenderFrameImpl::didLoadResourceFromMemoryCache( ResourceType::FromTargetType(request.targetType()))); } -void RenderFrameImpl::didDisplayInsecureContent(WebKit::WebFrame* frame) { +void RenderFrameImpl::didDisplayInsecureContent(blink::WebFrame* frame) { render_view_->Send(new ViewHostMsg_DidDisplayInsecureContent( render_view_->GetRoutingID())); } void RenderFrameImpl::didRunInsecureContent( - WebKit::WebFrame* frame, - const WebKit::WebSecurityOrigin& origin, - const WebKit::WebURL& target) { + blink::WebFrame* frame, + const blink::WebSecurityOrigin& origin, + const blink::WebURL& target) { render_view_->Send(new ViewHostMsg_DidRunInsecureContent( render_view_->GetRoutingID(), origin.toString().utf8(), target)); } -void RenderFrameImpl::didAbortLoading(WebKit::WebFrame* frame) { +void RenderFrameImpl::didAbortLoading(blink::WebFrame* frame) { #if defined(ENABLE_PLUGINS) if (frame != render_view_->webview()->mainFrame()) return; @@ -795,12 +795,12 @@ void RenderFrameImpl::didAbortLoading(WebKit::WebFrame* frame) { } void RenderFrameImpl::didExhaustMemoryAvailableForScript( - WebKit::WebFrame* frame) { + blink::WebFrame* frame) { render_view_->Send(new ViewHostMsg_JSOutOfMemory( render_view_->GetRoutingID())); } -void RenderFrameImpl::didCreateScriptContext(WebKit::WebFrame* frame, +void RenderFrameImpl::didCreateScriptContext(blink::WebFrame* frame, v8::Handle<v8::Context> context, int extension_group, int world_id) { @@ -808,32 +808,32 @@ void RenderFrameImpl::didCreateScriptContext(WebKit::WebFrame* frame, frame, context, extension_group, world_id); } -void RenderFrameImpl::willReleaseScriptContext(WebKit::WebFrame* frame, +void RenderFrameImpl::willReleaseScriptContext(blink::WebFrame* frame, v8::Handle<v8::Context> context, int world_id) { GetContentClient()->renderer()->WillReleaseScriptContext( frame, context, world_id); } -void RenderFrameImpl::didFirstVisuallyNonEmptyLayout(WebKit::WebFrame* frame) { +void RenderFrameImpl::didFirstVisuallyNonEmptyLayout(blink::WebFrame* frame) { render_view_->didFirstVisuallyNonEmptyLayout(frame); } -void RenderFrameImpl::didChangeContentsSize(WebKit::WebFrame* frame, - const WebKit::WebSize& size) { +void RenderFrameImpl::didChangeContentsSize(blink::WebFrame* frame, + const blink::WebSize& size) { // TODO(nasko): Move implementation here. Needed state: // * cached_has_main_frame_horizontal_scrollbar_ // * cached_has_main_frame_vertical_scrollbar_ render_view_->didChangeContentsSize(frame, size); } -void RenderFrameImpl::didChangeScrollOffset(WebKit::WebFrame* frame) { +void RenderFrameImpl::didChangeScrollOffset(blink::WebFrame* frame) { // TODO(nasko): Move implementation here. Needed methods: // * StartNavStateSyncTimerIfNecessary render_view_->didChangeScrollOffset(frame); } -void RenderFrameImpl::willInsertBody(WebKit::WebFrame* frame) { +void RenderFrameImpl::willInsertBody(blink::WebFrame* frame) { if (!frame->parent()) { render_view_->Send(new ViewHostMsg_WillInsertBody( render_view_->GetRoutingID())); @@ -855,22 +855,22 @@ void RenderFrameImpl::reportFindInPageMatchCount(int request_id, void RenderFrameImpl::reportFindInPageSelection( int request_id, int active_match_ordinal, - const WebKit::WebRect& selection_rect) { + const blink::WebRect& selection_rect) { render_view_->Send(new ViewHostMsg_Find_Reply( render_view_->GetRoutingID(), request_id, -1, selection_rect, active_match_ordinal, false)); } void RenderFrameImpl::requestStorageQuota( - WebKit::WebFrame* frame, - WebKit::WebStorageQuotaType type, + blink::WebFrame* frame, + blink::WebStorageQuotaType type, unsigned long long requested_size, - WebKit::WebStorageQuotaCallbacks* callbacks) { + blink::WebStorageQuotaCallbacks* callbacks) { DCHECK(frame); WebSecurityOrigin origin = frame->document().securityOrigin(); if (origin.isUnique()) { // Unique origins cannot store persistent state. - callbacks->didFail(WebKit::WebStorageQuotaErrorAbort); + callbacks->didFail(blink::WebStorageQuotaErrorAbort); return; } ChildThread::current()->quota_dispatcher()->RequestStorageQuota( @@ -880,35 +880,35 @@ void RenderFrameImpl::requestStorageQuota( } void RenderFrameImpl::willOpenSocketStream( - WebKit::WebSocketStreamHandle* handle) { + blink::WebSocketStreamHandle* handle) { SocketStreamHandleData::AddToHandle(handle, render_view_->GetRoutingID()); } void RenderFrameImpl::willStartUsingPeerConnectionHandler( - WebKit::WebFrame* frame, - WebKit::WebRTCPeerConnectionHandler* handler) { + blink::WebFrame* frame, + blink::WebRTCPeerConnectionHandler* handler) { #if defined(ENABLE_WEBRTC) static_cast<RTCPeerConnectionHandler*>(handler)->associateWithFrame(frame); #endif } bool RenderFrameImpl::willCheckAndDispatchMessageEvent( - WebKit::WebFrame* sourceFrame, - WebKit::WebFrame* targetFrame, - WebKit::WebSecurityOrigin targetOrigin, - WebKit::WebDOMMessageEvent event) { + blink::WebFrame* sourceFrame, + blink::WebFrame* targetFrame, + blink::WebSecurityOrigin targetOrigin, + blink::WebDOMMessageEvent event) { // TODO(nasko): Move implementation here. Needed state: // * is_swapped_out_ return render_view_->willCheckAndDispatchMessageEvent( sourceFrame, targetFrame, targetOrigin, event); } -WebKit::WebString RenderFrameImpl::userAgentOverride( - WebKit::WebFrame* frame, - const WebKit::WebURL& url) { +blink::WebString RenderFrameImpl::userAgentOverride( + blink::WebFrame* frame, + const blink::WebURL& url) { if (!render_view_->webview() || !render_view_->webview()->mainFrame() || render_view_->renderer_preferences_.user_agent_override.empty()) { - return WebKit::WebString(); + return blink::WebString(); } // If we're in the middle of committing a load, the data source we need @@ -925,16 +925,16 @@ WebKit::WebString RenderFrameImpl::userAgentOverride( if (internal_data && internal_data->is_overriding_user_agent()) return WebString::fromUTF8( render_view_->renderer_preferences_.user_agent_override); - return WebKit::WebString(); + return blink::WebString(); } -WebKit::WebString RenderFrameImpl::doNotTrackValue(WebKit::WebFrame* frame) { +blink::WebString RenderFrameImpl::doNotTrackValue(blink::WebFrame* frame) { if (render_view_->renderer_preferences_.enable_do_not_track) return WebString::fromUTF8("1"); return WebString(); } -bool RenderFrameImpl::allowWebGL(WebKit::WebFrame* frame, bool default_value) { +bool RenderFrameImpl::allowWebGL(blink::WebFrame* frame, bool default_value) { if (!default_value) return false; @@ -947,7 +947,7 @@ bool RenderFrameImpl::allowWebGL(WebKit::WebFrame* frame, bool default_value) { return !blocked; } -void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame, +void RenderFrameImpl::didLoseWebGLContext(blink::WebFrame* frame, int arb_robustness_status_code) { render_view_->Send(new ViewHostMsg_DidLose3DContext( GURL(frame->top()->document().securityOrigin().toString()), diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h index 7239b0c..5c81cd1 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h @@ -17,7 +17,7 @@ class RenderViewImpl; class CONTENT_EXPORT RenderFrameImpl : public RenderFrame, - NON_EXPORTED_BASE(public WebKit::WebFrameClient) { + NON_EXPORTED_BASE(public blink::WebFrameClient) { public: // Creates a new RenderFrame. |render_view| is the RenderView object that this // frame belongs to. @@ -36,149 +36,149 @@ class CONTENT_EXPORT RenderFrameImpl // IPC::Listener virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; - // WebKit::WebFrameClient implementation ------------------------------------- - virtual WebKit::WebPlugin* createPlugin( - WebKit::WebFrame* frame, - const WebKit::WebPluginParams& params); - virtual WebKit::WebMediaPlayer* createMediaPlayer( - WebKit::WebFrame* frame, - const WebKit::WebURL& url, - WebKit::WebMediaPlayerClient* client); - virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost( - WebKit::WebFrame* frame, - WebKit::WebApplicationCacheHostClient* client); - virtual WebKit::WebWorkerPermissionClientProxy* - createWorkerPermissionClientProxy(WebKit::WebFrame* frame); - virtual WebKit::WebCookieJar* cookieJar(WebKit::WebFrame* frame); - virtual WebKit::WebServiceWorkerProvider* createServiceWorkerProvider( - WebKit::WebFrame* frame, - WebKit::WebServiceWorkerProviderClient*); - virtual void didAccessInitialDocument(WebKit::WebFrame* frame); - virtual WebKit::WebFrame* createChildFrame(WebKit::WebFrame* parent, - const WebKit::WebString& name); - virtual void didDisownOpener(WebKit::WebFrame* frame); - virtual void frameDetached(WebKit::WebFrame* frame); - virtual void willClose(WebKit::WebFrame* frame); - virtual void didChangeName(WebKit::WebFrame* frame, - const WebKit::WebString& name); + // blink::WebFrameClient implementation ------------------------------------- + virtual blink::WebPlugin* createPlugin( + blink::WebFrame* frame, + const blink::WebPluginParams& params); + virtual blink::WebMediaPlayer* createMediaPlayer( + blink::WebFrame* frame, + const blink::WebURL& url, + blink::WebMediaPlayerClient* client); + virtual blink::WebApplicationCacheHost* createApplicationCacheHost( + blink::WebFrame* frame, + blink::WebApplicationCacheHostClient* client); + virtual blink::WebWorkerPermissionClientProxy* + createWorkerPermissionClientProxy(blink::WebFrame* frame); + virtual blink::WebCookieJar* cookieJar(blink::WebFrame* frame); + virtual blink::WebServiceWorkerProvider* createServiceWorkerProvider( + blink::WebFrame* frame, + blink::WebServiceWorkerProviderClient*); + virtual void didAccessInitialDocument(blink::WebFrame* frame); + virtual blink::WebFrame* createChildFrame(blink::WebFrame* parent, + const blink::WebString& name); + virtual void didDisownOpener(blink::WebFrame* frame); + virtual void frameDetached(blink::WebFrame* frame); + virtual void willClose(blink::WebFrame* frame); + virtual void didChangeName(blink::WebFrame* frame, + const blink::WebString& name); virtual void didMatchCSS( - WebKit::WebFrame* frame, - const WebKit::WebVector<WebKit::WebString>& newly_matching_selectors, - const WebKit::WebVector<WebKit::WebString>& stopped_matching_selectors); - virtual void loadURLExternally(WebKit::WebFrame* frame, - const WebKit::WebURLRequest& request, - WebKit::WebNavigationPolicy policy); + blink::WebFrame* frame, + const blink::WebVector<blink::WebString>& newly_matching_selectors, + const blink::WebVector<blink::WebString>& stopped_matching_selectors); + virtual void loadURLExternally(blink::WebFrame* frame, + const blink::WebURLRequest& request, + blink::WebNavigationPolicy policy); virtual void loadURLExternally( - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& request, - WebKit::WebNavigationPolicy policy, - const WebKit::WebString& suggested_name); - virtual WebKit::WebNavigationPolicy decidePolicyForNavigation( - WebKit::WebFrame* frame, - WebKit::WebDataSource::ExtraData* extra_data, - const WebKit::WebURLRequest& request, - WebKit::WebNavigationType type, - WebKit::WebNavigationPolicy default_policy, + blink::WebFrame* frame, + const blink::WebURLRequest& request, + blink::WebNavigationPolicy policy, + const blink::WebString& suggested_name); + virtual blink::WebNavigationPolicy decidePolicyForNavigation( + blink::WebFrame* frame, + blink::WebDataSource::ExtraData* extra_data, + const blink::WebURLRequest& request, + blink::WebNavigationType type, + blink::WebNavigationPolicy default_policy, bool is_redirect); // DEPRECATED - virtual WebKit::WebNavigationPolicy decidePolicyForNavigation( - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& request, - WebKit::WebNavigationType type, - WebKit::WebNavigationPolicy default_policy, + virtual blink::WebNavigationPolicy decidePolicyForNavigation( + blink::WebFrame* frame, + const blink::WebURLRequest& request, + blink::WebNavigationType type, + blink::WebNavigationPolicy default_policy, bool is_redirect); - virtual void willSendSubmitEvent(WebKit::WebFrame* frame, - const WebKit::WebFormElement& form); - virtual void willSubmitForm(WebKit::WebFrame* frame, - const WebKit::WebFormElement& form); - virtual void didCreateDataSource(WebKit::WebFrame* frame, - WebKit::WebDataSource* datasource); - virtual void didStartProvisionalLoad(WebKit::WebFrame* frame); + virtual void willSendSubmitEvent(blink::WebFrame* frame, + const blink::WebFormElement& form); + virtual void willSubmitForm(blink::WebFrame* frame, + const blink::WebFormElement& form); + virtual void didCreateDataSource(blink::WebFrame* frame, + blink::WebDataSource* datasource); + virtual void didStartProvisionalLoad(blink::WebFrame* frame); virtual void didReceiveServerRedirectForProvisionalLoad( - WebKit::WebFrame* frame); + blink::WebFrame* frame); virtual void didFailProvisionalLoad( - WebKit::WebFrame* frame, - const WebKit::WebURLError& error); - virtual void didCommitProvisionalLoad(WebKit::WebFrame* frame, + blink::WebFrame* frame, + const blink::WebURLError& error); + virtual void didCommitProvisionalLoad(blink::WebFrame* frame, bool is_new_navigation); - virtual void didClearWindowObject(WebKit::WebFrame* frame); - virtual void didCreateDocumentElement(WebKit::WebFrame* frame); - virtual void didReceiveTitle(WebKit::WebFrame* frame, - const WebKit::WebString& title, - WebKit::WebTextDirection direction); - virtual void didChangeIcon(WebKit::WebFrame* frame, - WebKit::WebIconURL::Type icon_type); - virtual void didFinishDocumentLoad(WebKit::WebFrame* frame); - virtual void didHandleOnloadEvents(WebKit::WebFrame* frame); - virtual void didFailLoad(WebKit::WebFrame* frame, - const WebKit::WebURLError& error); - virtual void didFinishLoad(WebKit::WebFrame* frame); - virtual void didNavigateWithinPage(WebKit::WebFrame* frame, + virtual void didClearWindowObject(blink::WebFrame* frame); + virtual void didCreateDocumentElement(blink::WebFrame* frame); + virtual void didReceiveTitle(blink::WebFrame* frame, + const blink::WebString& title, + blink::WebTextDirection direction); + virtual void didChangeIcon(blink::WebFrame* frame, + blink::WebIconURL::Type icon_type); + virtual void didFinishDocumentLoad(blink::WebFrame* frame); + virtual void didHandleOnloadEvents(blink::WebFrame* frame); + virtual void didFailLoad(blink::WebFrame* frame, + const blink::WebURLError& error); + virtual void didFinishLoad(blink::WebFrame* frame); + virtual void didNavigateWithinPage(blink::WebFrame* frame, bool is_new_navigation); - virtual void didUpdateCurrentHistoryItem(WebKit::WebFrame* frame); - virtual void willRequestAfterPreconnect(WebKit::WebFrame* frame, - WebKit::WebURLRequest& request); + virtual void didUpdateCurrentHistoryItem(blink::WebFrame* frame); + virtual void willRequestAfterPreconnect(blink::WebFrame* frame, + blink::WebURLRequest& request); virtual void willSendRequest( - WebKit::WebFrame* frame, + blink::WebFrame* frame, unsigned identifier, - WebKit::WebURLRequest& request, - const WebKit::WebURLResponse& redirect_response); + blink::WebURLRequest& request, + const blink::WebURLResponse& redirect_response); virtual void didReceiveResponse( - WebKit::WebFrame* frame, + blink::WebFrame* frame, unsigned identifier, - const WebKit::WebURLResponse& response); - virtual void didFinishResourceLoad(WebKit::WebFrame* frame, + const blink::WebURLResponse& response); + virtual void didFinishResourceLoad(blink::WebFrame* frame, unsigned identifier); virtual void didLoadResourceFromMemoryCache( - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& request, - const WebKit::WebURLResponse& response); - virtual void didDisplayInsecureContent(WebKit::WebFrame* frame); - virtual void didRunInsecureContent(WebKit::WebFrame* frame, - const WebKit::WebSecurityOrigin& origin, - const WebKit::WebURL& target); - virtual void didAbortLoading(WebKit::WebFrame* frame); + blink::WebFrame* frame, + const blink::WebURLRequest& request, + const blink::WebURLResponse& response); + virtual void didDisplayInsecureContent(blink::WebFrame* frame); + virtual void didRunInsecureContent(blink::WebFrame* frame, + const blink::WebSecurityOrigin& origin, + const blink::WebURL& target); + virtual void didAbortLoading(blink::WebFrame* frame); virtual void didExhaustMemoryAvailableForScript( - WebKit::WebFrame* frame); - virtual void didCreateScriptContext(WebKit::WebFrame* frame, + blink::WebFrame* frame); + virtual void didCreateScriptContext(blink::WebFrame* frame, v8::Handle<v8::Context> context, int extension_group, int world_id); - virtual void willReleaseScriptContext(WebKit::WebFrame* frame, + virtual void willReleaseScriptContext(blink::WebFrame* frame, v8::Handle<v8::Context> context, int world_id); - virtual void didFirstVisuallyNonEmptyLayout(WebKit::WebFrame* frame); - virtual void didChangeContentsSize(WebKit::WebFrame* frame, - const WebKit::WebSize& size); - virtual void didChangeScrollOffset(WebKit::WebFrame* frame); - virtual void willInsertBody(WebKit::WebFrame* frame); + virtual void didFirstVisuallyNonEmptyLayout(blink::WebFrame* frame); + virtual void didChangeContentsSize(blink::WebFrame* frame, + const blink::WebSize& size); + virtual void didChangeScrollOffset(blink::WebFrame* frame); + virtual void willInsertBody(blink::WebFrame* frame); virtual void reportFindInPageMatchCount(int request_id, int count, bool final_update); virtual void reportFindInPageSelection(int request_id, int active_match_ordinal, - const WebKit::WebRect& sel); + const blink::WebRect& sel); virtual void requestStorageQuota( - WebKit::WebFrame* frame, - WebKit::WebStorageQuotaType type, + blink::WebFrame* frame, + blink::WebStorageQuotaType type, unsigned long long requested_size, - WebKit::WebStorageQuotaCallbacks* callbacks); + blink::WebStorageQuotaCallbacks* callbacks); virtual void willOpenSocketStream( - WebKit::WebSocketStreamHandle* handle); + blink::WebSocketStreamHandle* handle); virtual void willStartUsingPeerConnectionHandler( - WebKit::WebFrame* frame, - WebKit::WebRTCPeerConnectionHandler* handler); + blink::WebFrame* frame, + blink::WebRTCPeerConnectionHandler* handler); virtual bool willCheckAndDispatchMessageEvent( - WebKit::WebFrame* sourceFrame, - WebKit::WebFrame* targetFrame, - WebKit::WebSecurityOrigin targetOrigin, - WebKit::WebDOMMessageEvent event); - virtual WebKit::WebString userAgentOverride( - WebKit::WebFrame* frame, - const WebKit::WebURL& url); - virtual WebKit::WebString doNotTrackValue(WebKit::WebFrame* frame); - virtual bool allowWebGL(WebKit::WebFrame* frame, bool default_value); - virtual void didLoseWebGLContext(WebKit::WebFrame* frame, + blink::WebFrame* sourceFrame, + blink::WebFrame* targetFrame, + blink::WebSecurityOrigin targetOrigin, + blink::WebDOMMessageEvent event); + virtual blink::WebString userAgentOverride( + blink::WebFrame* frame, + const blink::WebURL& url); + virtual blink::WebString doNotTrackValue(blink::WebFrame* frame); + virtual bool allowWebGL(blink::WebFrame* frame, bool default_value); + virtual void didLoseWebGLContext(blink::WebFrame* frame, int arb_robustness_status_code); protected: diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc index bf972b1..4bce329 100644 --- a/content/renderer/render_process_impl.cc +++ b/content/renderer/render_process_impl.cc @@ -90,7 +90,7 @@ RenderProcessImpl::RenderProcessImpl() RenderProcessImpl::~RenderProcessImpl() { #ifndef NDEBUG - int count = WebKit::WebFrame::instanceCount(); + int count = blink::WebFrame::instanceCount(); if (count) DLOG(ERROR) << "WebFrame LEAKED " << count << " TIMES"; #endif diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 646bf18..a8ef56d 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -137,14 +137,14 @@ #endif using base::ThreadRestrictions; -using WebKit::WebDocument; -using WebKit::WebFrame; -using WebKit::WebNetworkStateNotifier; -using WebKit::WebRuntimeFeatures; -using WebKit::WebScriptController; -using WebKit::WebSecurityPolicy; -using WebKit::WebString; -using WebKit::WebView; +using blink::WebDocument; +using blink::WebFrame; +using blink::WebNetworkStateNotifier; +using blink::WebRuntimeFeatures; +using blink::WebScriptController; +using blink::WebSecurityPolicy; +using blink::WebString; +using blink::WebView; namespace content { @@ -236,7 +236,7 @@ void EnableWebCoreLogChannels(const std::string& channels) { return; base::StringTokenizer t(channels, ", "); while (t.GetNext()) - WebKit::enableLogChannel(t.token().c_str()); + blink::enableLogChannel(t.token().c_str()); } } // namespace @@ -312,7 +312,7 @@ void RenderThreadImpl::Init() { #if defined(OS_MACOSX) || defined(OS_ANDROID) // On Mac and Android, the select popups are rendered by the browser. - WebKit::WebView::setUseExternalPopupMenus(true); + blink::WebView::setUseExternalPopupMenus(true); #endif lazy_tls.Pointer()->Set(this); @@ -455,7 +455,7 @@ void RenderThreadImpl::Shutdown() { main_thread_indexed_db_dispatcher_.reset(); if (webkit_platform_support_) - WebKit::shutdown(); + blink::shutdown(); lazy_tls.Pointer()->Set(NULL); @@ -640,7 +640,7 @@ void RenderThreadImpl::EnsureWebKitInitialized() { return; webkit_platform_support_.reset(new RendererWebKitPlatformSupportImpl); - WebKit::initialize(webkit_platform_support_.get()); + blink::initialize(webkit_platform_support_.get()); const CommandLine& command_line = *CommandLine::ForCurrentProcess(); @@ -703,7 +703,7 @@ void RenderThreadImpl::EnsureWebKitInitialized() { web_database_observer_impl_.reset( new WebDatabaseObserverImpl(sync_message_filter())); - WebKit::WebDatabase::setObserver(web_database_observer_impl_.get()); + blink::WebDatabase::setObserver(web_database_observer_impl_.get()); SetRuntimeFeaturesDefaultsAndUpdateFromArgs(command_line); @@ -886,7 +886,7 @@ RenderThreadImpl::GetGpuFactories() { make_scoped_ptr( WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext( gpu_channel_host.get(), - WebKit::WebGraphicsContext3D::Attributes(), + blink::WebGraphicsContext3D::Attributes(), GURL("chrome://gpu/RenderThreadImpl::GetGpuVDAContext3D"))), "GPU-VideoAccelerator-Offscreen"); } @@ -900,7 +900,7 @@ RenderThreadImpl::GetGpuFactories() { scoped_ptr<WebGraphicsContext3DCommandBufferImpl> RenderThreadImpl::CreateOffscreenContext3d() { - WebKit::WebGraphicsContext3D::Attributes attributes; + blink::WebGraphicsContext3D::Attributes attributes; attributes.shareResources = true; attributes.depth = false; attributes.stencil = false; @@ -1212,8 +1212,8 @@ GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( return gpu_channel_.get(); } -WebKit::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter( - WebKit::WebMediaStreamCenterClient* client) { +blink::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter( + blink::WebMediaStreamCenterClient* client) { #if defined(OS_ANDROID) if (CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableWebRTC)) @@ -1263,7 +1263,7 @@ void RenderThreadImpl::OnPurgePluginListCache(bool reload_pages) { // refresh temporarily to prevent each renderer process causing the list to be // regenerated. webkit_platform_support_->set_plugin_refresh_allowed(false); - WebKit::resetPluginCache(reload_pages); + blink::resetPluginCache(reload_pages); webkit_platform_support_->set_plugin_refresh_allowed(true); FOR_EACH_OBSERVER(RenderProcessObserver, observers_, PluginListChanged()); @@ -1296,7 +1296,7 @@ void RenderThreadImpl::OnMemoryPressure( // Trigger full v8 garbage collection on critical memory notification. v8::V8::LowMemoryNotification(); // Clear the image cache. - WebKit::WebImageCache::clear(); + blink::WebImageCache::clear(); // Purge Skia font cache, by setting it to 0 and then again to the previous // limit. size_t font_cache_limit = SkGraphics::SetFontCacheLimit(0); @@ -1341,7 +1341,7 @@ void RenderThreadImpl::SetFlingCurveParameters( } -void RenderThreadImpl::SampleGamepads(WebKit::WebGamepads* data) { +void RenderThreadImpl::SampleGamepads(blink::WebGamepads* data) { if (!gamepad_shared_memory_reader_) gamepad_shared_memory_reader_.reset(new GamepadSharedMemoryReader); gamepad_shared_memory_reader_->SampleGamepads(*data); diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index b0c0317..7492b92 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -27,7 +27,7 @@ class GrContext; class SkBitmap; struct ViewMsg_New_Params; -namespace WebKit { +namespace blink { class WebGamepads; class WebGraphicsContext3D; class WebMediaStreamCenter; @@ -224,8 +224,8 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, // Creates the embedder implementation of WebMediaStreamCenter. // The resulting object is owned by WebKit and deleted by WebKit at tear-down. - WebKit::WebMediaStreamCenter* CreateMediaStreamCenter( - WebKit::WebMediaStreamCenterClient* client); + blink::WebMediaStreamCenter* CreateMediaStreamCenter( + blink::WebMediaStreamCenterClient* client); // Returns a factory used for creating RTC PeerConnection objects. MediaStreamDependencyFactory* GetMediaStreamDependencyFactory(); @@ -337,7 +337,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, const std::vector<float>& new_touchscreen); // Retrieve current gamepad data. - void SampleGamepads(WebKit::WebGamepads* data); + void SampleGamepads(blink::WebGamepads* data); // Get the browser process's notion of the renderer process's ID. // This is the first argument to RenderWidgetHost::FromID. Ideally @@ -395,7 +395,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, scoped_ptr<RendererWebKitPlatformSupportImpl> webkit_platform_support_; // Used on the render thread and deleted by WebKit at shutdown. - WebKit::WebMediaStreamCenter* media_stream_center_; + blink::WebMediaStreamCenter* media_stream_center_; // Used on the renderer and IPC threads. scoped_refptr<DBMessageFilter> db_message_filter_; diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index b7afb5f..cd65e4f 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -57,13 +57,13 @@ #include "ui/events/x/events_x_utils.h" #endif -using WebKit::WebFrame; -using WebKit::WebInputEvent; -using WebKit::WebMouseEvent; -using WebKit::WebRuntimeFeatures; -using WebKit::WebString; -using WebKit::WebTextDirection; -using WebKit::WebURLError; +using blink::WebFrame; +using blink::WebInputEvent; +using blink::WebMouseEvent; +using blink::WebRuntimeFeatures; +using blink::WebString; +using blink::WebTextDirection; +using blink::WebURLError; namespace content { @@ -247,9 +247,9 @@ class RenderViewImplTest : public RenderViewTest { SendNativeKeyEvent(webkit_event); // Need to add a char event after the key down. - if (webkit_event.type == WebKit::WebInputEvent::RawKeyDown) { + if (webkit_event.type == blink::WebInputEvent::RawKeyDown) { NativeWebKeyboardEvent char_event = webkit_event; - char_event.type = WebKit::WebInputEvent::Char; + char_event.type = blink::WebInputEvent::Char; char_event.skip_in_browser = true; SendNativeKeyEvent(char_event); } @@ -322,13 +322,13 @@ TEST_F(RenderViewImplTest, OnNavigationHttpPost) { // Check post data sent to browser matches EXPECT_TRUE(host_nav_params.a.page_state.IsValid()); - const WebKit::WebHistoryItem item = PageStateToHistoryItem( + const blink::WebHistoryItem item = PageStateToHistoryItem( host_nav_params.a.page_state); - WebKit::WebHTTPBody body = item.httpBody(); - WebKit::WebHTTPBody::Element element; + blink::WebHTTPBody body = item.httpBody(); + blink::WebHTTPBody::Element element; bool successful = body.elementAt(0, element); EXPECT_TRUE(successful); - EXPECT_EQ(WebKit::WebHTTPBody::Element::TypeData, element.type); + EXPECT_EQ(blink::WebHTTPBody::Element::TypeData, element.type); EXPECT_EQ(length, element.data.size()); EXPECT_EQ(0, memcmp(raw_data, element.data.data(), length)); } @@ -341,38 +341,38 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicy) { state.set_navigation_state(NavigationState::CreateContentInitiated()); // Navigations to normal HTTP URLs can be handled locally. - WebKit::WebURLRequest request(GURL("http://foo.com")); - WebKit::WebNavigationPolicy policy = view()->decidePolicyForNavigation( + blink::WebURLRequest request(GURL("http://foo.com")); + blink::WebNavigationPolicy policy = view()->decidePolicyForNavigation( GetMainFrame(), &state, request, - WebKit::WebNavigationTypeLinkClicked, - WebKit::WebNavigationPolicyCurrentTab, + blink::WebNavigationTypeLinkClicked, + blink::WebNavigationPolicyCurrentTab, false); - EXPECT_EQ(WebKit::WebNavigationPolicyCurrentTab, policy); + EXPECT_EQ(blink::WebNavigationPolicyCurrentTab, policy); // Verify that form posts to WebUI URLs will be sent to the browser process. - WebKit::WebURLRequest form_request(GURL("chrome://foo")); + blink::WebURLRequest form_request(GURL("chrome://foo")); form_request.setHTTPMethod("POST"); policy = view()->decidePolicyForNavigation( GetMainFrame(), &state, form_request, - WebKit::WebNavigationTypeFormSubmitted, - WebKit::WebNavigationPolicyCurrentTab, + blink::WebNavigationTypeFormSubmitted, + blink::WebNavigationPolicyCurrentTab, false); - EXPECT_EQ(WebKit::WebNavigationPolicyIgnore, policy); + EXPECT_EQ(blink::WebNavigationPolicyIgnore, policy); // Verify that popup links to WebUI URLs also are sent to browser. - WebKit::WebURLRequest popup_request(GURL("chrome://foo")); + blink::WebURLRequest popup_request(GURL("chrome://foo")); policy = view()->decidePolicyForNavigation( GetMainFrame(), &state, popup_request, - WebKit::WebNavigationTypeLinkClicked, - WebKit::WebNavigationPolicyNewForegroundTab, + blink::WebNavigationTypeLinkClicked, + blink::WebNavigationPolicyNewForegroundTab, false); - EXPECT_EQ(WebKit::WebNavigationPolicyIgnore, policy); + EXPECT_EQ(blink::WebNavigationPolicyIgnore, policy); } TEST_F(RenderViewImplTest, DecideNavigationPolicyForWebUI) { @@ -383,55 +383,55 @@ TEST_F(RenderViewImplTest, DecideNavigationPolicyForWebUI) { state.set_navigation_state(NavigationState::CreateContentInitiated()); // Navigations to normal HTTP URLs will be sent to browser process. - WebKit::WebURLRequest request(GURL("http://foo.com")); - WebKit::WebNavigationPolicy policy = view()->decidePolicyForNavigation( + blink::WebURLRequest request(GURL("http://foo.com")); + blink::WebNavigationPolicy policy = view()->decidePolicyForNavigation( GetMainFrame(), &state, request, - WebKit::WebNavigationTypeLinkClicked, - WebKit::WebNavigationPolicyCurrentTab, + blink::WebNavigationTypeLinkClicked, + blink::WebNavigationPolicyCurrentTab, false); - EXPECT_EQ(WebKit::WebNavigationPolicyIgnore, policy); + EXPECT_EQ(blink::WebNavigationPolicyIgnore, policy); // Navigations to WebUI URLs will also be sent to browser process. - WebKit::WebURLRequest webui_request(GURL("chrome://foo")); + blink::WebURLRequest webui_request(GURL("chrome://foo")); policy = view()->decidePolicyForNavigation( GetMainFrame(), &state, webui_request, - WebKit::WebNavigationTypeLinkClicked, - WebKit::WebNavigationPolicyCurrentTab, + blink::WebNavigationTypeLinkClicked, + blink::WebNavigationPolicyCurrentTab, false); - EXPECT_EQ(WebKit::WebNavigationPolicyIgnore, policy); + EXPECT_EQ(blink::WebNavigationPolicyIgnore, policy); // Verify that form posts to data URLs will be sent to the browser process. - WebKit::WebURLRequest data_request(GURL("data:text/html,foo")); + blink::WebURLRequest data_request(GURL("data:text/html,foo")); data_request.setHTTPMethod("POST"); policy = view()->decidePolicyForNavigation( GetMainFrame(), &state, data_request, - WebKit::WebNavigationTypeFormSubmitted, - WebKit::WebNavigationPolicyCurrentTab, + blink::WebNavigationTypeFormSubmitted, + blink::WebNavigationPolicyCurrentTab, false); - EXPECT_EQ(WebKit::WebNavigationPolicyIgnore, policy); + EXPECT_EQ(blink::WebNavigationPolicyIgnore, policy); // Verify that a popup that creates a view first and then navigates to a // normal HTTP URL will be sent to the browser process, even though the // new view does not have any enabled_bindings_. - WebKit::WebURLRequest popup_request(GURL("http://foo.com")); - WebKit::WebView* new_web_view = view()->createView( - GetMainFrame(), popup_request, WebKit::WebWindowFeatures(), "foo", - WebKit::WebNavigationPolicyNewForegroundTab); + blink::WebURLRequest popup_request(GURL("http://foo.com")); + blink::WebView* new_web_view = view()->createView( + GetMainFrame(), popup_request, blink::WebWindowFeatures(), "foo", + blink::WebNavigationPolicyNewForegroundTab); RenderViewImpl* new_view = RenderViewImpl::FromWebView(new_web_view); policy = new_view->decidePolicyForNavigation( new_web_view->mainFrame(), &state, popup_request, - WebKit::WebNavigationTypeLinkClicked, - WebKit::WebNavigationPolicyNewForegroundTab, + blink::WebNavigationTypeLinkClicked, + blink::WebNavigationPolicyNewForegroundTab, false); - EXPECT_EQ(WebKit::WebNavigationPolicyIgnore, policy); + EXPECT_EQ(blink::WebNavigationPolicyIgnore, policy); // Clean up after the new view so we don't leak it. new_view->Close(); @@ -1007,7 +1007,7 @@ TEST_F(RenderViewImplTest, ImeComposition) { case IME_SETCOMPOSITION: view()->OnImeSetComposition( WideToUTF16Hack(ime_message->ime_string), - std::vector<WebKit::WebCompositionUnderline>(), + std::vector<blink::WebCompositionUnderline>(), ime_message->selection_start, ime_message->selection_end); break; @@ -1022,7 +1022,7 @@ TEST_F(RenderViewImplTest, ImeComposition) { case IME_CANCELCOMPOSITION: view()->OnImeSetComposition( string16(), - std::vector<WebKit::WebCompositionUnderline>(), + std::vector<blink::WebCompositionUnderline>(), 0, 0); break; } @@ -1066,8 +1066,8 @@ TEST_F(RenderViewImplTest, OnSetTextDirection) { WebTextDirection direction; const wchar_t* expected_result; } kTextDirection[] = { - { WebKit::WebTextDirectionRightToLeft, L"\x000A" L"rtl,rtl" }, - { WebKit::WebTextDirectionLeftToRight, L"\x000A" L"ltr,ltr" }, + { blink::WebTextDirectionRightToLeft, L"\x000A" L"rtl,rtl" }, + { blink::WebTextDirectionLeftToRight, L"\x000A" L"ltr,ltr" }, }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTextDirection); ++i) { // Set the text direction of the <textarea> element. @@ -1523,7 +1523,7 @@ TEST_F(RenderViewImplTest, DidFailProvisionalLoadWithErrorForCancellation) { // Regression test for http://crbug.com/41562 TEST_F(RenderViewImplTest, UpdateTargetURLWithInvalidURL) { const GURL invalid_gurl("http://"); - view()->setMouseOverURL(WebKit::WebURL(invalid_gurl)); + view()->setMouseOverURL(blink::WebURL(invalid_gurl)); EXPECT_EQ(invalid_gurl, view()->target_url_); } @@ -1712,7 +1712,7 @@ TEST_F(RenderViewImplTest, ContextMenu) { TEST_F(RenderViewImplTest, TestBackForward) { LoadHTML("<div id=pagename>Page A</div>"); - WebKit::WebHistoryItem page_a_item = GetMainFrame()->currentHistoryItem(); + blink::WebHistoryItem page_a_item = GetMainFrame()->currentHistoryItem(); int was_page_a = -1; string16 check_page_a = ASCIIToUTF16( @@ -1736,7 +1736,7 @@ TEST_F(RenderViewImplTest, TestBackForward) { EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(check_page_c, &was_page_c)); EXPECT_EQ(1, was_page_b); - WebKit::WebHistoryItem forward_item = GetMainFrame()->currentHistoryItem(); + blink::WebHistoryItem forward_item = GetMainFrame()->currentHistoryItem(); GoBack(GetMainFrame()->previousHistoryItem()); EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(check_page_b, &was_page_b)); EXPECT_EQ(1, was_page_b); @@ -1772,7 +1772,7 @@ TEST_F(RenderViewImplTest, GetCompositionCharacterBoundsTest) { ExecuteJavaScript("document.getElementById('test').focus();"); const string16 empty_string = UTF8ToUTF16(""); - const std::vector<WebKit::WebCompositionUnderline> empty_underline; + const std::vector<blink::WebCompositionUnderline> empty_underline; std::vector<gfx::Rect> bounds; view()->OnSetFocus(true); view()->OnSetInputMethodActive(true); @@ -1874,9 +1874,9 @@ TEST_F(RenderViewImplTest, SetEditableSelectionAndComposition) { "</html>"); ExecuteJavaScript("document.getElementById('test1').focus();"); view()->OnSetEditableSelectionOffsets(4, 8); - const std::vector<WebKit::WebCompositionUnderline> empty_underline; + const std::vector<blink::WebCompositionUnderline> empty_underline; view()->OnSetCompositionFromExistingText(7, 10, empty_underline); - WebKit::WebTextInputInfo info = view()->webview()->textInputInfo(); + blink::WebTextInputInfo info = view()->webview()->textInputInfo(); EXPECT_EQ(4, info.selectionStart); EXPECT_EQ(8, info.selectionEnd); EXPECT_EQ(7, info.compositionStart); @@ -1900,7 +1900,7 @@ TEST_F(RenderViewImplTest, OnExtendSelectionAndDelete) { ExecuteJavaScript("document.getElementById('test1').focus();"); view()->OnSetEditableSelectionOffsets(10, 10); view()->OnExtendSelectionAndDelete(3, 4); - WebKit::WebTextInputInfo info = view()->webview()->textInputInfo(); + blink::WebTextInputInfo info = view()->webview()->textInputInfo(); EXPECT_EQ("abcdefgopqrstuvwxyz", info.value); EXPECT_EQ(7, info.selectionStart); EXPECT_EQ(7, info.selectionEnd); @@ -1951,7 +1951,7 @@ TEST_F(RenderViewImplTest, GetSSLStatusOfFrame) { SSLStatus ssl_status = view()->GetSSLStatusOfFrame(frame); EXPECT_FALSE(net::IsCertStatusError(ssl_status.cert_status)); - const_cast<WebKit::WebURLResponse&>(frame->dataSource()->response()). + const_cast<blink::WebURLResponse&>(frame->dataSource()->response()). setSecurityInfo( SerializeSecurityInfo(0, net::CERT_STATUS_ALL_ERRORS, 0, 0)); ssl_status = view()->GetSSLStatusOfFrame(frame); @@ -2008,9 +2008,9 @@ class SuppressErrorPageTest : public RenderViewTest { } virtual void GetNavigationErrorStrings( - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& failed_request, - const WebKit::WebURLError& error, + blink::WebFrame* frame, + const blink::WebURLRequest& failed_request, + const blink::WebURLError& error, const std::string& accept_languages, std::string* error_html, string16* error_description) OVERRIDE { diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 54fb187..3a2abf6 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -255,102 +255,102 @@ #include "content/renderer/media/rtc_peer_connection_handler.h" #endif -using WebKit::WebAXObject; -using WebKit::WebApplicationCacheHost; -using WebKit::WebApplicationCacheHostClient; -using WebKit::WebCString; -using WebKit::WebColor; -using WebKit::WebColorName; -using WebKit::WebConsoleMessage; -using WebKit::WebContextMenuData; -using WebKit::WebCookieJar; -using WebKit::WebData; -using WebKit::WebDataSource; -using WebKit::WebDocument; -using WebKit::WebDOMEvent; -using WebKit::WebDOMMessageEvent; -using WebKit::WebDragData; -using WebKit::WebDragOperation; -using WebKit::WebDragOperationsMask; -using WebKit::WebElement; -using WebKit::WebExternalPopupMenu; -using WebKit::WebExternalPopupMenuClient; -using WebKit::WebFileChooserCompletion; -using WebKit::WebFindOptions; -using WebKit::WebFormControlElement; -using WebKit::WebFormElement; -using WebKit::WebFrame; -using WebKit::WebGestureEvent; -using WebKit::WebHistoryItem; -using WebKit::WebHTTPBody; -using WebKit::WebIconURL; -using WebKit::WebImage; -using WebKit::WebInputElement; -using WebKit::WebInputEvent; -using WebKit::WebMediaPlayer; -using WebKit::WebMediaPlayerAction; -using WebKit::WebMediaPlayerClient; -using WebKit::WebMouseEvent; -using WebKit::WebNavigationPolicy; -using WebKit::WebNavigationType; -using WebKit::WebNode; -using WebKit::WebPageSerializer; -using WebKit::WebPageSerializerClient; -using WebKit::WebPeerConnection00Handler; -using WebKit::WebPeerConnection00HandlerClient; -using WebKit::WebPeerConnectionHandler; -using WebKit::WebPeerConnectionHandlerClient; -using WebKit::WebPluginAction; -using WebKit::WebPluginContainer; -using WebKit::WebPluginDocument; -using WebKit::WebPluginParams; -using WebKit::WebPoint; -using WebKit::WebPopupMenuInfo; -using WebKit::WebRange; -using WebKit::WebRect; -using WebKit::WebReferrerPolicy; -using WebKit::WebRuntimeFeatures; -using WebKit::WebScriptSource; -using WebKit::WebSearchableFormData; -using WebKit::WebSecurityOrigin; -using WebKit::WebSecurityPolicy; -using WebKit::WebSerializedScriptValue; -using WebKit::WebSettings; -using WebKit::WebSize; -using WebKit::WebSocketStreamHandle; -using WebKit::WebStorageNamespace; -using WebKit::WebStorageQuotaCallbacks; -using WebKit::WebStorageQuotaError; -using WebKit::WebStorageQuotaType; -using WebKit::WebString; -using WebKit::WebTextAffinity; -using WebKit::WebTextDirection; -using WebKit::WebTouchEvent; -using WebKit::WebURL; -using WebKit::WebURLError; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; -using WebKit::WebUserGestureIndicator; -using WebKit::WebVector; -using WebKit::WebView; -using WebKit::WebWidget; -using WebKit::WebWindowFeatures; +using blink::WebAXObject; +using blink::WebApplicationCacheHost; +using blink::WebApplicationCacheHostClient; +using blink::WebCString; +using blink::WebColor; +using blink::WebColorName; +using blink::WebConsoleMessage; +using blink::WebContextMenuData; +using blink::WebCookieJar; +using blink::WebData; +using blink::WebDataSource; +using blink::WebDocument; +using blink::WebDOMEvent; +using blink::WebDOMMessageEvent; +using blink::WebDragData; +using blink::WebDragOperation; +using blink::WebDragOperationsMask; +using blink::WebElement; +using blink::WebExternalPopupMenu; +using blink::WebExternalPopupMenuClient; +using blink::WebFileChooserCompletion; +using blink::WebFindOptions; +using blink::WebFormControlElement; +using blink::WebFormElement; +using blink::WebFrame; +using blink::WebGestureEvent; +using blink::WebHistoryItem; +using blink::WebHTTPBody; +using blink::WebIconURL; +using blink::WebImage; +using blink::WebInputElement; +using blink::WebInputEvent; +using blink::WebMediaPlayer; +using blink::WebMediaPlayerAction; +using blink::WebMediaPlayerClient; +using blink::WebMouseEvent; +using blink::WebNavigationPolicy; +using blink::WebNavigationType; +using blink::WebNode; +using blink::WebPageSerializer; +using blink::WebPageSerializerClient; +using blink::WebPeerConnection00Handler; +using blink::WebPeerConnection00HandlerClient; +using blink::WebPeerConnectionHandler; +using blink::WebPeerConnectionHandlerClient; +using blink::WebPluginAction; +using blink::WebPluginContainer; +using blink::WebPluginDocument; +using blink::WebPluginParams; +using blink::WebPoint; +using blink::WebPopupMenuInfo; +using blink::WebRange; +using blink::WebRect; +using blink::WebReferrerPolicy; +using blink::WebRuntimeFeatures; +using blink::WebScriptSource; +using blink::WebSearchableFormData; +using blink::WebSecurityOrigin; +using blink::WebSecurityPolicy; +using blink::WebSerializedScriptValue; +using blink::WebSettings; +using blink::WebSize; +using blink::WebSocketStreamHandle; +using blink::WebStorageNamespace; +using blink::WebStorageQuotaCallbacks; +using blink::WebStorageQuotaError; +using blink::WebStorageQuotaType; +using blink::WebString; +using blink::WebTextAffinity; +using blink::WebTextDirection; +using blink::WebTouchEvent; +using blink::WebURL; +using blink::WebURLError; +using blink::WebURLRequest; +using blink::WebURLResponse; +using blink::WebUserGestureIndicator; +using blink::WebVector; +using blink::WebView; +using blink::WebWidget; +using blink::WebWindowFeatures; using base::Time; using base::TimeDelta; using webkit_glue::WebURLResponseExtraDataImpl; #if defined(OS_ANDROID) -using WebKit::WebContentDetectionResult; -using WebKit::WebFloatPoint; -using WebKit::WebFloatRect; -using WebKit::WebHitTestResult; +using blink::WebContentDetectionResult; +using blink::WebFloatPoint; +using blink::WebFloatRect; +using blink::WebHitTestResult; #endif namespace content { //----------------------------------------------------------------------------- -typedef std::map<WebKit::WebView*, RenderViewImpl*> ViewMap; +typedef std::map<blink::WebView*, RenderViewImpl*> ViewMap; static base::LazyInstance<ViewMap> g_view_map = LAZY_INSTANCE_INITIALIZER; typedef std::map<int32, RenderViewImpl*> RoutingIDViewMap; static base::LazyInstance<RoutingIDViewMap> g_routing_id_view_map = @@ -520,13 +520,13 @@ static bool IsNonLocalTopLevelNavigation(const GURL& url, if (!url.SchemeIs(kHttpScheme) && !url.SchemeIs(kHttpsScheme)) return false; - if (type != WebKit::WebNavigationTypeReload && - type != WebKit::WebNavigationTypeBackForward && !is_form_post) { + if (type != blink::WebNavigationTypeReload && + type != blink::WebNavigationTypeBackForward && !is_form_post) { // The opener relationship between the new window and the parent allows the // new window to script the parent and vice versa. This is not allowed if // the origins of the two domains are different. This can be treated as a // top level navigation and routed back to the host. - WebKit::WebFrame* opener = frame->opener(); + blink::WebFrame* opener = frame->opener(); if (!opener) return true; @@ -536,11 +536,11 @@ static bool IsNonLocalTopLevelNavigation(const GURL& url, return false; } -static void NotifyTimezoneChange(WebKit::WebFrame* frame) { +static void NotifyTimezoneChange(blink::WebFrame* frame) { v8::HandleScope handle_scope(v8::Isolate::GetCurrent()); v8::Context::Scope context_scope(frame->mainWorldScriptContext()); v8::Date::DateTimeConfigurationChangeNotification(); - WebKit::WebFrame* child = frame->firstChild(); + blink::WebFrame* child = frame->firstChild(); for (; child; child = child->nextSibling()) NotifyTimezoneChange(child); } @@ -548,19 +548,19 @@ static void NotifyTimezoneChange(WebKit::WebFrame* frame) { static WindowOpenDisposition NavigationPolicyToDisposition( WebNavigationPolicy policy) { switch (policy) { - case WebKit::WebNavigationPolicyIgnore: + case blink::WebNavigationPolicyIgnore: return IGNORE_ACTION; - case WebKit::WebNavigationPolicyDownload: + case blink::WebNavigationPolicyDownload: return SAVE_TO_DISK; - case WebKit::WebNavigationPolicyCurrentTab: + case blink::WebNavigationPolicyCurrentTab: return CURRENT_TAB; - case WebKit::WebNavigationPolicyNewBackgroundTab: + case blink::WebNavigationPolicyNewBackgroundTab: return NEW_BACKGROUND_TAB; - case WebKit::WebNavigationPolicyNewForegroundTab: + case blink::WebNavigationPolicyNewForegroundTab: return NEW_FOREGROUND_TAB; - case WebKit::WebNavigationPolicyNewWindow: + case blink::WebNavigationPolicyNewWindow: return NEW_WINDOW; - case WebKit::WebNavigationPolicyNewPopup: + case blink::WebNavigationPolicyNewPopup: return NEW_POPUP; default: NOTREACHED() << "Unexpected WebNavigationPolicy"; @@ -680,15 +680,15 @@ static bool ShouldUseAcceleratedFixedRootBackground(float device_scale_factor) { return DeviceScaleEnsuresTextQuality(device_scale_factor); } -static FaviconURL::IconType ToFaviconType(WebKit::WebIconURL::Type type) { +static FaviconURL::IconType ToFaviconType(blink::WebIconURL::Type type) { switch (type) { - case WebKit::WebIconURL::TypeFavicon: + case blink::WebIconURL::TypeFavicon: return FaviconURL::FAVICON; - case WebKit::WebIconURL::TypeTouch: + case blink::WebIconURL::TypeTouch: return FaviconURL::TOUCH_ICON; - case WebKit::WebIconURL::TypeTouchPrecomposed: + case blink::WebIconURL::TypeTouchPrecomposed: return FaviconURL::TOUCH_PRECOMPOSED_ICON; - case WebKit::WebIconURL::TypeInvalid: + case blink::WebIconURL::TypeInvalid: return FaviconURL::INVALID_ICON; } return FaviconURL::INVALID_ICON; @@ -709,7 +709,7 @@ namespace { class WebWidgetLockTarget : public MouseLockDispatcher::LockTarget { public: - explicit WebWidgetLockTarget(WebKit::WebWidget* webwidget) + explicit WebWidgetLockTarget(blink::WebWidget* webwidget) : webwidget_(webwidget) {} virtual void OnLockMouseACK(bool succeeded) OVERRIDE { @@ -724,13 +724,13 @@ class WebWidgetLockTarget : public MouseLockDispatcher::LockTarget { } virtual bool HandleMouseLockedInputEvent( - const WebKit::WebMouseEvent &event) OVERRIDE { + const blink::WebMouseEvent &event) OVERRIDE { // The WebWidget handles mouse lock in WebKit's handleInputEvent(). return false; } private: - WebKit::WebWidget* webwidget_; + blink::WebWidget* webwidget_; }; int64 ExtractPostId(const WebHistoryItem& item) { @@ -820,7 +820,7 @@ WebDragData DropDataToWebDragData(const DropData& drop_data) { } // namespace RenderViewImpl::RenderViewImpl(RenderViewImplParams* params) - : RenderWidget(WebKit::WebPopupTypeNone, + : RenderWidget(blink::WebPopupTypeNone, params->screen_info, params->swapped_out, params->hidden), @@ -1073,7 +1073,7 @@ RenderViewImpl* RenderViewImpl::FromWebView(WebView* webview) { } /*static*/ -RenderView* RenderView::FromWebView(WebKit::WebView* webview) { +RenderView* RenderView::FromWebView(blink::WebView* webview) { return RenderViewImpl::FromWebView(webview); } @@ -1112,7 +1112,7 @@ RenderViewImpl* RenderViewImpl::Create( bool swapped_out, bool hidden, int32 next_page_id, - const WebKit::WebScreenInfo& screen_info, + const blink::WebScreenInfo& screen_info, AccessibilityMode accessibility_mode, bool allow_partial_swap) { DCHECK(routing_id != MSG_ROUTING_NONE); @@ -1157,8 +1157,8 @@ void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) { observers_.RemoveObserver(observer); } -WebKit::WebView* RenderViewImpl::webview() const { - return static_cast<WebKit::WebView*>(webwidget()); +blink::WebView* RenderViewImpl::webview() const { + return static_cast<blink::WebView*>(webwidget()); } #if defined(ENABLE_PLUGINS) @@ -1177,7 +1177,7 @@ void RenderViewImpl::PepperInstanceDeleted(PepperPluginInstanceImpl* instance) { void RenderViewImpl::PepperDidChangeCursor( PepperPluginInstanceImpl* instance, - const WebKit::WebCursorInfo& cursor) { + const blink::WebCursorInfo& cursor) { // Update the cursor appearance immediately if the requesting plugin is the // one which receives the last mouse event. Otherwise, the new cursor won't be // picked up until the plugin gets the next input event. That is bad if, e.g., @@ -1244,7 +1244,7 @@ RenderWidgetFullscreenPepper* RenderViewImpl::CreatePepperFullscreenContainer( active_url = GURL(webview()->mainFrame()->document().url()); RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create( routing_id_, plugin, active_url, screen_info_); - widget->show(WebKit::WebNavigationPolicyIgnore); + widget->show(blink::WebNavigationPolicyIgnore); return widget; } @@ -1306,7 +1306,7 @@ bool RenderViewImpl::GetPluginInfo(const GURL& url, void RenderViewImpl::SimulateImeSetComposition( const string16& text, - const std::vector<WebKit::WebCompositionUnderline>& underlines, + const std::vector<blink::WebCompositionUnderline>& underlines, int selection_start, int selection_end) { OnImeSetComposition(text, underlines, selection_start, selection_end); @@ -1344,7 +1344,7 @@ void RenderViewImpl::StartPluginIme() { #endif // ENABLE_PLUGINS void RenderViewImpl::TransferActiveWheelFlingAnimation( - const WebKit::WebActiveWheelFlingParameters& params) { + const blink::WebActiveWheelFlingParameters& params) { if (webview()) webview()->transferActiveWheelFlingAnimation(params); } @@ -1840,7 +1840,7 @@ void RenderViewImpl::OnReplaceMisspelling(const string16& text) { void RenderViewImpl::OnScrollFocusedEditableNodeIntoRect( const gfx::Rect& rect) { - WebKit::WebNode node = GetFocusedNode(); + blink::WebNode node = GetFocusedNode(); if (!node.isNull()) { if (IsEditableNode(node)) { webview()->saveScrollAndScaleState(); @@ -1924,7 +1924,7 @@ void RenderViewImpl::OnSetEditableSelectionOffsets(int start, int end) { void RenderViewImpl::OnSetCompositionFromExistingText( int start, int end, - const std::vector<WebKit::WebCompositionUnderline>& underlines) { + const std::vector<blink::WebCompositionUnderline>& underlines) { if (!ShouldHandleImeEvent()) return; ImeEventGuard guard(this); @@ -2133,7 +2133,7 @@ void RenderViewImpl::UpdateURL(WebFrame* frame) { // Save some histogram data so we can compute the average memory used per // page load of the glyphs. UMA_HISTOGRAM_COUNTS_10000("Memory.GlyphPagesPerLoad", - WebKit::WebGlyphCache::pageCount()); + blink::WebGlyphCache::pageCount()); // This message needs to be sent before any of allowScripts(), // allowImages(), allowPlugins() is called for the new page, so that when @@ -2239,10 +2239,10 @@ void RenderViewImpl::OpenURL(WebFrame* frame, if (GetContentClient()->renderer()->AllowPopup()) params.user_gesture = true; - if (policy == WebKit::WebNavigationPolicyNewBackgroundTab || - policy == WebKit::WebNavigationPolicyNewForegroundTab || - policy == WebKit::WebNavigationPolicyNewWindow || - policy == WebKit::WebNavigationPolicyNewPopup) { + if (policy == blink::WebNavigationPolicyNewBackgroundTab || + policy == blink::WebNavigationPolicyNewForegroundTab || + policy == blink::WebNavigationPolicyNewWindow || + policy == blink::WebNavigationPolicyNewPopup) { WebUserGestureIndicator::consumeUserGesture(); } @@ -2338,7 +2338,7 @@ void RenderViewImpl::OnWindowSnapshotCompleted(const int snapshot_id, } } -// WebKit::WebViewClient ------------------------------------------------------ +// blink::WebViewClient ------------------------------------------------------ WebView* RenderViewImpl::createView( WebFrame* creator, @@ -2444,7 +2444,7 @@ WebView* RenderViewImpl::createView( return view->webview(); } -WebWidget* RenderViewImpl::createPopupMenu(WebKit::WebPopupType popup_type) { +WebWidget* RenderViewImpl::createPopupMenu(blink::WebPopupType popup_type) { RenderWidget* widget = RenderWidget::Create(routing_id_, popup_type, screen_info_); if (screen_metrics_emulator_) { @@ -2530,7 +2530,7 @@ void RenderViewImpl::printPage(WebFrame* frame) { PrintPage(frame, handling_input_event_)); } -WebKit::WebNotificationPresenter* RenderViewImpl::notificationPresenter() { +blink::WebNotificationPresenter* RenderViewImpl::notificationPresenter() { return notification_provider_; } @@ -2546,7 +2546,7 @@ bool RenderViewImpl::enumerateChosenDirectory( } void RenderViewImpl::initializeHelperPluginWebFrame( - WebKit::WebHelperPlugin* plugin) { + blink::WebHelperPlugin* plugin) { plugin->initializeFrame(main_render_frame_.get()); } @@ -2650,9 +2650,9 @@ bool RenderViewImpl::handleCurrentKeyboardEvent() { return did_execute_command; } -WebKit::WebColorChooser* RenderViewImpl::createColorChooser( - WebKit::WebColorChooserClient* client, - const WebKit::WebColor& initial_color) { +blink::WebColorChooser* RenderViewImpl::createColorChooser( + blink::WebColorChooserClient* client, + const blink::WebColor& initial_color) { RendererWebColorChooserImpl* color_chooser = new RendererWebColorChooserImpl(this, client); color_chooser->Open(static_cast<SkColor>(initial_color)); @@ -2660,7 +2660,7 @@ WebKit::WebColorChooser* RenderViewImpl::createColorChooser( } bool RenderViewImpl::runFileChooser( - const WebKit::WebFileChooserParams& params, + const blink::WebFileChooserParams& params, WebFileChooserCompletion* chooser_completion) { // Do not open the file dialog in a hidden RenderView. if (is_hidden()) @@ -2725,7 +2725,7 @@ bool RenderViewImpl::runModalBeforeUnloadDialog( bool is_reload = false; WebDataSource* ds = frame->provisionalDataSource(); if (ds) - is_reload = (ds->navigationType() == WebKit::WebNavigationTypeReload); + is_reload = (ds->navigationType() == blink::WebNavigationTypeReload); return runModalBeforeUnloadDialog(frame, is_reload, message); } @@ -2956,7 +2956,7 @@ int RenderViewImpl::historyForwardListCount() { } void RenderViewImpl::postAccessibilityEvent( - const WebAXObject& obj, WebKit::WebAXEvent event) { + const WebAXObject& obj, blink::WebAXEvent event) { if (renderer_accessibility_) { renderer_accessibility_->HandleWebAccessibilityEvent(obj, event); } @@ -2969,7 +2969,7 @@ void RenderViewImpl::didUpdateInspectorSetting(const WebString& key, value.utf8())); } -// WebKit::WebWidgetClient ---------------------------------------------------- +// blink::WebWidgetClient ---------------------------------------------------- void RenderViewImpl::didFocus() { // TODO(jcivelli): when https://bugs.webkit.org/show_bug.cgi?id=33389 is fixed @@ -3013,8 +3013,8 @@ void RenderViewImpl::show(WebNavigationPolicy policy) { // We exempt background tabs for compat with older versions of Chrome. // TODO(darin): This seems bogus. These should have a user gesture, so // we probably don't need this check. - if (policy != WebKit::WebNavigationPolicyNewBackgroundTab) - policy = WebKit::WebNavigationPolicyNewPopup; + if (policy != blink::WebNavigationPolicyNewBackgroundTab) + policy = blink::WebNavigationPolicyNewPopup; } // NOTE: initial_pos_ may still have its default values at this point, but @@ -3101,10 +3101,10 @@ void RenderViewImpl::initializeLayerTreeView() { webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId()); } -// WebKit::WebFrameClient ----------------------------------------------------- +// blink::WebFrameClient ----------------------------------------------------- WebMediaPlayer* RenderViewImpl::createMediaPlayer( - WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) { + WebFrame* frame, const blink::WebURL& url, WebMediaPlayerClient* client) { FOR_EACH_OBSERVER( RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client)); @@ -3146,7 +3146,7 @@ void RenderViewImpl::didAccessInitialDocument(WebFrame* frame) { Send(new ViewHostMsg_DidAccessInitialDocument(routing_id_)); } -void RenderViewImpl::didDisownOpener(WebKit::WebFrame* frame) { +void RenderViewImpl::didDisownOpener(blink::WebFrame* frame) { // We only need to notify the browser if the active, top-level frame clears // its opener. We can ignore cases where a swapped out frame clears its // opener after hearing about it from the browser, and the browser does not @@ -3190,7 +3190,7 @@ void RenderViewImpl::ClearEditCommands() { edit_commands_.clear(); } -SSLStatus RenderViewImpl::GetSSLStatusOfFrame(WebKit::WebFrame* frame) const { +SSLStatus RenderViewImpl::GetSSLStatusOfFrame(blink::WebFrame* frame) const { std::string security_info; if (frame && frame->dataSource()) security_info = frame->dataSource()->response().securityInfo(); @@ -3216,7 +3216,7 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation( GetContentClient()->renderer()->HandleNavigation(frame, request, type, default_policy, is_redirect)) { - return WebKit::WebNavigationPolicyIgnore; + return blink::WebNavigationPolicyIgnore; } Referrer referrer(GetReferrerFromRequest(frame, request)); @@ -3232,12 +3232,12 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation( // fixing http://crbug.com/101395. if (frame->parent() == NULL) { OpenURL(frame, request.url(), referrer, default_policy); - return WebKit::WebNavigationPolicyIgnore; // Suppress the load here. + return blink::WebNavigationPolicyIgnore; // Suppress the load here. } // We should otherwise ignore in-process iframe navigations, if they // arrive just after we are swapped out. - return WebKit::WebNavigationPolicyIgnore; + return blink::WebNavigationPolicyIgnore; } // Allow kSwappedOutURL to complete. @@ -3276,14 +3276,14 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation( net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES); if (!same_domain_or_host || frame_url.scheme() != url.scheme()) { OpenURL(frame, url, referrer, default_policy); - return WebKit::WebNavigationPolicyIgnore; + return blink::WebNavigationPolicyIgnore; } } // If the browser is interested, then give it a chance to look at the request. if (is_content_initiated) { - bool is_form_post = ((type == WebKit::WebNavigationTypeFormSubmitted) || - (type == WebKit::WebNavigationTypeFormResubmitted)) && + bool is_form_post = ((type == blink::WebNavigationTypeFormSubmitted) || + (type == blink::WebNavigationTypeFormResubmitted)) && EqualsASCII(request.httpMethod(), "POST"); bool browser_handles_request = renderer_preferences_.browser_handles_non_local_top_level_requests && @@ -3300,7 +3300,7 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation( page_id_ = -1; last_page_id_sent_to_browser_ = -1; OpenURL(frame, url, referrer, default_policy); - return WebKit::WebNavigationPolicyIgnore; // Suppress the load here. + return blink::WebNavigationPolicyIgnore; // Suppress the load here. } } @@ -3342,7 +3342,7 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation( (cumulative_bindings & BINDINGS_POLICY_WEB_UI) || url.SchemeIs(kViewSourceScheme) || (frame->isViewSourceModeEnabled() && - type != WebKit::WebNavigationTypeReload); + type != blink::WebNavigationTypeReload); if (!should_fork && url.SchemeIs(chrome::kFileScheme)) { // Fork non-file to file opens. Check the opener URL if this is the @@ -3364,7 +3364,7 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation( if (should_fork) { OpenURL( frame, url, send_referrer ? referrer : Referrer(), default_policy); - return WebKit::WebNavigationPolicyIgnore; // Suppress the load here. + return blink::WebNavigationPolicyIgnore; // Suppress the load here. } } @@ -3396,14 +3396,14 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation( // Must not have issued the request from this page. is_content_initiated && // Must be targeted at the current tab. - default_policy == WebKit::WebNavigationPolicyCurrentTab && + default_policy == blink::WebNavigationPolicyCurrentTab && // Must be a JavaScript navigation, which appears as "other". - type == WebKit::WebNavigationTypeOther; + type == blink::WebNavigationTypeOther; if (is_fork) { // Open the URL via the browser, not via WebKit. OpenURL(frame, url, Referrer(), default_policy); - return WebKit::WebNavigationPolicyIgnore; + return blink::WebNavigationPolicyIgnore; } return default_policy; @@ -3417,8 +3417,8 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation( request, type, default_policy, is_redirect); } -void RenderViewImpl::willSendSubmitEvent(WebKit::WebFrame* frame, - const WebKit::WebFormElement& form) { +void RenderViewImpl::willSendSubmitEvent(blink::WebFrame* frame, + const blink::WebFormElement& form) { FOR_EACH_OBSERVER( RenderViewObserver, observers_, WillSendSubmitEvent(frame, form)); } @@ -4159,7 +4159,7 @@ void RenderViewImpl::didChangeScrollOffset(WebFrame* frame) { RenderViewObserver, observers_, DidChangeScrollOffset(frame)); } -void RenderViewImpl::willInsertBody(WebKit::WebFrame* frame) { +void RenderViewImpl::willInsertBody(blink::WebFrame* frame) { NOTREACHED(); } @@ -4246,10 +4246,10 @@ void RenderViewImpl::requestStorageQuota( } bool RenderViewImpl::willCheckAndDispatchMessageEvent( - WebKit::WebFrame* sourceFrame, - WebKit::WebFrame* targetFrame, - WebKit::WebSecurityOrigin target_origin, - WebKit::WebDOMMessageEvent event) { + blink::WebFrame* sourceFrame, + blink::WebFrame* targetFrame, + blink::WebSecurityOrigin target_origin, + blink::WebDOMMessageEvent event) { if (!is_swapped_out_) return false; @@ -4259,7 +4259,7 @@ bool RenderViewImpl::willCheckAndDispatchMessageEvent( if (!target_origin.isNull()) params.target_origin = target_origin.toString(); - WebKit::WebMessagePortChannelArray channels = event.releaseChannels(); + blink::WebMessagePortChannelArray channels = event.releaseChannels(); if (!channels.isEmpty()) { std::vector<int> message_port_ids(channels.size()); // Extract the port IDs from the channel array. @@ -4293,24 +4293,24 @@ void RenderViewImpl::willOpenSocketStream( } void RenderViewImpl::willStartUsingPeerConnectionHandler( - WebKit::WebFrame* frame, WebKit::WebRTCPeerConnectionHandler* handler) { + blink::WebFrame* frame, blink::WebRTCPeerConnectionHandler* handler) { NOTREACHED(); } -WebKit::WebString RenderViewImpl::acceptLanguages() { +blink::WebString RenderViewImpl::acceptLanguages() { return WebString::fromUTF8(renderer_preferences_.accept_languages); } -WebKit::WebString RenderViewImpl::userAgentOverride( - WebKit::WebFrame* frame, - const WebKit::WebURL& url) { +blink::WebString RenderViewImpl::userAgentOverride( + blink::WebFrame* frame, + const blink::WebURL& url) { NOTREACHED(); - return WebKit::WebString(); + return blink::WebString(); } WebString RenderViewImpl::doNotTrackValue(WebFrame* frame) { NOTREACHED(); - return WebKit::WebString(); + return blink::WebString(); } bool RenderViewImpl::allowWebGL(WebFrame* frame, bool default_value) { @@ -4319,12 +4319,12 @@ bool RenderViewImpl::allowWebGL(WebFrame* frame, bool default_value) { } void RenderViewImpl::didLoseWebGLContext( - WebKit::WebFrame* frame, + blink::WebFrame* frame, int arb_robustness_status_code) { NOTREACHED(); } -// WebKit::WebPageSerializerClient implementation ------------------------------ +// blink::WebPageSerializerClient implementation ------------------------------ void RenderViewImpl::didSerializeDataForFrame( const WebURL& frame_url, @@ -4363,11 +4363,11 @@ void RenderViewImpl::SetWebkitPreferences(const WebPreferences& preferences) { OnUpdateWebPreferences(preferences); } -WebKit::WebView* RenderViewImpl::GetWebView() { +blink::WebView* RenderViewImpl::GetWebView() { return webview(); } -WebKit::WebNode RenderViewImpl::GetFocusedNode() const { +blink::WebNode RenderViewImpl::GetFocusedNode() const { if (!webview()) return WebNode(); WebFrame* focused_frame = webview()->focusedFrame(); @@ -4380,7 +4380,7 @@ WebKit::WebNode RenderViewImpl::GetFocusedNode() const { return WebNode(); } -WebKit::WebNode RenderViewImpl::GetContextMenuNode() const { +blink::WebNode RenderViewImpl::GetContextMenuNode() const { return context_menu_node_; } @@ -4409,10 +4409,10 @@ bool RenderViewImpl::IsEditableNode(const WebNode& node) const { return false; } -WebKit::WebPlugin* RenderViewImpl::CreatePlugin( - WebKit::WebFrame* frame, +blink::WebPlugin* RenderViewImpl::CreatePlugin( + blink::WebFrame* frame, const WebPluginInfo& info, - const WebKit::WebPluginParams& params) { + const blink::WebPluginParams& params) { #if defined(ENABLE_PLUGINS) bool pepper_plugin_was_registered = false; scoped_refptr<PluginModule> pepper_module(PluginModule::Create( @@ -4486,19 +4486,19 @@ void RenderViewImpl::CancelContextMenu(int request_id) { pending_context_menus_.Remove(request_id); } -WebKit::WebPageVisibilityState RenderViewImpl::GetVisibilityState() const { +blink::WebPageVisibilityState RenderViewImpl::GetVisibilityState() const { return visibilityState(); } -void RenderViewImpl::RunModalAlertDialog(WebKit::WebFrame* frame, - const WebKit::WebString& message) { +void RenderViewImpl::RunModalAlertDialog(blink::WebFrame* frame, + const blink::WebString& message) { return runModalAlertDialog(frame, message); } void RenderViewImpl::LoadURLExternally( - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& request, - WebKit::WebNavigationPolicy policy) { + blink::WebFrame* frame, + const blink::WebURLRequest& request, + blink::WebNavigationPolicy policy) { main_render_frame_->loadURLExternally(frame, request, policy); } @@ -4510,7 +4510,7 @@ void RenderViewImpl::DidStopLoading() { didStopLoading(); } -void RenderViewImpl::DidPlay(WebKit::WebMediaPlayer* player) { +void RenderViewImpl::DidPlay(blink::WebMediaPlayer* player) { Send(new ViewHostMsg_MediaNotification(routing_id_, reinterpret_cast<int64>(player), player->hasVideo(), @@ -4518,7 +4518,7 @@ void RenderViewImpl::DidPlay(WebKit::WebMediaPlayer* player) { true)); } -void RenderViewImpl::DidPause(WebKit::WebMediaPlayer* player) { +void RenderViewImpl::DidPause(blink::WebMediaPlayer* player) { Send(new ViewHostMsg_MediaNotification(routing_id_, reinterpret_cast<int64>(player), player->hasVideo(), @@ -4526,7 +4526,7 @@ void RenderViewImpl::DidPause(WebKit::WebMediaPlayer* player) { false)); } -void RenderViewImpl::PlayerGone(WebKit::WebMediaPlayer* player) { +void RenderViewImpl::PlayerGone(blink::WebMediaPlayer* player) { DidPause(player); } @@ -4560,7 +4560,7 @@ void RenderViewImpl::SyncSelectionIfRequired() { range = gfx::Range(location, location + length); - if (webview()->textInputInfo().type != WebKit::WebTextInputTypeNone) { + if (webview()->textInputInfo().type != blink::WebTextInputTypeNone) { // If current focused element is editable, we will send 100 more chars // before and after selection. It is for input method surrounding text // feature. @@ -4656,7 +4656,7 @@ GURL RenderViewImpl::GetAlternateErrorPageURL(const GURL& failed_url, return url; } -GURL RenderViewImpl::GetLoadingUrl(WebKit::WebFrame* frame) const { +GURL RenderViewImpl::GetLoadingUrl(blink::WebFrame* frame) const { WebDataSource* ds = frame->dataSource(); if (ds->hasUnreachableURL()) return ds->unreachableURL(); @@ -4665,7 +4665,7 @@ GURL RenderViewImpl::GetLoadingUrl(WebKit::WebFrame* frame) const { return request.url(); } -WebKit::WebPlugin* RenderViewImpl::GetWebPluginFromPluginDocument() { +blink::WebPlugin* RenderViewImpl::GetWebPluginFromPluginDocument() { return webview()->mainFrame()->document().to<WebPluginDocument>().plugin(); } @@ -5001,7 +5001,7 @@ void RenderViewImpl::OnPostMessageEvent( // If the message contained MessagePorts, create the corresponding endpoints. DCHECK_EQ(params.message_port_ids.size(), params.new_routing_ids.size()); - WebKit::WebMessagePortChannelArray channels(params.message_port_ids.size()); + blink::WebMessagePortChannelArray channels(params.message_port_ids.size()); for (size_t i = 0; i < params.message_port_ids.size() && i < params.new_routing_ids.size(); ++i) { @@ -5235,9 +5235,9 @@ void RenderViewImpl::OnSetRendererPrefs( #if defined(USE_DEFAULT_RENDER_THEME) || defined(TOOLKIT_GTK) if (renderer_prefs.use_custom_colors) { - WebColorName name = WebKit::WebColorWebkitFocusRingColor; - WebKit::setNamedColors(&name, &renderer_prefs.focus_ring_color, 1); - WebKit::setCaretBlinkInterval(renderer_prefs.caret_blink_interval); + WebColorName name = blink::WebColorWebkitFocusRingColor; + blink::setNamedColors(&name, &renderer_prefs.focus_ring_color, 1); + blink::setCaretBlinkInterval(renderer_prefs.caret_blink_interval); #if defined(TOOLKIT_GTK) ui::NativeTheme::instance()->SetScrollbarColors( renderer_prefs.thumb_inactive_color, @@ -5297,7 +5297,7 @@ void RenderViewImpl::OnGetAllSavableResourceLinksForCurrentPage( // Prepare list to storage all savable resource links. std::vector<GURL> resources_list; std::vector<GURL> referrer_urls_list; - std::vector<WebKit::WebReferrerPolicy> referrer_policies_list; + std::vector<blink::WebReferrerPolicy> referrer_policies_list; std::vector<GURL> frames_list; SavableResourcesResult result(&resources_list, &referrer_urls_list, @@ -5394,7 +5394,7 @@ void RenderViewImpl::OnSwapOut() { // Let WebKit know that this view is hidden so it can drop resources and // stop compositing. - webview()->setVisibilityState(WebKit::WebPageVisibilityStateHidden, false); + webview()->setVisibilityState(blink::WebPageVisibilityStateHidden, false); } // It is now safe to show modal dialogs again. @@ -5403,7 +5403,7 @@ void RenderViewImpl::OnSwapOut() { Send(new ViewHostMsg_SwapOut_ACK(routing_id_)); } -void RenderViewImpl::NavigateToSwappedOutURL(WebKit::WebFrame* frame) { +void RenderViewImpl::NavigateToSwappedOutURL(blink::WebFrame* frame) { // We use loadRequest instead of loadHTMLString because the former commits // synchronously. Otherwise a new navigation can interrupt the navigation // to kSwappedOutURL. If that happens to be to the page we had been @@ -5713,7 +5713,7 @@ void RenderViewImpl::DidHandleKeyEvent() { ClearEditCommands(); } -bool RenderViewImpl::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) { +bool RenderViewImpl::WillHandleMouseEvent(const blink::WebMouseEvent& event) { context_menu_source_type_ = ui::MENU_SOURCE_MOUSE; possible_drag_event_info_.event_source = ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE; @@ -5736,13 +5736,13 @@ bool RenderViewImpl::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) { return mouse_lock_dispatcher_->WillHandleMouseEvent(event); } -bool RenderViewImpl::WillHandleKeyEvent(const WebKit::WebKeyboardEvent& event) { +bool RenderViewImpl::WillHandleKeyEvent(const blink::WebKeyboardEvent& event) { context_menu_source_type_ = ui::MENU_SOURCE_KEYBOARD; return false; } bool RenderViewImpl::WillHandleGestureEvent( - const WebKit::WebGestureEvent& event) { + const blink::WebGestureEvent& event) { context_menu_source_type_ = ui::MENU_SOURCE_TOUCH; possible_drag_event_info_.event_source = ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH; @@ -5863,7 +5863,7 @@ void RenderViewImpl::OnSetFocus(bool enable) { void RenderViewImpl::OnImeSetComposition( const string16& text, - const std::vector<WebKit::WebCompositionUnderline>& underlines, + const std::vector<blink::WebCompositionUnderline>& underlines, int selection_start, int selection_end) { #if defined(ENABLE_PLUGINS) @@ -5947,8 +5947,8 @@ void RenderViewImpl::OnImeConfirmComposition( base::i18n::UTF16CharIterator iterator(&last_text); int32 i = 0; while (iterator.Advance()) { - WebKit::WebKeyboardEvent char_event; - char_event.type = WebKit::WebInputEvent::Char; + blink::WebKeyboardEvent char_event; + char_event.type = blink::WebInputEvent::Char; char_event.timeStampSeconds = base::Time::Now().ToDoubleT(); char_event.modifiers = 0; char_event.windowsKeyCode = last_text[i]; @@ -6073,12 +6073,12 @@ void RenderViewImpl::GetCompositionCharacterBounds( if (character_count == 0) return; - WebKit::WebFrame* frame = webview()->focusedFrame(); + blink::WebFrame* frame = webview()->focusedFrame(); if (!frame) return; bounds->reserve(character_count); - WebKit::WebRect webrect; + blink::WebRect webrect; for (size_t i = 0; i < character_count; ++i) { if (!frame->firstRectForCharacterRange(start_offset + i, 1, webrect)) { DLOG(ERROR) << "Could not retrieve character rectangle at " << i; @@ -6177,14 +6177,14 @@ bool RenderViewImpl::ScheduleFileChooser( return true; } -WebKit::WebGeolocationClient* RenderViewImpl::geolocationClient() { +blink::WebGeolocationClient* RenderViewImpl::geolocationClient() { if (!geolocation_dispatcher_) geolocation_dispatcher_ = new GeolocationDispatcher(this); return geolocation_dispatcher_; } -WebKit::WebSpeechInputController* RenderViewImpl::speechInputController( - WebKit::WebSpeechInputListener* listener) { +blink::WebSpeechInputController* RenderViewImpl::speechInputController( + blink::WebSpeechInputListener* listener) { #if defined(ENABLE_INPUT_SPEECH) if (!input_tag_speech_dispatcher_) input_tag_speech_dispatcher_ = @@ -6193,7 +6193,7 @@ WebKit::WebSpeechInputController* RenderViewImpl::speechInputController( return input_tag_speech_dispatcher_; } -WebKit::WebSpeechRecognizer* RenderViewImpl::speechRecognizer() { +blink::WebSpeechRecognizer* RenderViewImpl::speechRecognizer() { if (!speech_recognition_dispatcher_) speech_recognition_dispatcher_ = new SpeechRecognitionDispatcher(this); return speech_recognition_dispatcher_; @@ -6253,11 +6253,11 @@ void RenderViewImpl::registerProtocolHandler(const WebString& scheme, user_gesture)); } -WebKit::WebPageVisibilityState RenderViewImpl::visibilityState() const { - WebKit::WebPageVisibilityState current_state = is_hidden() ? - WebKit::WebPageVisibilityStateHidden : - WebKit::WebPageVisibilityStateVisible; - WebKit::WebPageVisibilityState override_state = current_state; +blink::WebPageVisibilityState RenderViewImpl::visibilityState() const { + blink::WebPageVisibilityState current_state = is_hidden() ? + blink::WebPageVisibilityStateHidden : + blink::WebPageVisibilityStateVisible; + blink::WebPageVisibilityState override_state = current_state; if (GetContentClient()->renderer()-> ShouldOverridePageVisibilityState(this, &override_state)) @@ -6265,7 +6265,7 @@ WebKit::WebPageVisibilityState RenderViewImpl::visibilityState() const { return current_state; } -WebKit::WebUserMediaClient* RenderViewImpl::userMediaClient() { +blink::WebUserMediaClient* RenderViewImpl::userMediaClient() { // This can happen in tests, in which case it's OK to return NULL. if (!InitializeMediaStreamClient()) return NULL; @@ -6273,7 +6273,7 @@ WebKit::WebUserMediaClient* RenderViewImpl::userMediaClient() { return web_user_media_client_; } -WebKit::WebMIDIClient* RenderViewImpl::webMIDIClient() { +blink::WebMIDIClient* RenderViewImpl::webMIDIClient() { if (!midi_dispatcher_) midi_dispatcher_ = new MIDIDispatcher(this); return midi_dispatcher_; @@ -6288,7 +6288,7 @@ void RenderViewImpl::draggableRegionsChanged() { WebMediaPlayer* RenderViewImpl::CreateWebMediaPlayerForMediaStream( WebFrame* frame, - const WebKit::WebURL& url, + const blink::WebURL& url, WebMediaPlayerClient* client) { #if defined(ENABLE_WEBRTC) if (!InitializeMediaStreamClient()) { @@ -6358,8 +6358,8 @@ void RenderViewImpl::LaunchAndroidContentIntent(const GURL& intent, } bool RenderViewImpl::openDateTimeChooser( - const WebKit::WebDateTimeChooserParams& params, - WebKit::WebDateTimeChooserCompletion* completion) { + const blink::WebDateTimeChooserParams& params, + blink::WebDateTimeChooserCompletion* completion) { date_time_picker_client_.reset( new RendererDateTimePicker(this, params, completion)); return date_time_picker_client_->Open(); @@ -6367,7 +6367,7 @@ bool RenderViewImpl::openDateTimeChooser( WebMediaPlayer* RenderViewImpl::CreateAndroidWebMediaPlayer( WebFrame* frame, - const WebKit::WebURL& url, + const blink::WebURL& url, WebMediaPlayerClient* client) { GpuChannelHost* gpu_channel_host = RenderThreadImpl::current()->EstablishGpuChannelSync( @@ -6500,7 +6500,7 @@ void RenderViewImpl::OnDisownOpener() { #if defined(OS_ANDROID) bool RenderViewImpl::didTapMultipleTargets( - const WebKit::WebGestureEvent& event, + const blink::WebGestureEvent& event, const WebVector<WebRect>& target_rects) { // Never show a disambiguation popup when accessibility is enabled, // as this interferes with "touch exploration". diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index 73d2006..7b1dcaa 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -84,7 +84,7 @@ namespace ui { struct SelectedFileInfo; } // namespace ui -namespace WebKit { +namespace blink { class WebApplicationCacheHost; class WebApplicationCacheHostClient; class WebDOMMessageEvent; @@ -176,9 +176,9 @@ class WebMediaPlayerProxyAndroid; // class CONTENT_EXPORT RenderViewImpl : public RenderWidget, - NON_EXPORTED_BASE(public WebKit::WebViewClient), - NON_EXPORTED_BASE(public WebKit::WebFrameClient), - NON_EXPORTED_BASE(public WebKit::WebPageSerializerClient), + NON_EXPORTED_BASE(public blink::WebViewClient), + NON_EXPORTED_BASE(public blink::WebFrameClient), + NON_EXPORTED_BASE(public blink::WebPageSerializerClient), public RenderView, NON_EXPORTED_BASE(public WebMediaPlayerDelegate), public base::SupportsWeakPtr<RenderViewImpl> { @@ -198,7 +198,7 @@ class CONTENT_EXPORT RenderViewImpl bool swapped_out, bool hidden, int32 next_page_id, - const WebKit::WebScreenInfo& screen_info, + const blink::WebScreenInfo& screen_info, AccessibilityMode accessibility_mode, bool allow_partial_swap); @@ -208,13 +208,13 @@ class CONTENT_EXPORT RenderViewImpl RenderViewImpl* (*create_render_view_impl)(RenderViewImplParams*)); // Returns the RenderViewImpl containing the given WebView. - static RenderViewImpl* FromWebView(WebKit::WebView* webview); + static RenderViewImpl* FromWebView(blink::WebView* webview); // Returns the RenderViewImpl for the given routing ID. static RenderViewImpl* FromRoutingID(int routing_id); // May return NULL when the view is closing. - WebKit::WebView* webview() const; + blink::WebView* webview() const; int history_list_offset() const { return history_list_offset_; } @@ -256,12 +256,12 @@ class CONTENT_EXPORT RenderViewImpl // Returns true if the chooser was successfully scheduled. False means we // didn't schedule anything. bool ScheduleFileChooser(const FileChooserParams& params, - WebKit::WebFileChooserCompletion* completion); + blink::WebFileChooserCompletion* completion); void LoadNavigationErrorPage( - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& failed_request, - const WebKit::WebURLError& error, + blink::WebFrame* frame, + const blink::WebURLRequest& failed_request, + const blink::WebURLError& error, const std::string& html, bool replace); @@ -280,7 +280,7 @@ class CONTENT_EXPORT RenderViewImpl // This will update the cursor appearance if it is currently over the plugin // instance. void PepperDidChangeCursor(PepperPluginInstanceImpl* instance, - const WebKit::WebCursorInfo& cursor); + const blink::WebCursorInfo& cursor); // Notifies that |instance| has received a mouse event. void PepperDidReceiveMouseEvent(PepperPluginInstanceImpl* instance); @@ -317,7 +317,7 @@ class CONTENT_EXPORT RenderViewImpl // Simulates IME events for testing purpose. void SimulateImeSetComposition( const string16& text, - const std::vector<WebKit::WebCompositionUnderline>& underlines, + const std::vector<blink::WebCompositionUnderline>& underlines, int selection_start, int selection_end); void SimulateImeConfirmComposition(const string16& text, @@ -350,7 +350,7 @@ class CONTENT_EXPORT RenderViewImpl #endif // ENABLE_PLUGINS void TransferActiveWheelFlingAnimation( - const WebKit::WebActiveWheelFlingParameters& params); + const blink::WebActiveWheelFlingParameters& params); // Returns true if the focused element is editable text from the perspective // of IME support (also used for on-screen keyboard). Works correctly inside @@ -402,12 +402,12 @@ class CONTENT_EXPORT RenderViewImpl virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; - // WebKit::WebWidgetClient implementation ------------------------------------ + // blink::WebWidgetClient implementation ------------------------------------ // Most methods are handled by RenderWidget. virtual void didFocus(); virtual void didBlur(); - virtual void show(WebKit::WebNavigationPolicy policy); + virtual void show(blink::WebNavigationPolicy policy); virtual void runModal(); virtual bool enterFullScreen(); virtual void exitFullScreen(); @@ -415,255 +415,255 @@ class CONTENT_EXPORT RenderViewImpl virtual void requestPointerUnlock(); virtual bool isPointerLocked(); virtual void didActivateCompositor(int input_handler_identifier); - virtual void didHandleGestureEvent(const WebKit::WebGestureEvent& event, + virtual void didHandleGestureEvent(const blink::WebGestureEvent& event, bool event_cancelled) OVERRIDE; virtual void initializeLayerTreeView() OVERRIDE; - // WebKit::WebViewClient implementation -------------------------------------- + // blink::WebViewClient implementation -------------------------------------- - virtual WebKit::WebView* createView( - WebKit::WebFrame* creator, - const WebKit::WebURLRequest& request, - const WebKit::WebWindowFeatures& features, - const WebKit::WebString& frame_name, - WebKit::WebNavigationPolicy policy, + virtual blink::WebView* createView( + blink::WebFrame* creator, + const blink::WebURLRequest& request, + const blink::WebWindowFeatures& features, + const blink::WebString& frame_name, + blink::WebNavigationPolicy policy, bool suppress_opener); // DEPRECATED - virtual WebKit::WebView* createView( - WebKit::WebFrame* creator, - const WebKit::WebURLRequest& request, - const WebKit::WebWindowFeatures& features, - const WebKit::WebString& frame_name, - WebKit::WebNavigationPolicy policy); - virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType popup_type); - virtual WebKit::WebExternalPopupMenu* createExternalPopupMenu( - const WebKit::WebPopupMenuInfo& popup_menu_info, - WebKit::WebExternalPopupMenuClient* popup_menu_client); - virtual WebKit::WebStorageNamespace* createSessionStorageNamespace(); + virtual blink::WebView* createView( + blink::WebFrame* creator, + const blink::WebURLRequest& request, + const blink::WebWindowFeatures& features, + const blink::WebString& frame_name, + blink::WebNavigationPolicy policy); + virtual blink::WebWidget* createPopupMenu(blink::WebPopupType popup_type); + virtual blink::WebExternalPopupMenu* createExternalPopupMenu( + const blink::WebPopupMenuInfo& popup_menu_info, + blink::WebExternalPopupMenuClient* popup_menu_client); + virtual blink::WebStorageNamespace* createSessionStorageNamespace(); virtual bool shouldReportDetailedMessageForSource( - const WebKit::WebString& source); + const blink::WebString& source); virtual void didAddMessageToConsole( - const WebKit::WebConsoleMessage& message, - const WebKit::WebString& source_name, + const blink::WebConsoleMessage& message, + const blink::WebString& source_name, unsigned source_line, - const WebKit::WebString& stack_trace); - virtual void printPage(WebKit::WebFrame* frame); - virtual WebKit::WebNotificationPresenter* notificationPresenter(); + const blink::WebString& stack_trace); + virtual void printPage(blink::WebFrame* frame); + virtual blink::WebNotificationPresenter* notificationPresenter(); virtual bool enumerateChosenDirectory( - const WebKit::WebString& path, - WebKit::WebFileChooserCompletion* chooser_completion); - virtual void initializeHelperPluginWebFrame(WebKit::WebHelperPlugin*); + const blink::WebString& path, + blink::WebFileChooserCompletion* chooser_completion); + virtual void initializeHelperPluginWebFrame(blink::WebHelperPlugin*); virtual void didStartLoading(); virtual void didStopLoading(); - virtual void didChangeLoadProgress(WebKit::WebFrame* frame, + virtual void didChangeLoadProgress(blink::WebFrame* frame, double load_progress); virtual void didCancelCompositionOnSelectionChange(); virtual void didChangeSelection(bool is_selection_empty); - virtual void didExecuteCommand(const WebKit::WebString& command_name); + virtual void didExecuteCommand(const blink::WebString& command_name); virtual bool handleCurrentKeyboardEvent(); - virtual WebKit::WebColorChooser* createColorChooser( - WebKit::WebColorChooserClient*, const WebKit::WebColor& initial_color); + virtual blink::WebColorChooser* createColorChooser( + blink::WebColorChooserClient*, const blink::WebColor& initial_color); virtual bool runFileChooser( - const WebKit::WebFileChooserParams& params, - WebKit::WebFileChooserCompletion* chooser_completion); - virtual void runModalAlertDialog(WebKit::WebFrame* frame, - const WebKit::WebString& message); - virtual bool runModalConfirmDialog(WebKit::WebFrame* frame, - const WebKit::WebString& message); - virtual bool runModalPromptDialog(WebKit::WebFrame* frame, - const WebKit::WebString& message, - const WebKit::WebString& default_value, - WebKit::WebString* actual_value); - virtual bool runModalBeforeUnloadDialog(WebKit::WebFrame* frame, + const blink::WebFileChooserParams& params, + blink::WebFileChooserCompletion* chooser_completion); + virtual void runModalAlertDialog(blink::WebFrame* frame, + const blink::WebString& message); + virtual bool runModalConfirmDialog(blink::WebFrame* frame, + const blink::WebString& message); + virtual bool runModalPromptDialog(blink::WebFrame* frame, + const blink::WebString& message, + const blink::WebString& default_value, + blink::WebString* actual_value); + virtual bool runModalBeforeUnloadDialog(blink::WebFrame* frame, bool is_reload, - const WebKit::WebString& message); + const blink::WebString& message); // DEPRECATED - virtual bool runModalBeforeUnloadDialog(WebKit::WebFrame* frame, - const WebKit::WebString& message); - virtual void showContextMenu(WebKit::WebFrame* frame, - const WebKit::WebContextMenuData& data); + virtual bool runModalBeforeUnloadDialog(blink::WebFrame* frame, + const blink::WebString& message); + virtual void showContextMenu(blink::WebFrame* frame, + const blink::WebContextMenuData& data); virtual void clearContextMenu(); - virtual void setStatusText(const WebKit::WebString& text); - virtual void setMouseOverURL(const WebKit::WebURL& url); - virtual void setKeyboardFocusURL(const WebKit::WebURL& url); - virtual void startDragging(WebKit::WebFrame* frame, - const WebKit::WebDragData& data, - WebKit::WebDragOperationsMask mask, - const WebKit::WebImage& image, - const WebKit::WebPoint& imageOffset); + virtual void setStatusText(const blink::WebString& text); + virtual void setMouseOverURL(const blink::WebURL& url); + virtual void setKeyboardFocusURL(const blink::WebURL& url); + virtual void startDragging(blink::WebFrame* frame, + const blink::WebDragData& data, + blink::WebDragOperationsMask mask, + const blink::WebImage& image, + const blink::WebPoint& imageOffset); virtual bool acceptsLoadDrops(); virtual void focusNext(); virtual void focusPrevious(); - virtual void focusedNodeChanged(const WebKit::WebNode& node); + virtual void focusedNodeChanged(const blink::WebNode& node); virtual void numberOfWheelEventHandlersChanged(unsigned num_handlers); virtual void didUpdateLayout(); #if defined(OS_ANDROID) virtual bool didTapMultipleTargets( - const WebKit::WebGestureEvent& event, - const WebKit::WebVector<WebKit::WebRect>& target_rects); + const blink::WebGestureEvent& event, + const blink::WebVector<blink::WebRect>& target_rects); #endif virtual void navigateBackForwardSoon(int offset); virtual int historyBackListCount(); virtual int historyForwardListCount(); virtual void postAccessibilityEvent( - const WebKit::WebAXObject& obj, WebKit::WebAXEvent event); - virtual void didUpdateInspectorSetting(const WebKit::WebString& key, - const WebKit::WebString& value); - virtual WebKit::WebGeolocationClient* geolocationClient(); - virtual WebKit::WebSpeechInputController* speechInputController( - WebKit::WebSpeechInputListener* listener); - virtual WebKit::WebSpeechRecognizer* speechRecognizer(); + const blink::WebAXObject& obj, blink::WebAXEvent event); + virtual void didUpdateInspectorSetting(const blink::WebString& key, + const blink::WebString& value); + virtual blink::WebGeolocationClient* geolocationClient(); + virtual blink::WebSpeechInputController* speechInputController( + blink::WebSpeechInputListener* listener); + virtual blink::WebSpeechRecognizer* speechRecognizer(); virtual void zoomLimitsChanged(double minimum_level, double maximum_level); virtual void zoomLevelChanged(); virtual double zoomLevelToZoomFactor(double zoom_level) const; virtual double zoomFactorToZoomLevel(double factor) const; - virtual void registerProtocolHandler(const WebKit::WebString& scheme, - const WebKit::WebString& base_url, - const WebKit::WebString& url, - const WebKit::WebString& title); - virtual WebKit::WebPageVisibilityState visibilityState() const; - virtual WebKit::WebUserMediaClient* userMediaClient(); - virtual WebKit::WebMIDIClient* webMIDIClient(); + virtual void registerProtocolHandler(const blink::WebString& scheme, + const blink::WebString& base_url, + const blink::WebString& url, + const blink::WebString& title); + virtual blink::WebPageVisibilityState visibilityState() const; + virtual blink::WebUserMediaClient* userMediaClient(); + virtual blink::WebMIDIClient* webMIDIClient(); virtual void draggableRegionsChanged(); #if defined(OS_ANDROID) - virtual void scheduleContentIntent(const WebKit::WebURL& intent); + virtual void scheduleContentIntent(const blink::WebURL& intent); virtual void cancelScheduledContentIntents(); - virtual WebKit::WebContentDetectionResult detectContentAround( - const WebKit::WebHitTestResult& touch_hit); + virtual blink::WebContentDetectionResult detectContentAround( + const blink::WebHitTestResult& touch_hit); // Only used on Android since all other platforms implement // date and time input fields using MULTIPLE_FIELDS_UI - virtual bool openDateTimeChooser(const WebKit::WebDateTimeChooserParams&, - WebKit::WebDateTimeChooserCompletion*); - virtual void didScrollWithKeyboard(const WebKit::WebSize& delta); + virtual bool openDateTimeChooser(const blink::WebDateTimeChooserParams&, + blink::WebDateTimeChooserCompletion*); + virtual void didScrollWithKeyboard(const blink::WebSize& delta); #endif - // WebKit::WebFrameClient implementation ------------------------------------- - - virtual WebKit::WebMediaPlayer* createMediaPlayer( - WebKit::WebFrame* frame, - const WebKit::WebURL& url, - WebKit::WebMediaPlayerClient* client); - virtual WebKit::WebCookieJar* cookieJar(WebKit::WebFrame* frame); - virtual void didAccessInitialDocument(WebKit::WebFrame* frame); - virtual void didDisownOpener(WebKit::WebFrame* frame); - virtual void frameDetached(WebKit::WebFrame* frame); - virtual void willClose(WebKit::WebFrame* frame); + // blink::WebFrameClient implementation ------------------------------------- + + virtual blink::WebMediaPlayer* createMediaPlayer( + blink::WebFrame* frame, + const blink::WebURL& url, + blink::WebMediaPlayerClient* client); + virtual blink::WebCookieJar* cookieJar(blink::WebFrame* frame); + virtual void didAccessInitialDocument(blink::WebFrame* frame); + virtual void didDisownOpener(blink::WebFrame* frame); + virtual void frameDetached(blink::WebFrame* frame); + virtual void willClose(blink::WebFrame* frame); virtual void didMatchCSS( - WebKit::WebFrame* frame, - const WebKit::WebVector<WebKit::WebString>& newly_matching_selectors, - const WebKit::WebVector<WebKit::WebString>& stopped_matching_selectors); + blink::WebFrame* frame, + const blink::WebVector<blink::WebString>& newly_matching_selectors, + const blink::WebVector<blink::WebString>& stopped_matching_selectors); // The WebDataSource::ExtraData* is assumed to be a DocumentState* subclass. - virtual WebKit::WebNavigationPolicy decidePolicyForNavigation( - WebKit::WebFrame* frame, - WebKit::WebDataSource::ExtraData* extraData, - const WebKit::WebURLRequest& request, - WebKit::WebNavigationType type, - WebKit::WebNavigationPolicy default_policy, + virtual blink::WebNavigationPolicy decidePolicyForNavigation( + blink::WebFrame* frame, + blink::WebDataSource::ExtraData* extraData, + const blink::WebURLRequest& request, + blink::WebNavigationType type, + blink::WebNavigationPolicy default_policy, bool is_redirect); // DEPRECATED. - virtual WebKit::WebNavigationPolicy decidePolicyForNavigation( - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& request, - WebKit::WebNavigationType type, - WebKit::WebNavigationPolicy default_policy, + virtual blink::WebNavigationPolicy decidePolicyForNavigation( + blink::WebFrame* frame, + const blink::WebURLRequest& request, + blink::WebNavigationType type, + blink::WebNavigationPolicy default_policy, bool is_redirect); - virtual void willSendSubmitEvent(WebKit::WebFrame* frame, - const WebKit::WebFormElement& form); - virtual void willSubmitForm(WebKit::WebFrame* frame, - const WebKit::WebFormElement& form); - virtual void didCreateDataSource(WebKit::WebFrame* frame, - WebKit::WebDataSource* datasource); - virtual void didStartProvisionalLoad(WebKit::WebFrame* frame); + virtual void willSendSubmitEvent(blink::WebFrame* frame, + const blink::WebFormElement& form); + virtual void willSubmitForm(blink::WebFrame* frame, + const blink::WebFormElement& form); + virtual void didCreateDataSource(blink::WebFrame* frame, + blink::WebDataSource* datasource); + virtual void didStartProvisionalLoad(blink::WebFrame* frame); virtual void didReceiveServerRedirectForProvisionalLoad( - WebKit::WebFrame* frame); - virtual void didFailProvisionalLoad(WebKit::WebFrame* frame, - const WebKit::WebURLError& error); - virtual void didCommitProvisionalLoad(WebKit::WebFrame* frame, + blink::WebFrame* frame); + virtual void didFailProvisionalLoad(blink::WebFrame* frame, + const blink::WebURLError& error); + virtual void didCommitProvisionalLoad(blink::WebFrame* frame, bool is_new_navigation); - virtual void didClearWindowObject(WebKit::WebFrame* frame); - virtual void didCreateDocumentElement(WebKit::WebFrame* frame); - virtual void didReceiveTitle(WebKit::WebFrame* frame, - const WebKit::WebString& title, - WebKit::WebTextDirection direction); - virtual void didChangeIcon(WebKit::WebFrame*, - WebKit::WebIconURL::Type); - virtual void didFinishDocumentLoad(WebKit::WebFrame* frame); - virtual void didHandleOnloadEvents(WebKit::WebFrame* frame); - virtual void didFailLoad(WebKit::WebFrame* frame, - const WebKit::WebURLError& error); - virtual void didFinishLoad(WebKit::WebFrame* frame); - virtual void didNavigateWithinPage(WebKit::WebFrame* frame, + virtual void didClearWindowObject(blink::WebFrame* frame); + virtual void didCreateDocumentElement(blink::WebFrame* frame); + virtual void didReceiveTitle(blink::WebFrame* frame, + const blink::WebString& title, + blink::WebTextDirection direction); + virtual void didChangeIcon(blink::WebFrame*, + blink::WebIconURL::Type); + virtual void didFinishDocumentLoad(blink::WebFrame* frame); + virtual void didHandleOnloadEvents(blink::WebFrame* frame); + virtual void didFailLoad(blink::WebFrame* frame, + const blink::WebURLError& error); + virtual void didFinishLoad(blink::WebFrame* frame); + virtual void didNavigateWithinPage(blink::WebFrame* frame, bool is_new_navigation); - virtual void didUpdateCurrentHistoryItem(WebKit::WebFrame* frame); - virtual void willSendRequest(WebKit::WebFrame* frame, + virtual void didUpdateCurrentHistoryItem(blink::WebFrame* frame); + virtual void willSendRequest(blink::WebFrame* frame, unsigned identifier, - WebKit::WebURLRequest& request, - const WebKit::WebURLResponse& redirect_response); - virtual void didReceiveResponse(WebKit::WebFrame* frame, + blink::WebURLRequest& request, + const blink::WebURLResponse& redirect_response); + virtual void didReceiveResponse(blink::WebFrame* frame, unsigned identifier, - const WebKit::WebURLResponse& response); - virtual void didFinishResourceLoad(WebKit::WebFrame* frame, + const blink::WebURLResponse& response); + virtual void didFinishResourceLoad(blink::WebFrame* frame, unsigned identifier); virtual void didLoadResourceFromMemoryCache( - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& request, - const WebKit::WebURLResponse&); - virtual void didDisplayInsecureContent(WebKit::WebFrame* frame); + blink::WebFrame* frame, + const blink::WebURLRequest& request, + const blink::WebURLResponse&); + virtual void didDisplayInsecureContent(blink::WebFrame* frame); virtual void didRunInsecureContent( - WebKit::WebFrame* frame, - const WebKit::WebSecurityOrigin& origin, - const WebKit::WebURL& target); - virtual void didExhaustMemoryAvailableForScript(WebKit::WebFrame* frame); - virtual void didCreateScriptContext(WebKit::WebFrame* frame, + blink::WebFrame* frame, + const blink::WebSecurityOrigin& origin, + const blink::WebURL& target); + virtual void didExhaustMemoryAvailableForScript(blink::WebFrame* frame); + virtual void didCreateScriptContext(blink::WebFrame* frame, v8::Handle<v8::Context>, int extension_group, int world_id); - virtual void willReleaseScriptContext(WebKit::WebFrame* frame, + virtual void willReleaseScriptContext(blink::WebFrame* frame, v8::Handle<v8::Context>, int world_id); - virtual void didChangeScrollOffset(WebKit::WebFrame* frame); - virtual void willInsertBody(WebKit::WebFrame* frame); - virtual void didFirstVisuallyNonEmptyLayout(WebKit::WebFrame*); - virtual void didChangeContentsSize(WebKit::WebFrame* frame, - const WebKit::WebSize& size); + virtual void didChangeScrollOffset(blink::WebFrame* frame); + virtual void willInsertBody(blink::WebFrame* frame); + virtual void didFirstVisuallyNonEmptyLayout(blink::WebFrame*); + virtual void didChangeContentsSize(blink::WebFrame* frame, + const blink::WebSize& size); virtual void reportFindInPageMatchCount(int request_id, int count, bool final_update); virtual void reportFindInPageSelection(int request_id, int active_match_ordinal, - const WebKit::WebRect& sel); + const blink::WebRect& sel); virtual void requestStorageQuota( - WebKit::WebFrame* frame, - WebKit::WebStorageQuotaType type, + blink::WebFrame* frame, + blink::WebStorageQuotaType type, unsigned long long requested_size, - WebKit::WebStorageQuotaCallbacks* callbacks); + blink::WebStorageQuotaCallbacks* callbacks); virtual void willOpenSocketStream( - WebKit::WebSocketStreamHandle* handle); - virtual void willStartUsingPeerConnectionHandler(WebKit::WebFrame* frame, - WebKit::WebRTCPeerConnectionHandler* handler); + blink::WebSocketStreamHandle* handle); + virtual void willStartUsingPeerConnectionHandler(blink::WebFrame* frame, + blink::WebRTCPeerConnectionHandler* handler); virtual bool willCheckAndDispatchMessageEvent( - WebKit::WebFrame* sourceFrame, - WebKit::WebFrame* targetFrame, - WebKit::WebSecurityOrigin targetOrigin, - WebKit::WebDOMMessageEvent event); - virtual WebKit::WebString acceptLanguages(); - virtual WebKit::WebString userAgentOverride( - WebKit::WebFrame* frame, - const WebKit::WebURL& url); - virtual WebKit::WebString doNotTrackValue(WebKit::WebFrame* frame); - virtual bool allowWebGL(WebKit::WebFrame* frame, bool default_value); + blink::WebFrame* sourceFrame, + blink::WebFrame* targetFrame, + blink::WebSecurityOrigin targetOrigin, + blink::WebDOMMessageEvent event); + virtual blink::WebString acceptLanguages(); + virtual blink::WebString userAgentOverride( + blink::WebFrame* frame, + const blink::WebURL& url); + virtual blink::WebString doNotTrackValue(blink::WebFrame* frame); + virtual bool allowWebGL(blink::WebFrame* frame, bool default_value); virtual void didLoseWebGLContext( - WebKit::WebFrame* frame, + blink::WebFrame* frame, int arb_robustness_status_code); - // WebKit::WebPageSerializerClient implementation ---------------------------- + // blink::WebPageSerializerClient implementation ---------------------------- virtual void didSerializeDataForFrame( - const WebKit::WebURL& frame_url, - const WebKit::WebCString& data, + const blink::WebURL& frame_url, + const blink::WebCString& data, PageSerializationStatus status) OVERRIDE; // RenderView implementation ------------------------------------------------- @@ -674,14 +674,14 @@ class CONTENT_EXPORT RenderViewImpl virtual gfx::Size GetSize() const OVERRIDE; virtual WebPreferences& GetWebkitPreferences() OVERRIDE; virtual void SetWebkitPreferences(const WebPreferences& preferences) OVERRIDE; - virtual WebKit::WebView* GetWebView() OVERRIDE; - virtual WebKit::WebNode GetFocusedNode() const OVERRIDE; - virtual WebKit::WebNode GetContextMenuNode() const OVERRIDE; - virtual bool IsEditableNode(const WebKit::WebNode& node) const OVERRIDE; - virtual WebKit::WebPlugin* CreatePlugin( - WebKit::WebFrame* frame, + virtual blink::WebView* GetWebView() OVERRIDE; + virtual blink::WebNode GetFocusedNode() const OVERRIDE; + virtual blink::WebNode GetContextMenuNode() const OVERRIDE; + virtual bool IsEditableNode(const blink::WebNode& node) const OVERRIDE; + virtual blink::WebPlugin* CreatePlugin( + blink::WebFrame* frame, const WebPluginInfo& info, - const WebKit::WebPluginParams& params) OVERRIDE; + const blink::WebPluginParams& params) OVERRIDE; virtual void EvaluateScript(const string16& frame_xpath, const string16& jscript, int id, @@ -693,20 +693,20 @@ class CONTENT_EXPORT RenderViewImpl virtual int ShowContextMenu(ContextMenuClient* client, const ContextMenuParams& params) OVERRIDE; virtual void CancelContextMenu(int request_id) OVERRIDE; - virtual WebKit::WebPageVisibilityState GetVisibilityState() const OVERRIDE; - virtual void RunModalAlertDialog(WebKit::WebFrame* frame, - const WebKit::WebString& message) OVERRIDE; + virtual blink::WebPageVisibilityState GetVisibilityState() const OVERRIDE; + virtual void RunModalAlertDialog(blink::WebFrame* frame, + const blink::WebString& message) OVERRIDE; virtual void LoadURLExternally( - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& request, - WebKit::WebNavigationPolicy policy) OVERRIDE; + blink::WebFrame* frame, + const blink::WebURLRequest& request, + blink::WebNavigationPolicy policy) OVERRIDE; virtual void DidStartLoading() OVERRIDE; virtual void DidStopLoading() OVERRIDE; virtual void Repaint(const gfx::Size& size) OVERRIDE; virtual void SetEditCommandForNextKeyEvent(const std::string& name, const std::string& value) OVERRIDE; virtual void ClearEditCommands() OVERRIDE; - virtual SSLStatus GetSSLStatusOfFrame(WebKit::WebFrame* frame) const OVERRIDE; + virtual SSLStatus GetSSLStatusOfFrame(blink::WebFrame* frame) const OVERRIDE; virtual const std::string& GetAcceptLanguages() const OVERRIDE; #if defined(OS_ANDROID) virtual void UpdateTopControlsState(TopControlsState constraints, @@ -716,9 +716,9 @@ class CONTENT_EXPORT RenderViewImpl // WebMediaPlayerDelegate implementation ----------------------- - virtual void DidPlay(WebKit::WebMediaPlayer* player) OVERRIDE; - virtual void DidPause(WebKit::WebMediaPlayer* player) OVERRIDE; - virtual void PlayerGone(WebKit::WebMediaPlayer* player) OVERRIDE; + virtual void DidPlay(blink::WebMediaPlayer* player) OVERRIDE; + virtual void DidPause(blink::WebMediaPlayer* player) OVERRIDE; + virtual void PlayerGone(blink::WebMediaPlayer* player) OVERRIDE; // Please do not add your stuff randomly to the end here. If there is an // appropriate section, add it there. If not, there are some random functions @@ -744,13 +744,13 @@ class CONTENT_EXPORT RenderViewImpl virtual gfx::Vector2d GetScrollOffset() OVERRIDE; virtual void DidHandleKeyEvent() OVERRIDE; virtual bool WillHandleMouseEvent( - const WebKit::WebMouseEvent& event) OVERRIDE; + const blink::WebMouseEvent& event) OVERRIDE; virtual bool WillHandleKeyEvent( - const WebKit::WebKeyboardEvent& event) OVERRIDE; + const blink::WebKeyboardEvent& event) OVERRIDE; virtual bool WillHandleGestureEvent( - const WebKit::WebGestureEvent& event) OVERRIDE; - virtual void DidHandleMouseEvent(const WebKit::WebMouseEvent& event) OVERRIDE; - virtual void DidHandleTouchEvent(const WebKit::WebTouchEvent& event) OVERRIDE; + const blink::WebGestureEvent& event) OVERRIDE; + virtual void DidHandleMouseEvent(const blink::WebMouseEvent& event) OVERRIDE; + virtual void DidHandleTouchEvent(const blink::WebTouchEvent& event) OVERRIDE; virtual bool HasTouchEventHandlersAt(const gfx::Point& point) const OVERRIDE; virtual void OnSetFocus(bool enable) OVERRIDE; virtual void OnWasHidden() OVERRIDE; @@ -759,7 +759,7 @@ class CONTENT_EXPORT RenderViewImpl virtual bool ForceCompositingModeEnabled() OVERRIDE; virtual void OnImeSetComposition( const string16& text, - const std::vector<WebKit::WebCompositionUnderline>& underlines, + const std::vector<blink::WebCompositionUnderline>& underlines, int selection_start, int selection_end) OVERRIDE; virtual void OnImeConfirmComposition(const string16& text, @@ -857,22 +857,22 @@ class CONTENT_EXPORT RenderViewImpl CONNECTION_ERROR, }; - static WebKit::WebReferrerPolicy GetReferrerPolicyFromRequest( - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& request); + static blink::WebReferrerPolicy GetReferrerPolicyFromRequest( + blink::WebFrame* frame, + const blink::WebURLRequest& request); static Referrer GetReferrerFromRequest( - WebKit::WebFrame* frame, - const WebKit::WebURLRequest& request); + blink::WebFrame* frame, + const blink::WebURLRequest& request); static webkit_glue::WebURLResponseExtraDataImpl* GetExtraDataFromResponse( - const WebKit::WebURLResponse& response); + const blink::WebURLResponse& response); - void UpdateURL(WebKit::WebFrame* frame); - void UpdateTitle(WebKit::WebFrame* frame, const string16& title, - WebKit::WebTextDirection title_direction); - void UpdateSessionHistory(WebKit::WebFrame* frame); - void SendUpdateState(const WebKit::WebHistoryItem& item); + void UpdateURL(blink::WebFrame* frame); + void UpdateTitle(blink::WebFrame* frame, const string16& title, + blink::WebTextDirection title_direction); + void UpdateSessionHistory(blink::WebFrame* frame); + void SendUpdateState(const blink::WebHistoryItem& item); // Update current main frame's encoding and send it to browser window. // Since we want to let users see the right encoding info from menu @@ -887,13 +887,13 @@ class CONTENT_EXPORT RenderViewImpl // c) function:DidFinishDocumentLoadForFrame. When this function is // called, that means we have got whole html page. In here we should // finally get right encoding of page. - void UpdateEncoding(WebKit::WebFrame* frame, + void UpdateEncoding(blink::WebFrame* frame, const std::string& encoding_name); - void OpenURL(WebKit::WebFrame* frame, + void OpenURL(blink::WebFrame* frame, const GURL& url, const Referrer& referrer, - WebKit::WebNavigationPolicy policy); + blink::WebNavigationPolicy policy); bool RunJavaScriptMessage(JavaScriptMessageType type, const string16& message, @@ -905,7 +905,7 @@ class CONTENT_EXPORT RenderViewImpl bool SendAndRunNestedMessageLoop(IPC::SyncMessage* message); // Called when the "pinned to left/right edge" state needs to be updated. - void UpdateScrollState(WebKit::WebFrame* frame); + void UpdateScrollState(blink::WebFrame* frame); // IPC message handlers ------------------------------------------------------ // @@ -947,7 +947,7 @@ class CONTENT_EXPORT RenderViewImpl void OnDragSourceEndedOrMoved(const gfx::Point& client_point, const gfx::Point& screen_point, bool ended, - WebKit::WebDragOperation drag_operation); + blink::WebDragOperation drag_operation); void OnDragSourceSystemDragEnded(); void OnDragTargetDrop(const gfx::Point& client_pt, const gfx::Point& screen_pt, @@ -955,12 +955,12 @@ class CONTENT_EXPORT RenderViewImpl void OnDragTargetDragEnter(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); void OnDragTargetDragLeave(); void OnDragTargetDragOver(const gfx::Point& client_pt, const gfx::Point& screen_pt, - WebKit::WebDragOperationsMask operations_allowed, + blink::WebDragOperationsMask operations_allowed, int key_modifiers); void OnEnablePreferredSizeChangedMode(); void OnEnableAutoResize(const gfx::Size& min_size, const gfx::Size& max_size); @@ -970,17 +970,17 @@ class CONTENT_EXPORT RenderViewImpl void OnExtendSelectionAndDelete(int before, int after); void OnFileChooserResponse( const std::vector<ui::SelectedFileInfo>& files); - void OnFind(int request_id, const string16&, const WebKit::WebFindOptions&); + void OnFind(int request_id, const string16&, const blink::WebFindOptions&); void OnGetAllSavableResourceLinksForCurrentPage(const GURL& page_url); void OnGetSerializedHtmlDataForCurrentPageWithLocalLinks( const std::vector<GURL>& links, const std::vector<base::FilePath>& local_paths, const base::FilePath& local_directory_name); void OnMediaPlayerActionAt(const gfx::Point& location, - const WebKit::WebMediaPlayerAction& action); + const blink::WebMediaPlayerAction& action); void OnOrientationChangeEvent(int orientation); void OnPluginActionAt(const gfx::Point& location, - const WebKit::WebPluginAction& action); + const blink::WebPluginAction& action); void OnMoveOrResizeStarted(); void OnNavigate(const ViewMsg_Navigate_Params& params); void OnPostMessageEvent(const ViewMsg_PostMessage_Params& params); @@ -997,7 +997,7 @@ class CONTENT_EXPORT RenderViewImpl void OnSetBackground(const SkBitmap& background); void OnSetCompositionFromExistingText( int start, int end, - const std::vector<WebKit::WebCompositionUnderline>& underlines); + const std::vector<blink::WebCompositionUnderline>& underlines); void OnExitFullscreen(); void OnSetEditableSelectionOffsets(int start, int end); void OnSetHistoryLengthAndPrune(int history_length, int32 minimum_page_id); @@ -1050,9 +1050,9 @@ class CONTENT_EXPORT RenderViewImpl void ZoomFactorHelper(PageZoom zoom, int zoom_center_x, int zoom_center_y, float scaling_increment); - void AltErrorPageFinished(WebKit::WebFrame* frame, - const WebKit::WebURLRequest& original_request, - const WebKit::WebURLError& original_error, + void AltErrorPageFinished(blink::WebFrame* frame, + const blink::WebURLRequest& original_request, + const blink::WebURLError& original_error, const std::string& html); // Check whether the preferred size has changed. @@ -1081,25 +1081,25 @@ class CONTENT_EXPORT RenderViewImpl ErrorPageType error_type); // Locates a sub frame with given xpath - WebKit::WebFrame* GetChildFrame(const string16& frame_xpath) const; + blink::WebFrame* GetChildFrame(const string16& frame_xpath) const; // Returns the URL being loaded by the given frame's request. - GURL GetLoadingUrl(WebKit::WebFrame* frame) const; + GURL GetLoadingUrl(blink::WebFrame* frame) const; // Should only be called if this object wraps a PluginDocument. - WebKit::WebPlugin* GetWebPluginFromPluginDocument(); + blink::WebPlugin* GetWebPluginFromPluginDocument(); // Returns true if the |params| navigation is to an entry that has been // cropped due to a recent navigation the browser did not know about. bool IsBackForwardToStaleEntry(const ViewMsg_Navigate_Params& params, bool is_reload); - bool MaybeLoadAlternateErrorPage(WebKit::WebFrame* frame, - const WebKit::WebURLError& error, + bool MaybeLoadAlternateErrorPage(blink::WebFrame* frame, + const blink::WebURLError& error, bool replace); // Make this RenderView show an empty, unscriptable page. - void NavigateToSwappedOutURL(WebKit::WebFrame* frame); + void NavigateToSwappedOutURL(blink::WebFrame* frame); // If we initiated a navigation, this function will populate |document_state| // with the navigation information saved in OnNavigate(). @@ -1117,23 +1117,23 @@ class CONTENT_EXPORT RenderViewImpl // Launch an Android content intent with the given URL. void LaunchAndroidContentIntent(const GURL& intent_url, size_t request_id); - WebKit::WebMediaPlayer* CreateAndroidWebMediaPlayer( - WebKit::WebFrame* frame, - const WebKit::WebURL& url, - WebKit::WebMediaPlayerClient* client); + blink::WebMediaPlayer* CreateAndroidWebMediaPlayer( + blink::WebFrame* frame, + const blink::WebURL& url, + blink::WebMediaPlayerClient* client); #endif - WebKit::WebMediaPlayer* CreateWebMediaPlayerForMediaStream( - WebKit::WebFrame* frame, - const WebKit::WebURL& url, - WebKit::WebMediaPlayerClient* client); + blink::WebMediaPlayer* CreateWebMediaPlayerForMediaStream( + blink::WebFrame* frame, + const blink::WebURL& url, + blink::WebMediaPlayerClient* client); // Sends a reply to the current find operation handling if it was a // synchronous find request. void SendFindReply(int request_id, int match_count, int ordinal, - const WebKit::WebRect& selection_rect, + const blink::WebRect& selection_rect, bool final_status_update); // Returns whether |params.selection_text| should be synchronized to the @@ -1418,7 +1418,7 @@ class CONTENT_EXPORT RenderViewImpl // MediaStreamClient attached to this view; lazily initialized. MediaStreamClient* media_stream_client_; - WebKit::WebUserMediaClient* web_user_media_client_; + blink::WebUserMediaClient* web_user_media_client_; // MIDIClient attached to this view; lazily initialized. MIDIDispatcher* midi_dispatcher_; @@ -1499,7 +1499,7 @@ class CONTENT_EXPORT RenderViewImpl std::deque< linked_ptr<PendingFileChooser> > file_chooser_completions_; // The current directory enumeration callback - std::map<int, WebKit::WebFileChooserCompletion*> enumeration_completions_; + std::map<int, blink::WebFileChooserCompletion*> enumeration_completions_; int enumeration_completion_id_; // Reports load progress to the browser. @@ -1518,7 +1518,7 @@ class CONTENT_EXPORT RenderViewImpl scoped_ptr<ExternalPopupMenu> external_popup_menu_; // The node that the context menu was pressed over. - WebKit::WebNode context_menu_node_; + blink::WebNode context_menu_node_; // All the registered observers. We expect this list to be small, so vector // is fine. diff --git a/content/renderer/render_view_impl_android.cc b/content/renderer/render_view_impl_android.cc index 18f41a2..5ae3f09 100644 --- a/content/renderer/render_view_impl_android.cc +++ b/content/renderer/render_view_impl_android.cc @@ -51,7 +51,7 @@ void RenderViewImpl::UpdateTopControlsState(TopControlsState constraints, top_controls_constraints_ = constraints_cc; } -void RenderViewImpl::didScrollWithKeyboard(const WebKit::WebSize& delta) { +void RenderViewImpl::didScrollWithKeyboard(const blink::WebSize& delta) { if (delta.height == 0) return; if (compositor_) { diff --git a/content/renderer/render_view_impl_params.cc b/content/renderer/render_view_impl_params.cc index 44c8353..253ef7f 100644 --- a/content/renderer/render_view_impl_params.cc +++ b/content/renderer/render_view_impl_params.cc @@ -19,7 +19,7 @@ RenderViewImplParams::RenderViewImplParams( bool swapped_out, bool hidden, int32 next_page_id, - const WebKit::WebScreenInfo& screen_info, + const blink::WebScreenInfo& screen_info, AccessibilityMode accessibility_mode, bool allow_partial_swap) : opener_id(opener_id), diff --git a/content/renderer/render_view_impl_params.h b/content/renderer/render_view_impl_params.h index 07a4f41..3aec433 100644 --- a/content/renderer/render_view_impl_params.h +++ b/content/renderer/render_view_impl_params.h @@ -13,7 +13,7 @@ struct WebPreferences; -namespace WebKit { +namespace blink { struct WebScreenInfo; } @@ -35,7 +35,7 @@ struct CONTENT_EXPORT RenderViewImplParams { bool swapped_out, bool hidden, int32 next_page_id, - const WebKit::WebScreenInfo& screen_info, + const blink::WebScreenInfo& screen_info, AccessibilityMode accessibility_mode, bool allow_partial_swap); ~RenderViewImplParams(); @@ -52,7 +52,7 @@ struct CONTENT_EXPORT RenderViewImplParams { bool swapped_out; bool hidden; int32 next_page_id; - const WebKit::WebScreenInfo& screen_info; + const blink::WebScreenInfo& screen_info; AccessibilityMode accessibility_mode; bool allow_partial_swap; }; diff --git a/content/renderer/render_view_linux.cc b/content/renderer/render_view_linux.cc index 01218ad..41f558c 100644 --- a/content/renderer/render_view_linux.cc +++ b/content/renderer/render_view_linux.cc @@ -7,7 +7,7 @@ #include "content/public/common/renderer_preferences.h" #include "third_party/WebKit/public/web/linux/WebFontRendering.h" -using WebKit::WebFontRendering; +using blink::WebFontRendering; namespace content { diff --git a/content/renderer/render_view_mouse_lock_dispatcher.cc b/content/renderer/render_view_mouse_lock_dispatcher.cc index 41d21b7..25b4ccc 100644 --- a/content/renderer/render_view_mouse_lock_dispatcher.cc +++ b/content/renderer/render_view_mouse_lock_dispatcher.cc @@ -11,7 +11,7 @@ #include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/web/WebWidget.h" -using WebKit::WebUserGestureIndicator; +using blink::WebUserGestureIndicator; namespace content { diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index 70da9f2..b9ad015 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -78,26 +78,26 @@ #include "third_party/WebKit/public/web/WebWidget.h" -using WebKit::WebCompositionUnderline; -using WebKit::WebCursorInfo; -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; -using WebKit::WebKeyboardEvent; -using WebKit::WebMouseEvent; -using WebKit::WebMouseWheelEvent; -using WebKit::WebNavigationPolicy; -using WebKit::WebPagePopup; -using WebKit::WebPopupMenu; -using WebKit::WebPopupMenuInfo; -using WebKit::WebPopupType; -using WebKit::WebRange; -using WebKit::WebRect; -using WebKit::WebScreenInfo; -using WebKit::WebSize; -using WebKit::WebTextDirection; -using WebKit::WebTouchEvent; -using WebKit::WebVector; -using WebKit::WebWidget; +using blink::WebCompositionUnderline; +using blink::WebCursorInfo; +using blink::WebGestureEvent; +using blink::WebInputEvent; +using blink::WebKeyboardEvent; +using blink::WebMouseEvent; +using blink::WebMouseWheelEvent; +using blink::WebNavigationPolicy; +using blink::WebPagePopup; +using blink::WebPopupMenu; +using blink::WebPopupMenuInfo; +using blink::WebPopupType; +using blink::WebRange; +using blink::WebRect; +using blink::WebScreenInfo; +using blink::WebSize; +using blink::WebTextDirection; +using blink::WebTouchEvent; +using blink::WebVector; +using blink::WebWidget; namespace { @@ -134,7 +134,7 @@ class TextInputModeMapSingleton { }; ui::TextInputMode ConvertInputMode( - const WebKit::WebString& input_mode) { + const blink::WebString& input_mode) { static TextInputModeMapSingleton* singleton = TextInputModeMapSingleton::GetInstance(); TextInputModeMap::iterator it = singleton->Map().find(input_mode.utf8()); @@ -200,7 +200,7 @@ class RenderWidget::ScreenMetricsEmulator { // Original values to restore back after emulation ends. gfx::Size original_size_; gfx::Size original_physical_backing_size_; - WebKit::WebScreenInfo original_screen_info_; + blink::WebScreenInfo original_screen_info_; gfx::Rect original_view_screen_rect_; gfx::Rect original_window_screen_rect_; }; @@ -330,8 +330,8 @@ void RenderWidget::ScreenMetricsEmulator::OnShowContextMenu( // RenderWidget --------------------------------------------------------------- -RenderWidget::RenderWidget(WebKit::WebPopupType popup_type, - const WebKit::WebScreenInfo& screen_info, +RenderWidget::RenderWidget(blink::WebPopupType popup_type, + const blink::WebScreenInfo& screen_info, bool swapped_out, bool hidden) : routing_id_(MSG_ROUTING_NONE), @@ -411,8 +411,8 @@ RenderWidget::~RenderWidget() { // static RenderWidget* RenderWidget::Create(int32 opener_id, - WebKit::WebPopupType popup_type, - const WebKit::WebScreenInfo& screen_info) { + blink::WebPopupType popup_type, + const blink::WebScreenInfo& screen_info) { DCHECK(opener_id != MSG_ROUTING_NONE); scoped_refptr<RenderWidget> widget( new RenderWidget(popup_type, screen_info, false, false)); @@ -425,15 +425,15 @@ RenderWidget* RenderWidget::Create(int32 opener_id, // static WebWidget* RenderWidget::CreateWebWidget(RenderWidget* render_widget) { switch (render_widget->popup_type_) { - case WebKit::WebPopupTypeNone: // Nothing to create. + case blink::WebPopupTypeNone: // Nothing to create. break; - case WebKit::WebPopupTypeSelect: - case WebKit::WebPopupTypeSuggestion: + case blink::WebPopupTypeSelect: + case blink::WebPopupTypeSuggestion: return WebPopupMenu::create(render_widget); - case WebKit::WebPopupTypePage: + case blink::WebPopupTypePage: return WebPagePopup::create(render_widget); - case WebKit::WebPopupTypeHelperPlugin: - return WebKit::WebHelperPlugin::create(render_widget); + case blink::WebPopupTypeHelperPlugin: + return blink::WebHelperPlugin::create(render_widget); default: NOTREACHED(); } @@ -897,7 +897,7 @@ scoped_ptr<cc::OutputSurface> RenderWidget::CreateOutputSurface(bool fallback) { // be optimized to resolve directly into the IOSurface shared between the // GPU and browser processes. For these reasons and to avoid platform // disparities we explicitly disable antialiasing. - WebKit::WebGraphicsContext3D::Attributes attributes; + blink::WebGraphicsContext3D::Attributes attributes; attributes.antialias = false; attributes.shareResources = true; attributes.noAutomaticFlushes = true; @@ -1049,7 +1049,7 @@ void RenderWidget::OnViewContextSwapBuffersComplete() { DoDeferredUpdateAndSendInputAck(); } -void RenderWidget::OnHandleInputEvent(const WebKit::WebInputEvent* input_event, +void RenderWidget::OnHandleInputEvent(const blink::WebInputEvent* input_event, const ui::LatencyInfo& latency_info, bool is_keyboard_shortcut) { handling_input_event_ = true; @@ -1848,7 +1848,7 @@ void RenderWidget::initializeLayerTreeView() { compositor_->setSurfaceReady(); } -WebKit::WebLayerTreeView* RenderWidget::layerTreeView() { +blink::WebLayerTreeView* RenderWidget::layerTreeView() { return compositor_.get(); } @@ -2015,7 +2015,7 @@ WebRect RenderWidget::windowRect() { return view_screen_rect_; } -void RenderWidget::setToolTipText(const WebKit::WebString& text, +void RenderWidget::setToolTipText(const blink::WebString& text, WebTextDirection hint) { Send(new ViewHostMsg_SetTooltipText(routing_id_, text, hint)); } @@ -2433,7 +2433,7 @@ void RenderWidget::UpdateTextInputType() { bool new_can_compose_inline = CanComposeInline(); - WebKit::WebTextInputInfo new_info; + blink::WebTextInputInfo new_info; if (webwidget_) new_info = webwidget_->textInputInfo(); const ui::TextInputMode new_mode = ConvertInputMode(new_info.inputMode); @@ -2462,7 +2462,7 @@ void RenderWidget::UpdateTextInputState(bool show_ime_if_needed, if (IsDateTimeInput(new_type)) return; // Not considered as a text input field in WebKit/Chromium. - WebKit::WebTextInputInfo new_info; + blink::WebTextInputInfo new_info; if (webwidget_) new_info = webwidget_->textInputInfo(); @@ -2523,47 +2523,47 @@ void RenderWidget::UpdateSelectionBounds() { #endif } -// Check WebKit::WebTextInputType and ui::TextInputType is kept in sync. -COMPILE_ASSERT(int(WebKit::WebTextInputTypeNone) == \ +// Check blink::WebTextInputType and ui::TextInputType is kept in sync. +COMPILE_ASSERT(int(blink::WebTextInputTypeNone) == \ int(ui::TEXT_INPUT_TYPE_NONE), mismatching_enums); -COMPILE_ASSERT(int(WebKit::WebTextInputTypeText) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypeText) == \ int(ui::TEXT_INPUT_TYPE_TEXT), mismatching_enums); -COMPILE_ASSERT(int(WebKit::WebTextInputTypePassword) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypePassword) == \ int(ui::TEXT_INPUT_TYPE_PASSWORD), mismatching_enums); -COMPILE_ASSERT(int(WebKit::WebTextInputTypeSearch) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypeSearch) == \ int(ui::TEXT_INPUT_TYPE_SEARCH), mismatching_enums); -COMPILE_ASSERT(int(WebKit::WebTextInputTypeEmail) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypeEmail) == \ int(ui::TEXT_INPUT_TYPE_EMAIL), mismatching_enums); -COMPILE_ASSERT(int(WebKit::WebTextInputTypeNumber) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypeNumber) == \ int(ui::TEXT_INPUT_TYPE_NUMBER), mismatching_enums); -COMPILE_ASSERT(int(WebKit::WebTextInputTypeTelephone) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypeTelephone) == \ int(ui::TEXT_INPUT_TYPE_TELEPHONE), mismatching_enums); -COMPILE_ASSERT(int(WebKit::WebTextInputTypeURL) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypeURL) == \ int(ui::TEXT_INPUT_TYPE_URL), mismatching_enums); -COMPILE_ASSERT(int(WebKit::WebTextInputTypeDate) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypeDate) == \ int(ui::TEXT_INPUT_TYPE_DATE), mismatching_enum); -COMPILE_ASSERT(int(WebKit::WebTextInputTypeDateTime) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypeDateTime) == \ int(ui::TEXT_INPUT_TYPE_DATE_TIME), mismatching_enum); -COMPILE_ASSERT(int(WebKit::WebTextInputTypeDateTimeLocal) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypeDateTimeLocal) == \ int(ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL), mismatching_enum); -COMPILE_ASSERT(int(WebKit::WebTextInputTypeMonth) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypeMonth) == \ int(ui::TEXT_INPUT_TYPE_MONTH), mismatching_enum); -COMPILE_ASSERT(int(WebKit::WebTextInputTypeTime) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypeTime) == \ int(ui::TEXT_INPUT_TYPE_TIME), mismatching_enum); -COMPILE_ASSERT(int(WebKit::WebTextInputTypeWeek) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypeWeek) == \ int(ui::TEXT_INPUT_TYPE_WEEK), mismatching_enum); -COMPILE_ASSERT(int(WebKit::WebTextInputTypeTextArea) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypeTextArea) == \ int(ui::TEXT_INPUT_TYPE_TEXT_AREA), mismatching_enums); -COMPILE_ASSERT(int(WebKit::WebTextInputTypeContentEditable) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypeContentEditable) == \ int(ui::TEXT_INPUT_TYPE_CONTENT_EDITABLE), mismatching_enums); -COMPILE_ASSERT(int(WebKit::WebTextInputTypeDateTimeField) == \ +COMPILE_ASSERT(int(blink::WebTextInputTypeDateTimeField) == \ int(ui::TEXT_INPUT_TYPE_DATE_TIME_FIELD), mismatching_enums); ui::TextInputType RenderWidget::WebKitToUiTextInputType( - WebKit::WebTextInputType type) { + blink::WebTextInputType type) { // Check the type is in the range representable by ui::TextInputType. DCHECK_LE(type, static_cast<int>(ui::TEXT_INPUT_TYPE_MAX)) << - "WebKit::WebTextInputType and ui::TextInputType not synchronized"; + "blink::WebTextInputType and ui::TextInputType not synchronized"; return static_cast<ui::TextInputType>(type); } @@ -2698,7 +2698,7 @@ void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) { } void RenderWidget::GetRenderingStats( - WebKit::WebRenderingStatsImpl& stats) const { + blink::WebRenderingStatsImpl& stats) const { if (compositor_) compositor_->GetRenderingStats(&stats.rendering_stats); @@ -2763,16 +2763,16 @@ void RenderWidget::BeginPinch( pending_synthetic_gesture_ = callback; } -bool RenderWidget::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) { +bool RenderWidget::WillHandleMouseEvent(const blink::WebMouseEvent& event) { return false; } -bool RenderWidget::WillHandleKeyEvent(const WebKit::WebKeyboardEvent& event) { +bool RenderWidget::WillHandleKeyEvent(const blink::WebKeyboardEvent& event) { return false; } bool RenderWidget::WillHandleGestureEvent( - const WebKit::WebGestureEvent& event) { + const blink::WebGestureEvent& event) { return false; } @@ -2786,7 +2786,7 @@ bool RenderWidget::HasTouchEventHandlersAt(const gfx::Point& point) const { scoped_ptr<WebGraphicsContext3DCommandBufferImpl> RenderWidget::CreateGraphicsContext3D( - const WebKit::WebGraphicsContext3D::Attributes& attributes) { + const blink::WebGraphicsContext3D::Attributes& attributes) { if (!webwidget_) return scoped_ptr<WebGraphicsContext3DCommandBufferImpl>(); if (CommandLine::ForCurrentProcess()->HasSwitch( diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h index 85e7eb9..abd20c3 100644 --- a/content/renderer/render_widget.h +++ b/content/renderer/render_widget.h @@ -48,7 +48,7 @@ namespace IPC { class SyncMessage; } -namespace WebKit { +namespace blink { class WebGestureEvent; class WebInputEvent; class WebKeyboardEvent; @@ -78,18 +78,18 @@ struct WebPluginGeometry; class CONTENT_EXPORT RenderWidget : public IPC::Listener, public IPC::Sender, - NON_EXPORTED_BASE(virtual public WebKit::WebWidgetClient), + NON_EXPORTED_BASE(virtual public blink::WebWidgetClient), NON_EXPORTED_BASE(public WebGraphicsContext3DSwapBuffersClient), public base::RefCounted<RenderWidget> { public: // Creates a new RenderWidget. The opener_id is the routing ID of the // RenderView that this widget lives inside. static RenderWidget* Create(int32 opener_id, - WebKit::WebPopupType popup_type, - const WebKit::WebScreenInfo& screen_info); + blink::WebPopupType popup_type, + const blink::WebScreenInfo& screen_info); // Creates a WebWidget based on the popup type. - static WebKit::WebWidget* CreateWebWidget(RenderWidget* render_widget); + static blink::WebWidget* CreateWebWidget(RenderWidget* render_widget); // The compositing surface assigned by the RenderWidgetHost // (or RenderViewHost). Will be gfx::kNullPluginWindow if not assigned yet, @@ -106,7 +106,7 @@ class CONTENT_EXPORT RenderWidget } // May return NULL when the window is closing. - WebKit::WebWidget* webwidget() const { return webwidget_; } + blink::WebWidget* webwidget() const { return webwidget_; } gfx::Size size() const { return size_; } bool has_focus() const { return has_focus_; } @@ -119,17 +119,17 @@ class CONTENT_EXPORT RenderWidget // IPC::Sender virtual bool Send(IPC::Message* msg) OVERRIDE; - // WebKit::WebWidgetClient + // blink::WebWidgetClient virtual void suppressCompositorScheduling(bool enable); virtual void willBeginCompositorFrame(); - virtual void didInvalidateRect(const WebKit::WebRect&); + virtual void didInvalidateRect(const blink::WebRect&); virtual void didScrollRect(int dx, int dy, - const WebKit::WebRect& clipRect); - virtual void didAutoResize(const WebKit::WebSize& new_size); + const blink::WebRect& clipRect); + virtual void didAutoResize(const blink::WebSize& new_size); virtual void didActivateCompositor(int input_handler_identifier); virtual void didDeactivateCompositor(); virtual void initializeLayerTreeView(); - virtual WebKit::WebLayerTreeView* layerTreeView(); + virtual blink::WebLayerTreeView* layerTreeView(); virtual void didBecomeReadyForAdditionalInput(); virtual void didCommitAndDrawCompositorFrame(); virtual void didCompleteSwapBuffers(); @@ -137,20 +137,20 @@ class CONTENT_EXPORT RenderWidget virtual void scheduleAnimation(); virtual void didFocus(); virtual void didBlur(); - virtual void didChangeCursor(const WebKit::WebCursorInfo&); + virtual void didChangeCursor(const blink::WebCursorInfo&); virtual void closeWidgetSoon(); - virtual void show(WebKit::WebNavigationPolicy); + virtual void show(blink::WebNavigationPolicy); virtual void runModal() {} - virtual WebKit::WebRect windowRect(); - virtual void setToolTipText(const WebKit::WebString& text, - WebKit::WebTextDirection hint); - virtual void setWindowRect(const WebKit::WebRect&); - virtual WebKit::WebRect windowResizerRect(); - virtual WebKit::WebRect rootWindowRect(); - virtual WebKit::WebScreenInfo screenInfo(); + virtual blink::WebRect windowRect(); + virtual void setToolTipText(const blink::WebString& text, + blink::WebTextDirection hint); + virtual void setWindowRect(const blink::WebRect&); + virtual blink::WebRect windowResizerRect(); + virtual blink::WebRect rootWindowRect(); + virtual blink::WebScreenInfo screenInfo(); virtual float deviceScaleFactor(); virtual void resetInputMethod(); - virtual void didHandleGestureEvent(const WebKit::WebGestureEvent& event, + virtual void didHandleGestureEvent(const blink::WebGestureEvent& event, bool event_cancelled); // Called when a plugin is moved. These events are queued up and sent with @@ -163,7 +163,7 @@ class CONTENT_EXPORT RenderWidget // Fills in a WebRenderingStatsImpl struct containing information about // rendering, e.g. count of frames rendered, time spent painting. - void GetRenderingStats(WebKit::WebRenderingStatsImpl&) const; + void GetRenderingStats(blink::WebRenderingStatsImpl&) const; // Fills in a GpuRenderingStats struct containing information about // GPU rendering, e.g. count of texture uploads performed, time spent @@ -254,8 +254,8 @@ class CONTENT_EXPORT RenderWidget NO_RESIZE_ACK, }; - RenderWidget(WebKit::WebPopupType popup_type, - const WebKit::WebScreenInfo& screen_info, + RenderWidget(blink::WebPopupType popup_type, + const blink::WebScreenInfo& screen_info, bool swapped_out, bool hidden); @@ -267,7 +267,7 @@ class CONTENT_EXPORT RenderWidget // Called by Init and subclasses to perform initialization. bool DoInit(int32 opener_id, - WebKit::WebWidget* web_widget, + blink::WebWidget* web_widget, IPC::SyncMessage* create_widget_message); // Finishes creation of a pending view started with Init. @@ -296,7 +296,7 @@ class CONTENT_EXPORT RenderWidget void DoDeferredUpdateAndSendInputAck(); void DoDeferredUpdate(); void DoDeferredClose(); - void DoDeferredSetWindowRect(const WebKit::WebRect& pos); + void DoDeferredSetWindowRect(const blink::WebRect& pos); virtual void Composite(base::TimeTicks frame_begin_time); // Set the background of the render widget to a bitmap. The bitmap will be @@ -320,7 +320,7 @@ class CONTENT_EXPORT RenderWidget virtual void OnShowHostContextMenu(ContextMenuParams* params); // RenderWidget IPC message handlers - void OnHandleInputEvent(const WebKit::WebInputEvent* event, + void OnHandleInputEvent(const blink::WebInputEvent* event, const ui::LatencyInfo& latency_info, bool keyboard_shortcut); void OnCursorVisibilityChange(bool is_visible); @@ -340,7 +340,7 @@ class CONTENT_EXPORT RenderWidget void OnSetInputMethodActive(bool is_active); virtual void OnImeSetComposition( const string16& text, - const std::vector<WebKit::WebCompositionUnderline>& underlines, + const std::vector<blink::WebCompositionUnderline>& underlines, int selection_start, int selection_end); virtual void OnImeConfirmComposition(const string16& text, @@ -352,7 +352,7 @@ class CONTENT_EXPORT RenderWidget const gfx::Size& desired_size); void OnRepaint(gfx::Size size_to_paint); void OnSyntheticGestureCompleted(); - void OnSetTextDirection(WebKit::WebTextDirection direction); + void OnSetTextDirection(blink::WebTextDirection direction); void OnGetFPS(); void OnUpdateScreenRects(const gfx::Rect& view_screen_rect, const gfx::Rect& window_screen_rect); @@ -466,7 +466,7 @@ class CONTENT_EXPORT RenderWidget virtual ui::TextInputType GetTextInputType(); virtual void GetSelectionBounds(gfx::Rect* start, gfx::Rect* end); virtual ui::TextInputType WebKitToUiTextInputType( - WebKit::WebTextInputType type); + blink::WebTextInputType type); #if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA) // Checks if the composition range or composition character bounds have been @@ -506,7 +506,7 @@ class CONTENT_EXPORT RenderWidget // been processed by the browser. So we maintain a pending window rect // size. If JS code sets the WindowRect, and then immediately calls // GetWindowRect() we'll use this pending window rect as the size. - void SetPendingWindowRect(const WebKit::WebRect& r); + void SetPendingWindowRect(const blink::WebRect& r); // Called by OnHandleInputEvent() to notify subclasses that a key event was // just handled. @@ -516,27 +516,27 @@ class CONTENT_EXPORT RenderWidget // about to be handled. // Returns true if no further handling is needed. In that case, the event // won't be sent to WebKit or trigger DidHandleMouseEvent(). - virtual bool WillHandleMouseEvent(const WebKit::WebMouseEvent& event); + virtual bool WillHandleMouseEvent(const blink::WebMouseEvent& event); // Called by OnHandleInputEvent() to notify subclasses that a key event is // about to be handled. // Returns true if no further handling is needed. In that case, the event // won't be sent to WebKit or trigger DidHandleKeyEvent(). - virtual bool WillHandleKeyEvent(const WebKit::WebKeyboardEvent& event); + virtual bool WillHandleKeyEvent(const blink::WebKeyboardEvent& event); // Called by OnHandleInputEvent() to notify subclasses that a gesture event is // about to be handled. // Returns true if no further handling is needed. In that case, the event // won't be sent to WebKit. - virtual bool WillHandleGestureEvent(const WebKit::WebGestureEvent& event); + virtual bool WillHandleGestureEvent(const blink::WebGestureEvent& event); // Called by OnHandleInputEvent() to notify subclasses that a mouse event was // just handled. - virtual void DidHandleMouseEvent(const WebKit::WebMouseEvent& event) {} + virtual void DidHandleMouseEvent(const blink::WebMouseEvent& event) {} // Called by OnHandleInputEvent() to notify subclasses that a touch event was // just handled. - virtual void DidHandleTouchEvent(const WebKit::WebTouchEvent& event) {} + virtual void DidHandleTouchEvent(const blink::WebTouchEvent& event) {} // Check whether the WebWidget has any touch event handlers registered // at the given point. @@ -547,7 +547,7 @@ class CONTENT_EXPORT RenderWidget // Creates a 3D context associated with this view. scoped_ptr<WebGraphicsContext3DCommandBufferImpl> CreateGraphicsContext3D( - const WebKit::WebGraphicsContext3D::Attributes& attributes); + const blink::WebGraphicsContext3D::Attributes& attributes); bool OnSnapshotHelper(const gfx::Rect& src_subrect, SkBitmap* bitmap); @@ -560,7 +560,7 @@ class CONTENT_EXPORT RenderWidget int32 surface_id_; // We are responsible for destroying this object via its Close method. - WebKit::WebWidget* webwidget_; + blink::WebWidget* webwidget_; // This is lazily constructed and must not outlive webwidget_. scoped_ptr<RenderWidgetCompositor> compositor_; @@ -672,7 +672,7 @@ class CONTENT_EXPORT RenderWidget bool input_method_is_active_; // Stores information about the current text input. - WebKit::WebTextInputInfo text_input_info_; + blink::WebTextInputInfo text_input_info_; // Stores the current text input type of |webwidget_|. ui::TextInputType text_input_type_; @@ -694,7 +694,7 @@ class CONTENT_EXPORT RenderWidget gfx::Range composition_range_; // The kind of popup this widget represents, NONE if not a popup. - WebKit::WebPopupType popup_type_; + blink::WebPopupType popup_type_; // Holds all the needed plugin window moves for a scroll. typedef std::vector<WebPluginGeometry> WebPluginGeometryVector; @@ -706,7 +706,7 @@ class CONTENT_EXPORT RenderWidget // While we are waiting for the browser to update window sizes, we track the // pending size temporarily. int pending_window_rect_count_; - WebKit::WebRect pending_window_rect_; + blink::WebRect pending_window_rect_; // The screen rects of the view and the window that contains it. gfx::Rect view_screen_rect_; @@ -752,7 +752,7 @@ class CONTENT_EXPORT RenderWidget std::deque<ViewHostMsg_UpdateRect*> updates_pending_swap_; // Properties of the screen hosting this RenderWidget instance. - WebKit::WebScreenInfo screen_info_; + blink::WebScreenInfo screen_info_; // The device scale factor. This value is computed from the DPI entries in // |screen_info_| on some platforms, and defaults to 1 on other platforms. diff --git a/content/renderer/render_widget_fullscreen.cc b/content/renderer/render_widget_fullscreen.cc index 5798285d..d6650ae 100644 --- a/content/renderer/render_widget_fullscreen.cc +++ b/content/renderer/render_widget_fullscreen.cc @@ -7,11 +7,11 @@ #include "content/common/view_messages.h" #include "third_party/WebKit/public/web/WebWidget.h" -using WebKit::WebWidget; +using blink::WebWidget; namespace content { -void RenderWidgetFullscreen::show(WebKit::WebNavigationPolicy) { +void RenderWidgetFullscreen::show(blink::WebNavigationPolicy) { DCHECK(!did_show_) << "received extraneous Show call"; DCHECK_NE(MSG_ROUTING_NONE, routing_id_); DCHECK_NE(MSG_ROUTING_NONE, opener_id_); @@ -24,8 +24,8 @@ void RenderWidgetFullscreen::show(WebKit::WebNavigationPolicy) { } RenderWidgetFullscreen::RenderWidgetFullscreen( - const WebKit::WebScreenInfo& screen_info) - : RenderWidget(WebKit::WebPopupTypeNone, screen_info, false, false) { + const blink::WebScreenInfo& screen_info) + : RenderWidget(blink::WebPopupTypeNone, screen_info, false, false) { } RenderWidgetFullscreen::~RenderWidgetFullscreen() {} diff --git a/content/renderer/render_widget_fullscreen.h b/content/renderer/render_widget_fullscreen.h index 9978fd2..4b65b88 100644 --- a/content/renderer/render_widget_fullscreen.h +++ b/content/renderer/render_widget_fullscreen.h @@ -14,13 +14,13 @@ namespace content { // TODO(boliu): Override non-supported methods with no-op? eg setWindowRect(). class RenderWidgetFullscreen : public RenderWidget { public: - virtual void show(WebKit::WebNavigationPolicy); + virtual void show(blink::WebNavigationPolicy); protected: - RenderWidgetFullscreen(const WebKit::WebScreenInfo& screen_info); + RenderWidgetFullscreen(const blink::WebScreenInfo& screen_info); virtual ~RenderWidgetFullscreen(); - virtual WebKit::WebWidget* CreateWebWidget(); + virtual blink::WebWidget* CreateWebWidget(); bool Init(int32 opener_id); }; diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc index 405b5450..d81b8cc 100644 --- a/content/renderer/render_widget_fullscreen_pepper.cc +++ b/content/renderer/render_widget_fullscreen_pepper.cc @@ -27,22 +27,22 @@ #include "ui/gfx/size_conversions.h" #include "ui/gl/gpu_preference.h" -using WebKit::WebCanvas; -using WebKit::WebCompositionUnderline; -using WebKit::WebCursorInfo; -using WebKit::WebGestureEvent; -using WebKit::WebInputEvent; -using WebKit::WebMouseEvent; -using WebKit::WebMouseWheelEvent; -using WebKit::WebPoint; -using WebKit::WebRect; -using WebKit::WebSize; -using WebKit::WebString; -using WebKit::WebTextDirection; -using WebKit::WebTextInputType; -using WebKit::WebVector; -using WebKit::WebWidget; -using WebKit::WGC3Dintptr; +using blink::WebCanvas; +using blink::WebCompositionUnderline; +using blink::WebCursorInfo; +using blink::WebGestureEvent; +using blink::WebInputEvent; +using blink::WebMouseEvent; +using blink::WebMouseWheelEvent; +using blink::WebPoint; +using blink::WebRect; +using blink::WebSize; +using blink::WebString; +using blink::WebTextDirection; +using blink::WebTextInputType; +using blink::WebVector; +using blink::WebWidget; +using blink::WGC3Dintptr; namespace content { @@ -309,7 +309,7 @@ class PepperWidget : public WebWidget { } virtual WebTextInputType textInputType() { - return WebKit::WebTextInputTypeNone; + return blink::WebTextInputTypeNone; } virtual WebRect caretOrSelectionBounds() { @@ -345,7 +345,7 @@ RenderWidgetFullscreenPepper* RenderWidgetFullscreenPepper::Create( int32 opener_id, PepperPluginInstanceImpl* plugin, const GURL& active_url, - const WebKit::WebScreenInfo& screen_info) { + const blink::WebScreenInfo& screen_info) { DCHECK_NE(MSG_ROUTING_NONE, opener_id); scoped_refptr<RenderWidgetFullscreenPepper> widget( new RenderWidgetFullscreenPepper(plugin, active_url, screen_info)); @@ -357,7 +357,7 @@ RenderWidgetFullscreenPepper* RenderWidgetFullscreenPepper::Create( RenderWidgetFullscreenPepper::RenderWidgetFullscreenPepper( PepperPluginInstanceImpl* plugin, const GURL& active_url, - const WebKit::WebScreenInfo& screen_info) + const blink::WebScreenInfo& screen_info) : RenderWidgetFullscreen(screen_info), active_url_(active_url), plugin_(plugin), @@ -373,12 +373,12 @@ void RenderWidgetFullscreenPepper::Invalidate() { InvalidateRect(gfx::Rect(size_.width(), size_.height())); } -void RenderWidgetFullscreenPepper::InvalidateRect(const WebKit::WebRect& rect) { +void RenderWidgetFullscreenPepper::InvalidateRect(const blink::WebRect& rect) { didInvalidateRect(rect); } void RenderWidgetFullscreenPepper::ScrollRect( - int dx, int dy, const WebKit::WebRect& rect) { + int dx, int dy, const blink::WebRect& rect) { didScrollRect(dx, dy, rect); } @@ -397,11 +397,11 @@ void RenderWidgetFullscreenPepper::Destroy() { } void RenderWidgetFullscreenPepper::DidChangeCursor( - const WebKit::WebCursorInfo& cursor) { + const blink::WebCursorInfo& cursor) { didChangeCursor(cursor); } -void RenderWidgetFullscreenPepper::SetLayer(WebKit::WebLayer* layer) { +void RenderWidgetFullscreenPepper::SetLayer(blink::WebLayer* layer) { layer_ = layer; bool compositing = !!layer_; if (compositing != is_accelerated_compositing_active_) { @@ -410,7 +410,7 @@ void RenderWidgetFullscreenPepper::SetLayer(WebKit::WebLayer* layer) { initializeLayerTreeView(); if (!layerTreeView()) return; - layer_->setBounds(WebKit::WebSize(size())); + layer_->setBounds(blink::WebSize(size())); layer_->setDrawsContent(true); compositor_->setDeviceScaleFactor(device_scale_factor_); compositor_->setRootLayer(*layer_); @@ -475,7 +475,7 @@ PepperPluginInstanceImpl* void RenderWidgetFullscreenPepper::OnResize( const ViewMsg_Resize_Params& params) { if (layer_) - layer_->setBounds(WebKit::WebSize(params.new_size)); + layer_->setBounds(blink::WebSize(params.new_size)); RenderWidget::OnResize(params); } diff --git a/content/renderer/render_widget_fullscreen_pepper.h b/content/renderer/render_widget_fullscreen_pepper.h index 16b88b9..5e2952c 100644 --- a/content/renderer/render_widget_fullscreen_pepper.h +++ b/content/renderer/render_widget_fullscreen_pepper.h @@ -11,7 +11,7 @@ #include "content/renderer/render_widget_fullscreen.h" #include "third_party/WebKit/public/web/WebWidget.h" -namespace WebKit { +namespace blink { class WebLayer; } @@ -28,15 +28,15 @@ class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen, int32 opener_id, PepperPluginInstanceImpl* plugin, const GURL& active_url, - const WebKit::WebScreenInfo& screen_info); + const blink::WebScreenInfo& screen_info); // pepper::FullscreenContainer API. virtual void Invalidate() OVERRIDE; - virtual void InvalidateRect(const WebKit::WebRect& rect) OVERRIDE; - virtual void ScrollRect(int dx, int dy, const WebKit::WebRect& rect) OVERRIDE; + virtual void InvalidateRect(const blink::WebRect& rect) OVERRIDE; + virtual void ScrollRect(int dx, int dy, const blink::WebRect& rect) OVERRIDE; virtual void Destroy() OVERRIDE; - virtual void DidChangeCursor(const WebKit::WebCursorInfo& cursor) OVERRIDE; - virtual void SetLayer(WebKit::WebLayer* layer) OVERRIDE; + virtual void DidChangeCursor(const blink::WebCursorInfo& cursor) OVERRIDE; + virtual void SetLayer(blink::WebLayer* layer) OVERRIDE; // IPC::Listener implementation. This overrides the implementation // in RenderWidgetFullscreen. @@ -54,7 +54,7 @@ class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen, protected: RenderWidgetFullscreenPepper(PepperPluginInstanceImpl* plugin, const GURL& active_url, - const WebKit::WebScreenInfo& screen_info); + const blink::WebScreenInfo& screen_info); virtual ~RenderWidgetFullscreenPepper(); // RenderWidget API. @@ -70,7 +70,7 @@ class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen, virtual void OnResize(const ViewMsg_Resize_Params& params) OVERRIDE; // RenderWidgetFullscreen API. - virtual WebKit::WebWidget* CreateWebWidget() OVERRIDE; + virtual blink::WebWidget* CreateWebWidget() OVERRIDE; // RenderWidget overrides. virtual GURL GetURLForGraphicsContext3D() OVERRIDE; @@ -83,7 +83,7 @@ class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen, // The plugin instance this widget wraps. PepperPluginInstanceImpl* plugin_; - WebKit::WebLayer* layer_; + blink::WebLayer* layer_; scoped_ptr<MouseLockDispatcher> mouse_lock_dispatcher_; diff --git a/content/renderer/renderer_date_time_picker.cc b/content/renderer/renderer_date_time_picker.cc index 86d268a..074ebe5 100644 --- a/content/renderer/renderer_date_time_picker.cc +++ b/content/renderer/renderer_date_time_picker.cc @@ -13,14 +13,14 @@ #include "third_party/WebKit/public/web/WebDateTimeChooserParams.h" #include "third_party/WebKit/public/web/WebDateTimeInputType.h" -using WebKit::WebString; +using blink::WebString; namespace content { RendererDateTimePicker::RendererDateTimePicker( RenderViewImpl* sender, - const WebKit::WebDateTimeChooserParams& params, - WebKit::WebDateTimeChooserCompletion* completion) + const blink::WebDateTimeChooserParams& params, + blink::WebDateTimeChooserCompletion* completion) : RenderViewObserver(sender), chooser_params_(params), chooser_completion_(completion){ diff --git a/content/renderer/renderer_date_time_picker.h b/content/renderer/renderer_date_time_picker.h index d7292b7..2dc6386 100644 --- a/content/renderer/renderer_date_time_picker.h +++ b/content/renderer/renderer_date_time_picker.h @@ -11,9 +11,9 @@ struct ViewHostMsg_DateTimeDialogValue_Params; -namespace WebKit { +namespace blink { class WebDateTimeChooserCompletion; -} // namespace WebKit +} // namespace blink namespace content { class RenderViewImpl; @@ -22,8 +22,8 @@ class RendererDateTimePicker : public RenderViewObserver { public: RendererDateTimePicker( RenderViewImpl* sender, - const WebKit::WebDateTimeChooserParams& params, - WebKit::WebDateTimeChooserCompletion* completion); + const blink::WebDateTimeChooserParams& params, + blink::WebDateTimeChooserCompletion* completion); virtual ~RendererDateTimePicker(); bool Open(); @@ -35,8 +35,8 @@ class RendererDateTimePicker : public RenderViewObserver { // RenderViewObserver virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - WebKit::WebDateTimeChooserParams chooser_params_; - WebKit::WebDateTimeChooserCompletion* chooser_completion_; // Not owned by us + blink::WebDateTimeChooserParams chooser_params_; + blink::WebDateTimeChooserCompletion* chooser_completion_; // Not owned by us DISALLOW_COPY_AND_ASSIGN(RendererDateTimePicker); }; diff --git a/content/renderer/renderer_webapplicationcachehost_impl.cc b/content/renderer/renderer_webapplicationcachehost_impl.cc index 42b281c..8aeee8a 100644 --- a/content/renderer/renderer_webapplicationcachehost_impl.cc +++ b/content/renderer/renderer_webapplicationcachehost_impl.cc @@ -11,8 +11,8 @@ #include "third_party/WebKit/public/web/WebView.h" using appcache::AppCacheBackend; -using WebKit::WebApplicationCacheHostClient; -using WebKit::WebConsoleMessage; +using blink::WebApplicationCacheHostClient; +using blink::WebConsoleMessage; namespace content { @@ -34,10 +34,10 @@ void RendererWebApplicationCacheHostImpl::OnLogMessage( !render_view->webview()->mainFrame()) return; - WebKit::WebFrame* frame = render_view->webview()->mainFrame(); + blink::WebFrame* frame = render_view->webview()->mainFrame(); frame->addMessageToConsole(WebConsoleMessage( static_cast<WebConsoleMessage::Level>(log_level), - WebKit::WebString::fromUTF8(message.c_str()))); + blink::WebString::fromUTF8(message.c_str()))); } void RendererWebApplicationCacheHostImpl::OnContentBlocked( diff --git a/content/renderer/renderer_webapplicationcachehost_impl.h b/content/renderer/renderer_webapplicationcachehost_impl.h index 0612039..16fd17c 100644 --- a/content/renderer/renderer_webapplicationcachehost_impl.h +++ b/content/renderer/renderer_webapplicationcachehost_impl.h @@ -14,7 +14,7 @@ class RendererWebApplicationCacheHostImpl : public WebApplicationCacheHostImpl { public: RendererWebApplicationCacheHostImpl( RenderViewImpl* render_view, - WebKit::WebApplicationCacheHostClient* client, + blink::WebApplicationCacheHostClient* client, appcache::AppCacheBackend* backend); // WebApplicationCacheHostImpl: diff --git a/content/renderer/renderer_webcolorchooser_impl.cc b/content/renderer/renderer_webcolorchooser_impl.cc index 337ec7e..af04dab 100644 --- a/content/renderer/renderer_webcolorchooser_impl.cc +++ b/content/renderer/renderer_webcolorchooser_impl.cc @@ -16,7 +16,7 @@ static int GenerateColorChooserIdentifier() { RendererWebColorChooserImpl::RendererWebColorChooserImpl( RenderViewImpl* render_view, - WebKit::WebColorChooserClient* client) + blink::WebColorChooserClient* client) : RenderViewObserver(render_view), identifier_(GenerateColorChooserIdentifier()), client_(client) { @@ -38,7 +38,7 @@ bool RendererWebColorChooserImpl::OnMessageReceived( return handled; } -void RendererWebColorChooserImpl::setSelectedColor(WebKit::WebColor color) { +void RendererWebColorChooserImpl::setSelectedColor(blink::WebColor color) { Send(new ViewHostMsg_SetSelectedColorInColorChooser(routing_id(), identifier_, static_cast<SkColor>(color))); } @@ -56,7 +56,7 @@ void RendererWebColorChooserImpl::OnDidChooseColorResponse(int color_chooser_id, SkColor color) { DCHECK(identifier_ == color_chooser_id); - client_->didChooseColor(static_cast<WebKit::WebColor>(color)); + client_->didChooseColor(static_cast<blink::WebColor>(color)); } void RendererWebColorChooserImpl::OnDidEndColorChooser(int color_chooser_id) { diff --git a/content/renderer/renderer_webcolorchooser_impl.h b/content/renderer/renderer_webcolorchooser_impl.h index bd8f235..4d6540b 100644 --- a/content/renderer/renderer_webcolorchooser_impl.h +++ b/content/renderer/renderer_webcolorchooser_impl.h @@ -11,26 +11,26 @@ #include "third_party/WebKit/public/web/WebColorChooserClient.h" #include "third_party/skia/include/core/SkColor.h" -namespace WebKit { +namespace blink { class WebFrame; } namespace content { class RenderViewImpl; -class RendererWebColorChooserImpl : public WebKit::WebColorChooser, +class RendererWebColorChooserImpl : public blink::WebColorChooser, public RenderViewObserver { public: explicit RendererWebColorChooserImpl(RenderViewImpl* sender, - WebKit::WebColorChooserClient*); + blink::WebColorChooserClient*); virtual ~RendererWebColorChooserImpl(); - virtual void setSelectedColor(const WebKit::WebColor); + virtual void setSelectedColor(const blink::WebColor); virtual void endChooser(); void Open(SkColor initial_color); - WebKit::WebColorChooserClient* client() { return client_; } + blink::WebColorChooserClient* client() { return client_; } private: // RenderViewObserver implementation. @@ -40,7 +40,7 @@ class RendererWebColorChooserImpl : public WebKit::WebColorChooser, void OnDidEndColorChooser(int color_chooser_id); int identifier_; - WebKit::WebColorChooserClient* client_; + blink::WebColorChooserClient* client_; DISALLOW_COPY_AND_ASSIGN(RendererWebColorChooserImpl); }; diff --git a/content/renderer/renderer_webcookiejar_impl.cc b/content/renderer/renderer_webcookiejar_impl.cc index c9e6934..e169c48 100644 --- a/content/renderer/renderer_webcookiejar_impl.cc +++ b/content/renderer/renderer_webcookiejar_impl.cc @@ -11,10 +11,10 @@ #include "content/renderer/render_view_impl.h" #include "third_party/WebKit/public/platform/WebCookie.h" -using WebKit::WebCookie; -using WebKit::WebString; -using WebKit::WebURL; -using WebKit::WebVector; +using blink::WebCookie; +using blink::WebString; +using blink::WebURL; +using blink::WebVector; namespace content { diff --git a/content/renderer/renderer_webcookiejar_impl.h b/content/renderer/renderer_webcookiejar_impl.h index 4820bc4..a6451af 100644 --- a/content/renderer/renderer_webcookiejar_impl.h +++ b/content/renderer/renderer_webcookiejar_impl.h @@ -12,7 +12,7 @@ namespace content { class RenderViewImpl; -class RendererWebCookieJarImpl : public WebKit::WebCookieJar { +class RendererWebCookieJarImpl : public blink::WebCookieJar { public: explicit RendererWebCookieJarImpl(RenderViewImpl* sender) : sender_(sender) { @@ -20,21 +20,21 @@ class RendererWebCookieJarImpl : public WebKit::WebCookieJar { virtual ~RendererWebCookieJarImpl() {} private: - // WebKit::WebCookieJar methods: + // blink::WebCookieJar methods: virtual void setCookie( - const WebKit::WebURL& url, const WebKit::WebURL& first_party_for_cookies, - const WebKit::WebString& value); - virtual WebKit::WebString cookies( - const WebKit::WebURL& url, const WebKit::WebURL& first_party_for_cookies); - virtual WebKit::WebString cookieRequestHeaderFieldValue( - const WebKit::WebURL& url, const WebKit::WebURL& first_party_for_cookies); + const blink::WebURL& url, const blink::WebURL& first_party_for_cookies, + const blink::WebString& value); + virtual blink::WebString cookies( + const blink::WebURL& url, const blink::WebURL& first_party_for_cookies); + virtual blink::WebString cookieRequestHeaderFieldValue( + const blink::WebURL& url, const blink::WebURL& first_party_for_cookies); virtual void rawCookies( - const WebKit::WebURL& url, const WebKit::WebURL& first_party_for_cookies, - WebKit::WebVector<WebKit::WebCookie>& cookies); + const blink::WebURL& url, const blink::WebURL& first_party_for_cookies, + blink::WebVector<blink::WebCookie>& cookies); virtual void deleteCookie( - const WebKit::WebURL& url, const WebKit::WebString& cookie_name); + const blink::WebURL& url, const blink::WebString& cookie_name); virtual bool cookiesEnabled( - const WebKit::WebURL& url, const WebKit::WebURL& first_party_for_cookies); + const blink::WebURL& url, const blink::WebURL& first_party_for_cookies); RenderViewImpl* sender_; }; diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index 6f7dd05..3515563 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -103,33 +103,33 @@ #include "content/renderer/media/android/audio_decoder_android.h" #endif -using WebKit::WebAudioDevice; -using WebKit::WebBlobRegistry; -using WebKit::WebFileInfo; -using WebKit::WebFileSystem; -using WebKit::WebFrame; -using WebKit::WebGamepads; -using WebKit::WebIDBFactory; -using WebKit::WebMIDIAccessor; -using WebKit::Platform; -using WebKit::WebMediaStreamCenter; -using WebKit::WebMediaStreamCenterClient; -using WebKit::WebMimeRegistry; -using WebKit::WebRTCPeerConnectionHandler; -using WebKit::WebRTCPeerConnectionHandlerClient; -using WebKit::WebStorageNamespace; -using WebKit::WebString; -using WebKit::WebURL; -using WebKit::WebVector; +using blink::WebAudioDevice; +using blink::WebBlobRegistry; +using blink::WebFileInfo; +using blink::WebFileSystem; +using blink::WebFrame; +using blink::WebGamepads; +using blink::WebIDBFactory; +using blink::WebMIDIAccessor; +using blink::Platform; +using blink::WebMediaStreamCenter; +using blink::WebMediaStreamCenterClient; +using blink::WebMimeRegistry; +using blink::WebRTCPeerConnectionHandler; +using blink::WebRTCPeerConnectionHandlerClient; +using blink::WebStorageNamespace; +using blink::WebString; +using blink::WebURL; +using blink::WebVector; namespace content { static bool g_sandbox_enabled = true; base::LazyInstance<WebGamepads>::Leaky g_test_gamepads = LAZY_INSTANCE_INITIALIZER; -base::LazyInstance<WebKit::WebDeviceMotionData>::Leaky +base::LazyInstance<blink::WebDeviceMotionData>::Leaky g_test_device_motion_data = LAZY_INSTANCE_INITIALIZER; -base::LazyInstance<WebKit::WebDeviceOrientationData>::Leaky +base::LazyInstance<blink::WebDeviceOrientationData>::Leaky g_test_device_orientation_data = LAZY_INSTANCE_INITIALIZER; //------------------------------------------------------------------------------ @@ -137,16 +137,16 @@ base::LazyInstance<WebKit::WebDeviceOrientationData>::Leaky class RendererWebKitPlatformSupportImpl::MimeRegistry : public webkit_glue::SimpleWebMimeRegistryImpl { public: - virtual WebKit::WebMimeRegistry::SupportsType supportsMediaMIMEType( - const WebKit::WebString& mime_type, - const WebKit::WebString& codecs, - const WebKit::WebString& key_system); - virtual bool supportsMediaSourceMIMEType(const WebKit::WebString& mime_type, - const WebKit::WebString& codecs); - virtual WebKit::WebString mimeTypeForExtension( - const WebKit::WebString& file_extension); - virtual WebKit::WebString mimeTypeFromFile( - const WebKit::WebString& file_path); + virtual blink::WebMimeRegistry::SupportsType supportsMediaMIMEType( + const blink::WebString& mime_type, + const blink::WebString& codecs, + const blink::WebString& key_system); + virtual bool supportsMediaSourceMIMEType(const blink::WebString& mime_type, + const blink::WebString& codecs); + virtual blink::WebString mimeTypeForExtension( + const blink::WebString& file_extension); + virtual blink::WebString mimeTypeFromFile( + const blink::WebString& file_path); }; class RendererWebKitPlatformSupportImpl::FileUtilities @@ -167,7 +167,7 @@ class RendererWebKitPlatformSupportImpl::SandboxSupport { }; #else class RendererWebKitPlatformSupportImpl::SandboxSupport - : public WebKit::WebSandboxSupport { + : public blink::WebSandboxSupport { public: virtual ~SandboxSupport() {} @@ -180,18 +180,18 @@ class RendererWebKitPlatformSupportImpl::SandboxSupport uint32* font_id); #elif defined(OS_POSIX) virtual void getFontFamilyForCharacter( - WebKit::WebUChar32 character, + blink::WebUChar32 character, const char* preferred_locale, - WebKit::WebFontFamily* family); + blink::WebFontFamily* family); virtual void getRenderStyleForStrike( - const char* family, int sizeAndStyle, WebKit::WebFontRenderStyle* out); + const char* family, int sizeAndStyle, blink::WebFontRenderStyle* out); private: // WebKit likes to ask us for the correct font family to use for a set of // unicode code points. It needs this information frequently so we cache it // here. base::Lock unicode_font_families_mutex_; - std::map<int32_t, WebKit::WebFontFamily> unicode_font_families_; + std::map<int32_t, blink::WebFontFamily> unicode_font_families_; #endif }; #endif // defined(OS_ANDROID) @@ -227,19 +227,19 @@ RendererWebKitPlatformSupportImpl::~RendererWebKitPlatformSupportImpl() { //------------------------------------------------------------------------------ -WebKit::WebClipboard* RendererWebKitPlatformSupportImpl::clipboard() { - WebKit::WebClipboard* clipboard = +blink::WebClipboard* RendererWebKitPlatformSupportImpl::clipboard() { + blink::WebClipboard* clipboard = GetContentClient()->renderer()->OverrideWebClipboard(); if (clipboard) return clipboard; return clipboard_.get(); } -WebKit::WebMimeRegistry* RendererWebKitPlatformSupportImpl::mimeRegistry() { +blink::WebMimeRegistry* RendererWebKitPlatformSupportImpl::mimeRegistry() { return mime_registry_.get(); } -WebKit::WebFileUtilities* +blink::WebFileUtilities* RendererWebKitPlatformSupportImpl::fileUtilities() { if (!file_utilities_) { file_utilities_.reset(new FileUtilities(thread_safe_sender_.get())); @@ -248,7 +248,7 @@ RendererWebKitPlatformSupportImpl::fileUtilities() { return file_utilities_.get(); } -WebKit::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() { +blink::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() { #if defined(OS_ANDROID) // WebKit doesn't use WebSandboxSupport on android. return NULL; @@ -257,13 +257,13 @@ WebKit::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() { #endif } -WebKit::WebCookieJar* RendererWebKitPlatformSupportImpl::cookieJar() { +blink::WebCookieJar* RendererWebKitPlatformSupportImpl::cookieJar() { NOTREACHED() << "Use WebFrameClient::cookieJar() instead!"; return NULL; } -WebKit::WebThemeEngine* RendererWebKitPlatformSupportImpl::themeEngine() { - WebKit::WebThemeEngine* theme_engine = +blink::WebThemeEngine* RendererWebKitPlatformSupportImpl::themeEngine() { + blink::WebThemeEngine* theme_engine = GetContentClient()->renderer()->OverrideThemeEngine(); if (theme_engine) return theme_engine; @@ -292,12 +292,12 @@ bool RendererWebKitPlatformSupportImpl::isLinkVisited( return GetContentClient()->renderer()->IsLinkVisited(link_hash); } -WebKit::WebMessagePortChannel* +blink::WebMessagePortChannel* RendererWebKitPlatformSupportImpl::createMessagePortChannel() { return new WebMessagePortChannelImpl(child_thread_loop_.get()); } -WebKit::WebPrescientNetworking* +blink::WebPrescientNetworking* RendererWebKitPlatformSupportImpl::prescientNetworking() { return GetContentClient()->renderer()->GetPrescientNetworking(); } @@ -315,7 +315,7 @@ RendererWebKitPlatformSupportImpl::CheckPreparsedJsCachingEnabled() const { } void RendererWebKitPlatformSupportImpl::cacheMetadata( - const WebKit::WebURL& url, + const blink::WebURL& url, double response_time, const char* data, size_t size) { @@ -429,7 +429,7 @@ RendererWebKitPlatformSupportImpl::MimeRegistry::supportsMediaMIMEType( bool RendererWebKitPlatformSupportImpl::MimeRegistry::supportsMediaSourceMIMEType( - const WebKit::WebString& mime_type, + const blink::WebString& mime_type, const WebString& codecs) { const std::string mime_type_ascii = ToASCIIOrEmpty(mime_type); std::vector<std::string> parsed_codec_ids; @@ -547,11 +547,11 @@ bool RendererWebKitPlatformSupportImpl::SandboxSupport::loadFont( void RendererWebKitPlatformSupportImpl::SandboxSupport::getFontFamilyForCharacter( - WebKit::WebUChar32 character, + blink::WebUChar32 character, const char* preferred_locale, - WebKit::WebFontFamily* family) { + blink::WebFontFamily* family) { base::AutoLock lock(unicode_font_families_mutex_); - const std::map<int32_t, WebKit::WebFontFamily>::const_iterator iter = + const std::map<int32_t, blink::WebFontFamily>::const_iterator iter = unicode_font_families_.find(character); if (iter != unicode_font_families_.end()) { family->name = iter->second.name; @@ -566,7 +566,7 @@ RendererWebKitPlatformSupportImpl::SandboxSupport::getFontFamilyForCharacter( void RendererWebKitPlatformSupportImpl::SandboxSupport::getRenderStyleForStrike( - const char* family, int sizeAndStyle, WebKit::WebFontRenderStyle* out) { + const char* family, int sizeAndStyle, blink::WebFontRenderStyle* out) { GetRenderStyleForStrike(family, sizeAndStyle, out); } @@ -668,9 +668,9 @@ RendererWebKitPlatformSupportImpl::createAudioDevice( unsigned channels, double sample_rate, WebAudioDevice::RenderCallback* callback, - const WebKit::WebString& input_device_id) { + const blink::WebString& input_device_id) { // Use a mock for testing. - WebKit::WebAudioDevice* mock_device = + blink::WebAudioDevice* mock_device = GetContentClient()->renderer()->OverrideCreateAudioDevice(sample_rate); if (mock_device) return mock_device; @@ -729,7 +729,7 @@ RendererWebKitPlatformSupportImpl::createAudioDevice( #if defined(OS_ANDROID) bool RendererWebKitPlatformSupportImpl::loadAudioResource( - WebKit::WebAudioBus* destination_bus, const char* audio_file_data, + blink::WebAudioBus* destination_bus, const char* audio_file_data, size_t data_size, double sample_rate) { return DecodeAudioFileData(destination_bus, audio_file_data, @@ -739,7 +739,7 @@ bool RendererWebKitPlatformSupportImpl::loadAudioResource( } #else bool RendererWebKitPlatformSupportImpl::loadAudioResource( - WebKit::WebAudioBus* destination_bus, const char* audio_file_data, + blink::WebAudioBus* destination_bus, const char* audio_file_data, size_t data_size, double sample_rate) { return DecodeAudioFileData( destination_bus, audio_file_data, data_size, sample_rate); @@ -748,18 +748,18 @@ bool RendererWebKitPlatformSupportImpl::loadAudioResource( //------------------------------------------------------------------------------ -WebKit::WebContentDecryptionModule* +blink::WebContentDecryptionModule* RendererWebKitPlatformSupportImpl::createContentDecryptionModule( - const WebKit::WebString& key_system) { + const blink::WebString& key_system) { return WebContentDecryptionModuleImpl::Create(key_system); } //------------------------------------------------------------------------------ -WebKit::WebMIDIAccessor* +blink::WebMIDIAccessor* RendererWebKitPlatformSupportImpl::createMIDIAccessor( - WebKit::WebMIDIAccessorClient* client) { - WebKit::WebMIDIAccessor* accessor = + blink::WebMIDIAccessorClient* client) { + blink::WebMIDIAccessor* accessor = GetContentClient()->renderer()->OverrideCreateMIDIAccessor(client); if (accessor) return accessor; @@ -769,7 +769,7 @@ RendererWebKitPlatformSupportImpl::createMIDIAccessor( void RendererWebKitPlatformSupportImpl::getPluginList( bool refresh, - WebKit::WebPluginListBuilder* builder) { + blink::WebPluginListBuilder* builder) { #if defined(ENABLE_PLUGINS) std::vector<WebPluginInfo> plugins; if (!plugin_refresh_allowed_) @@ -800,11 +800,11 @@ void RendererWebKitPlatformSupportImpl::getPluginList( //------------------------------------------------------------------------------ -WebKit::WebString +blink::WebString RendererWebKitPlatformSupportImpl::signedPublicKeyAndChallengeString( unsigned key_size_index, - const WebKit::WebString& challenge, - const WebKit::WebURL& url) { + const blink::WebString& challenge, + const blink::WebURL& url) { std::string signed_public_key; RenderThread::Get()->Send(new ViewHostMsg_Keygen( static_cast<uint32>(key_size_index), @@ -841,8 +841,8 @@ void RendererWebKitPlatformSupportImpl::sampleGamepads(WebGamepads& gamepads) { } } -WebKit::WebString RendererWebKitPlatformSupportImpl::userAgent( - const WebKit::WebURL& url) { +blink::WebString RendererWebKitPlatformSupportImpl::userAgent( + const blink::WebURL& url) { return WebKitPlatformSupportImpl::userAgent(url); } @@ -899,9 +899,9 @@ void RendererWebKitPlatformSupportImpl::SetMockGamepadsForTesting( //------------------------------------------------------------------------------ -WebKit::WebSpeechSynthesizer* +blink::WebSpeechSynthesizer* RendererWebKitPlatformSupportImpl::createSpeechSynthesizer( - WebKit::WebSpeechSynthesizerClient* client) { + blink::WebSpeechSynthesizerClient* client) { return GetContentClient()->renderer()->OverrideSpeechSynthesizer(client); } @@ -916,9 +916,9 @@ bool RendererWebKitPlatformSupportImpl::processMemorySizesInBytes( //------------------------------------------------------------------------------ -WebKit::WebGraphicsContext3D* +blink::WebGraphicsContext3D* RendererWebKitPlatformSupportImpl::createOffscreenGraphicsContext3D( - const WebKit::WebGraphicsContext3D::Attributes& attributes) { + const blink::WebGraphicsContext3D::Attributes& attributes) { if (!RenderThreadImpl::current()) return NULL; @@ -933,7 +933,7 @@ RendererWebKitPlatformSupportImpl::createOffscreenGraphicsContext3D( //------------------------------------------------------------------------------ -WebKit::WebGraphicsContext3DProvider* RendererWebKitPlatformSupportImpl:: +blink::WebGraphicsContext3DProvider* RendererWebKitPlatformSupportImpl:: createSharedOffscreenGraphicsContext3DProvider() { scoped_refptr<cc::ContextProvider> provider = RenderThreadImpl::current()->SharedMainThreadContextProvider(); @@ -944,23 +944,23 @@ WebKit::WebGraphicsContext3DProvider* RendererWebKitPlatformSupportImpl:: //------------------------------------------------------------------------------ -WebKit::WebCompositorSupport* +blink::WebCompositorSupport* RendererWebKitPlatformSupportImpl::compositorSupport() { return &compositor_support_; } //------------------------------------------------------------------------------ -WebKit::WebString RendererWebKitPlatformSupportImpl::convertIDNToUnicode( - const WebKit::WebString& host, - const WebKit::WebString& languages) { +blink::WebString RendererWebKitPlatformSupportImpl::convertIDNToUnicode( + const blink::WebString& host, + const blink::WebString& languages) { return net::IDNToUnicode(host.utf8(), languages.utf8()); } //------------------------------------------------------------------------------ void RendererWebKitPlatformSupportImpl::setDeviceMotionListener( - WebKit::WebDeviceMotionListener* listener) { + blink::WebDeviceMotionListener* listener) { if (g_test_device_motion_data == 0) { if (!device_motion_event_pump_) { device_motion_event_pump_.reset(new DeviceMotionEventPump); @@ -971,7 +971,7 @@ void RendererWebKitPlatformSupportImpl::setDeviceMotionListener( // Testing mode: just echo the test data to the listener. base::MessageLoopProxy::current()->PostTask( FROM_HERE, - base::Bind(&WebKit::WebDeviceMotionListener::didChangeDeviceMotion, + base::Bind(&blink::WebDeviceMotionListener::didChangeDeviceMotion, base::Unretained(listener), g_test_device_motion_data.Get())); } @@ -979,14 +979,14 @@ void RendererWebKitPlatformSupportImpl::setDeviceMotionListener( // static void RendererWebKitPlatformSupportImpl::SetMockDeviceMotionDataForTesting( - const WebKit::WebDeviceMotionData& data) { + const blink::WebDeviceMotionData& data) { g_test_device_motion_data.Get() = data; } //------------------------------------------------------------------------------ void RendererWebKitPlatformSupportImpl::setDeviceOrientationListener( - WebKit::WebDeviceOrientationListener* listener) { + blink::WebDeviceOrientationListener* listener) { if (g_test_device_orientation_data == 0) { if (!device_orientation_event_pump_) { device_orientation_event_pump_.reset(new DeviceOrientationEventPump); @@ -998,7 +998,7 @@ void RendererWebKitPlatformSupportImpl::setDeviceOrientationListener( base::MessageLoopProxy::current()->PostTask( FROM_HERE, base::Bind( - &WebKit::WebDeviceOrientationListener::didChangeDeviceOrientation, + &blink::WebDeviceOrientationListener::didChangeDeviceOrientation, base::Unretained(listener), g_test_device_orientation_data.Get())); } @@ -1006,13 +1006,13 @@ void RendererWebKitPlatformSupportImpl::setDeviceOrientationListener( // static void RendererWebKitPlatformSupportImpl::SetMockDeviceOrientationDataForTesting( - const WebKit::WebDeviceOrientationData& data) { + const blink::WebDeviceOrientationData& data) { g_test_device_orientation_data.Get() = data; } //------------------------------------------------------------------------------ -WebKit::WebCrypto* RendererWebKitPlatformSupportImpl::crypto() { +blink::WebCrypto* RendererWebKitPlatformSupportImpl::crypto() { if (!web_crypto_) web_crypto_.reset(new WebCryptoImpl()); return web_crypto_.get(); @@ -1035,9 +1035,9 @@ void RendererWebKitPlatformSupportImpl::cancelVibration() { //------------------------------------------------------------------------------ void RendererWebKitPlatformSupportImpl::queryStorageUsageAndQuota( - const WebKit::WebURL& storage_partition, - WebKit::WebStorageQuotaType type, - WebKit::WebStorageQuotaCallbacks* callbacks) { + const blink::WebURL& storage_partition, + blink::WebStorageQuotaType type, + blink::WebStorageQuotaCallbacks* callbacks) { if (!thread_safe_sender_.get() || !quota_message_filter_.get()) return; QuotaDispatcher::ThreadSpecificInstance( diff --git a/content/renderer/renderer_webkitplatformsupport_impl.h b/content/renderer/renderer_webkitplatformsupport_impl.h index 1a55021..51d76e7 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.h +++ b/content/renderer/renderer_webkitplatformsupport_impl.h @@ -26,7 +26,7 @@ namespace IPC { class SyncMessageFilter; } -namespace WebKit { +namespace blink { class WebDeviceMotionData; class WebDeviceOrientationData; class WebGraphicsContext3DProvider; @@ -52,44 +52,44 @@ class CONTENT_EXPORT RendererWebKitPlatformSupportImpl plugin_refresh_allowed_ = plugin_refresh_allowed; } // Platform methods: - virtual WebKit::WebClipboard* clipboard(); - virtual WebKit::WebMimeRegistry* mimeRegistry(); - virtual WebKit::WebFileUtilities* fileUtilities(); - virtual WebKit::WebSandboxSupport* sandboxSupport(); - virtual WebKit::WebCookieJar* cookieJar(); - virtual WebKit::WebThemeEngine* themeEngine(); - virtual WebKit::WebSpeechSynthesizer* createSpeechSynthesizer( - WebKit::WebSpeechSynthesizerClient* client); + virtual blink::WebClipboard* clipboard(); + virtual blink::WebMimeRegistry* mimeRegistry(); + virtual blink::WebFileUtilities* fileUtilities(); + virtual blink::WebSandboxSupport* sandboxSupport(); + virtual blink::WebCookieJar* cookieJar(); + virtual blink::WebThemeEngine* themeEngine(); + virtual blink::WebSpeechSynthesizer* createSpeechSynthesizer( + blink::WebSpeechSynthesizerClient* client); virtual bool sandboxEnabled(); virtual unsigned long long visitedLinkHash( const char* canonicalURL, size_t length); virtual bool isLinkVisited(unsigned long long linkHash); - virtual WebKit::WebMessagePortChannel* createMessagePortChannel(); - virtual WebKit::WebPrescientNetworking* prescientNetworking(); + virtual blink::WebMessagePortChannel* createMessagePortChannel(); + virtual blink::WebPrescientNetworking* prescientNetworking(); virtual void cacheMetadata( - const WebKit::WebURL&, double, const char*, size_t); - virtual WebKit::WebString defaultLocale(); + const blink::WebURL&, double, const char*, size_t); + virtual blink::WebString defaultLocale(); virtual void suddenTerminationChanged(bool enabled); - virtual WebKit::WebStorageNamespace* createLocalStorageNamespace(); - virtual WebKit::Platform::FileHandle databaseOpenFile( - const WebKit::WebString& vfs_file_name, int desired_flags); - virtual int databaseDeleteFile(const WebKit::WebString& vfs_file_name, + virtual blink::WebStorageNamespace* createLocalStorageNamespace(); + virtual blink::Platform::FileHandle databaseOpenFile( + const blink::WebString& vfs_file_name, int desired_flags); + virtual int databaseDeleteFile(const blink::WebString& vfs_file_name, bool sync_dir); virtual long databaseGetFileAttributes( - const WebKit::WebString& vfs_file_name); + const blink::WebString& vfs_file_name); virtual long long databaseGetFileSize( - const WebKit::WebString& vfs_file_name); + const blink::WebString& vfs_file_name); virtual long long databaseGetSpaceAvailableForOrigin( - const WebKit::WebString& origin_identifier); - virtual WebKit::WebString signedPublicKeyAndChallengeString( + const blink::WebString& origin_identifier); + virtual blink::WebString signedPublicKeyAndChallengeString( unsigned key_size_index, - const WebKit::WebString& challenge, - const WebKit::WebURL& url); + const blink::WebString& challenge, + const blink::WebURL& url); virtual void getPluginList(bool refresh, - WebKit::WebPluginListBuilder* builder); - virtual void screenColorProfile(WebKit::WebVector<char>* to_profile); - virtual WebKit::WebIDBFactory* idbFactory(); - virtual WebKit::WebFileSystem* fileSystem(); + blink::WebPluginListBuilder* builder); + virtual void screenColorProfile(blink::WebVector<char>* to_profile); + virtual blink::WebIDBFactory* idbFactory(); + virtual blink::WebFileSystem* fileSystem(); virtual bool canAccelerate2dCanvas(); virtual bool isThreadedCompositingEnabled(); virtual double audioHardwareSampleRate(); @@ -97,53 +97,53 @@ class CONTENT_EXPORT RendererWebKitPlatformSupportImpl virtual unsigned audioHardwareOutputChannels(); // TODO(crogers): remove deprecated API as soon as WebKit calls new API. - virtual WebKit::WebAudioDevice* createAudioDevice( + virtual blink::WebAudioDevice* createAudioDevice( size_t buffer_size, unsigned channels, double sample_rate, - WebKit::WebAudioDevice::RenderCallback* callback); + blink::WebAudioDevice::RenderCallback* callback); // TODO(crogers): remove deprecated API as soon as WebKit calls new API. - virtual WebKit::WebAudioDevice* createAudioDevice( + virtual blink::WebAudioDevice* createAudioDevice( size_t buffer_size, unsigned input_channels, unsigned channels, - double sample_rate, WebKit::WebAudioDevice::RenderCallback* callback); + double sample_rate, blink::WebAudioDevice::RenderCallback* callback); - virtual WebKit::WebAudioDevice* createAudioDevice( + virtual blink::WebAudioDevice* createAudioDevice( size_t buffer_size, unsigned input_channels, unsigned channels, - double sample_rate, WebKit::WebAudioDevice::RenderCallback* callback, - const WebKit::WebString& input_device_id); + double sample_rate, blink::WebAudioDevice::RenderCallback* callback, + const blink::WebString& input_device_id); virtual bool loadAudioResource( - WebKit::WebAudioBus* destination_bus, const char* audio_file_data, + blink::WebAudioBus* destination_bus, const char* audio_file_data, size_t data_size, double sample_rate); - virtual WebKit::WebContentDecryptionModule* createContentDecryptionModule( - const WebKit::WebString& key_system); - virtual WebKit::WebMIDIAccessor* - createMIDIAccessor(WebKit::WebMIDIAccessorClient* client); - - virtual WebKit::WebBlobRegistry* blobRegistry(); - virtual void sampleGamepads(WebKit::WebGamepads&); - virtual WebKit::WebString userAgent(const WebKit::WebURL& url); - virtual WebKit::WebRTCPeerConnectionHandler* createRTCPeerConnectionHandler( - WebKit::WebRTCPeerConnectionHandlerClient* client); - virtual WebKit::WebMediaStreamCenter* createMediaStreamCenter( - WebKit::WebMediaStreamCenterClient* client); + virtual blink::WebContentDecryptionModule* createContentDecryptionModule( + const blink::WebString& key_system); + virtual blink::WebMIDIAccessor* + createMIDIAccessor(blink::WebMIDIAccessorClient* client); + + virtual blink::WebBlobRegistry* blobRegistry(); + virtual void sampleGamepads(blink::WebGamepads&); + virtual blink::WebString userAgent(const blink::WebURL& url); + virtual blink::WebRTCPeerConnectionHandler* createRTCPeerConnectionHandler( + blink::WebRTCPeerConnectionHandlerClient* client); + virtual blink::WebMediaStreamCenter* createMediaStreamCenter( + blink::WebMediaStreamCenterClient* client); virtual bool processMemorySizesInBytes( size_t* private_bytes, size_t* shared_bytes); - virtual WebKit::WebGraphicsContext3D* createOffscreenGraphicsContext3D( - const WebKit::WebGraphicsContext3D::Attributes& attributes); - virtual WebKit::WebGraphicsContext3DProvider* + virtual blink::WebGraphicsContext3D* createOffscreenGraphicsContext3D( + const blink::WebGraphicsContext3D::Attributes& attributes); + virtual blink::WebGraphicsContext3DProvider* createSharedOffscreenGraphicsContext3DProvider(); - virtual WebKit::WebCompositorSupport* compositorSupport(); - virtual WebKit::WebString convertIDNToUnicode( - const WebKit::WebString& host, const WebKit::WebString& languages); + virtual blink::WebCompositorSupport* compositorSupport(); + virtual blink::WebString convertIDNToUnicode( + const blink::WebString& host, const blink::WebString& languages); virtual void setDeviceMotionListener( - WebKit::WebDeviceMotionListener* listener) OVERRIDE; + blink::WebDeviceMotionListener* listener) OVERRIDE; virtual void setDeviceOrientationListener( - WebKit::WebDeviceOrientationListener* listener) OVERRIDE; - virtual WebKit::WebCrypto* crypto() OVERRIDE; + blink::WebDeviceOrientationListener* listener) OVERRIDE; + virtual blink::WebCrypto* crypto() OVERRIDE; virtual void queryStorageUsageAndQuota( - const WebKit::WebURL& storage_partition, - WebKit::WebStorageQuotaType, - WebKit::WebStorageQuotaCallbacks*) OVERRIDE; + const blink::WebURL& storage_partition, + blink::WebStorageQuotaType, + blink::WebStorageQuotaCallbacks*) OVERRIDE; #if defined(OS_ANDROID) virtual void vibrate(unsigned int milliseconds); @@ -160,14 +160,14 @@ class CONTENT_EXPORT RendererWebKitPlatformSupportImpl static bool SetSandboxEnabledForTesting(bool enable); // Set WebGamepads to return when sampleGamepads() is invoked. - static void SetMockGamepadsForTesting(const WebKit::WebGamepads& pads); + static void SetMockGamepadsForTesting(const blink::WebGamepads& pads); // Set WebDeviceMotionData to return when setDeviceMotionListener is invoked. static void SetMockDeviceMotionDataForTesting( - const WebKit::WebDeviceMotionData& data); + const blink::WebDeviceMotionData& data); // Set WebDeviceOrientationData to return when setDeviceOrientationListener // is invoked. static void SetMockDeviceOrientationDataForTesting( - const WebKit::WebDeviceOrientationData& data); + const blink::WebDeviceOrientationData& data); private: bool CheckPreparsedJsCachingEnabled() const; @@ -193,11 +193,11 @@ class CONTENT_EXPORT RendererWebKitPlatformSupportImpl // If true, then a GetPlugins call is allowed to rescan the disk. bool plugin_refresh_allowed_; - scoped_ptr<WebKit::WebIDBFactory> web_idb_factory_; + scoped_ptr<blink::WebIDBFactory> web_idb_factory_; scoped_ptr<WebFileSystemImpl> web_file_system_; - scoped_ptr<WebKit::WebBlobRegistry> blob_registry_; + scoped_ptr<blink::WebBlobRegistry> blob_registry_; scoped_ptr<DeviceMotionEventPump> device_motion_event_pump_; scoped_ptr<DeviceOrientationEventPump> device_orientation_event_pump_; diff --git a/content/renderer/resource_fetcher_browsertest.cc b/content/renderer/resource_fetcher_browsertest.cc index 573fe4d..b03ad45 100644 --- a/content/renderer/resource_fetcher_browsertest.cc +++ b/content/renderer/resource_fetcher_browsertest.cc @@ -20,9 +20,9 @@ #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebView.h" -using WebKit::WebFrame; -using WebKit::WebURLRequest; -using WebKit::WebURLResponse; +using blink::WebFrame; +using blink::WebURLRequest; +using blink::WebURLResponse; namespace content { diff --git a/content/renderer/sad_plugin.cc b/content/renderer/sad_plugin.cc index a30788c..52d613d 100644 --- a/content/renderer/sad_plugin.cc +++ b/content/renderer/sad_plugin.cc @@ -13,7 +13,7 @@ namespace content { -void PaintSadPlugin(WebKit::WebCanvas* webcanvas, +void PaintSadPlugin(blink::WebCanvas* webcanvas, const gfx::Rect& plugin_rect, const SkBitmap& sad_plugin_bitmap) { const int width = plugin_rect.width(); diff --git a/content/renderer/sad_plugin.h b/content/renderer/sad_plugin.h index 827d705..4148c0a 100644 --- a/content/renderer/sad_plugin.h +++ b/content/renderer/sad_plugin.h @@ -17,7 +17,7 @@ namespace content { // Paints the sad plugin to the given canvas for the given plugin bounds. This // is used by both the NPAPI and the PPAPI out-of-process plugin impls. -void PaintSadPlugin(WebKit::WebCanvas* canvas, +void PaintSadPlugin(blink::WebCanvas* canvas, const gfx::Rect& plugin_rect, const SkBitmap& sad_plugin_bitmap); diff --git a/content/renderer/savable_resources.cc b/content/renderer/savable_resources.cc index f1b2fde..5e5e047 100644 --- a/content/renderer/savable_resources.cc +++ b/content/renderer/savable_resources.cc @@ -20,16 +20,16 @@ #include "third_party/WebKit/public/web/WebNodeList.h" #include "third_party/WebKit/public/web/WebView.h" -using WebKit::WebDocument; -using WebKit::WebElement; -using WebKit::WebFrame; -using WebKit::WebInputElement; -using WebKit::WebNode; -using WebKit::WebNodeCollection; -using WebKit::WebNodeList; -using WebKit::WebString; -using WebKit::WebVector; -using WebKit::WebView; +using blink::WebDocument; +using blink::WebElement; +using blink::WebFrame; +using blink::WebInputElement; +using blink::WebNode; +using blink::WebNodeCollection; +using blink::WebNodeList; +using blink::WebString; +using blink::WebVector; +using blink::WebView; namespace content { namespace { @@ -97,7 +97,7 @@ void GetSavableResourceLinkForElement( result->resources_list->push_back(u); // Insert referrer for above new resource link. result->referrer_urls_list->push_back(GURL()); - result->referrer_policies_list->push_back(WebKit::WebReferrerPolicyDefault); + result->referrer_policies_list->push_back(blink::WebReferrerPolicyDefault); } // Get all savable resource links from current WebFrameImpl object pointer. diff --git a/content/renderer/savable_resources.h b/content/renderer/savable_resources.h index 52b5114..9432692 100644 --- a/content/renderer/savable_resources.h +++ b/content/renderer/savable_resources.h @@ -12,7 +12,7 @@ #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" #include "url/gurl.h" -namespace WebKit { +namespace blink { class WebElement; class WebString; class WebView; @@ -32,7 +32,7 @@ struct SavableResourcesResult { // it matched with links one by one. std::vector<GURL>* referrer_urls_list; // and the corresponding referrer policies. - std::vector<WebKit::WebReferrerPolicy>* referrer_policies_list; + std::vector<blink::WebReferrerPolicy>* referrer_policies_list; // vector which contains all savable links of main frame and sub frames. std::vector<GURL>* frames_list; @@ -40,7 +40,7 @@ struct SavableResourcesResult { SavableResourcesResult( std::vector<GURL>* resources_list, std::vector<GURL>* referrer_urls_list, - std::vector<WebKit::WebReferrerPolicy>* referrer_policies_list, + std::vector<blink::WebReferrerPolicy>* referrer_policies_list, std::vector<GURL>* frames_list) : resources_list(resources_list), referrer_urls_list(referrer_urls_list), @@ -56,7 +56,7 @@ struct SavableResourcesResult { // will send those links to embedder. Return value indicates whether we get // all saved resource links successfully. CONTENT_EXPORT bool GetAllSavableResourceLinksForCurrentPage( - WebKit::WebView* view, + blink::WebView* view, const GURL& page_url, SavableResourcesResult* savable_resources_result, const char** savable_schemes); @@ -66,8 +66,8 @@ CONTENT_EXPORT bool GetAllSavableResourceLinksForCurrentPage( // the value in "href". For BODY, TABLE, TR, TD, returns the value in // "background". For BLOCKQUOTE, Q, DEL, INS, returns the value in "cite" // attribute. Otherwise returns a null WebString. -CONTENT_EXPORT WebKit::WebString GetSubResourceLinkFromElement( - const WebKit::WebElement& element); +CONTENT_EXPORT blink::WebString GetSubResourceLinkFromElement( + const blink::WebElement& element); } // namespace content diff --git a/content/renderer/savable_resources_browsertest.cc b/content/renderer/savable_resources_browsertest.cc index a7ad83a..5f7a0ca 100644 --- a/content/renderer/savable_resources_browsertest.cc +++ b/content/renderer/savable_resources_browsertest.cc @@ -53,7 +53,7 @@ class SavableResourcesTest : public ContentBrowserTest { // Get all savable resource links for the page. std::vector<GURL> resources_list; std::vector<GURL> referrer_urls_list; - std::vector<WebKit::WebReferrerPolicy> referrer_policies_list; + std::vector<blink::WebReferrerPolicy> referrer_policies_list; std::vector<GURL> frames_list; SavableResourcesResult result(&resources_list, &referrer_urls_list, diff --git a/content/renderer/shared_worker_repository.cc b/content/renderer/shared_worker_repository.cc index e39fa37..66aae23 100644 --- a/content/renderer/shared_worker_repository.cc +++ b/content/renderer/shared_worker_repository.cc @@ -19,9 +19,9 @@ SharedWorkerRepository::SharedWorkerRepository(RenderViewImpl* render_view) SharedWorkerRepository::~SharedWorkerRepository() {} -WebKit::WebSharedWorker* SharedWorkerRepository::createSharedWorker( - const WebKit::WebURL& url, - const WebKit::WebString& name, +blink::WebSharedWorker* SharedWorkerRepository::createSharedWorker( + const blink::WebURL& url, + const blink::WebString& name, DocumentID document_id) { int route_id = MSG_ROUTING_NONE; bool exists = false; diff --git a/content/renderer/shared_worker_repository.h b/content/renderer/shared_worker_repository.h index 28c36d9..a51d7b3 100644 --- a/content/renderer/shared_worker_repository.h +++ b/content/renderer/shared_worker_repository.h @@ -16,15 +16,15 @@ namespace content { class RenderViewImpl; class SharedWorkerRepository : public RenderViewObserver, - public WebKit::WebSharedWorkerRepositoryClient { + public blink::WebSharedWorkerRepositoryClient { public: explicit SharedWorkerRepository(RenderViewImpl* render_view); virtual ~SharedWorkerRepository(); // WebSharedWorkerRepositoryClient overrides. - virtual WebKit::WebSharedWorker* createSharedWorker( - const WebKit::WebURL& url, - const WebKit::WebString& name, + virtual blink::WebSharedWorker* createSharedWorker( + const blink::WebURL& url, + const blink::WebString& name, DocumentID document_id) OVERRIDE; virtual void documentDetached(DocumentID document_id) OVERRIDE; diff --git a/content/renderer/skia_benchmarking_extension.cc b/content/renderer/skia_benchmarking_extension.cc index 42ae3b4..46fd14d 100644 --- a/content/renderer/skia_benchmarking_extension.cc +++ b/content/renderer/skia_benchmarking_extension.cc @@ -24,7 +24,7 @@ #include "ui/gfx/skia_util.h" #include "v8/include/v8.h" -using WebKit::WebFrame; +using blink::WebFrame; namespace { @@ -202,8 +202,8 @@ class SkiaBenchmarkingWrapper : public v8::Extension { : std::min(last_index, stop_index)); } - WebKit::WebArrayBuffer buffer = - WebKit::WebArrayBuffer::create(bitmap.getSize(), 1); + blink::WebArrayBuffer buffer = + blink::WebArrayBuffer::create(bitmap.getSize(), 1); uint32* packed_pixels = reinterpret_cast<uint32*>(bitmap.getPixels()); uint8* buffer_pixels = reinterpret_cast<uint8*>(buffer.data()); // Swizzle from native Skia format to RGBA as we copy out. diff --git a/content/renderer/speech_recognition_dispatcher.cc b/content/renderer/speech_recognition_dispatcher.cc index cf7c2fe..1ac2237 100644 --- a/content/renderer/speech_recognition_dispatcher.cc +++ b/content/renderer/speech_recognition_dispatcher.cc @@ -15,13 +15,13 @@ #include "third_party/WebKit/public/web/WebSpeechRecognitionResult.h" #include "third_party/WebKit/public/web/WebSpeechRecognizerClient.h" -using WebKit::WebVector; -using WebKit::WebString; -using WebKit::WebSpeechGrammar; -using WebKit::WebSpeechRecognitionHandle; -using WebKit::WebSpeechRecognitionResult; -using WebKit::WebSpeechRecognitionParams; -using WebKit::WebSpeechRecognizerClient; +using blink::WebVector; +using blink::WebString; +using blink::WebSpeechGrammar; +using blink::WebSpeechRecognitionHandle; +using blink::WebSpeechRecognitionResult; +using blink::WebSpeechRecognitionParams; +using blink::WebSpeechRecognizerClient; namespace content { diff --git a/content/renderer/speech_recognition_dispatcher.h b/content/renderer/speech_recognition_dispatcher.h index bffb0c8..297f174 100644 --- a/content/renderer/speech_recognition_dispatcher.h +++ b/content/renderer/speech_recognition_dispatcher.h @@ -23,7 +23,7 @@ struct SpeechRecognitionResult; // scripted JS speech APIs. It's the complement of // SpeechRecognitionDispatcherHost (owned by RenderViewHost). class SpeechRecognitionDispatcher : public RenderViewObserver, - public WebKit::WebSpeechRecognizer { + public blink::WebSpeechRecognizer { public: explicit SpeechRecognitionDispatcher(RenderViewImpl* render_view); virtual ~SpeechRecognitionDispatcher(); @@ -32,14 +32,14 @@ class SpeechRecognitionDispatcher : public RenderViewObserver, // RenderViewObserver implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - // WebKit::WebSpeechRecognizer implementation. - virtual void start(const WebKit::WebSpeechRecognitionHandle&, - const WebKit::WebSpeechRecognitionParams&, - WebKit::WebSpeechRecognizerClient*) OVERRIDE; - virtual void stop(const WebKit::WebSpeechRecognitionHandle&, - WebKit::WebSpeechRecognizerClient*) OVERRIDE; - virtual void abort(const WebKit::WebSpeechRecognitionHandle&, - WebKit::WebSpeechRecognizerClient*) OVERRIDE; + // blink::WebSpeechRecognizer implementation. + virtual void start(const blink::WebSpeechRecognitionHandle&, + const blink::WebSpeechRecognitionParams&, + blink::WebSpeechRecognizerClient*) OVERRIDE; + virtual void stop(const blink::WebSpeechRecognitionHandle&, + blink::WebSpeechRecognizerClient*) OVERRIDE; + virtual void abort(const blink::WebSpeechRecognitionHandle&, + blink::WebSpeechRecognizerClient*) OVERRIDE; void OnRecognitionStarted(int request_id); void OnAudioStarted(int request_id); @@ -51,14 +51,14 @@ class SpeechRecognitionDispatcher : public RenderViewObserver, void OnResultsRetrieved(int request_id, const SpeechRecognitionResults& result); - int GetOrCreateIDForHandle(const WebKit::WebSpeechRecognitionHandle& handle); - bool HandleExists(const WebKit::WebSpeechRecognitionHandle& handle); - const WebKit::WebSpeechRecognitionHandle& GetHandleFromID(int handle_id); + int GetOrCreateIDForHandle(const blink::WebSpeechRecognitionHandle& handle); + bool HandleExists(const blink::WebSpeechRecognitionHandle& handle); + const blink::WebSpeechRecognitionHandle& GetHandleFromID(int handle_id); // The WebKit client class that we use to send events back to the JS world. - WebKit::WebSpeechRecognizerClient* recognizer_client_; + blink::WebSpeechRecognizerClient* recognizer_client_; - typedef std::map<int, WebKit::WebSpeechRecognitionHandle> HandleMap; + typedef std::map<int, blink::WebSpeechRecognitionHandle> HandleMap; HandleMap handle_map_; int next_id_; diff --git a/content/renderer/stats_collection_controller.cc b/content/renderer/stats_collection_controller.cc index f82a8c4..9f610ef 100644 --- a/content/renderer/stats_collection_controller.cc +++ b/content/renderer/stats_collection_controller.cc @@ -23,11 +23,11 @@ namespace content { namespace { bool CurrentRenderViewImpl(RenderViewImpl** out) { - WebKit::WebFrame* web_frame = WebKit::WebFrame::frameForCurrentContext(); + blink::WebFrame* web_frame = blink::WebFrame::frameForCurrentContext(); if (!web_frame) return false; - WebKit::WebView* web_view = web_frame->view(); + blink::WebView* web_view = web_frame->view(); if (!web_view) return false; diff --git a/content/renderer/text_input_client_observer.cc b/content/renderer/text_input_client_observer.cc index cec5e1a..6d89203 100644 --- a/content/renderer/text_input_client_observer.cc +++ b/content/renderer/text_input_client_observer.cc @@ -38,12 +38,12 @@ bool TextInputClientObserver::OnMessageReceived(const IPC::Message& message) { return handled; } -WebKit::WebView* TextInputClientObserver::webview() { +blink::WebView* TextInputClientObserver::webview() { return render_view()->GetWebView(); } void TextInputClientObserver::OnCharacterIndexForPoint(gfx::Point point) { - WebKit::WebPoint web_point(point); + blink::WebPoint web_point(point); size_t index = webview()->focusedFrame()->characterIndexForPoint(web_point); Send(new TextInputClientReplyMsg_GotCharacterIndexForPoint(routing_id(), index)); @@ -55,9 +55,9 @@ void TextInputClientObserver::OnFirstRectForCharacterRange(gfx::Range range) { if (!render_view_impl_->GetPepperCaretBounds(&rect)) #endif { - WebKit::WebFrame* frame = webview()->focusedFrame(); + blink::WebFrame* frame = webview()->focusedFrame(); if (frame) { - WebKit::WebRect web_rect; + blink::WebRect web_rect; frame->firstRectForCharacterRange(range.start(), range.length(), web_rect); rect = web_rect; @@ -69,9 +69,9 @@ void TextInputClientObserver::OnFirstRectForCharacterRange(gfx::Range range) { void TextInputClientObserver::OnStringForRange(gfx::Range range) { #if defined(OS_MACOSX) NSAttributedString* string = nil; - WebKit::WebFrame* frame = webview()->focusedFrame(); + blink::WebFrame* frame = webview()->focusedFrame(); if (frame) { - string = WebKit::WebSubstringUtil::attributedSubstringInRange( + string = blink::WebSubstringUtil::attributedSubstringInRange( frame, range.start(), range.length()); } scoped_ptr<const mac::AttributedStringCoder::EncodedString> encoded( diff --git a/content/renderer/text_input_client_observer.h b/content/renderer/text_input_client_observer.h index 4c8b9a6..cd67418 100644 --- a/content/renderer/text_input_client_observer.h +++ b/content/renderer/text_input_client_observer.h @@ -11,7 +11,7 @@ #include "ui/gfx/point.h" #include "ui/gfx/range/range.h" -namespace WebKit { +namespace blink { class WebView; } @@ -32,7 +32,7 @@ class TextInputClientObserver : public RenderViewObserver { private: // Returns the WebView of the RenderView. - WebKit::WebView* webview(); + blink::WebView* webview(); // IPC Message handlers: void OnCharacterIndexForPoint(gfx::Point point); diff --git a/content/renderer/v8_value_converter_impl.cc b/content/renderer/v8_value_converter_impl.cc index ab2a633..2f139cf 100644 --- a/content/renderer/v8_value_converter_impl.cc +++ b/content/renderer/v8_value_converter_impl.cc @@ -217,8 +217,8 @@ v8::Handle<v8::Value> V8ValueConverterImpl::ToV8Object( v8::Handle<v8::Value> V8ValueConverterImpl::ToArrayBuffer( const base::BinaryValue* value) const { - WebKit::WebArrayBuffer buffer = - WebKit::WebArrayBuffer::create(value->GetSize(), 1); + blink::WebArrayBuffer buffer = + blink::WebArrayBuffer::create(value->GetSize(), 1); memcpy(buffer.data(), value->GetBuffer(), value->GetSize()); return buffer.toV8Value(); } @@ -346,14 +346,14 @@ base::BinaryValue* V8ValueConverterImpl::FromV8Buffer( char* data = NULL; size_t length = 0; - scoped_ptr<WebKit::WebArrayBuffer> array_buffer( - WebKit::WebArrayBuffer::createFromV8Value(val)); - scoped_ptr<WebKit::WebArrayBufferView> view; + scoped_ptr<blink::WebArrayBuffer> array_buffer( + blink::WebArrayBuffer::createFromV8Value(val)); + scoped_ptr<blink::WebArrayBufferView> view; if (array_buffer) { data = reinterpret_cast<char*>(array_buffer->data()); length = array_buffer->byteLength(); } else { - view.reset(WebKit::WebArrayBufferView::createFromV8Value(val)); + view.reset(blink::WebArrayBufferView::createFromV8Value(val)); if (view) { data = reinterpret_cast<char*>(view->baseAddress()) + view->byteOffset(); length = view->byteLength(); diff --git a/content/renderer/web_preferences.cc b/content/renderer/web_preferences.cc index 6a1db98..ee27e92 100644 --- a/content/renderer/web_preferences.cc +++ b/content/renderer/web_preferences.cc @@ -16,18 +16,18 @@ #include "third_party/icu/source/common/unicode/uscript.h" #include "webkit/common/webpreferences.h" -using WebKit::WebNetworkStateNotifier; -using WebKit::WebRuntimeFeatures; -using WebKit::WebSettings; -using WebKit::WebString; -using WebKit::WebURL; -using WebKit::WebView; +using blink::WebNetworkStateNotifier; +using blink::WebRuntimeFeatures; +using blink::WebSettings; +using blink::WebString; +using blink::WebURL; +using blink::WebView; namespace content { namespace { -typedef void (*SetFontFamilyWrapper)(WebKit::WebSettings*, +typedef void (*SetFontFamilyWrapper)(blink::WebSettings*, const base::string16&, UScriptCode); diff --git a/content/renderer/web_ui_extension.cc b/content/renderer/web_ui_extension.cc index 9616dbb..2675f39 100644 --- a/content/renderer/web_ui_extension.cc +++ b/content/renderer/web_ui_extension.cc @@ -54,7 +54,7 @@ class WebUIExtensionWrapper : public v8::Extension { static void GetVariableValue(const v8::FunctionCallbackInfo<v8::Value>& args); private: - static bool ShouldRespondToRequest(WebKit::WebFrame** frame_ptr, + static bool ShouldRespondToRequest(blink::WebFrame** frame_ptr, RenderView** render_view_ptr); DISALLOW_COPY_AND_ASSIGN(WebUIExtensionWrapper); @@ -76,9 +76,9 @@ v8::Handle<v8::FunctionTemplate> WebUIExtensionWrapper::GetNativeFunction( // static bool WebUIExtensionWrapper::ShouldRespondToRequest( - WebKit::WebFrame** frame_ptr, + blink::WebFrame** frame_ptr, RenderView** render_view_ptr) { - WebKit::WebFrame* frame = WebKit::WebFrame::frameForCurrentContext(); + blink::WebFrame* frame = blink::WebFrame::frameForCurrentContext(); if (!frame || !frame->view()) return false; @@ -104,7 +104,7 @@ bool WebUIExtensionWrapper::ShouldRespondToRequest( // static void WebUIExtensionWrapper::Send( const v8::FunctionCallbackInfo<v8::Value>& args) { - WebKit::WebFrame* frame; + blink::WebFrame* frame; RenderView* render_view; if (!ShouldRespondToRequest(&frame, &render_view)) return; @@ -145,7 +145,7 @@ void WebUIExtensionWrapper::Send( // static void WebUIExtensionWrapper::GetVariableValue( const v8::FunctionCallbackInfo<v8::Value>& args) { - WebKit::WebFrame* frame; + blink::WebFrame* frame; RenderView* render_view; if (!ShouldRespondToRequest(&frame, &render_view)) return; diff --git a/content/renderer/webclipboard_impl.cc b/content/renderer/webclipboard_impl.cc index 0a73576..3232eca 100644 --- a/content/renderer/webclipboard_impl.cc +++ b/content/renderer/webclipboard_impl.cc @@ -25,13 +25,13 @@ #include "url/gurl.h" #include "webkit/glue/webkit_glue.h" -using WebKit::WebClipboard; -using WebKit::WebData; -using WebKit::WebDragData; -using WebKit::WebImage; -using WebKit::WebString; -using WebKit::WebURL; -using WebKit::WebVector; +using blink::WebClipboard; +using blink::WebData; +using blink::WebDragData; +using blink::WebImage; +using blink::WebString; +using blink::WebURL; +using blink::WebVector; namespace content { diff --git a/content/renderer/webclipboard_impl.h b/content/renderer/webclipboard_impl.h index 926ca2c..477f53b 100644 --- a/content/renderer/webclipboard_impl.h +++ b/content/renderer/webclipboard_impl.h @@ -15,7 +15,7 @@ namespace content { class ClipboardClient; -class WebClipboardImpl : public WebKit::WebClipboard { +class WebClipboardImpl : public blink::WebClipboard { public: explicit WebClipboardImpl(ClipboardClient* client); @@ -24,28 +24,28 @@ class WebClipboardImpl : public WebKit::WebClipboard { // WebClipboard methods: virtual uint64 sequenceNumber(Buffer buffer); virtual bool isFormatAvailable(Format format, Buffer buffer); - virtual WebKit::WebVector<WebKit::WebString> readAvailableTypes( + virtual blink::WebVector<blink::WebString> readAvailableTypes( Buffer buffer, bool* contains_filenames); - virtual WebKit::WebString readPlainText(Buffer buffer); - virtual WebKit::WebString readHTML( + virtual blink::WebString readPlainText(Buffer buffer); + virtual blink::WebString readHTML( Buffer buffer, - WebKit::WebURL* source_url, + blink::WebURL* source_url, unsigned* fragment_start, unsigned* fragment_end); - virtual WebKit::WebData readImage(Buffer buffer); - virtual WebKit::WebString readCustomData( - Buffer buffer, const WebKit::WebString& type); - virtual void writePlainText(const WebKit::WebString& plain_text); + virtual blink::WebData readImage(Buffer buffer); + virtual blink::WebString readCustomData( + Buffer buffer, const blink::WebString& type); + virtual void writePlainText(const blink::WebString& plain_text); virtual void writeHTML( - const WebKit::WebString& html_text, - const WebKit::WebURL& source_url, - const WebKit::WebString& plain_text, + const blink::WebString& html_text, + const blink::WebURL& source_url, + const blink::WebString& plain_text, bool write_smart_paste); virtual void writeImage( - const WebKit::WebImage& image, - const WebKit::WebURL& source_url, - const WebKit::WebString& title); - virtual void writeDataObject(const WebKit::WebDragData& data); + const blink::WebImage& image, + const blink::WebURL& source_url, + const blink::WebString& title); + virtual void writeDataObject(const blink::WebDragData& data); private: bool ConvertBufferType(Buffer, ui::ClipboardType*); diff --git a/content/renderer/webcrypto/webcrypto_impl.cc b/content/renderer/webcrypto/webcrypto_impl.cc index 38dc772..2269030 100644 --- a/content/renderer/webcrypto/webcrypto_impl.cc +++ b/content/renderer/webcrypto/webcrypto_impl.cc @@ -14,12 +14,12 @@ namespace content { namespace { -bool IsAlgorithmAsymmetric(const WebKit::WebCryptoAlgorithm& algorithm) { +bool IsAlgorithmAsymmetric(const blink::WebCryptoAlgorithm& algorithm) { // TODO(padolph): include all other asymmetric algorithms once they are // defined, e.g. EC and DH. - return (algorithm.id() == WebKit::WebCryptoAlgorithmIdRsaEsPkcs1v1_5 || - algorithm.id() == WebKit::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5 || - algorithm.id() == WebKit::WebCryptoAlgorithmIdRsaOaep); + return (algorithm.id() == blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5 || + algorithm.id() == blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5 || + algorithm.id() == blink::WebCryptoAlgorithmIdRsaOaep); } } // namespace @@ -32,28 +32,28 @@ WebCryptoImpl::WebCryptoImpl() { // TODO(eroman): This works by re-allocating a new buffer. It would be better if // the WebArrayBuffer could just be truncated instead. void WebCryptoImpl::ShrinkBuffer( - WebKit::WebArrayBuffer* buffer, + blink::WebArrayBuffer* buffer, unsigned new_size) { DCHECK_LE(new_size, buffer->byteLength()); if (new_size == buffer->byteLength()) return; - WebKit::WebArrayBuffer new_buffer = - WebKit::WebArrayBuffer::create(new_size, 1); + blink::WebArrayBuffer new_buffer = + blink::WebArrayBuffer::create(new_size, 1); DCHECK(!new_buffer.isNull()); memcpy(new_buffer.data(), buffer->data(), new_size); *buffer = new_buffer; } void WebCryptoImpl::encrypt( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebCryptoResult result) { + blink::WebCryptoResult result) { DCHECK(!algorithm.isNull()); - WebKit::WebArrayBuffer buffer; + blink::WebArrayBuffer buffer; if (!EncryptInternal(algorithm, key, data, data_size, &buffer)) { result.completeWithError(); } else { @@ -62,13 +62,13 @@ void WebCryptoImpl::encrypt( } void WebCryptoImpl::decrypt( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebCryptoResult result) { + blink::WebCryptoResult result) { DCHECK(!algorithm.isNull()); - WebKit::WebArrayBuffer buffer; + blink::WebArrayBuffer buffer; if (!DecryptInternal(algorithm, key, data, data_size, &buffer)) { result.completeWithError(); } else { @@ -77,12 +77,12 @@ void WebCryptoImpl::decrypt( } void WebCryptoImpl::digest( - const WebKit::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoAlgorithm& algorithm, const unsigned char* data, unsigned data_size, - WebKit::WebCryptoResult result) { + blink::WebCryptoResult result) { DCHECK(!algorithm.isNull()); - WebKit::WebArrayBuffer buffer; + blink::WebArrayBuffer buffer; if (!DigestInternal(algorithm, data, data_size, &buffer)) { result.completeWithError(); } else { @@ -91,14 +91,14 @@ void WebCryptoImpl::digest( } void WebCryptoImpl::generateKey( - const WebKit::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoAlgorithm& algorithm, bool extractable, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoResult result) { + blink::WebCryptoKeyUsageMask usage_mask, + blink::WebCryptoResult result) { DCHECK(!algorithm.isNull()); if (IsAlgorithmAsymmetric(algorithm)) { - WebKit::WebCryptoKey public_key = WebKit::WebCryptoKey::createNull(); - WebKit::WebCryptoKey private_key = WebKit::WebCryptoKey::createNull(); + blink::WebCryptoKey public_key = blink::WebCryptoKey::createNull(); + blink::WebCryptoKey private_key = blink::WebCryptoKey::createNull(); if (!GenerateKeyPairInternal( algorithm, extractable, usage_mask, &public_key, &private_key)) { result.completeWithError(); @@ -118,7 +118,7 @@ void WebCryptoImpl::generateKey( result.completeWithKeyPair(public_key, private_key); } } else { - WebKit::WebCryptoKey key = WebKit::WebCryptoKey::createNull(); + blink::WebCryptoKey key = blink::WebCryptoKey::createNull(); if (!GenerateKeyInternal(algorithm, extractable, usage_mask, &key)) { result.completeWithError(); } else { @@ -132,14 +132,14 @@ void WebCryptoImpl::generateKey( } void WebCryptoImpl::importKey( - WebKit::WebCryptoKeyFormat format, + blink::WebCryptoKeyFormat format, const unsigned char* key_data, unsigned key_data_size, - const WebKit::WebCryptoAlgorithm& algorithm_or_null, + const blink::WebCryptoAlgorithm& algorithm_or_null, bool extractable, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoResult result) { - WebKit::WebCryptoKey key = WebKit::WebCryptoKey::createNull(); + blink::WebCryptoKeyUsageMask usage_mask, + blink::WebCryptoResult result) { + blink::WebCryptoKey key = blink::WebCryptoKey::createNull(); if (!ImportKeyInternal(format, key_data, key_data_size, @@ -157,13 +157,13 @@ void WebCryptoImpl::importKey( } void WebCryptoImpl::sign( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebCryptoResult result) { + blink::WebCryptoResult result) { DCHECK(!algorithm.isNull()); - WebKit::WebArrayBuffer buffer; + blink::WebArrayBuffer buffer; if (!SignInternal(algorithm, key, data, data_size, &buffer)) { result.completeWithError(); } else { @@ -172,13 +172,13 @@ void WebCryptoImpl::sign( } void WebCryptoImpl::verifySignature( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* signature, unsigned signature_size, const unsigned char* data, unsigned data_size, - WebKit::WebCryptoResult result) { + blink::WebCryptoResult result) { DCHECK(!algorithm.isNull()); bool signature_match = false; if (!VerifySignatureInternal(algorithm, diff --git a/content/renderer/webcrypto/webcrypto_impl.h b/content/renderer/webcrypto/webcrypto_impl.h index 87c611a..6c6a6b0 100644 --- a/content/renderer/webcrypto/webcrypto_impl.h +++ b/content/renderer/webcrypto/webcrypto_impl.h @@ -13,56 +13,56 @@ namespace content { class CONTENT_EXPORT WebCryptoImpl - : NON_EXPORTED_BASE(public WebKit::WebCrypto) { + : NON_EXPORTED_BASE(public blink::WebCrypto) { public: WebCryptoImpl(); virtual void encrypt( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebCryptoResult result); + blink::WebCryptoResult result); virtual void decrypt( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebCryptoResult result); + blink::WebCryptoResult result); virtual void digest( - const WebKit::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoAlgorithm& algorithm, const unsigned char* data, unsigned data_size, - WebKit::WebCryptoResult result); + blink::WebCryptoResult result); virtual void generateKey( - const WebKit::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoAlgorithm& algorithm, bool extractable, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoResult result); + blink::WebCryptoKeyUsageMask usage_mask, + blink::WebCryptoResult result); virtual void importKey( - WebKit::WebCryptoKeyFormat format, + blink::WebCryptoKeyFormat format, const unsigned char* key_data, unsigned key_data_size, - const WebKit::WebCryptoAlgorithm& algorithm_or_null, + const blink::WebCryptoAlgorithm& algorithm_or_null, bool extractable, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoResult result); + blink::WebCryptoKeyUsageMask usage_mask, + blink::WebCryptoResult result); virtual void sign( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebCryptoResult result); + blink::WebCryptoResult result); virtual void verifySignature( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* signature, unsigned signature_size, const unsigned char* data, unsigned data_size, - WebKit::WebCryptoResult result); + blink::WebCryptoResult result); - static void ShrinkBuffer(WebKit::WebArrayBuffer* buffer, unsigned new_size); + static void ShrinkBuffer(blink::WebArrayBuffer* buffer, unsigned new_size); protected: friend class WebCryptoImplTest; @@ -70,50 +70,50 @@ class CONTENT_EXPORT WebCryptoImpl void Init(); bool EncryptInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer); + blink::WebArrayBuffer* buffer); bool DecryptInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer); + blink::WebArrayBuffer* buffer); bool DigestInternal( - const WebKit::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoAlgorithm& algorithm, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer); + blink::WebArrayBuffer* buffer); bool GenerateKeyInternal( - const WebKit::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoAlgorithm& algorithm, bool extractable, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoKey* key); + blink::WebCryptoKeyUsageMask usage_mask, + blink::WebCryptoKey* key); bool GenerateKeyPairInternal( - const WebKit::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoAlgorithm& algorithm, bool extractable, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoKey* public_key, - WebKit::WebCryptoKey* private_key); + blink::WebCryptoKeyUsageMask usage_mask, + blink::WebCryptoKey* public_key, + blink::WebCryptoKey* private_key); bool ImportKeyInternal( - WebKit::WebCryptoKeyFormat format, + blink::WebCryptoKeyFormat format, const unsigned char* key_data, unsigned key_data_size, - const WebKit::WebCryptoAlgorithm& algorithm_or_null, + const blink::WebCryptoAlgorithm& algorithm_or_null, bool extractable, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoKey* key); + blink::WebCryptoKeyUsageMask usage_mask, + blink::WebCryptoKey* key); bool SignInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer); + blink::WebArrayBuffer* buffer); bool VerifySignatureInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* signature, unsigned signature_size, const unsigned char* data, diff --git a/content/renderer/webcrypto/webcrypto_impl_nss.cc b/content/renderer/webcrypto/webcrypto_impl_nss.cc index 2b143a5..1590a099 100644 --- a/content/renderer/webcrypto/webcrypto_impl_nss.cc +++ b/content/renderer/webcrypto/webcrypto_impl_nss.cc @@ -22,7 +22,7 @@ namespace content { namespace { -class SymKeyHandle : public WebKit::WebCryptoKeyHandle { +class SymKeyHandle : public blink::WebCryptoKeyHandle { public: explicit SymKeyHandle(crypto::ScopedPK11SymKey key) : key_(key.Pass()) {} @@ -34,7 +34,7 @@ class SymKeyHandle : public WebKit::WebCryptoKeyHandle { DISALLOW_COPY_AND_ASSIGN(SymKeyHandle); }; -class PublicKeyHandle : public WebKit::WebCryptoKeyHandle { +class PublicKeyHandle : public blink::WebCryptoKeyHandle { public: explicit PublicKeyHandle(crypto::ScopedSECKEYPublicKey key) : key_(key.Pass()) {} @@ -47,7 +47,7 @@ class PublicKeyHandle : public WebKit::WebCryptoKeyHandle { DISALLOW_COPY_AND_ASSIGN(PublicKeyHandle); }; -class PrivateKeyHandle : public WebKit::WebCryptoKeyHandle { +class PrivateKeyHandle : public blink::WebCryptoKeyHandle { public: explicit PrivateKeyHandle(crypto::ScopedSECKEYPrivateKey key) : key_(key.Pass()) {} @@ -61,17 +61,17 @@ class PrivateKeyHandle : public WebKit::WebCryptoKeyHandle { }; HASH_HashType WebCryptoAlgorithmToNSSHashType( - const WebKit::WebCryptoAlgorithm& algorithm) { + const blink::WebCryptoAlgorithm& algorithm) { switch (algorithm.id()) { - case WebKit::WebCryptoAlgorithmIdSha1: + case blink::WebCryptoAlgorithmIdSha1: return HASH_AlgSHA1; - case WebKit::WebCryptoAlgorithmIdSha224: + case blink::WebCryptoAlgorithmIdSha224: return HASH_AlgSHA224; - case WebKit::WebCryptoAlgorithmIdSha256: + case blink::WebCryptoAlgorithmIdSha256: return HASH_AlgSHA256; - case WebKit::WebCryptoAlgorithmIdSha384: + case blink::WebCryptoAlgorithmIdSha384: return HASH_AlgSHA384; - case WebKit::WebCryptoAlgorithmIdSha512: + case blink::WebCryptoAlgorithmIdSha512: return HASH_AlgSHA512; default: // Not a digest algorithm. @@ -80,11 +80,11 @@ HASH_HashType WebCryptoAlgorithmToNSSHashType( } CK_MECHANISM_TYPE WebCryptoAlgorithmToHMACMechanism( - const WebKit::WebCryptoAlgorithm& algorithm) { + const blink::WebCryptoAlgorithm& algorithm) { switch (algorithm.id()) { - case WebKit::WebCryptoAlgorithmIdSha1: + case blink::WebCryptoAlgorithmIdSha1: return CKM_SHA_1_HMAC; - case WebKit::WebCryptoAlgorithmIdSha256: + case blink::WebCryptoAlgorithmIdSha256: return CKM_SHA256_HMAC; default: // Not a supported algorithm. @@ -94,19 +94,19 @@ CK_MECHANISM_TYPE WebCryptoAlgorithmToHMACMechanism( bool AesCbcEncryptDecrypt( CK_ATTRIBUTE_TYPE operation, - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer) { - DCHECK_EQ(WebKit::WebCryptoAlgorithmIdAesCbc, algorithm.id()); + blink::WebArrayBuffer* buffer) { + DCHECK_EQ(blink::WebCryptoAlgorithmIdAesCbc, algorithm.id()); DCHECK_EQ(algorithm.id(), key.algorithm().id()); - DCHECK_EQ(WebKit::WebCryptoKeyTypeSecret, key.type()); + DCHECK_EQ(blink::WebCryptoKeyTypeSecret, key.type()); DCHECK(operation == CKA_ENCRYPT || operation == CKA_DECRYPT); SymKeyHandle* sym_key = reinterpret_cast<SymKeyHandle*>(key.handle()); - const WebKit::WebCryptoAesCbcParams* params = algorithm.aesCbcParams(); + const blink::WebCryptoAesCbcParams* params = algorithm.aesCbcParams(); if (params->iv().size() != AES_BLOCK_SIZE) return false; @@ -148,7 +148,7 @@ bool AesCbcEncryptDecrypt( unsigned output_max_len = data_size + AES_BLOCK_SIZE; CHECK_GT(output_max_len, data_size); - *buffer = WebKit::WebArrayBuffer::create(output_max_len, 1); + *buffer = blink::WebArrayBuffer::create(output_max_len, 1); unsigned char* buffer_data = reinterpret_cast<unsigned char*>(buffer->data()); @@ -175,14 +175,14 @@ bool AesCbcEncryptDecrypt( } CK_MECHANISM_TYPE HmacAlgorithmToGenMechanism( - const WebKit::WebCryptoAlgorithm& algorithm) { - DCHECK_EQ(algorithm.id(), WebKit::WebCryptoAlgorithmIdHmac); - const WebKit::WebCryptoHmacKeyParams* params = algorithm.hmacKeyParams(); + const blink::WebCryptoAlgorithm& algorithm) { + DCHECK_EQ(algorithm.id(), blink::WebCryptoAlgorithmIdHmac); + const blink::WebCryptoHmacKeyParams* params = algorithm.hmacKeyParams(); DCHECK(params); switch (params->hash().id()) { - case WebKit::WebCryptoAlgorithmIdSha1: + case blink::WebCryptoAlgorithmIdSha1: return CKM_SHA_1_HMAC; - case WebKit::WebCryptoAlgorithmIdSha256: + case blink::WebCryptoAlgorithmIdSha256: return CKM_SHA256_HMAC; default: return CKM_INVALID_MECHANISM; @@ -190,11 +190,11 @@ CK_MECHANISM_TYPE HmacAlgorithmToGenMechanism( } CK_MECHANISM_TYPE WebCryptoAlgorithmToGenMechanism( - const WebKit::WebCryptoAlgorithm& algorithm) { + const blink::WebCryptoAlgorithm& algorithm) { switch (algorithm.id()) { - case WebKit::WebCryptoAlgorithmIdAesCbc: + case blink::WebCryptoAlgorithmIdAesCbc: return CKM_AES_KEY_GEN; - case WebKit::WebCryptoAlgorithmIdHmac: + case blink::WebCryptoAlgorithmIdHmac: return HmacAlgorithmToGenMechanism(algorithm); default: return CKM_INVALID_MECHANISM; @@ -202,14 +202,14 @@ CK_MECHANISM_TYPE WebCryptoAlgorithmToGenMechanism( } unsigned int WebCryptoHmacAlgorithmToBlockSize( - const WebKit::WebCryptoAlgorithm& algorithm) { - DCHECK_EQ(algorithm.id(), WebKit::WebCryptoAlgorithmIdHmac); - const WebKit::WebCryptoHmacKeyParams* params = algorithm.hmacKeyParams(); + const blink::WebCryptoAlgorithm& algorithm) { + DCHECK_EQ(algorithm.id(), blink::WebCryptoAlgorithmIdHmac); + const blink::WebCryptoHmacKeyParams* params = algorithm.hmacKeyParams(); DCHECK(params); switch (params->hash().id()) { - case WebKit::WebCryptoAlgorithmIdSha1: + case blink::WebCryptoAlgorithmIdSha1: return 512; - case WebKit::WebCryptoAlgorithmIdSha256: + case blink::WebCryptoAlgorithmIdSha256: return 512; default: return 0; @@ -245,12 +245,12 @@ void WebCryptoImpl::Init() { } bool WebCryptoImpl::EncryptInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer) { - if (algorithm.id() == WebKit::WebCryptoAlgorithmIdAesCbc) { + blink::WebArrayBuffer* buffer) { + if (algorithm.id() == blink::WebCryptoAlgorithmIdAesCbc) { return AesCbcEncryptDecrypt( CKA_ENCRYPT, algorithm, key, data, data_size, buffer); } @@ -259,12 +259,12 @@ bool WebCryptoImpl::EncryptInternal( } bool WebCryptoImpl::DecryptInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer) { - if (algorithm.id() == WebKit::WebCryptoAlgorithmIdAesCbc) { + blink::WebArrayBuffer* buffer) { + if (algorithm.id() == blink::WebCryptoAlgorithmIdAesCbc) { return AesCbcEncryptDecrypt( CKA_DECRYPT, algorithm, key, data, data_size, buffer); } @@ -273,10 +273,10 @@ bool WebCryptoImpl::DecryptInternal( } bool WebCryptoImpl::DigestInternal( - const WebKit::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoAlgorithm& algorithm, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer) { + blink::WebArrayBuffer* buffer) { HASH_HashType hash_type = WebCryptoAlgorithmToNSSHashType(algorithm); if (hash_type == HASH_AlgNULL) { return false; @@ -294,7 +294,7 @@ bool WebCryptoImpl::DigestInternal( unsigned hash_result_length = HASH_ResultLenContext(context); DCHECK_LE(hash_result_length, static_cast<size_t>(HASH_LENGTH_MAX)); - *buffer = WebKit::WebArrayBuffer::create(hash_result_length, 1); + *buffer = blink::WebArrayBuffer::create(hash_result_length, 1); unsigned char* digest = reinterpret_cast<unsigned char*>(buffer->data()); @@ -307,38 +307,38 @@ bool WebCryptoImpl::DigestInternal( } bool WebCryptoImpl::GenerateKeyInternal( - const WebKit::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoAlgorithm& algorithm, bool extractable, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoKey* key) { + blink::WebCryptoKeyUsageMask usage_mask, + blink::WebCryptoKey* key) { CK_MECHANISM_TYPE mech = WebCryptoAlgorithmToGenMechanism(algorithm); unsigned int keylen_bytes = 0; - WebKit::WebCryptoKeyType key_type = WebKit::WebCryptoKeyTypeSecret; + blink::WebCryptoKeyType key_type = blink::WebCryptoKeyTypeSecret; if (mech == CKM_INVALID_MECHANISM) { return false; } switch (algorithm.id()) { - case WebKit::WebCryptoAlgorithmIdAesCbc: { - const WebKit::WebCryptoAesKeyGenParams* params = + case blink::WebCryptoAlgorithmIdAesCbc: { + const blink::WebCryptoAesKeyGenParams* params = algorithm.aesKeyGenParams(); DCHECK(params); keylen_bytes = params->length() / 8; if (params->length() % 8) return false; - key_type = WebKit::WebCryptoKeyTypeSecret; + key_type = blink::WebCryptoKeyTypeSecret; break; } - case WebKit::WebCryptoAlgorithmIdHmac: { - const WebKit::WebCryptoHmacKeyParams* params = algorithm.hmacKeyParams(); + case blink::WebCryptoAlgorithmIdHmac: { + const blink::WebCryptoHmacKeyParams* params = algorithm.hmacKeyParams(); DCHECK(params); if (!params->getLength(keylen_bytes)) { keylen_bytes = WebCryptoHmacAlgorithmToBlockSize(algorithm) / 8; } - key_type = WebKit::WebCryptoKeyTypeSecret; + key_type = blink::WebCryptoKeyTypeSecret; break; } @@ -363,25 +363,25 @@ bool WebCryptoImpl::GenerateKeyInternal( return false; } - *key = WebKit::WebCryptoKey::create( + *key = blink::WebCryptoKey::create( new SymKeyHandle(pk11_key.Pass()), key_type, extractable, algorithm, usage_mask); return true; } bool WebCryptoImpl::GenerateKeyPairInternal( - const WebKit::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoAlgorithm& algorithm, bool extractable, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoKey* public_key, - WebKit::WebCryptoKey* private_key) { + blink::WebCryptoKeyUsageMask usage_mask, + blink::WebCryptoKey* public_key, + blink::WebCryptoKey* private_key) { // TODO(padolph): Handle other asymmetric algorithm key generation. switch (algorithm.id()) { - case WebKit::WebCryptoAlgorithmIdRsaEsPkcs1v1_5: - case WebKit::WebCryptoAlgorithmIdRsaOaep: - case WebKit::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5: { - const WebKit::WebCryptoRsaKeyGenParams* const params = + case blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5: + case blink::WebCryptoAlgorithmIdRsaOaep: + case blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5: { + const blink::WebCryptoRsaKeyGenParams* const params = algorithm.rsaKeyGenParams(); DCHECK(params); @@ -403,11 +403,11 @@ bool WebCryptoImpl::GenerateKeyPairInternal( // possible operations for the given key type. CK_FLAGS operation_flags; switch (algorithm.id()) { - case WebKit::WebCryptoAlgorithmIdRsaEsPkcs1v1_5: - case WebKit::WebCryptoAlgorithmIdRsaOaep: + case blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5: + case blink::WebCryptoAlgorithmIdRsaOaep: operation_flags = CKF_ENCRYPT | CKF_DECRYPT | CKF_WRAP | CKF_UNWRAP; break; - case WebKit::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5: + case blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5: operation_flags = CKF_SIGN | CKF_VERIFY; break; default: @@ -441,15 +441,15 @@ bool WebCryptoImpl::GenerateKeyPairInternal( // extractable apply only to the private key and make the public key // always extractable. For now implement what the spec says and track the // spec bug here: https://www.w3.org/Bugs/Public/show_bug.cgi?id=23695 - *public_key = WebKit::WebCryptoKey::create( + *public_key = blink::WebCryptoKey::create( new PublicKeyHandle(crypto::ScopedSECKEYPublicKey(sec_public_key)), - WebKit::WebCryptoKeyTypePublic, + blink::WebCryptoKeyTypePublic, extractable, // probably should be 'true' always algorithm, usage_mask); - *private_key = WebKit::WebCryptoKey::create( + *private_key = blink::WebCryptoKey::create( new PrivateKeyHandle(scoped_sec_private_key.Pass()), - WebKit::WebCryptoKeyTypePrivate, + blink::WebCryptoKeyTypePrivate, extractable, algorithm, usage_mask); @@ -462,24 +462,24 @@ bool WebCryptoImpl::GenerateKeyPairInternal( } bool WebCryptoImpl::ImportKeyInternal( - WebKit::WebCryptoKeyFormat format, + blink::WebCryptoKeyFormat format, const unsigned char* key_data, unsigned key_data_size, - const WebKit::WebCryptoAlgorithm& algorithm_or_null, + const blink::WebCryptoAlgorithm& algorithm_or_null, bool extractable, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoKey* key) { + blink::WebCryptoKeyUsageMask usage_mask, + blink::WebCryptoKey* key) { // TODO(eroman): Currently expects algorithm to always be specified, as it is // required for raw format. if (algorithm_or_null.isNull()) return false; - const WebKit::WebCryptoAlgorithm& algorithm = algorithm_or_null; + const blink::WebCryptoAlgorithm& algorithm = algorithm_or_null; - WebKit::WebCryptoKeyType type; + blink::WebCryptoKeyType type; switch (algorithm.id()) { - case WebKit::WebCryptoAlgorithmIdHmac: - case WebKit::WebCryptoAlgorithmIdAesCbc: - type = WebKit::WebCryptoKeyTypeSecret; + case blink::WebCryptoAlgorithmIdHmac: + case blink::WebCryptoAlgorithmIdAesCbc: + type = blink::WebCryptoKeyTypeSecret; break; // TODO(bryaneyler): Support more key types. default: @@ -494,8 +494,8 @@ bool WebCryptoImpl::ImportKeyInternal( CK_FLAGS flags = 0; switch(algorithm.id()) { - case WebKit::WebCryptoAlgorithmIdHmac: { - const WebKit::WebCryptoHmacParams* params = algorithm.hmacParams(); + case blink::WebCryptoAlgorithmIdHmac: { + const blink::WebCryptoHmacParams* params = algorithm.hmacParams(); if (!params) { return false; } @@ -509,7 +509,7 @@ bool WebCryptoImpl::ImportKeyInternal( break; } - case WebKit::WebCryptoAlgorithmIdAesCbc: { + case blink::WebCryptoAlgorithmIdAesCbc: { mechanism = CKM_AES_CBC; flags |= CKF_ENCRYPT | CKF_DECRYPT; break; @@ -524,7 +524,7 @@ bool WebCryptoImpl::ImportKeyInternal( SECItem key_item = { siBuffer, NULL, 0 }; switch (format) { - case WebKit::WebCryptoKeyFormatRaw: + case blink::WebCryptoKeyFormatRaw: key_item.data = const_cast<unsigned char*>(key_data); key_item.len = key_data_size; break; @@ -546,22 +546,22 @@ bool WebCryptoImpl::ImportKeyInternal( return false; } - *key = WebKit::WebCryptoKey::create(new SymKeyHandle(pk11_sym_key.Pass()), + *key = blink::WebCryptoKey::create(new SymKeyHandle(pk11_sym_key.Pass()), type, extractable, algorithm, usage_mask); return true; } bool WebCryptoImpl::SignInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer) { - WebKit::WebArrayBuffer result; + blink::WebArrayBuffer* buffer) { + blink::WebArrayBuffer result; switch (algorithm.id()) { - case WebKit::WebCryptoAlgorithmIdHmac: { - const WebKit::WebCryptoHmacParams* params = algorithm.hmacParams(); + case blink::WebCryptoAlgorithmIdHmac: { + const blink::WebCryptoHmacParams* params = algorithm.hmacParams(); if (!params) { return false; } @@ -570,7 +570,7 @@ bool WebCryptoImpl::SignInternal( DCHECK_EQ(PK11_GetMechanism(sym_key->key()), WebCryptoAlgorithmToHMACMechanism(params->hash())); - DCHECK_NE(0, key.usages() & WebKit::WebCryptoKeyUsageSign); + DCHECK_NE(0, key.usages() & blink::WebCryptoKeyUsageSign); SECItem param_item = { siBuffer, NULL, 0 }; SECItem data_item = { @@ -592,7 +592,7 @@ bool WebCryptoImpl::SignInternal( DCHECK_NE(0u, signature_item.len); - result = WebKit::WebArrayBuffer::create(signature_item.len, 1); + result = blink::WebArrayBuffer::create(signature_item.len, 1); signature_item.data = reinterpret_cast<unsigned char*>(result.data()); if (PK11_SignWithSymKey(sym_key->key(), @@ -617,16 +617,16 @@ bool WebCryptoImpl::SignInternal( } bool WebCryptoImpl::VerifySignatureInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* signature, unsigned signature_size, const unsigned char* data, unsigned data_size, bool* signature_match) { switch (algorithm.id()) { - case WebKit::WebCryptoAlgorithmIdHmac: { - WebKit::WebArrayBuffer result; + case blink::WebCryptoAlgorithmIdHmac: { + blink::WebArrayBuffer result; if (!SignInternal(algorithm, key, data, data_size, &result)) { return false; } diff --git a/content/renderer/webcrypto/webcrypto_impl_openssl.cc b/content/renderer/webcrypto/webcrypto_impl_openssl.cc index 23f89c2..f3dc397 100644 --- a/content/renderer/webcrypto/webcrypto_impl_openssl.cc +++ b/content/renderer/webcrypto/webcrypto_impl_openssl.cc @@ -23,7 +23,7 @@ namespace content { namespace { -class SymKeyHandle : public WebKit::WebCryptoKeyHandle { +class SymKeyHandle : public blink::WebCryptoKeyHandle { public: SymKeyHandle(const unsigned char* key_data, unsigned key_data_size) : key_(key_data, key_data + key_data_size) {} @@ -51,18 +51,18 @@ const EVP_CIPHER* GetAESCipherByKeyLength(unsigned key_length_bytes) { } unsigned WebCryptoHmacParamsToBlockSize( - const WebKit::WebCryptoHmacKeyParams* params) { + const blink::WebCryptoHmacKeyParams* params) { DCHECK(params); switch (params->hash().id()) { - case WebKit::WebCryptoAlgorithmIdSha1: + case blink::WebCryptoAlgorithmIdSha1: return SHA_DIGEST_LENGTH / 8; - case WebKit::WebCryptoAlgorithmIdSha224: + case blink::WebCryptoAlgorithmIdSha224: return SHA224_DIGEST_LENGTH / 8; - case WebKit::WebCryptoAlgorithmIdSha256: + case blink::WebCryptoAlgorithmIdSha256: return SHA256_DIGEST_LENGTH / 8; - case WebKit::WebCryptoAlgorithmIdSha384: + case blink::WebCryptoAlgorithmIdSha384: return SHA384_DIGEST_LENGTH / 8; - case WebKit::WebCryptoAlgorithmIdSha512: + case blink::WebCryptoAlgorithmIdSha512: return SHA512_DIGEST_LENGTH / 8; default: return 0; @@ -76,18 +76,18 @@ enum CipherOperation { }; bool AesCbcEncryptDecrypt(CipherOperation cipher_operation, - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer) { + blink::WebArrayBuffer* buffer) { // TODO(padolph): Handle other encrypt operations and then remove this gate - if (algorithm.id() != WebKit::WebCryptoAlgorithmIdAesCbc) + if (algorithm.id() != blink::WebCryptoAlgorithmIdAesCbc) return false; DCHECK_EQ(algorithm.id(), key.algorithm().id()); - DCHECK_EQ(WebKit::WebCryptoKeyTypeSecret, key.type()); + DCHECK_EQ(blink::WebCryptoKeyTypeSecret, key.type()); if (data_size >= INT_MAX - AES_BLOCK_SIZE) { // TODO(padolph): Handle this by chunking the input fed into OpenSSL. Right @@ -110,7 +110,7 @@ bool AesCbcEncryptDecrypt(CipherOperation cipher_operation, GetAESCipherByKeyLength(sym_key->key().size()); DCHECK(cipher); - const WebKit::WebCryptoAesCbcParams* const params = algorithm.aesCbcParams(); + const blink::WebCryptoAesCbcParams* const params = algorithm.aesCbcParams(); if (params->iv().size() != AES_BLOCK_SIZE) return false; @@ -132,7 +132,7 @@ bool AesCbcEncryptDecrypt(CipherOperation cipher_operation, output_max_len += AES_BLOCK_SIZE - remainder; DCHECK_GT(output_max_len, data_size); - *buffer = WebKit::WebArrayBuffer::create(output_max_len, 1); + *buffer = blink::WebArrayBuffer::create(output_max_len, 1); unsigned char* const buffer_data = reinterpret_cast<unsigned char*>(buffer->data()); @@ -160,12 +160,12 @@ bool AesCbcEncryptDecrypt(CipherOperation cipher_operation, void WebCryptoImpl::Init() { crypto::EnsureOpenSSLInit(); } -bool WebCryptoImpl::EncryptInternal(const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, +bool WebCryptoImpl::EncryptInternal(const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer) { - if (algorithm.id() == WebKit::WebCryptoAlgorithmIdAesCbc) { + blink::WebArrayBuffer* buffer) { + if (algorithm.id() == blink::WebCryptoAlgorithmIdAesCbc) { return AesCbcEncryptDecrypt( kDoEncrypt, algorithm, key, data, data_size, buffer); } @@ -173,12 +173,12 @@ bool WebCryptoImpl::EncryptInternal(const WebKit::WebCryptoAlgorithm& algorithm, return false; } -bool WebCryptoImpl::DecryptInternal(const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, +bool WebCryptoImpl::DecryptInternal(const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer) { - if (algorithm.id() == WebKit::WebCryptoAlgorithmIdAesCbc) { + blink::WebArrayBuffer* buffer) { + if (algorithm.id() == blink::WebCryptoAlgorithmIdAesCbc) { return AesCbcEncryptDecrypt( kDoDecrypt, algorithm, key, data, data_size, buffer); } @@ -186,28 +186,28 @@ bool WebCryptoImpl::DecryptInternal(const WebKit::WebCryptoAlgorithm& algorithm, return false; } -bool WebCryptoImpl::DigestInternal(const WebKit::WebCryptoAlgorithm& algorithm, +bool WebCryptoImpl::DigestInternal(const blink::WebCryptoAlgorithm& algorithm, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer) { + blink::WebArrayBuffer* buffer) { crypto::OpenSSLErrStackTracer(FROM_HERE); const EVP_MD* digest_algorithm; switch (algorithm.id()) { - case WebKit::WebCryptoAlgorithmIdSha1: + case blink::WebCryptoAlgorithmIdSha1: digest_algorithm = EVP_sha1(); break; - case WebKit::WebCryptoAlgorithmIdSha224: + case blink::WebCryptoAlgorithmIdSha224: digest_algorithm = EVP_sha224(); break; - case WebKit::WebCryptoAlgorithmIdSha256: + case blink::WebCryptoAlgorithmIdSha256: digest_algorithm = EVP_sha256(); break; - case WebKit::WebCryptoAlgorithmIdSha384: + case blink::WebCryptoAlgorithmIdSha384: digest_algorithm = EVP_sha384(); break; - case WebKit::WebCryptoAlgorithmIdSha512: + case blink::WebCryptoAlgorithmIdSha512: digest_algorithm = EVP_sha512(); break; default: @@ -232,7 +232,7 @@ bool WebCryptoImpl::DigestInternal(const WebKit::WebCryptoAlgorithm& algorithm, } DCHECK_LE(hash_expected_size, EVP_MAX_MD_SIZE); - *buffer = WebKit::WebArrayBuffer::create(hash_expected_size, 1); + *buffer = blink::WebArrayBuffer::create(hash_expected_size, 1); unsigned char* const hash_buffer = reinterpret_cast<unsigned char* const>(buffer->data()); @@ -247,16 +247,16 @@ bool WebCryptoImpl::DigestInternal(const WebKit::WebCryptoAlgorithm& algorithm, } bool WebCryptoImpl::GenerateKeyInternal( - const WebKit::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoAlgorithm& algorithm, bool extractable, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoKey* key) { + blink::WebCryptoKeyUsageMask usage_mask, + blink::WebCryptoKey* key) { unsigned keylen_bytes = 0; - WebKit::WebCryptoKeyType key_type; + blink::WebCryptoKeyType key_type; switch (algorithm.id()) { - case WebKit::WebCryptoAlgorithmIdAesCbc: { - const WebKit::WebCryptoAesKeyGenParams* params = + case blink::WebCryptoAlgorithmIdAesCbc: { + const blink::WebCryptoAesKeyGenParams* params = algorithm.aesKeyGenParams(); DCHECK(params); if (params->length() % 8) @@ -265,16 +265,16 @@ bool WebCryptoImpl::GenerateKeyInternal( if (!GetAESCipherByKeyLength(keylen_bytes)) { return false; } - key_type = WebKit::WebCryptoKeyTypeSecret; + key_type = blink::WebCryptoKeyTypeSecret; break; } - case WebKit::WebCryptoAlgorithmIdHmac: { - const WebKit::WebCryptoHmacKeyParams* params = algorithm.hmacKeyParams(); + case blink::WebCryptoAlgorithmIdHmac: { + const blink::WebCryptoHmacKeyParams* params = algorithm.hmacKeyParams(); DCHECK(params); if (!params->getLength(keylen_bytes)) { keylen_bytes = WebCryptoHmacParamsToBlockSize(params); } - key_type = WebKit::WebCryptoKeyTypeSecret; + key_type = blink::WebCryptoKeyTypeSecret; break; } @@ -292,7 +292,7 @@ bool WebCryptoImpl::GenerateKeyInternal( return false; } - *key = WebKit::WebCryptoKey::create( + *key = blink::WebCryptoKey::create( new SymKeyHandle(&random_bytes[0], random_bytes.size()), key_type, extractable, algorithm, usage_mask); @@ -300,33 +300,33 @@ bool WebCryptoImpl::GenerateKeyInternal( } bool WebCryptoImpl::GenerateKeyPairInternal( - const WebKit::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoAlgorithm& algorithm, bool extractable, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoKey* public_key, - WebKit::WebCryptoKey* private_key) { + blink::WebCryptoKeyUsageMask usage_mask, + blink::WebCryptoKey* public_key, + blink::WebCryptoKey* private_key) { // TODO(padolph): Placeholder for OpenSSL implementation. // Issue http://crbug.com/267888. return false; } bool WebCryptoImpl::ImportKeyInternal( - WebKit::WebCryptoKeyFormat format, + blink::WebCryptoKeyFormat format, const unsigned char* key_data, unsigned key_data_size, - const WebKit::WebCryptoAlgorithm& algorithm_or_null, + const blink::WebCryptoAlgorithm& algorithm_or_null, bool extractable, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoKey* key) { + blink::WebCryptoKeyUsageMask usage_mask, + blink::WebCryptoKey* key) { // TODO(eroman): Currently expects algorithm to always be specified, as it is // required for raw format. if (algorithm_or_null.isNull()) return false; - const WebKit::WebCryptoAlgorithm& algorithm = algorithm_or_null; + const blink::WebCryptoAlgorithm& algorithm = algorithm_or_null; // TODO(padolph): Support all relevant alg types and then remove this gate. - if (algorithm.id() != WebKit::WebCryptoAlgorithmIdHmac && - algorithm.id() != WebKit::WebCryptoAlgorithmIdAesCbc) { + if (algorithm.id() != blink::WebCryptoAlgorithmIdHmac && + algorithm.id() != blink::WebCryptoAlgorithmIdAesCbc) { return false; } @@ -339,22 +339,22 @@ bool WebCryptoImpl::ImportKeyInternal( // they differ? (jwk, probably) // Symmetric keys are always type secret - WebKit::WebCryptoKeyType type = WebKit::WebCryptoKeyTypeSecret; + blink::WebCryptoKeyType type = blink::WebCryptoKeyTypeSecret; const unsigned char* raw_key_data; unsigned raw_key_data_size; switch (format) { - case WebKit::WebCryptoKeyFormatRaw: + case blink::WebCryptoKeyFormatRaw: raw_key_data = key_data; raw_key_data_size = key_data_size; // The NSS implementation fails when importing a raw AES key with a length // incompatible with AES. The line below is to match this behavior. - if (algorithm.id() == WebKit::WebCryptoAlgorithmIdAesCbc && + if (algorithm.id() == blink::WebCryptoAlgorithmIdAesCbc && !GetAESCipherByKeyLength(raw_key_data_size)) { return false; } break; - case WebKit::WebCryptoKeyFormatJwk: + case blink::WebCryptoKeyFormatJwk: // TODO(padolph): Handle jwk format; need simple JSON parser. // break; return false; @@ -362,7 +362,7 @@ bool WebCryptoImpl::ImportKeyInternal( return false; } - *key = WebKit::WebCryptoKey::create( + *key = blink::WebCryptoKey::create( new SymKeyHandle(raw_key_data, raw_key_data_size), type, extractable, algorithm, usage_mask); @@ -370,21 +370,21 @@ bool WebCryptoImpl::ImportKeyInternal( } bool WebCryptoImpl::SignInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer) { + blink::WebArrayBuffer* buffer) { - WebKit::WebArrayBuffer result; + blink::WebArrayBuffer result; switch (algorithm.id()) { - case WebKit::WebCryptoAlgorithmIdHmac: { + case blink::WebCryptoAlgorithmIdHmac: { - DCHECK_EQ(key.algorithm().id(), WebKit::WebCryptoAlgorithmIdHmac); - DCHECK_NE(0, key.usages() & WebKit::WebCryptoKeyUsageSign); + DCHECK_EQ(key.algorithm().id(), blink::WebCryptoAlgorithmIdHmac); + DCHECK_NE(0, key.usages() & blink::WebCryptoKeyUsageSign); - const WebKit::WebCryptoHmacParams* const params = algorithm.hmacParams(); + const blink::WebCryptoHmacParams* const params = algorithm.hmacParams(); if (!params) return false; @@ -392,23 +392,23 @@ bool WebCryptoImpl::SignInternal( unsigned int hmac_expected_length = 0; // Note that HMAC length is determined by the hash used. switch (params->hash().id()) { - case WebKit::WebCryptoAlgorithmIdSha1: + case blink::WebCryptoAlgorithmIdSha1: evp_sha = EVP_sha1(); hmac_expected_length = SHA_DIGEST_LENGTH; break; - case WebKit::WebCryptoAlgorithmIdSha224: + case blink::WebCryptoAlgorithmIdSha224: evp_sha = EVP_sha224(); hmac_expected_length = SHA224_DIGEST_LENGTH; break; - case WebKit::WebCryptoAlgorithmIdSha256: + case blink::WebCryptoAlgorithmIdSha256: evp_sha = EVP_sha256(); hmac_expected_length = SHA256_DIGEST_LENGTH; break; - case WebKit::WebCryptoAlgorithmIdSha384: + case blink::WebCryptoAlgorithmIdSha384: evp_sha = EVP_sha384(); hmac_expected_length = SHA384_DIGEST_LENGTH; break; - case WebKit::WebCryptoAlgorithmIdSha512: + case blink::WebCryptoAlgorithmIdSha512: evp_sha = EVP_sha512(); hmac_expected_length = SHA512_DIGEST_LENGTH; break; @@ -429,7 +429,7 @@ bool WebCryptoImpl::SignInternal( const unsigned char null_key[] = {}; const void* const raw_key_voidp = raw_key.size() ? &raw_key[0] : null_key; - result = WebKit::WebArrayBuffer::create(hmac_expected_length, 1); + result = blink::WebArrayBuffer::create(hmac_expected_length, 1); crypto::ScopedOpenSSLSafeSizeBuffer<EVP_MAX_MD_SIZE> hmac_result( reinterpret_cast<unsigned char*>(result.data()), hmac_expected_length); @@ -458,16 +458,16 @@ bool WebCryptoImpl::SignInternal( } bool WebCryptoImpl::VerifySignatureInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* signature, unsigned signature_size, const unsigned char* data, unsigned data_size, bool* signature_match) { switch (algorithm.id()) { - case WebKit::WebCryptoAlgorithmIdHmac: { - WebKit::WebArrayBuffer result; + case blink::WebCryptoAlgorithmIdHmac: { + blink::WebArrayBuffer result; if (!SignInternal(algorithm, key, data, data_size, &result)) { return false; } diff --git a/content/renderer/webcrypto/webcrypto_impl_unittest.cc b/content/renderer/webcrypto/webcrypto_impl_unittest.cc index cacdd7f..e0d215e 100644 --- a/content/renderer/webcrypto/webcrypto_impl_unittest.cc +++ b/content/renderer/webcrypto/webcrypto_impl_unittest.cc @@ -28,31 +28,31 @@ std::vector<uint8> HexStringToBytes(const std::string& hex) { } void ExpectArrayBufferMatchesHex(const std::string& expected_hex, - const WebKit::WebArrayBuffer& array_buffer) { + const blink::WebArrayBuffer& array_buffer) { EXPECT_STRCASEEQ( expected_hex.c_str(), base::HexEncode( array_buffer.data(), array_buffer.byteLength()).c_str()); } -WebKit::WebCryptoAlgorithm CreateAlgorithm(WebKit::WebCryptoAlgorithmId id) { - return WebKit::WebCryptoAlgorithm::adoptParamsAndCreate(id, NULL); +blink::WebCryptoAlgorithm CreateAlgorithm(blink::WebCryptoAlgorithmId id) { + return blink::WebCryptoAlgorithm::adoptParamsAndCreate(id, NULL); } -WebKit::WebCryptoAlgorithm CreateHmacAlgorithm( - WebKit::WebCryptoAlgorithmId hashId) { - return WebKit::WebCryptoAlgorithm::adoptParamsAndCreate( - WebKit::WebCryptoAlgorithmIdHmac, - new WebKit::WebCryptoHmacParams(CreateAlgorithm(hashId))); +blink::WebCryptoAlgorithm CreateHmacAlgorithm( + blink::WebCryptoAlgorithmId hashId) { + return blink::WebCryptoAlgorithm::adoptParamsAndCreate( + blink::WebCryptoAlgorithmIdHmac, + new blink::WebCryptoHmacParams(CreateAlgorithm(hashId))); } -WebKit::WebCryptoAlgorithm CreateHmacKeyAlgorithm( - WebKit::WebCryptoAlgorithmId hashId, +blink::WebCryptoAlgorithm CreateHmacKeyAlgorithm( + blink::WebCryptoAlgorithmId hashId, unsigned hash_length) { // hash_length < 0 means unspecified - return WebKit::WebCryptoAlgorithm::adoptParamsAndCreate( - WebKit::WebCryptoAlgorithmIdHmac, - new WebKit::WebCryptoHmacKeyParams(CreateAlgorithm(hashId), + return blink::WebCryptoAlgorithm::adoptParamsAndCreate( + blink::WebCryptoAlgorithmIdHmac, + new blink::WebCryptoHmacKeyParams(CreateAlgorithm(hashId), (hash_length != 0), hash_length)); } @@ -66,30 +66,30 @@ const uint8* Start(const std::vector<uint8>& data) { return &data[0]; } -WebKit::WebCryptoAlgorithm CreateAesCbcAlgorithm( +blink::WebCryptoAlgorithm CreateAesCbcAlgorithm( const std::vector<uint8>& iv) { - return WebKit::WebCryptoAlgorithm::adoptParamsAndCreate( - WebKit::WebCryptoAlgorithmIdAesCbc, - new WebKit::WebCryptoAesCbcParams(Start(iv), iv.size())); + return blink::WebCryptoAlgorithm::adoptParamsAndCreate( + blink::WebCryptoAlgorithmIdAesCbc, + new blink::WebCryptoAesCbcParams(Start(iv), iv.size())); } -WebKit::WebCryptoAlgorithm CreateAesCbcAlgorithm( +blink::WebCryptoAlgorithm CreateAesCbcAlgorithm( unsigned short key_length_bits) { // NOLINT - return WebKit::WebCryptoAlgorithm::adoptParamsAndCreate( - WebKit::WebCryptoAlgorithmIdAesCbc, - new WebKit::WebCryptoAesKeyGenParams(key_length_bits)); + return blink::WebCryptoAlgorithm::adoptParamsAndCreate( + blink::WebCryptoAlgorithmIdAesCbc, + new blink::WebCryptoAesKeyGenParams(key_length_bits)); } -WebKit::WebCryptoAlgorithm CreateRsaAlgorithm( - WebKit::WebCryptoAlgorithmId algorithm_id, +blink::WebCryptoAlgorithm CreateRsaAlgorithm( + blink::WebCryptoAlgorithmId algorithm_id, unsigned modulus_length, const std::vector<uint8>& public_exponent) { - DCHECK(algorithm_id == WebKit::WebCryptoAlgorithmIdRsaEsPkcs1v1_5 || - algorithm_id == WebKit::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5 || - algorithm_id == WebKit::WebCryptoAlgorithmIdRsaOaep); - return WebKit::WebCryptoAlgorithm::adoptParamsAndCreate( + DCHECK(algorithm_id == blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5 || + algorithm_id == blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5 || + algorithm_id == blink::WebCryptoAlgorithmIdRsaOaep); + return blink::WebCryptoAlgorithm::adoptParamsAndCreate( algorithm_id, - new WebKit::WebCryptoRsaKeyGenParams( + new blink::WebCryptoRsaKeyGenParams( modulus_length, Start(public_exponent), public_exponent.size())); } @@ -99,15 +99,15 @@ namespace content { class WebCryptoImplTest : public testing::Test { protected: - WebKit::WebCryptoKey ImportSecretKeyFromRawHexString( + blink::WebCryptoKey ImportSecretKeyFromRawHexString( const std::string& key_hex, - const WebKit::WebCryptoAlgorithm& algorithm, - WebKit::WebCryptoKeyUsageMask usage) { + const blink::WebCryptoAlgorithm& algorithm, + blink::WebCryptoKeyUsageMask usage) { std::vector<uint8> key_raw = HexStringToBytes(key_hex); - WebKit::WebCryptoKey key = WebKit::WebCryptoKey::createNull(); + blink::WebCryptoKey key = blink::WebCryptoKey::createNull(); bool extractable = true; - EXPECT_TRUE(crypto_.ImportKeyInternal(WebKit::WebCryptoKeyFormatRaw, + EXPECT_TRUE(crypto_.ImportKeyInternal(blink::WebCryptoKeyFormatRaw, Start(key_raw), key_raw.size(), algorithm, @@ -115,7 +115,7 @@ class WebCryptoImplTest : public testing::Test { usage, &key)); - EXPECT_EQ(WebKit::WebCryptoKeyTypeSecret, key.type()); + EXPECT_EQ(blink::WebCryptoKeyTypeSecret, key.type()); EXPECT_FALSE(key.isNull()); EXPECT_TRUE(key.handle()); return key; @@ -125,36 +125,36 @@ class WebCryptoImplTest : public testing::Test { // WebCryptoImpl. bool DigestInternal( - const WebKit::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoAlgorithm& algorithm, const std::vector<uint8>& data, - WebKit::WebArrayBuffer* buffer) { + blink::WebArrayBuffer* buffer) { return crypto_.DigestInternal(algorithm, Start(data), data.size(), buffer); } bool GenerateKeyInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - WebKit::WebCryptoKey* key) { + const blink::WebCryptoAlgorithm& algorithm, + blink::WebCryptoKey* key) { bool extractable = true; - WebKit::WebCryptoKeyUsageMask usage_mask = 0; + blink::WebCryptoKeyUsageMask usage_mask = 0; return crypto_.GenerateKeyInternal(algorithm, extractable, usage_mask, key); } bool GenerateKeyPairInternal( - const WebKit::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoAlgorithm& algorithm, bool extractable, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoKey* public_key, - WebKit::WebCryptoKey* private_key) { + blink::WebCryptoKeyUsageMask usage_mask, + blink::WebCryptoKey* public_key, + blink::WebCryptoKey* private_key) { return crypto_.GenerateKeyPairInternal( algorithm, extractable, usage_mask, public_key, private_key); } bool ImportKeyInternal( - WebKit::WebCryptoKeyFormat format, + blink::WebCryptoKeyFormat format, const std::vector<uint8>& key_data, - const WebKit::WebCryptoAlgorithm& algorithm, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoKey* key) { + const blink::WebCryptoAlgorithm& algorithm, + blink::WebCryptoKeyUsageMask usage_mask, + blink::WebCryptoKey* key) { bool extractable = true; return crypto_.ImportKeyInternal(format, Start(key_data), @@ -166,17 +166,17 @@ class WebCryptoImplTest : public testing::Test { } bool SignInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const std::vector<uint8>& data, - WebKit::WebArrayBuffer* buffer) { + blink::WebArrayBuffer* buffer) { return crypto_.SignInternal( algorithm, key, Start(data), data.size(), buffer); } bool VerifySignatureInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* signature, unsigned signature_size, const std::vector<uint8>& data, @@ -191,37 +191,37 @@ class WebCryptoImplTest : public testing::Test { } bool EncryptInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer) { + blink::WebArrayBuffer* buffer) { return crypto_.EncryptInternal(algorithm, key, data, data_size, buffer); } bool EncryptInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const std::vector<uint8>& data, - WebKit::WebArrayBuffer* buffer) { + blink::WebArrayBuffer* buffer) { return crypto_.EncryptInternal( algorithm, key, Start(data), data.size(), buffer); } bool DecryptInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const unsigned char* data, unsigned data_size, - WebKit::WebArrayBuffer* buffer) { + blink::WebArrayBuffer* buffer) { return crypto_.DecryptInternal(algorithm, key, data, data_size, buffer); } bool DecryptInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, + const blink::WebCryptoAlgorithm& algorithm, + const blink::WebCryptoKey& key, const std::vector<uint8>& data, - WebKit::WebArrayBuffer* buffer) { + blink::WebArrayBuffer* buffer) { return crypto_.DecryptInternal( algorithm, key, Start(data), data.size(), buffer); } @@ -238,60 +238,60 @@ TEST_F(WebCryptoImplTest, DigestSampleSets) { // // Results were generated using the command sha{1,224,256,384,512}sum. struct TestCase { - WebKit::WebCryptoAlgorithmId algorithm; + blink::WebCryptoAlgorithmId algorithm; const std::string hex_input; const char* hex_result; }; const TestCase kTests[] = { - { WebKit::WebCryptoAlgorithmIdSha1, "", + { blink::WebCryptoAlgorithmIdSha1, "", "da39a3ee5e6b4b0d3255bfef95601890afd80709" }, - { WebKit::WebCryptoAlgorithmIdSha224, "", + { blink::WebCryptoAlgorithmIdSha224, "", "d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f" }, - { WebKit::WebCryptoAlgorithmIdSha256, "", + { blink::WebCryptoAlgorithmIdSha256, "", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" }, - { WebKit::WebCryptoAlgorithmIdSha384, "", + { blink::WebCryptoAlgorithmIdSha384, "", "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274e" "debfe76f65fbd51ad2f14898b95b" }, - { WebKit::WebCryptoAlgorithmIdSha512, "", + { blink::WebCryptoAlgorithmIdSha512, "", "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0" "d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e", }, - { WebKit::WebCryptoAlgorithmIdSha1, "00", + { blink::WebCryptoAlgorithmIdSha1, "00", "5ba93c9db0cff93f52b521d7420e43f6eda2784f", }, - { WebKit::WebCryptoAlgorithmIdSha224, "00", + { blink::WebCryptoAlgorithmIdSha224, "00", "fff9292b4201617bdc4d3053fce02734166a683d7d858a7f5f59b073", }, - { WebKit::WebCryptoAlgorithmIdSha256, "00", + { blink::WebCryptoAlgorithmIdSha256, "00", "6e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d", }, - { WebKit::WebCryptoAlgorithmIdSha384, "00", + { blink::WebCryptoAlgorithmIdSha384, "00", "bec021b4f368e3069134e012c2b4307083d3a9bdd206e24e5f0d86e13d6636655933" "ec2b413465966817a9c208a11717", }, - { WebKit::WebCryptoAlgorithmIdSha512, "00", + { blink::WebCryptoAlgorithmIdSha512, "00", "b8244d028981d693af7b456af8efa4cad63d282e19ff14942c246e50d9351d22704a" "802a71c3580b6370de4ceb293c324a8423342557d4e5c38438f0e36910ee", }, - { WebKit::WebCryptoAlgorithmIdSha1, "000102030405", + { blink::WebCryptoAlgorithmIdSha1, "000102030405", "868460d98d09d8bbb93d7b6cdd15cc7fbec676b9", }, - { WebKit::WebCryptoAlgorithmIdSha224, "000102030405", + { blink::WebCryptoAlgorithmIdSha224, "000102030405", "7d92e7f1cad1818ed1d13ab41f04ebabfe1fef6bb4cbeebac34c29bc", }, - { WebKit::WebCryptoAlgorithmIdSha256, "000102030405", + { blink::WebCryptoAlgorithmIdSha256, "000102030405", "17e88db187afd62c16e5debf3e6527cd006bc012bc90b51a810cd80c2d511f43", }, - { WebKit::WebCryptoAlgorithmIdSha384, "000102030405", + { blink::WebCryptoAlgorithmIdSha384, "000102030405", "79f4738706fce9650ac60266675c3cd07298b09923850d525604d040e6e448adc7dc" "22780d7e1b95bfeaa86a678e4552", }, - { WebKit::WebCryptoAlgorithmIdSha512, "000102030405", + { blink::WebCryptoAlgorithmIdSha512, "000102030405", "2f3831bccc94cf061bcfa5f8c23c1429d26e3bc6b76edad93d9025cb91c903af6cf9" "c935dc37193c04c2c66e7d9de17c358284418218afea2160147aaa912f4c", }, @@ -302,10 +302,10 @@ TEST_F(WebCryptoImplTest, DigestSampleSets) { SCOPED_TRACE(test_index); const TestCase& test = kTests[test_index]; - WebKit::WebCryptoAlgorithm algorithm = CreateAlgorithm(test.algorithm); + blink::WebCryptoAlgorithm algorithm = CreateAlgorithm(test.algorithm); std::vector<uint8> input = HexStringToBytes(test.hex_input); - WebKit::WebArrayBuffer output; + blink::WebArrayBuffer output; ASSERT_TRUE(DigestInternal(algorithm, input, &output)); ExpectArrayBufferMatchesHex(test.hex_result, output); } @@ -313,7 +313,7 @@ TEST_F(WebCryptoImplTest, DigestSampleSets) { TEST_F(WebCryptoImplTest, HMACSampleSets) { struct TestCase { - WebKit::WebCryptoAlgorithmId algorithm; + blink::WebCryptoAlgorithmId algorithm; const char* key; const char* message; const char* mac; @@ -324,14 +324,14 @@ TEST_F(WebCryptoImplTest, HMACSampleSets) { // particular results are also posted on the Wikipedia page examples: // http://en.wikipedia.org/wiki/Hash-based_message_authentication_code { - WebKit::WebCryptoAlgorithmIdSha1, + blink::WebCryptoAlgorithmIdSha1, "", "", // openssl dgst -sha1 -hmac "" < /dev/null "fbdb1d1b18aa6c08324b7d64b71fb76370690e1d", }, { - WebKit::WebCryptoAlgorithmIdSha256, + blink::WebCryptoAlgorithmIdSha256, "", "", // openssl dgst -sha256 -hmac "" < /dev/null @@ -342,7 +342,7 @@ TEST_F(WebCryptoImplTest, HMACSampleSets) { // http://csrc.nist.gov/groups/STM/cavp/documents/mac/hmactestvectors.zip // L=20 set 45 { - WebKit::WebCryptoAlgorithmIdSha1, + blink::WebCryptoAlgorithmIdSha1, // key "59785928d72516e31272", // message @@ -355,7 +355,7 @@ TEST_F(WebCryptoImplTest, HMACSampleSets) { }, // L=20 set 299 { - WebKit::WebCryptoAlgorithmIdSha1, + blink::WebCryptoAlgorithmIdSha1, // key "ceb9aedf8d6efcf0ae52bea0fa99a9e26ae81bacea0cff4d5eecf201e3bca3c3577480" "621b818fd717ba99d6ff958ea3d59b2527b019c343bb199e648090225867d994607962" @@ -370,7 +370,7 @@ TEST_F(WebCryptoImplTest, HMACSampleSets) { }, // L=32, set 30 { - WebKit::WebCryptoAlgorithmIdSha256, + blink::WebCryptoAlgorithmIdSha256, // key "9779d9120642797f1747025d5b22b7ac607cab08e1758f2f3a46c8be1e25c53b8c6a8f" "58ffefa176", @@ -384,7 +384,7 @@ TEST_F(WebCryptoImplTest, HMACSampleSets) { }, // L=32, set 224 { - WebKit::WebCryptoAlgorithmIdSha256, + blink::WebCryptoAlgorithmIdSha256, // key "4b7ab133efe99e02fc89a28409ee187d579e774f4cba6fc223e13504e3511bef8d4f63" "8b9aca55d4a43b8fbd64cf9d74dcc8c9e8d52034898c70264ea911a3fd70813fa73b08" @@ -404,14 +404,14 @@ TEST_F(WebCryptoImplTest, HMACSampleSets) { SCOPED_TRACE(test_index); const TestCase& test = kTests[test_index]; - WebKit::WebCryptoAlgorithm algorithm = CreateHmacAlgorithm(test.algorithm); + blink::WebCryptoAlgorithm algorithm = CreateHmacAlgorithm(test.algorithm); - WebKit::WebCryptoKey key = ImportSecretKeyFromRawHexString( - test.key, algorithm, WebKit::WebCryptoKeyUsageSign); + blink::WebCryptoKey key = ImportSecretKeyFromRawHexString( + test.key, algorithm, blink::WebCryptoKeyUsageSign); std::vector<uint8> message_raw = HexStringToBytes(test.message); - WebKit::WebArrayBuffer output; + blink::WebArrayBuffer output; ASSERT_TRUE(SignInternal(algorithm, key, message_raw, &output)); @@ -451,12 +451,12 @@ TEST_F(WebCryptoImplTest, HMACSampleSets) { } TEST_F(WebCryptoImplTest, AesCbcFailures) { - WebKit::WebCryptoKey key = ImportSecretKeyFromRawHexString( + blink::WebCryptoKey key = ImportSecretKeyFromRawHexString( "2b7e151628aed2a6abf7158809cf4f3c", - CreateAlgorithm(WebKit::WebCryptoAlgorithmIdAesCbc), - WebKit::WebCryptoKeyUsageEncrypt | WebKit::WebCryptoKeyUsageDecrypt); + CreateAlgorithm(blink::WebCryptoAlgorithmIdAesCbc), + blink::WebCryptoKeyUsageEncrypt | blink::WebCryptoKeyUsageDecrypt); - WebKit::WebArrayBuffer output; + blink::WebArrayBuffer output; // Use an invalid |iv| (fewer than 16 bytes) { @@ -500,11 +500,11 @@ TEST_F(WebCryptoImplTest, AesCbcFailures) { std::vector<uint8> key_raw(1); std::vector<uint8> iv(16); - WebKit::WebCryptoKey key = WebKit::WebCryptoKey::createNull(); - EXPECT_FALSE(ImportKeyInternal(WebKit::WebCryptoKeyFormatRaw, + blink::WebCryptoKey key = blink::WebCryptoKey::createNull(); + EXPECT_FALSE(ImportKeyInternal(blink::WebCryptoKeyFormatRaw, key_raw, CreateAesCbcAlgorithm(iv), - WebKit::WebCryptoKeyUsageDecrypt, + blink::WebCryptoKeyUsageDecrypt, &key)); } } @@ -591,15 +591,15 @@ TEST_F(WebCryptoImplTest, AesCbcSampleSets) { SCOPED_TRACE(index); const TestCase& test = kTests[index]; - WebKit::WebCryptoKey key = ImportSecretKeyFromRawHexString( + blink::WebCryptoKey key = ImportSecretKeyFromRawHexString( test.key, - CreateAlgorithm(WebKit::WebCryptoAlgorithmIdAesCbc), - WebKit::WebCryptoKeyUsageEncrypt | WebKit::WebCryptoKeyUsageDecrypt); + CreateAlgorithm(blink::WebCryptoAlgorithmIdAesCbc), + blink::WebCryptoKeyUsageEncrypt | blink::WebCryptoKeyUsageDecrypt); std::vector<uint8> plain_text = HexStringToBytes(test.plain_text); std::vector<uint8> iv = HexStringToBytes(test.iv); - WebKit::WebArrayBuffer output; + blink::WebArrayBuffer output; // Test encryption. EXPECT_TRUE(EncryptInternal(CreateAesCbcAlgorithm(iv), @@ -643,46 +643,46 @@ TEST_F(WebCryptoImplTest, AesCbcSampleSets) { // TODO(padolph): Add test to verify generated symmetric keys appear random. TEST_F(WebCryptoImplTest, GenerateKeyAes) { - WebKit::WebCryptoKey key = WebKit::WebCryptoKey::createNull(); + blink::WebCryptoKey key = blink::WebCryptoKey::createNull(); ASSERT_TRUE(GenerateKeyInternal(CreateAesCbcAlgorithm(128), &key)); EXPECT_TRUE(key.handle()); - EXPECT_EQ(WebKit::WebCryptoKeyTypeSecret, key.type()); + EXPECT_EQ(blink::WebCryptoKeyTypeSecret, key.type()); } TEST_F(WebCryptoImplTest, GenerateKeyAesBadLength) { - WebKit::WebCryptoKey key = WebKit::WebCryptoKey::createNull(); + blink::WebCryptoKey key = blink::WebCryptoKey::createNull(); EXPECT_FALSE(GenerateKeyInternal(CreateAesCbcAlgorithm(0), &key)); EXPECT_FALSE(GenerateKeyInternal(CreateAesCbcAlgorithm(129), &key)); } TEST_F(WebCryptoImplTest, GenerateKeyHmac) { - WebKit::WebCryptoKey key = WebKit::WebCryptoKey::createNull(); - WebKit::WebCryptoAlgorithm algorithm = - CreateHmacKeyAlgorithm(WebKit::WebCryptoAlgorithmIdSha1, 128); + blink::WebCryptoKey key = blink::WebCryptoKey::createNull(); + blink::WebCryptoAlgorithm algorithm = + CreateHmacKeyAlgorithm(blink::WebCryptoAlgorithmIdSha1, 128); ASSERT_TRUE(GenerateKeyInternal(algorithm, &key)); EXPECT_FALSE(key.isNull()); EXPECT_TRUE(key.handle()); - EXPECT_EQ(WebKit::WebCryptoKeyTypeSecret, key.type()); + EXPECT_EQ(blink::WebCryptoKeyTypeSecret, key.type()); } TEST_F(WebCryptoImplTest, GenerateKeyHmacNoLength) { - WebKit::WebCryptoKey key = WebKit::WebCryptoKey::createNull(); - WebKit::WebCryptoAlgorithm algorithm = - CreateHmacKeyAlgorithm(WebKit::WebCryptoAlgorithmIdSha1, 0); + blink::WebCryptoKey key = blink::WebCryptoKey::createNull(); + blink::WebCryptoAlgorithm algorithm = + CreateHmacKeyAlgorithm(blink::WebCryptoAlgorithmIdSha1, 0); ASSERT_TRUE(GenerateKeyInternal(algorithm, &key)); EXPECT_TRUE(key.handle()); - EXPECT_EQ(WebKit::WebCryptoKeyTypeSecret, key.type()); + EXPECT_EQ(blink::WebCryptoKeyTypeSecret, key.type()); } TEST_F(WebCryptoImplTest, ImportSecretKeyNoAlgorithm) { - WebKit::WebCryptoKey key = WebKit::WebCryptoKey::createNull(); + blink::WebCryptoKey key = blink::WebCryptoKey::createNull(); // This fails because the algorithm is null. EXPECT_FALSE(ImportKeyInternal( - WebKit::WebCryptoKeyFormatRaw, + blink::WebCryptoKeyFormatRaw, HexStringToBytes("00000000000000000000"), - WebKit::WebCryptoAlgorithm::createNull(), - WebKit::WebCryptoKeyUsageSign, + blink::WebCryptoAlgorithm::createNull(), + blink::WebCryptoKeyUsageSign, &key)); } @@ -694,20 +694,20 @@ TEST_F(WebCryptoImplTest, GenerateKeyPairRsa) { // Successful WebCryptoAlgorithmIdRsaEsPkcs1v1_5 key generation. const unsigned modulus_length = 256; const std::vector<uint8> public_exponent = HexStringToBytes("010001"); - WebKit::WebCryptoAlgorithm algorithm = - CreateRsaAlgorithm(WebKit::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, + blink::WebCryptoAlgorithm algorithm = + CreateRsaAlgorithm(blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, modulus_length, public_exponent); bool extractable = false; - const WebKit::WebCryptoKeyUsageMask usage_mask = 0; - WebKit::WebCryptoKey public_key = WebKit::WebCryptoKey::createNull(); - WebKit::WebCryptoKey private_key = WebKit::WebCryptoKey::createNull(); + const blink::WebCryptoKeyUsageMask usage_mask = 0; + blink::WebCryptoKey public_key = blink::WebCryptoKey::createNull(); + blink::WebCryptoKey private_key = blink::WebCryptoKey::createNull(); EXPECT_TRUE(GenerateKeyPairInternal( algorithm, extractable, usage_mask, &public_key, &private_key)); EXPECT_FALSE(public_key.isNull()); EXPECT_FALSE(private_key.isNull()); - EXPECT_EQ(WebKit::WebCryptoKeyTypePublic, public_key.type()); - EXPECT_EQ(WebKit::WebCryptoKeyTypePrivate, private_key.type()); + EXPECT_EQ(blink::WebCryptoKeyTypePublic, public_key.type()); + EXPECT_EQ(blink::WebCryptoKeyTypePrivate, private_key.type()); EXPECT_EQ(extractable, public_key.extractable()); EXPECT_EQ(extractable, private_key.extractable()); EXPECT_EQ(usage_mask, public_key.usages()); @@ -715,14 +715,14 @@ TEST_F(WebCryptoImplTest, GenerateKeyPairRsa) { // Fail with bad modulus. algorithm = CreateRsaAlgorithm( - WebKit::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, 0, public_exponent); + blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, 0, public_exponent); EXPECT_FALSE(GenerateKeyPairInternal( algorithm, extractable, usage_mask, &public_key, &private_key)); // Fail with bad exponent: larger than unsigned long. unsigned exponent_length = sizeof(unsigned long) + 1; // NOLINT const std::vector<uint8> long_exponent(exponent_length, 0x01); - algorithm = CreateRsaAlgorithm(WebKit::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, + algorithm = CreateRsaAlgorithm(blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, modulus_length, long_exponent); EXPECT_FALSE(GenerateKeyPairInternal( @@ -730,7 +730,7 @@ TEST_F(WebCryptoImplTest, GenerateKeyPairRsa) { // Fail with bad exponent: empty. const std::vector<uint8> empty_exponent; - algorithm = CreateRsaAlgorithm(WebKit::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, + algorithm = CreateRsaAlgorithm(blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, modulus_length, empty_exponent); EXPECT_FALSE(GenerateKeyPairInternal( @@ -738,7 +738,7 @@ TEST_F(WebCryptoImplTest, GenerateKeyPairRsa) { // Fail with bad exponent: all zeros. std::vector<uint8> exponent_with_leading_zeros(15, 0x00); - algorithm = CreateRsaAlgorithm(WebKit::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, + algorithm = CreateRsaAlgorithm(blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, modulus_length, exponent_with_leading_zeros); EXPECT_FALSE(GenerateKeyPairInternal( @@ -748,15 +748,15 @@ TEST_F(WebCryptoImplTest, GenerateKeyPairRsa) { exponent_with_leading_zeros.insert(exponent_with_leading_zeros.end(), public_exponent.begin(), public_exponent.end()); - algorithm = CreateRsaAlgorithm(WebKit::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, + algorithm = CreateRsaAlgorithm(blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5, modulus_length, exponent_with_leading_zeros); EXPECT_TRUE(GenerateKeyPairInternal( algorithm, extractable, usage_mask, &public_key, &private_key)); EXPECT_FALSE(public_key.isNull()); EXPECT_FALSE(private_key.isNull()); - EXPECT_EQ(WebKit::WebCryptoKeyTypePublic, public_key.type()); - EXPECT_EQ(WebKit::WebCryptoKeyTypePrivate, private_key.type()); + EXPECT_EQ(blink::WebCryptoKeyTypePublic, public_key.type()); + EXPECT_EQ(blink::WebCryptoKeyTypePrivate, private_key.type()); EXPECT_EQ(extractable, public_key.extractable()); EXPECT_EQ(extractable, private_key.extractable()); EXPECT_EQ(usage_mask, public_key.usages()); @@ -764,28 +764,28 @@ TEST_F(WebCryptoImplTest, GenerateKeyPairRsa) { // Successful WebCryptoAlgorithmIdRsaOaep key generation. algorithm = CreateRsaAlgorithm( - WebKit::WebCryptoAlgorithmIdRsaOaep, modulus_length, public_exponent); + blink::WebCryptoAlgorithmIdRsaOaep, modulus_length, public_exponent); EXPECT_TRUE(GenerateKeyPairInternal( algorithm, extractable, usage_mask, &public_key, &private_key)); EXPECT_FALSE(public_key.isNull()); EXPECT_FALSE(private_key.isNull()); - EXPECT_EQ(WebKit::WebCryptoKeyTypePublic, public_key.type()); - EXPECT_EQ(WebKit::WebCryptoKeyTypePrivate, private_key.type()); + EXPECT_EQ(blink::WebCryptoKeyTypePublic, public_key.type()); + EXPECT_EQ(blink::WebCryptoKeyTypePrivate, private_key.type()); EXPECT_EQ(extractable, public_key.extractable()); EXPECT_EQ(extractable, private_key.extractable()); EXPECT_EQ(usage_mask, public_key.usages()); EXPECT_EQ(usage_mask, private_key.usages()); // Successful WebCryptoAlgorithmIdRsaSsaPkcs1v1_5 key generation. - algorithm = CreateRsaAlgorithm(WebKit::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5, + algorithm = CreateRsaAlgorithm(blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5, modulus_length, public_exponent); EXPECT_TRUE(GenerateKeyPairInternal( algorithm, extractable, usage_mask, &public_key, &private_key)); EXPECT_FALSE(public_key.isNull()); EXPECT_FALSE(private_key.isNull()); - EXPECT_EQ(WebKit::WebCryptoKeyTypePublic, public_key.type()); - EXPECT_EQ(WebKit::WebCryptoKeyTypePrivate, private_key.type()); + EXPECT_EQ(blink::WebCryptoKeyTypePublic, public_key.type()); + EXPECT_EQ(blink::WebCryptoKeyTypePrivate, private_key.type()); EXPECT_EQ(extractable, public_key.extractable()); EXPECT_EQ(extractable, private_key.extractable()); EXPECT_EQ(usage_mask, public_key.usages()); diff --git a/content/renderer/websharedworker_proxy.cc b/content/renderer/websharedworker_proxy.cc index 190a35c..ad35f02 100644 --- a/content/renderer/websharedworker_proxy.cc +++ b/content/renderer/websharedworker_proxy.cc @@ -55,7 +55,7 @@ void WebSharedWorkerProxy::CreateWorkerContext( const string16& user_agent, const string16& source_code, const string16& content_security_policy, - WebKit::WebContentSecurityPolicyType policy_type, + blink::WebContentSecurityPolicyType policy_type, int pending_route_id, int64 script_resource_appcache_id) { DCHECK(route_id_ == MSG_ROUTING_NONE); @@ -121,12 +121,12 @@ bool WebSharedWorkerProxy::isStarted() { } void WebSharedWorkerProxy::startWorkerContext( - const WebKit::WebURL& script_url, - const WebKit::WebString& name, - const WebKit::WebString& user_agent, - const WebKit::WebString& source_code, - const WebKit::WebString& content_security_policy, - WebKit::WebContentSecurityPolicyType policy_type, + const blink::WebURL& script_url, + const blink::WebString& name, + const blink::WebString& user_agent, + const blink::WebString& source_code, + const blink::WebString& content_security_policy, + blink::WebContentSecurityPolicyType policy_type, long long script_resource_appcache_id) { DCHECK(!isStarted()); CreateWorkerContext( @@ -144,7 +144,7 @@ void WebSharedWorkerProxy::clientDestroyed() { NOTREACHED(); } -void WebSharedWorkerProxy::connect(WebKit::WebMessagePortChannel* channel, +void WebSharedWorkerProxy::connect(blink::WebMessagePortChannel* channel, ConnectListener* listener) { WebMessagePortChannelImpl* webchannel = static_cast<WebMessagePortChannelImpl*>(channel); diff --git a/content/renderer/websharedworker_proxy.h b/content/renderer/websharedworker_proxy.h index 75c7b55..92f1a20 100644 --- a/content/renderer/websharedworker_proxy.h +++ b/content/renderer/websharedworker_proxy.h @@ -23,7 +23,7 @@ class ChildThread; // thread. Once the connect event has been sent, all future communication will // happen via the WebMessagePortChannel, and the WebSharedWorker instance will // be freed. -class WebSharedWorkerProxy : public WebKit::WebSharedWorker, +class WebSharedWorkerProxy : public blink::WebSharedWorker, private IPC::Listener { public: // If the worker not loaded yet, route_id == MSG_ROUTING_NONE @@ -36,16 +36,16 @@ class WebSharedWorkerProxy : public WebKit::WebSharedWorker, // Implementations of WebSharedWorker APIs virtual bool isStarted(); - virtual void connect(WebKit::WebMessagePortChannel* channel, + virtual void connect(blink::WebMessagePortChannel* channel, ConnectListener* listener); virtual void startWorkerContext( - const WebKit::WebURL& script_url, - const WebKit::WebString& name, - const WebKit::WebString& user_agent, - const WebKit::WebString& source_code, - const WebKit::WebString& content_security_policy, - WebKit::WebContentSecurityPolicyType policy_type, + const blink::WebURL& script_url, + const blink::WebString& name, + const blink::WebString& user_agent, + const blink::WebString& source_code, + const blink::WebString& content_security_policy, + blink::WebContentSecurityPolicyType policy_type, long long script_resource_appcache_id); virtual void terminateWorkerContext(); @@ -77,7 +77,7 @@ class WebSharedWorkerProxy : public WebKit::WebSharedWorker, const string16& user_agent, const string16& source_code, const string16& content_security_policy, - WebKit::WebContentSecurityPolicyType policy_type, + blink::WebContentSecurityPolicyType policy_type, int pending_route_id, int64 script_resource_appcache_id); void OnWorkerCreated(); |