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

Side by Side Diff: Source/core/page/FrameView.cpp

Issue 19555002: Translate viewport related meta tags into @viewport descriptors as suggested by the CSS Device Adap… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 months 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 2245 matching lines...) Expand 10 before | Expand all | Expand 10 after
2256 2256
2257 if (page) { 2257 if (page) {
2258 if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordina tor()) 2258 if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordina tor())
2259 scrollingCoordinator->frameViewLayoutUpdated(this); 2259 scrollingCoordinator->frameViewLayoutUpdated(this);
2260 } 2260 }
2261 2261
2262 scrollToAnchor(); 2262 scrollToAnchor();
2263 2263
2264 m_actionScheduler->resume(); 2264 m_actionScheduler->resume();
2265 2265
2266 // Viewport-dependent media queries may cause us to need completely differen t style information. 2266 IntSize currentSize = layoutSize(IncludeScrollbars);
2267 float currentZoomFactor = renderView->style()->zoom();
2268 bool resized = !m_firstLayout && (currentSize != m_lastViewportSize || curre ntZoomFactor != m_lastZoomFactor);
2269 m_lastViewportSize = currentSize;
2270 m_lastZoomFactor = currentZoomFactor;
2271
2272 // Viewport-dependent media queries and @viewport rue may cause us to need c ompletely
2273 // different style information.
2267 if (m_frame->document()->styleResolver()->affectedByViewportChange()) { 2274 if (m_frame->document()->styleResolver()->affectedByViewportChange()) {
2275 if (resized)
2276 m_frame->document()->styleResolver()->viewportStyleResolver()->resol ve();
2268 m_frame->document()->styleResolverChanged(DeferRecalcStyle); 2277 m_frame->document()->styleResolverChanged(DeferRecalcStyle);
2269 InspectorInstrumentation::mediaQueryResultChanged(m_frame->document()); 2278 InspectorInstrumentation::mediaQueryResultChanged(m_frame->document());
2270 } 2279 }
2271 2280
2272 // Refetch render view since it can be destroyed by updateWidget() call abov e. 2281 // Refetch render view since it can be destroyed by updateWidget() call abov e.
2273 renderView = this->renderView(); 2282 renderView = this->renderView();
2274 if (renderView && !renderView->printing()) { 2283 if (renderView && !renderView->printing() && resized) {
2275 IntSize currentSize = layoutSize(IncludeScrollbars); 2284 m_frame->eventHandler()->sendResizeEvent();
2276 float currentZoomFactor = renderView->style()->zoom(); 2285 if (page && page->mainFrame() == m_frame)
2277 bool resized = !m_firstLayout && (currentSize != m_lastViewportSize || c urrentZoomFactor != m_lastZoomFactor); 2286 InspectorInstrumentation::didResizeMainFrame(page);
2278 m_lastViewportSize = currentSize;
2279 m_lastZoomFactor = currentZoomFactor;
2280 if (resized) {
2281 m_frame->eventHandler()->sendResizeEvent();
2282 if (page && page->mainFrame() == m_frame)
2283 InspectorInstrumentation::didResizeMainFrame(page);
2284 }
2285 } 2287 }
2286 } 2288 }
2287 2289
2288 void FrameView::postLayoutTimerFired(Timer<FrameView>*) 2290 void FrameView::postLayoutTimerFired(Timer<FrameView>*)
2289 { 2291 {
2290 performPostLayoutTasks(); 2292 performPostLayoutTasks();
2291 } 2293 }
2292 2294
2293 void FrameView::autoSizeIfEnabled() 2295 void FrameView::autoSizeIfEnabled()
2294 { 2296 {
(...skipping 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after
3385 } 3387 }
3386 3388
3387 AXObjectCache* FrameView::axObjectCache() const 3389 AXObjectCache* FrameView::axObjectCache() const
3388 { 3390 {
3389 if (frame() && frame()->document()) 3391 if (frame() && frame()->document())
3390 return frame()->document()->existingAXObjectCache(); 3392 return frame()->document()->existingAXObjectCache();
3391 return 0; 3393 return 0;
3392 } 3394 }
3393 3395
3394 } // namespace WebCore 3396 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698