| 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 1732 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1743 void WebLocalFrameImpl::createFrameView() | 1743 void WebLocalFrameImpl::createFrameView() |
| 1744 { | 1744 { |
| 1745 TRACE_EVENT0("blink", "WebLocalFrameImpl::createFrameView"); | 1745 TRACE_EVENT0("blink", "WebLocalFrameImpl::createFrameView"); |
| 1746 | 1746 |
| 1747 ASSERT(frame()); // If frame() doesn't exist, we probably didn't init proper
ly. | 1747 ASSERT(frame()); // If frame() doesn't exist, we probably didn't init proper
ly. |
| 1748 | 1748 |
| 1749 WebViewImpl* webView = viewImpl(); | 1749 WebViewImpl* webView = viewImpl(); |
| 1750 | 1750 |
| 1751 bool isMainFrame = !parent(); | 1751 bool isMainFrame = !parent(); |
| 1752 IntSize initialSize = (isMainFrame || !frameWidget()) ? webView->mainFrameSi
ze() : (IntSize)frameWidget()->size(); | 1752 IntSize initialSize = (isMainFrame || !frameWidget()) ? webView->mainFrameSi
ze() : (IntSize)frameWidget()->size(); |
| 1753 bool isTransparent = !isMainFrame && parent()->isWebRemoteFrame() ? true : w
ebView->isTransparent(); |
| 1753 | 1754 |
| 1754 frame()->createView(initialSize, webView->baseBackgroundColor(), webView->is
Transparent()); | 1755 frame()->createView(initialSize, webView->baseBackgroundColor(), isTranspare
nt); |
| 1755 if (webView->shouldAutoResize() && frame()->isLocalRoot()) | 1756 if (webView->shouldAutoResize() && frame()->isLocalRoot()) |
| 1756 frame()->view()->enableAutoSizeMode(webView->minAutoSize(), webView->max
AutoSize()); | 1757 frame()->view()->enableAutoSizeMode(webView->minAutoSize(), webView->max
AutoSize()); |
| 1757 | 1758 |
| 1758 frame()->view()->setInputEventsTransformForEmulation(m_inputEventsOffsetForE
mulation, m_inputEventsScaleFactorForEmulation); | 1759 frame()->view()->setInputEventsTransformForEmulation(m_inputEventsOffsetForE
mulation, m_inputEventsScaleFactorForEmulation); |
| 1759 frame()->view()->setDisplayMode(webView->displayMode()); | 1760 frame()->view()->setDisplayMode(webView->displayMode()); |
| 1760 } | 1761 } |
| 1761 | 1762 |
| 1762 WebLocalFrameImpl* WebLocalFrameImpl::fromFrame(LocalFrame* frame) | 1763 WebLocalFrameImpl* WebLocalFrameImpl::fromFrame(LocalFrame* frame) |
| 1763 { | 1764 { |
| 1764 if (!frame) | 1765 if (!frame) |
| (...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2252 return WebSandboxFlags::None; | 2253 return WebSandboxFlags::None; |
| 2253 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); | 2254 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); |
| 2254 } | 2255 } |
| 2255 | 2256 |
| 2256 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) | 2257 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) |
| 2257 { | 2258 { |
| 2258 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); | 2259 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); |
| 2259 } | 2260 } |
| 2260 | 2261 |
| 2261 } // namespace blink | 2262 } // namespace blink |
| OLD | NEW |