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 1641 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1652 } | 1652 } |
1653 } | 1653 } |
1654 | 1654 |
1655 void WebLocalFrameImpl::createFrameView() | 1655 void WebLocalFrameImpl::createFrameView() |
1656 { | 1656 { |
1657 TRACE_EVENT0("webkit", "WebLocalFrameImpl::createFrameView"); | 1657 TRACE_EVENT0("webkit", "WebLocalFrameImpl::createFrameView"); |
1658 | 1658 |
1659 ASSERT(frame()); // If frame() doesn't exist, we probably didn't init proper ly. | 1659 ASSERT(frame()); // If frame() doesn't exist, we probably didn't init proper ly. |
1660 | 1660 |
1661 WebViewImpl* webView = viewImpl(); | 1661 WebViewImpl* webView = viewImpl(); |
1662 bool isMainFrame = webView->mainFrameImpl()->frame() == frame(); | 1662 bool isMainFrame = (parent() == 0); |
dcheng
2014/06/20 20:49:12
I think Blink style would prefer bool isMainFrame
| |
1663 if (isMainFrame) | 1663 if (isMainFrame) |
1664 webView->suppressInvalidations(true); | 1664 webView->suppressInvalidations(true); |
1665 | 1665 |
1666 frame()->createView(webView->size(), webView->baseBackgroundColor(), webView ->isTransparent()); | 1666 frame()->createView(webView->size(), webView->baseBackgroundColor(), webView ->isTransparent()); |
1667 if (webView->shouldAutoResize() && isMainFrame) | 1667 if (webView->shouldAutoResize() && isMainFrame) |
1668 frame()->view()->enableAutoSizeMode(true, webView->minAutoSize(), webVie w->maxAutoSize()); | 1668 frame()->view()->enableAutoSizeMode(true, webView->minAutoSize(), webVie w->maxAutoSize()); |
1669 | 1669 |
1670 frame()->view()->setInputEventsTransformForEmulation(m_inputEventsOffsetForE mulation, m_inputEventsScaleFactorForEmulation); | 1670 frame()->view()->setInputEventsTransformForEmulation(m_inputEventsOffsetForE mulation, m_inputEventsScaleFactorForEmulation); |
1671 | 1671 |
1672 if (isMainFrame) | 1672 if (isMainFrame) |
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1906 { | 1906 { |
1907 RefPtr<LocalFrame> frame = LocalFrame::create(&m_frameLoaderClientImpl, host , owner); | 1907 RefPtr<LocalFrame> frame = LocalFrame::create(&m_frameLoaderClientImpl, host , owner); |
1908 setWebCoreFrame(frame); | 1908 setWebCoreFrame(frame); |
1909 frame->tree().setName(name, fallbackName); | 1909 frame->tree().setName(name, fallbackName); |
1910 // May dispatch JS events; frame may be detached after this. | 1910 // May dispatch JS events; frame may be detached after this. |
1911 frame->init(); | 1911 frame->init(); |
1912 return frame; | 1912 return frame; |
1913 } | 1913 } |
1914 | 1914 |
1915 } // namespace blink | 1915 } // namespace blink |
OLD | NEW |