| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 #include "public/web/WebRange.h" | 212 #include "public/web/WebRange.h" |
| 213 #include "public/web/WebScriptSource.h" | 213 #include "public/web/WebScriptSource.h" |
| 214 #include "public/web/WebSerializedScriptValue.h" | 214 #include "public/web/WebSerializedScriptValue.h" |
| 215 #include "public/web/WebTreeScopeType.h" | 215 #include "public/web/WebTreeScopeType.h" |
| 216 #include "skia/ext/platform_canvas.h" | 216 #include "skia/ext/platform_canvas.h" |
| 217 #include "web/CompositionUnderlineVectorBuilder.h" | 217 #include "web/CompositionUnderlineVectorBuilder.h" |
| 218 #include "web/FindInPageCoordinates.h" | 218 #include "web/FindInPageCoordinates.h" |
| 219 #include "web/RemoteFrameOwner.h" | 219 #include "web/RemoteFrameOwner.h" |
| 220 #include "web/SharedWorkerRepositoryClientImpl.h" | 220 #include "web/SharedWorkerRepositoryClientImpl.h" |
| 221 #include "web/SuspendableScriptExecutor.h" | 221 #include "web/SuspendableScriptExecutor.h" |
| 222 #include "web/TextCheckerClientImpl.h" |
| 222 #include "web/TextFinder.h" | 223 #include "web/TextFinder.h" |
| 223 #include "web/WebAssociatedURLLoaderImpl.h" | 224 #include "web/WebAssociatedURLLoaderImpl.h" |
| 224 #include "web/WebDataSourceImpl.h" | 225 #include "web/WebDataSourceImpl.h" |
| 225 #include "web/WebDevToolsAgentImpl.h" | 226 #include "web/WebDevToolsAgentImpl.h" |
| 226 #include "web/WebFrameWidgetImpl.h" | 227 #include "web/WebFrameWidgetImpl.h" |
| 227 #include "web/WebPluginContainerImpl.h" | 228 #include "web/WebPluginContainerImpl.h" |
| 228 #include "web/WebRemoteFrameImpl.h" | 229 #include "web/WebRemoteFrameImpl.h" |
| 229 #include "web/WebViewImpl.h" | 230 #include "web/WebViewImpl.h" |
| 230 #include "wtf/CurrentTime.h" | 231 #include "wtf/CurrentTime.h" |
| 231 #include "wtf/HashMap.h" | 232 #include "wtf/HashMap.h" |
| (...skipping 1329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1561 m_localFrameClientImpl(LocalFrameClientImpl::create(this)), | 1562 m_localFrameClientImpl(LocalFrameClientImpl::create(this)), |
| 1562 m_frameWidget(0), | 1563 m_frameWidget(0), |
| 1563 m_client(client), | 1564 m_client(client), |
| 1564 m_autofillClient(0), | 1565 m_autofillClient(0), |
| 1565 m_contentSettingsClient(0), | 1566 m_contentSettingsClient(0), |
| 1566 m_inputEventsScaleFactorForEmulation(1), | 1567 m_inputEventsScaleFactorForEmulation(1), |
| 1567 m_interfaceProvider(interfaceProvider), | 1568 m_interfaceProvider(interfaceProvider), |
| 1568 m_interfaceRegistry(interfaceRegistry), | 1569 m_interfaceRegistry(interfaceRegistry), |
| 1569 m_webDevToolsFrontend(0), | 1570 m_webDevToolsFrontend(0), |
| 1570 m_inputMethodController(new WebInputMethodControllerImpl(this)), | 1571 m_inputMethodController(new WebInputMethodControllerImpl(this)), |
| 1572 m_textCheckerClient(new TextCheckerClientImpl(this)), |
| 1571 m_selfKeepAlive(this) { | 1573 m_selfKeepAlive(this) { |
| 1572 DCHECK(m_client); | 1574 DCHECK(m_client); |
| 1573 frameCount++; | 1575 frameCount++; |
| 1574 } | 1576 } |
| 1575 | 1577 |
| 1576 WebLocalFrameImpl::WebLocalFrameImpl( | 1578 WebLocalFrameImpl::WebLocalFrameImpl( |
| 1577 WebRemoteFrame* oldWebFrame, | 1579 WebRemoteFrame* oldWebFrame, |
| 1578 WebFrameClient* client, | 1580 WebFrameClient* client, |
| 1579 blink::InterfaceProvider* interfaceProvider, | 1581 blink::InterfaceProvider* interfaceProvider, |
| 1580 blink::InterfaceRegistry* interfaceRegistry) | 1582 blink::InterfaceRegistry* interfaceRegistry) |
| (...skipping 10 matching lines...) Expand all Loading... |
| 1591 frameCount--; | 1593 frameCount--; |
| 1592 } | 1594 } |
| 1593 | 1595 |
| 1594 DEFINE_TRACE(WebLocalFrameImpl) { | 1596 DEFINE_TRACE(WebLocalFrameImpl) { |
| 1595 visitor->trace(m_localFrameClientImpl); | 1597 visitor->trace(m_localFrameClientImpl); |
| 1596 visitor->trace(m_frame); | 1598 visitor->trace(m_frame); |
| 1597 visitor->trace(m_devToolsAgent); | 1599 visitor->trace(m_devToolsAgent); |
| 1598 visitor->trace(m_textFinder); | 1600 visitor->trace(m_textFinder); |
| 1599 visitor->trace(m_printContext); | 1601 visitor->trace(m_printContext); |
| 1600 visitor->trace(m_contextMenuNode); | 1602 visitor->trace(m_contextMenuNode); |
| 1603 visitor->trace(m_textCheckerClient); |
| 1601 WebFrame::traceFrames(visitor, this); | 1604 WebFrame::traceFrames(visitor, this); |
| 1602 WebFrameImplBase::trace(visitor); | 1605 WebFrameImplBase::trace(visitor); |
| 1603 } | 1606 } |
| 1604 | 1607 |
| 1605 void WebLocalFrameImpl::setCoreFrame(LocalFrame* frame) { | 1608 void WebLocalFrameImpl::setCoreFrame(LocalFrame* frame) { |
| 1606 m_frame = frame; | 1609 m_frame = frame; |
| 1607 } | 1610 } |
| 1608 | 1611 |
| 1609 void WebLocalFrameImpl::initializeCoreFrame(Page& page, | 1612 void WebLocalFrameImpl::initializeCoreFrame(Page& page, |
| 1610 FrameOwner* owner, | 1613 FrameOwner* owner, |
| (...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2513 clipHtml = | 2516 clipHtml = |
| 2514 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2517 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
| 2515 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2518 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2516 } else { | 2519 } else { |
| 2517 clipHtml = | 2520 clipHtml = |
| 2518 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2521 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
| 2519 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2522 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2520 } | 2523 } |
| 2521 } | 2524 } |
| 2522 | 2525 |
| 2526 TextCheckerClient& WebLocalFrameImpl::textCheckerClient() const { |
| 2527 return *m_textCheckerClient; |
| 2528 } |
| 2529 |
| 2523 } // namespace blink | 2530 } // namespace blink |
| OLD | NEW |