| Index: Source/web/ChromeClientImpl.cpp
|
| diff --git a/Source/web/ChromeClientImpl.cpp b/Source/web/ChromeClientImpl.cpp
|
| index 90fefc4bc74d158a052868e7ee6f1b582c9d5e0c..637b399993e528252e21c266544d287a2be35077 100644
|
| --- a/Source/web/ChromeClientImpl.cpp
|
| +++ b/Source/web/ChromeClientImpl.cpp
|
| @@ -108,11 +108,11 @@
|
| #include "wtf/text/StringConcatenate.h"
|
| #include "wtf/unicode/CharacterNames.h"
|
|
|
| -using namespace WebCore;
|
| +using namespace blink;
|
|
|
| namespace blink {
|
|
|
| -// Converts a WebCore::AXObjectCache::AXNotification to a blink::WebAXEvent
|
| +// Converts a blink::AXObjectCache::AXNotification to a blink::WebAXEvent
|
| static WebAXEvent toWebAXEvent(AXObjectCache::AXNotification notification)
|
| {
|
| // These enums have the same values; enforced in AssertMatchingEnums.cpp.
|
| @@ -206,7 +206,7 @@ void ChromeClientImpl::focusedNodeChanged(Node* node)
|
| m_webView->client()->setKeyboardFocusURL(focusURL);
|
| }
|
|
|
| -void ChromeClientImpl::focusedFrameChanged(WebCore::LocalFrame* frame)
|
| +void ChromeClientImpl::focusedFrameChanged(blink::LocalFrame* frame)
|
| {
|
| WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(frame);
|
| if (webframe && webframe->client())
|
| @@ -639,7 +639,7 @@ void ChromeClientImpl::enumerateChosenDirectory(FileChooser* fileChooser)
|
| chooserCompletion->didChooseFile(WebVector<WebString>());
|
| }
|
|
|
| -void ChromeClientImpl::setCursor(const WebCore::Cursor& cursor)
|
| +void ChromeClientImpl::setCursor(const blink::Cursor& cursor)
|
| {
|
| setCursor(WebCursorInfo(cursor));
|
| }
|
| @@ -833,7 +833,7 @@ void ChromeClientImpl::handleKeyboardEventOnTextField(HTMLInputElement& inputEle
|
| // FIXME: Remove this code once we have input routing in the browser
|
| // process. See http://crbug.com/339659.
|
| void ChromeClientImpl::forwardInputEvent(
|
| - WebCore::Frame* frame, WebCore::Event* event)
|
| + blink::Frame* frame, blink::Event* event)
|
| {
|
| // FIXME: Input event forwarding to out-of-process frames is broken until
|
| // WebRemoteFrameImpl has a WebFrameClient.
|
| @@ -846,17 +846,17 @@ void ChromeClientImpl::forwardInputEvent(
|
| // need to forward input events across processes.
|
| // FIXME: Add a check for out-of-process iframes enabled.
|
| if (event->isKeyboardEvent()) {
|
| - WebKeyboardEventBuilder webEvent(*static_cast<WebCore::KeyboardEvent*>(event));
|
| + WebKeyboardEventBuilder webEvent(*static_cast<blink::KeyboardEvent*>(event));
|
| webFrame->client()->forwardInputEvent(&webEvent);
|
| } else if (event->isMouseEvent()) {
|
| - WebMouseEventBuilder webEvent(webFrame->frameView(), frame->ownerRenderer(), *static_cast<WebCore::MouseEvent*>(event));
|
| + WebMouseEventBuilder webEvent(webFrame->frameView(), frame->ownerRenderer(), *static_cast<blink::MouseEvent*>(event));
|
| // Internal Blink events should not be forwarded.
|
| if (webEvent.type == WebInputEvent::Undefined)
|
| return;
|
|
|
| webFrame->client()->forwardInputEvent(&webEvent);
|
| } else if (event->isWheelEvent()) {
|
| - WebMouseWheelEventBuilder webEvent(webFrame->frameView(), frame->ownerRenderer(), *static_cast<WebCore::WheelEvent*>(event));
|
| + WebMouseWheelEventBuilder webEvent(webFrame->frameView(), frame->ownerRenderer(), *static_cast<blink::WheelEvent*>(event));
|
| if (webEvent.type == WebInputEvent::Undefined)
|
| return;
|
| webFrame->client()->forwardInputEvent(&webEvent);
|
|
|