Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: Source/web/WebLocalFrameImpl.cpp

Issue 717053002: Revert "Use expected main frame size from WebViewImpl when creating a new FrameView." (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/web/WebViewImpl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1648 matching lines...) Expand 10 before | Expand all | Expand 10 after
1659 { 1659 {
1660 TRACE_EVENT0("blink", "WebLocalFrameImpl::createFrameView"); 1660 TRACE_EVENT0("blink", "WebLocalFrameImpl::createFrameView");
1661 1661
1662 ASSERT(frame()); // If frame() doesn't exist, we probably didn't init proper ly. 1662 ASSERT(frame()); // If frame() doesn't exist, we probably didn't init proper ly.
1663 1663
1664 WebViewImpl* webView = viewImpl(); 1664 WebViewImpl* webView = viewImpl();
1665 bool isLocalRoot = frame()->isLocalRoot(); 1665 bool isLocalRoot = frame()->isLocalRoot();
1666 if (isLocalRoot) 1666 if (isLocalRoot)
1667 webView->suppressInvalidations(true); 1667 webView->suppressInvalidations(true);
1668 1668
1669 frame()->createView(webView->mainFrameSize(), webView->baseBackgroundColor() , webView->isTransparent()); 1669 frame()->createView(webView->size(), webView->baseBackgroundColor(), webView ->isTransparent());
1670 if (webView->shouldAutoResize() && isLocalRoot) 1670 if (webView->shouldAutoResize() && isLocalRoot)
1671 frame()->view()->enableAutoSizeMode(webView->minAutoSize(), webView->max AutoSize()); 1671 frame()->view()->enableAutoSizeMode(webView->minAutoSize(), webView->max AutoSize());
1672 1672
1673 frame()->view()->setInputEventsTransformForEmulation(m_inputEventsOffsetForE mulation, m_inputEventsScaleFactorForEmulation); 1673 frame()->view()->setInputEventsTransformForEmulation(m_inputEventsOffsetForE mulation, m_inputEventsScaleFactorForEmulation);
1674 1674
1675 if (isLocalRoot) 1675 if (isLocalRoot)
1676 webView->suppressInvalidations(false); 1676 webView->suppressInvalidations(false);
1677 } 1677 }
1678 1678
1679 WebLocalFrameImpl* WebLocalFrameImpl::fromFrame(LocalFrame* frame) 1679 WebLocalFrameImpl* WebLocalFrameImpl::fromFrame(LocalFrame* frame)
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
1969 1969
1970 void WebLocalFrameImpl::invalidateAll() const 1970 void WebLocalFrameImpl::invalidateAll() const
1971 { 1971 {
1972 ASSERT(frame() && frame()->view()); 1972 ASSERT(frame() && frame()->view());
1973 FrameView* view = frame()->view(); 1973 FrameView* view = frame()->view();
1974 view->invalidateRect(view->frameRect()); 1974 view->invalidateRect(view->frameRect());
1975 invalidateScrollbar(); 1975 invalidateScrollbar();
1976 } 1976 }
1977 1977
1978 } // namespace blink 1978 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698