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

Side by Side Diff: Source/core/dom/Document.cpp

Issue 16646002: Move the CSS Device Adaptation @viewport rule support behind a runtime flag (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: For landing Created 7 years, 6 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
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/features.gypi » ('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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 5253 matching lines...) Expand 10 before | Expand all | Expand 10 after
5264 return loader; 5264 return loader;
5265 } 5265 }
5266 5266
5267 IntSize Document::viewportSize() const 5267 IntSize Document::viewportSize() const
5268 { 5268 {
5269 if (!view()) 5269 if (!view())
5270 return IntSize(); 5270 return IntSize();
5271 return view()->visibleContentRect(ScrollableArea::IncludeScrollbars).size(); 5271 return view()->visibleContentRect(ScrollableArea::IncludeScrollbars).size();
5272 } 5272 }
5273 5273
5274 #if ENABLE(CSS_DEVICE_ADAPTATION)
5275 IntSize Document::initialViewportSize() const 5274 IntSize Document::initialViewportSize() const
5276 { 5275 {
5277 if (!view()) 5276 if (!view())
5278 return IntSize(); 5277 return IntSize();
5279 return view()->initialViewportSize(); 5278 return view()->unscaledVisibleContentSize(ScrollableArea::IncludeScrollbars) ;
5280 } 5279 }
5281 #endif
5282 5280
5283 Node* eventTargetNodeForDocument(Document* doc) 5281 Node* eventTargetNodeForDocument(Document* doc)
5284 { 5282 {
5285 if (!doc) 5283 if (!doc)
5286 return 0; 5284 return 0;
5287 Node* node = doc->focusedNode(); 5285 Node* node = doc->focusedNode();
5288 if (!node && doc->isPluginDocument()) { 5286 if (!node && doc->isPluginDocument()) {
5289 PluginDocument* pluginDocument = toPluginDocument(doc); 5287 PluginDocument* pluginDocument = toPluginDocument(doc);
5290 node = pluginDocument->pluginNode(); 5288 node = pluginDocument->pluginNode();
5291 } 5289 }
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
5595 return; 5593 return;
5596 5594
5597 Vector<RefPtr<Element> > associatedFormControls; 5595 Vector<RefPtr<Element> > associatedFormControls;
5598 copyToVector(m_associatedFormControls, associatedFormControls); 5596 copyToVector(m_associatedFormControls, associatedFormControls);
5599 5597
5600 frame()->page()->chrome().client()->didAssociateFormControls(associatedFormC ontrols); 5598 frame()->page()->chrome().client()->didAssociateFormControls(associatedFormC ontrols);
5601 m_associatedFormControls.clear(); 5599 m_associatedFormControls.clear();
5602 } 5600 }
5603 5601
5604 } // namespace WebCore 5602 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/features.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698