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

Side by Side Diff: Source/core/html/ImageDocument.h

Issue 262053005: Allow zoom/restore in a zoomed document. It is a regression from an earlier fix. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | Source/core/html/ImageDocument.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) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 25 matching lines...) Expand all
36 class ImageDocument FINAL : public HTMLDocument { 36 class ImageDocument FINAL : public HTMLDocument {
37 public: 37 public:
38 static PassRefPtr<ImageDocument> create(const DocumentInit& initializer = Do cumentInit()) 38 static PassRefPtr<ImageDocument> create(const DocumentInit& initializer = Do cumentInit())
39 { 39 {
40 return adoptRef(new ImageDocument(initializer)); 40 return adoptRef(new ImageDocument(initializer));
41 } 41 }
42 42
43 ImageResource* cachedImage(); 43 ImageResource* cachedImage();
44 HTMLImageElement* imageElement() const { return m_imageElement.get(); } 44 HTMLImageElement* imageElement() const { return m_imageElement.get(); }
45 45
46 void windowSizeChanged(); 46 void windowSizeChanged(bool resizeZoomedDocument);
tony 2014/05/05 16:38:13 Can you make this an enum with 2 values instead of
47 void imageUpdated(); 47 void imageUpdated();
48 void imageClicked(int x, int y); 48 void imageClicked(int x, int y);
49 49
50 private: 50 private:
51 ImageDocument(const DocumentInit&); 51 ImageDocument(const DocumentInit&);
52 52
53 virtual PassRefPtr<DocumentParser> createParser() OVERRIDE; 53 virtual PassRefPtr<DocumentParser> createParser() OVERRIDE;
54 virtual void dispose() OVERRIDE; 54 virtual void dispose() OVERRIDE;
55 55
56 void createDocumentStructure(); 56 void createDocumentStructure();
57 void resizeImageToFit(); 57 void resizeImageToFit(bool resizeZoomedDocument);
58 void restoreImageSize(); 58 void restoreImageSize(bool restoreZoomedDocument);
59 bool imageFitsInWindow() const; 59 bool imageFitsInWindow() const;
60 bool shouldShrinkToFit() const; 60 bool shouldShrinkToFit() const;
61 float scale() const; 61 float scale() const;
62 62
63 RefPtr<HTMLImageElement> m_imageElement; 63 RefPtr<HTMLImageElement> m_imageElement;
64 64
65 // Whether enough of the image has been loaded to determine its size 65 // Whether enough of the image has been loaded to determine its size
66 bool m_imageSizeIsKnown; 66 bool m_imageSizeIsKnown;
67 67
68 // Whether the image is shrunk to fit or not 68 // Whether the image is shrunk to fit or not
69 bool m_didShrinkImage; 69 bool m_didShrinkImage;
70 70
71 // Whether the image should be shrunk or not 71 // Whether the image should be shrunk or not
72 bool m_shouldShrinkImage; 72 bool m_shouldShrinkImage;
73 }; 73 };
74 74
75 DEFINE_DOCUMENT_TYPE_CASTS(ImageDocument); 75 DEFINE_DOCUMENT_TYPE_CASTS(ImageDocument);
76 76
77 } 77 }
78 78
79 #endif // ImageDocument_h 79 #endif // ImageDocument_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/ImageDocument.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698