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

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

Issue 123503002: Mark the AtomicString(const String&) constructor as explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 11 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
« no previous file with comments | « Source/core/fileapi/FileReaderLoader.cpp ('k') | Source/core/frame/Location.cpp » ('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) 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 1264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1275 m_frame->document()->mediaQueryAffectingValueChanged(); 1275 m_frame->document()->mediaQueryAffectingValueChanged();
1276 m_mediaType = mediaType; 1276 m_mediaType = mediaType;
1277 } 1277 }
1278 1278
1279 AtomicString FrameView::mediaType() const 1279 AtomicString FrameView::mediaType() const
1280 { 1280 {
1281 // See if we have an override type. 1281 // See if we have an override type.
1282 String overrideType; 1282 String overrideType;
1283 InspectorInstrumentation::applyEmulatedMedia(m_frame.get(), &overrideType); 1283 InspectorInstrumentation::applyEmulatedMedia(m_frame.get(), &overrideType);
1284 if (!overrideType.isNull()) 1284 if (!overrideType.isNull())
1285 return overrideType; 1285 return AtomicString(overrideType);
1286 return m_mediaType; 1286 return m_mediaType;
1287 } 1287 }
1288 1288
1289 void FrameView::adjustMediaTypeForPrinting(bool printing) 1289 void FrameView::adjustMediaTypeForPrinting(bool printing)
1290 { 1290 {
1291 if (printing) { 1291 if (printing) {
1292 if (m_mediaTypeWhenNotPrinting.isNull()) 1292 if (m_mediaTypeWhenNotPrinting.isNull())
1293 m_mediaTypeWhenNotPrinting = mediaType(); 1293 m_mediaTypeWhenNotPrinting = mediaType();
1294 setMediaType("print"); 1294 setMediaType("print");
1295 } else { 1295 } else {
(...skipping 2209 matching lines...) Expand 10 before | Expand all | Expand 10 after
3505 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3505 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3506 { 3506 {
3507 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3507 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3508 if (AXObjectCache* cache = axObjectCache()) { 3508 if (AXObjectCache* cache = axObjectCache()) {
3509 cache->remove(scrollbar); 3509 cache->remove(scrollbar);
3510 cache->handleScrollbarUpdate(this); 3510 cache->handleScrollbarUpdate(this);
3511 } 3511 }
3512 } 3512 }
3513 3513
3514 } // namespace WebCore 3514 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/fileapi/FileReaderLoader.cpp ('k') | Source/core/frame/Location.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698