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

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

Issue 1660863002: Force all LayoutUnit construction to be explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix multicol Created 4 years, 10 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
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 2066 matching lines...) Expand 10 before | Expand all | Expand 10 after
2077 height = size.height(); 2077 height = size.height();
2078 break; 2078 break;
2079 } 2079 }
2080 default: 2080 default:
2081 ASSERT_NOT_REACHED(); 2081 ASSERT_NOT_REACHED();
2082 } 2082 }
2083 pageSize = IntSize(width, height); 2083 pageSize = IntSize(width, height);
2084 2084
2085 // The percentage is calculated with respect to the width even for margin to p and bottom. 2085 // The percentage is calculated with respect to the width even for margin to p and bottom.
2086 // http://www.w3.org/TR/CSS2/box.html#margin-properties 2086 // http://www.w3.org/TR/CSS2/box.html#margin-properties
2087 marginTop = style->marginTop().isAuto() ? marginTop : intValueForLength(styl e->marginTop(), width); 2087 marginTop = style->marginTop().isAuto() ? marginTop : intValueForLength(styl e->marginTop(), LayoutUnit(width));
eae 2016/02/12 01:14:59 How about adding a version of intValueForLength th
2088 marginRight = style->marginRight().isAuto() ? marginRight : intValueForLengt h(style->marginRight(), width); 2088 marginRight = style->marginRight().isAuto() ? marginRight : intValueForLengt h(style->marginRight(), LayoutUnit(width));
2089 marginBottom = style->marginBottom().isAuto() ? marginBottom : intValueForLe ngth(style->marginBottom(), width); 2089 marginBottom = style->marginBottom().isAuto() ? marginBottom : intValueForLe ngth(style->marginBottom(), LayoutUnit(width));
2090 marginLeft = style->marginLeft().isAuto() ? marginLeft : intValueForLength(s tyle->marginLeft(), width); 2090 marginLeft = style->marginLeft().isAuto() ? marginLeft : intValueForLength(s tyle->marginLeft(), LayoutUnit(width));
2091 } 2091 }
2092 2092
2093 void Document::setIsViewSource(bool isViewSource) 2093 void Document::setIsViewSource(bool isViewSource)
2094 { 2094 {
2095 m_isViewSource = isViewSource; 2095 m_isViewSource = isViewSource;
2096 if (!m_isViewSource) 2096 if (!m_isViewSource)
2097 return; 2097 return;
2098 2098
2099 setSecurityOrigin(SecurityOrigin::createUnique()); 2099 setSecurityOrigin(SecurityOrigin::createUnique());
2100 didUpdateSecurityOrigin(); 2100 didUpdateSecurityOrigin();
(...skipping 3849 matching lines...) Expand 10 before | Expand all | Expand 10 after
5950 #ifndef NDEBUG 5950 #ifndef NDEBUG
5951 using namespace blink; 5951 using namespace blink;
5952 void showLiveDocumentInstances() 5952 void showLiveDocumentInstances()
5953 { 5953 {
5954 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 5954 Document::WeakDocumentSet& set = Document::liveDocumentSet();
5955 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5955 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5956 for (Document* document : set) 5956 for (Document* document : set)
5957 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5957 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5958 } 5958 }
5959 #endif 5959 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698