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

Side by Side Diff: Source/core/page/DOMWindow.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: Land patch upload resulted in python error 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) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 24 matching lines...) Expand all
35 #include "bindings/v8/ScriptCallStackFactory.h" 35 #include "bindings/v8/ScriptCallStackFactory.h"
36 #include "bindings/v8/ScriptController.h" 36 #include "bindings/v8/ScriptController.h"
37 #include "bindings/v8/SerializedScriptValue.h" 37 #include "bindings/v8/SerializedScriptValue.h"
38 #include "core/css/CSSComputedStyleDeclaration.h" 38 #include "core/css/CSSComputedStyleDeclaration.h"
39 #include "core/css/CSSRuleList.h" 39 #include "core/css/CSSRuleList.h"
40 #include "core/css/DOMWindowCSS.h" 40 #include "core/css/DOMWindowCSS.h"
41 #include "core/css/MediaQueryList.h" 41 #include "core/css/MediaQueryList.h"
42 #include "core/css/MediaQueryMatcher.h" 42 #include "core/css/MediaQueryMatcher.h"
43 #include "core/css/StyleMedia.h" 43 #include "core/css/StyleMedia.h"
44 #include "core/css/resolver/StyleResolver.h" 44 #include "core/css/resolver/StyleResolver.h"
45 #include "core/css/resolver/ViewportStyleResolver.h"
45 #include "core/dom/DeviceOrientationController.h" 46 #include "core/dom/DeviceOrientationController.h"
46 #include "core/dom/Document.h" 47 #include "core/dom/Document.h"
47 #include "core/dom/Element.h" 48 #include "core/dom/Element.h"
48 #include "core/dom/EventListener.h" 49 #include "core/dom/EventListener.h"
49 #include "core/dom/EventNames.h" 50 #include "core/dom/EventNames.h"
50 #include "core/dom/ExceptionCode.h" 51 #include "core/dom/ExceptionCode.h"
51 #include "core/dom/ExceptionCodePlaceholder.h" 52 #include "core/dom/ExceptionCodePlaceholder.h"
52 #include "core/dom/MessageEvent.h" 53 #include "core/dom/MessageEvent.h"
53 #include "core/dom/PageTransitionEvent.h" 54 #include "core/dom/PageTransitionEvent.h"
54 #include "core/dom/RequestAnimationFrameCallback.h" 55 #include "core/dom/RequestAnimationFrameCallback.h"
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 return; 347 return;
347 348
348 m_document->setDOMWindow(this); 349 m_document->setDOMWindow(this);
349 if (!m_document->attached()) 350 if (!m_document->attached())
350 m_document->attach(); 351 m_document->attach();
351 352
352 if (!m_frame) 353 if (!m_frame)
353 return; 354 return;
354 355
355 m_frame->script()->updateDocument(); 356 m_frame->script()->updateDocument();
356 m_document->updateViewportArguments(); 357 m_document->styleResolver()->viewportStyleResolver()->resolve();
357 358
358 if (m_frame->page() && m_frame->view()) { 359 if (m_frame->page() && m_frame->view()) {
359 if (ScrollingCoordinator* scrollingCoordinator = m_frame->page()->scroll ingCoordinator()) { 360 if (ScrollingCoordinator* scrollingCoordinator = m_frame->page()->scroll ingCoordinator()) {
360 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_frame- >view(), HorizontalScrollbar); 361 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_frame- >view(), HorizontalScrollbar);
361 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_frame- >view(), VerticalScrollbar); 362 scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_frame- >view(), VerticalScrollbar);
362 scrollingCoordinator->scrollableAreaScrollLayerDidChange(m_frame->vi ew()); 363 scrollingCoordinator->scrollableAreaScrollLayerDidChange(m_frame->vi ew());
363 } 364 }
364 } 365 }
365 366
366 m_frame->selection()->updateSecureKeyboardEntryIfActive(); 367 m_frame->selection()->updateSecureKeyboardEntryIfActive();
(...skipping 1555 matching lines...) Expand 10 before | Expand all | Expand 10 after
1922 1923
1923 Frame* child = frame->tree()->scopedChild(index); 1924 Frame* child = frame->tree()->scopedChild(index);
1924 if (child) 1925 if (child)
1925 return child->domWindow(); 1926 return child->domWindow();
1926 1927
1927 return 0; 1928 return 0;
1928 } 1929 }
1929 1930
1930 1931
1931 } // namespace WebCore 1932 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698