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 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
562 | 562 |
563 WebVector<WebIconURL> WebLocalFrameImpl::iconURLs(int iconTypesMask) const { | 563 WebVector<WebIconURL> WebLocalFrameImpl::iconURLs(int iconTypesMask) const { |
564 // The URL to the icon may be in the header. As such, only | 564 // The URL to the icon may be in the header. As such, only |
565 // ask the loader for the icon if it's finished loading. | 565 // ask the loader for the icon if it's finished loading. |
566 if (frame()->document()->loadEventFinished()) | 566 if (frame()->document()->loadEventFinished()) |
567 return frame()->document()->iconURLs(iconTypesMask); | 567 return frame()->document()->iconURLs(iconTypesMask); |
568 return WebVector<WebIconURL>(); | 568 return WebVector<WebIconURL>(); |
569 } | 569 } |
570 | 570 |
571 void WebLocalFrameImpl::setContentSettingsClient( | 571 void WebLocalFrameImpl::setContentSettingsClient( |
572 WebContentSettingsClient* contentSettingsClient) { | 572 WebContentSettingsClient* client) { |
573 m_contentSettingsClient = contentSettingsClient; | 573 m_contentSettingsClient.setClient(client); |
574 } | 574 } |
575 | 575 |
576 void WebLocalFrameImpl::setSharedWorkerRepositoryClient( | 576 void WebLocalFrameImpl::setSharedWorkerRepositoryClient( |
577 WebSharedWorkerRepositoryClient* client) { | 577 WebSharedWorkerRepositoryClient* client) { |
578 m_sharedWorkerRepositoryClient = | 578 m_sharedWorkerRepositoryClient = |
579 SharedWorkerRepositoryClientImpl::create(client); | 579 SharedWorkerRepositoryClientImpl::create(client); |
580 } | 580 } |
581 | 581 |
582 ScrollableArea* WebLocalFrameImpl::layoutViewportScrollableArea() const { | 582 ScrollableArea* WebLocalFrameImpl::layoutViewportScrollableArea() const { |
583 if (FrameView* view = frameView()) | 583 if (FrameView* view = frameView()) |
(...skipping 971 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1555 WebLocalFrameImpl::WebLocalFrameImpl( | 1555 WebLocalFrameImpl::WebLocalFrameImpl( |
1556 WebTreeScopeType scope, | 1556 WebTreeScopeType scope, |
1557 WebFrameClient* client, | 1557 WebFrameClient* client, |
1558 blink::InterfaceProvider* interfaceProvider, | 1558 blink::InterfaceProvider* interfaceProvider, |
1559 blink::InterfaceRegistry* interfaceRegistry) | 1559 blink::InterfaceRegistry* interfaceRegistry) |
1560 : WebLocalFrame(scope), | 1560 : WebLocalFrame(scope), |
1561 m_localFrameClientImpl(LocalFrameClientImpl::create(this)), | 1561 m_localFrameClientImpl(LocalFrameClientImpl::create(this)), |
1562 m_frameWidget(0), | 1562 m_frameWidget(0), |
1563 m_client(client), | 1563 m_client(client), |
1564 m_autofillClient(0), | 1564 m_autofillClient(0), |
1565 m_contentSettingsClient(0), | |
1566 m_inputEventsScaleFactorForEmulation(1), | 1565 m_inputEventsScaleFactorForEmulation(1), |
1567 m_interfaceProvider(interfaceProvider), | 1566 m_interfaceProvider(interfaceProvider), |
1568 m_interfaceRegistry(interfaceRegistry), | 1567 m_interfaceRegistry(interfaceRegistry), |
1569 m_webDevToolsFrontend(0), | 1568 m_webDevToolsFrontend(0), |
1570 m_inputMethodController(new WebInputMethodControllerImpl(this)), | 1569 m_inputMethodController(new WebInputMethodControllerImpl(this)), |
1571 m_selfKeepAlive(this) { | 1570 m_selfKeepAlive(this) { |
1572 DCHECK(m_client); | 1571 DCHECK(m_client); |
1573 frameCount++; | 1572 frameCount++; |
1574 } | 1573 } |
1575 | 1574 |
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2514 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2513 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
2515 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2514 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
2516 } else { | 2515 } else { |
2517 clipHtml = | 2516 clipHtml = |
2518 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2517 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
2519 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2518 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
2520 } | 2519 } |
2521 } | 2520 } |
2522 | 2521 |
2523 } // namespace blink | 2522 } // namespace blink |
OLD | NEW |