projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
core
/
html
/
ImageDocument.h
diff --git
a/src/third_party/WebKit/Source/core/html/ImageDocument.h
b/src/third_party/WebKit/Source/core/html/ImageDocument.h
index
896a462
..
c37eb47
100644
(file)
--- a/
src/third_party/WebKit/Source/core/html/ImageDocument.h
+++ b/
src/third_party/WebKit/Source/core/html/ImageDocument.h
@@
-35,9
+35,9
@@
class HTMLImageElement;
class ImageDocument FINAL : public HTMLDocument {
public:
class ImageDocument FINAL : public HTMLDocument {
public:
- static PassRefPtr<ImageDocument> create(const DocumentInit& initializer = DocumentInit())
+ static PassRefPtr
WillBeRawPtr
<ImageDocument> create(const DocumentInit& initializer = DocumentInit())
{
{
- return adoptRef(new ImageDocument(initializer));
+ return adoptRef
WillBeRefCountedGarbageCollected
(new ImageDocument(initializer));
}
ImageResource* cachedImage();
}
ImageResource* cachedImage();
@@
-47,8
+47,10
@@
public:
void imageUpdated();
void imageClicked(int x, int y);
void imageUpdated();
void imageClicked(int x, int y);
+ virtual void trace(Visitor*) OVERRIDE;
+
private:
private:
- ImageDocument(const DocumentInit&);
+
explicit
ImageDocument(const DocumentInit&);
virtual PassRefPtr<DocumentParser> createParser() OVERRIDE;
virtual void dispose() OVERRIDE;
virtual PassRefPtr<DocumentParser> createParser() OVERRIDE;
virtual void dispose() OVERRIDE;
@@
-60,7
+62,7
@@
private:
bool shouldShrinkToFit() const;
float scale() const;
bool shouldShrinkToFit() const;
float scale() const;
- RefPtr<HTMLImageElement> m_imageElement;
+ RefPtr
WillBeMember
<HTMLImageElement> m_imageElement;
// Whether enough of the image has been loaded to determine its size
bool m_imageSizeIsKnown;
// Whether enough of the image has been loaded to determine its size
bool m_imageSizeIsKnown;