Chromium Code Reviews| 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 110 #include "core/html/HTMLInputElement.h" | 110 #include "core/html/HTMLInputElement.h" |
| 111 #include "core/html/HTMLLinkElement.h" | 111 #include "core/html/HTMLLinkElement.h" |
| 112 #include "core/html/PluginDocument.h" | 112 #include "core/html/PluginDocument.h" |
| 113 #include "core/inspector/ConsoleMessage.h" | 113 #include "core/inspector/ConsoleMessage.h" |
| 114 #include "core/inspector/InspectorController.h" | 114 #include "core/inspector/InspectorController.h" |
| 115 #include "core/inspector/ScriptCallStack.h" | 115 #include "core/inspector/ScriptCallStack.h" |
| 116 #include "core/loader/DocumentLoader.h" | 116 #include "core/loader/DocumentLoader.h" |
| 117 #include "core/loader/FrameLoadRequest.h" | 117 #include "core/loader/FrameLoadRequest.h" |
| 118 #include "core/loader/FrameLoader.h" | 118 #include "core/loader/FrameLoader.h" |
| 119 #include "core/loader/HistoryItem.h" | 119 #include "core/loader/HistoryItem.h" |
| 120 #include "core/loader/ManifestLoader.h" | |
| 120 #include "core/loader/SubstituteData.h" | 121 #include "core/loader/SubstituteData.h" |
| 121 #include "core/page/Chrome.h" | 122 #include "core/page/Chrome.h" |
| 122 #include "core/page/EventHandler.h" | 123 #include "core/page/EventHandler.h" |
| 123 #include "core/page/FocusController.h" | 124 #include "core/page/FocusController.h" |
| 124 #include "core/page/FrameTree.h" | 125 #include "core/page/FrameTree.h" |
| 125 #include "core/page/Page.h" | 126 #include "core/page/Page.h" |
| 126 #include "core/page/PrintContext.h" | 127 #include "core/page/PrintContext.h" |
| 127 #include "core/rendering/HitTestResult.h" | 128 #include "core/rendering/HitTestResult.h" |
| 128 #include "core/rendering/RenderBox.h" | 129 #include "core/rendering/RenderBox.h" |
| 129 #include "core/rendering/RenderFrame.h" | 130 #include "core/rendering/RenderFrame.h" |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 148 #include "platform/network/ResourceRequest.h" | 149 #include "platform/network/ResourceRequest.h" |
| 149 #include "platform/scroll/ScrollTypes.h" | 150 #include "platform/scroll/ScrollTypes.h" |
| 150 #include "platform/scroll/ScrollbarTheme.h" | 151 #include "platform/scroll/ScrollbarTheme.h" |
| 151 #include "platform/weborigin/KURL.h" | 152 #include "platform/weborigin/KURL.h" |
| 152 #include "platform/weborigin/SchemeRegistry.h" | 153 #include "platform/weborigin/SchemeRegistry.h" |
| 153 #include "platform/weborigin/SecurityPolicy.h" | 154 #include "platform/weborigin/SecurityPolicy.h" |
| 154 #include "public/platform/Platform.h" | 155 #include "public/platform/Platform.h" |
| 155 #include "public/platform/WebFloatPoint.h" | 156 #include "public/platform/WebFloatPoint.h" |
| 156 #include "public/platform/WebFloatRect.h" | 157 #include "public/platform/WebFloatRect.h" |
| 157 #include "public/platform/WebLayer.h" | 158 #include "public/platform/WebLayer.h" |
| 159 #include "public/platform/WebManifest.h" | |
| 158 #include "public/platform/WebPoint.h" | 160 #include "public/platform/WebPoint.h" |
| 159 #include "public/platform/WebRect.h" | 161 #include "public/platform/WebRect.h" |
| 160 #include "public/platform/WebSize.h" | 162 #include "public/platform/WebSize.h" |
| 161 #include "public/platform/WebURLError.h" | 163 #include "public/platform/WebURLError.h" |
| 162 #include "public/platform/WebVector.h" | 164 #include "public/platform/WebVector.h" |
| 163 #include "public/web/WebConsoleMessage.h" | 165 #include "public/web/WebConsoleMessage.h" |
| 164 #include "public/web/WebDOMEvent.h" | 166 #include "public/web/WebDOMEvent.h" |
| 165 #include "public/web/WebDocument.h" | 167 #include "public/web/WebDocument.h" |
| 166 #include "public/web/WebFindOptions.h" | 168 #include "public/web/WebFindOptions.h" |
| 167 #include "public/web/WebFormElement.h" | 169 #include "public/web/WebFormElement.h" |
| (...skipping 1330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1498 } | 1500 } |
| 1499 | 1501 |
| 1500 WebString WebLocalFrameImpl::layerTreeAsText(bool showDebugInfo) const | 1502 WebString WebLocalFrameImpl::layerTreeAsText(bool showDebugInfo) const |
| 1501 { | 1503 { |
| 1502 if (!frame()) | 1504 if (!frame()) |
| 1503 return WebString(); | 1505 return WebString(); |
| 1504 | 1506 |
| 1505 return WebString(frame()->layerTreeAsText(showDebugInfo ? LayerTreeIncludesD ebugInfo : LayerTreeNormal)); | 1507 return WebString(frame()->layerTreeAsText(showDebugInfo ? LayerTreeIncludesD ebugInfo : LayerTreeNormal)); |
| 1506 } | 1508 } |
| 1507 | 1509 |
| 1510 void WebLocalFrameImpl::requestManifest() | |
| 1511 { | |
| 1512 ASSERT(m_frame); | |
| 1513 ManifestLoader::loadManifest(PassRefPtr<LocalFrame>(m_frame)); | |
|
dcheng
2014/09/02 08:56:34
PassRefPtr has a conversion constructor for RefPtr
mlamouri (slow - plz ping)
2014/09/02 15:24:39
Done.
| |
| 1514 } | |
| 1515 | |
| 1508 // WebLocalFrameImpl public ---------------------------------------------------- ----- | 1516 // WebLocalFrameImpl public ---------------------------------------------------- ----- |
| 1509 | 1517 |
| 1510 WebLocalFrame* WebLocalFrame::create(WebFrameClient* client) | 1518 WebLocalFrame* WebLocalFrame::create(WebFrameClient* client) |
| 1511 { | 1519 { |
| 1512 return WebLocalFrameImpl::create(client); | 1520 return WebLocalFrameImpl::create(client); |
| 1513 } | 1521 } |
| 1514 | 1522 |
| 1515 WebLocalFrameImpl* WebLocalFrameImpl::create(WebFrameClient* client) | 1523 WebLocalFrameImpl* WebLocalFrameImpl::create(WebFrameClient* client) |
| 1516 { | 1524 { |
| 1517 return adoptRef(new WebLocalFrameImpl(client)).leakRef(); | 1525 return adoptRef(new WebLocalFrameImpl(client)).leakRef(); |
| (...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1861 | 1869 |
| 1862 void WebLocalFrameImpl::invalidateAll() const | 1870 void WebLocalFrameImpl::invalidateAll() const |
| 1863 { | 1871 { |
| 1864 ASSERT(frame() && frame()->view()); | 1872 ASSERT(frame() && frame()->view()); |
| 1865 FrameView* view = frame()->view(); | 1873 FrameView* view = frame()->view(); |
| 1866 view->invalidateRect(view->frameRect()); | 1874 view->invalidateRect(view->frameRect()); |
| 1867 invalidateScrollbar(); | 1875 invalidateScrollbar(); |
| 1868 } | 1876 } |
| 1869 | 1877 |
| 1870 } // namespace blink | 1878 } // namespace blink |
| OLD | NEW |