| 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 1667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1678 if (isLocalRoot) | 1678 if (isLocalRoot) |
| 1679 webView->suppressInvalidations(true); | 1679 webView->suppressInvalidations(true); |
| 1680 | 1680 |
| 1681 IntSize initialSize = frameWidget() ? (IntSize)frameWidget()->size() : webVi
ew->mainFrameSize(); | 1681 IntSize initialSize = frameWidget() ? (IntSize)frameWidget()->size() : webVi
ew->mainFrameSize(); |
| 1682 | 1682 |
| 1683 frame()->createView(initialSize, webView->baseBackgroundColor(), webView->is
Transparent()); | 1683 frame()->createView(initialSize, webView->baseBackgroundColor(), webView->is
Transparent()); |
| 1684 if (webView->shouldAutoResize() && isLocalRoot) | 1684 if (webView->shouldAutoResize() && isLocalRoot) |
| 1685 frame()->view()->enableAutoSizeMode(webView->minAutoSize(), webView->max
AutoSize()); | 1685 frame()->view()->enableAutoSizeMode(webView->minAutoSize(), webView->max
AutoSize()); |
| 1686 | 1686 |
| 1687 frame()->view()->setInputEventsTransformForEmulation(m_inputEventsOffsetForE
mulation, m_inputEventsScaleFactorForEmulation); | 1687 frame()->view()->setInputEventsTransformForEmulation(m_inputEventsOffsetForE
mulation, m_inputEventsScaleFactorForEmulation); |
| 1688 frame()->view()->setDisplayMode(webView->displayMode()); |
| 1688 | 1689 |
| 1689 if (isLocalRoot) | 1690 if (isLocalRoot) |
| 1690 webView->suppressInvalidations(false); | 1691 webView->suppressInvalidations(false); |
| 1691 } | 1692 } |
| 1692 | 1693 |
| 1693 WebLocalFrameImpl* WebLocalFrameImpl::fromFrame(LocalFrame* frame) | 1694 WebLocalFrameImpl* WebLocalFrameImpl::fromFrame(LocalFrame* frame) |
| 1694 { | 1695 { |
| 1695 if (!frame) | 1696 if (!frame) |
| 1696 return 0; | 1697 return 0; |
| 1697 return fromFrame(*frame); | 1698 return fromFrame(*frame); |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2006 { | 2007 { |
| 2007 m_frameWidget = frameWidget; | 2008 m_frameWidget = frameWidget; |
| 2008 } | 2009 } |
| 2009 | 2010 |
| 2010 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const | 2011 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const |
| 2011 { | 2012 { |
| 2012 return m_frameWidget; | 2013 return m_frameWidget; |
| 2013 } | 2014 } |
| 2014 | 2015 |
| 2015 } // namespace blink | 2016 } // namespace blink |
| OLD | NEW |