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

Side by Side Diff: Source/core/html/HTMLCanvasElement.cpp

Issue 13973026: remove memoryinstrumentation Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove the rest part of MemoryInstrumentation Created 7 years, 8 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/html/HTMLCanvasElement.h ('k') | Source/core/html/HTMLFormControlElement.h » ('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) 2004, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
4 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. 4 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 29 matching lines...) Expand all
40 #include "Frame.h" 40 #include "Frame.h"
41 #include "GraphicsContext.h" 41 #include "GraphicsContext.h"
42 #include "HTMLNames.h" 42 #include "HTMLNames.h"
43 #include "ImageBuffer.h" 43 #include "ImageBuffer.h"
44 #include "ImageData.h" 44 #include "ImageData.h"
45 #include "MIMETypeRegistry.h" 45 #include "MIMETypeRegistry.h"
46 #include "Page.h" 46 #include "Page.h"
47 #include "RenderHTMLCanvas.h" 47 #include "RenderHTMLCanvas.h"
48 #include "ScriptController.h" 48 #include "ScriptController.h"
49 #include "Settings.h" 49 #include "Settings.h"
50 #include "WebCoreMemoryInstrumentation.h"
51 #include <math.h> 50 #include <math.h>
52 #include <stdio.h> 51 #include <stdio.h>
53 52
54 #include "WebGLContextAttributes.h" 53 #include "WebGLContextAttributes.h"
55 #include "WebGLRenderingContext.h" 54 #include "WebGLRenderingContext.h"
56 55
57 #include <public/Platform.h> 56 #include <public/Platform.h>
58 57
59 namespace WebCore { 58 namespace WebCore {
60 59
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 ASSERT(m_hasCreatedImageBuffer); 575 ASSERT(m_hasCreatedImageBuffer);
577 FloatSize unscaledSize = size(); 576 FloatSize unscaledSize = size();
578 FloatSize deviceSize = convertLogicalToDevice(unscaledSize); 577 FloatSize deviceSize = convertLogicalToDevice(unscaledSize);
579 IntSize size(deviceSize.width(), deviceSize.height()); 578 IntSize size(deviceSize.width(), deviceSize.height());
580 AffineTransform transform; 579 AffineTransform transform;
581 if (size.width() && size.height()) 580 if (size.width() && size.height())
582 transform.scaleNonUniform(size.width() / unscaledSize.width(), size.heig ht() / unscaledSize.height()); 581 transform.scaleNonUniform(size.width() / unscaledSize.width(), size.heig ht() / unscaledSize.height());
583 return m_imageBuffer->baseTransform() * transform; 582 return m_imageBuffer->baseTransform() * transform;
584 } 583 }
585 584
586 void HTMLCanvasElement::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) co nst
587 {
588 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
589 HTMLElement::reportMemoryUsage(memoryObjectInfo);
590 info.addMember(m_observers, "observers");
591 info.addMember(m_context, "context");
592 info.addMember(m_imageBuffer, "imageBuffer");
593 info.addMember(m_contextStateSaver, "contextStateSaver");
594 info.addMember(m_presentedImage, "presentedImage");
595 info.addMember(m_copiedImage, "copiedImage");
596 } 585 }
597
598 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLCanvasElement.h ('k') | Source/core/html/HTMLFormControlElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698