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

Side by Side Diff: Source/WebCore/css/CSSComputedStyleDeclaration.cpp

Issue 10349004: Revert 115573 - Move Length and CSS length computation to float (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1123/
Patch Set: Created 8 years, 7 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) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 513
514 // Create the border outset. 514 // Create the border outset.
515 RefPtr<CSSValue> outset = valueForNinePieceImageQuad(image.outset()); 515 RefPtr<CSSValue> outset = valueForNinePieceImageQuad(image.outset());
516 516
517 // Create the repeat rules. 517 // Create the repeat rules.
518 RefPtr<CSSValue> repeat = valueForNinePieceImageRepeat(image); 518 RefPtr<CSSValue> repeat = valueForNinePieceImageRepeat(image);
519 519
520 return createBorderImageValue(imageValue, imageSlices, borderSlices, outset, repeat); 520 return createBorderImageValue(imageValue, imageSlices, borderSlices, outset, repeat);
521 } 521 }
522 522
523 inline static PassRefPtr<CSSPrimitiveValue> zoomAdjustedPixelValue(double value, const RenderStyle* style) 523 inline static PassRefPtr<CSSPrimitiveValue> zoomAdjustedPixelValue(int value, co nst RenderStyle* style)
524 { 524 {
525 return cssValuePool().createValue(adjustFloatForAbsoluteZoom(value, style), CSSPrimitiveValue::CSS_PX); 525 return cssValuePool().createValue(adjustForAbsoluteZoom(value, style), CSSPr imitiveValue::CSS_PX);
526 } 526 }
527 527
528 inline static PassRefPtr<CSSPrimitiveValue> zoomAdjustedNumberValue(double value , const RenderStyle* style) 528 inline static PassRefPtr<CSSPrimitiveValue> zoomAdjustedNumberValue(double value , const RenderStyle* style)
529 { 529 {
530 return cssValuePool().createValue(value / style->effectiveZoom(), CSSPrimiti veValue::CSS_NUMBER); 530 return cssValuePool().createValue(value / style->effectiveZoom(), CSSPrimiti veValue::CSS_NUMBER);
531 } 531 }
532 532
533 static PassRefPtr<CSSValue> zoomAdjustedPixelValueForLength(const Length& length , const RenderStyle* style) 533 static PassRefPtr<CSSValue> zoomAdjustedPixelValueForLength(const Length& length , const RenderStyle* style)
534 { 534 {
535 if (length.isFixed()) 535 if (length.isFixed())
(...skipping 2150 matching lines...) Expand 10 before | Expand all | Expand 10 after
2686 { 2686 {
2687 return getPropertyValue(propertyID); 2687 return getPropertyValue(propertyID);
2688 } 2688 }
2689 2689
2690 void CSSComputedStyleDeclaration::setPropertyInternal(CSSPropertyID, const Strin g&, bool, ExceptionCode& ec) 2690 void CSSComputedStyleDeclaration::setPropertyInternal(CSSPropertyID, const Strin g&, bool, ExceptionCode& ec)
2691 { 2691 {
2692 ec = NO_MODIFICATION_ALLOWED_ERR; 2692 ec = NO_MODIFICATION_ALLOWED_ERR;
2693 } 2693 }
2694 2694
2695 } // namespace WebCore 2695 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/platform/mac/tables/mozilla/bugs/bug1318-expected.txt ('k') | Source/WebCore/css/CSSPrimitiveValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698