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

Side by Side Diff: third_party/WebKit/Source/core/editing/Editor.cpp

Issue 2469873002: [ImageResource 4] Split ImageResource into Resource and Image parts (Closed)
Patch Set: Rebase. Created 4 years 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) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "core/editing/commands/TypingCommand.h" 55 #include "core/editing/commands/TypingCommand.h"
56 #include "core/editing/commands/UndoStack.h" 56 #include "core/editing/commands/UndoStack.h"
57 #include "core/editing/iterators/SearchBuffer.h" 57 #include "core/editing/iterators/SearchBuffer.h"
58 #include "core/editing/markers/DocumentMarkerController.h" 58 #include "core/editing/markers/DocumentMarkerController.h"
59 #include "core/editing/serializers/Serialization.h" 59 #include "core/editing/serializers/Serialization.h"
60 #include "core/editing/spellcheck/SpellChecker.h" 60 #include "core/editing/spellcheck/SpellChecker.h"
61 #include "core/events/ClipboardEvent.h" 61 #include "core/events/ClipboardEvent.h"
62 #include "core/events/KeyboardEvent.h" 62 #include "core/events/KeyboardEvent.h"
63 #include "core/events/ScopedEventQueue.h" 63 #include "core/events/ScopedEventQueue.h"
64 #include "core/events/TextEvent.h" 64 #include "core/events/TextEvent.h"
65 #include "core/fetch/ImageResource.h" 65 #include "core/fetch/ImageResourceContent.h"
66 #include "core/fetch/ResourceFetcher.h" 66 #include "core/fetch/ResourceFetcher.h"
67 #include "core/frame/FrameView.h" 67 #include "core/frame/FrameView.h"
68 #include "core/frame/LocalFrame.h" 68 #include "core/frame/LocalFrame.h"
69 #include "core/frame/Settings.h" 69 #include "core/frame/Settings.h"
70 #include "core/frame/UseCounter.h" 70 #include "core/frame/UseCounter.h"
71 #include "core/html/HTMLBodyElement.h" 71 #include "core/html/HTMLBodyElement.h"
72 #include "core/html/HTMLCanvasElement.h" 72 #include "core/html/HTMLCanvasElement.h"
73 #include "core/html/HTMLHtmlElement.h" 73 #include "core/html/HTMLHtmlElement.h"
74 #include "core/html/HTMLImageElement.h" 74 #include "core/html/HTMLImageElement.h"
75 #include "core/html/HTMLInputElement.h" 75 #include "core/html/HTMLInputElement.h"
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 482
483 if (layoutObject->isCanvas()) 483 if (layoutObject->isCanvas())
484 return toHTMLCanvasElement(node).copiedImage(FrontBuffer, 484 return toHTMLCanvasElement(node).copiedImage(FrontBuffer,
485 PreferNoAcceleration); 485 PreferNoAcceleration);
486 486
487 if (layoutObject->isImage()) { 487 if (layoutObject->isImage()) {
488 LayoutImage* layoutImage = toLayoutImage(layoutObject); 488 LayoutImage* layoutImage = toLayoutImage(layoutObject);
489 if (!layoutImage) 489 if (!layoutImage)
490 return nullptr; 490 return nullptr;
491 491
492 ImageResource* cachedImage = layoutImage->cachedImage(); 492 ImageResourceContent* cachedImage = layoutImage->cachedImage();
493 if (!cachedImage || cachedImage->errorOccurred()) 493 if (!cachedImage || cachedImage->errorOccurred())
494 return nullptr; 494 return nullptr;
495 return cachedImage->getImage(); 495 return cachedImage->getImage();
496 } 496 }
497 497
498 return nullptr; 498 return nullptr;
499 } 499 }
500 500
501 static void writeImageNodeToPasteboard(Pasteboard* pasteboard, 501 static void writeImageNodeToPasteboard(Pasteboard* pasteboard,
502 Node* node, 502 Node* node,
(...skipping 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after
1660 } 1660 }
1661 1661
1662 DEFINE_TRACE(Editor) { 1662 DEFINE_TRACE(Editor) {
1663 visitor->trace(m_frame); 1663 visitor->trace(m_frame);
1664 visitor->trace(m_lastEditCommand); 1664 visitor->trace(m_lastEditCommand);
1665 visitor->trace(m_undoStack); 1665 visitor->trace(m_undoStack);
1666 visitor->trace(m_mark); 1666 visitor->trace(m_mark);
1667 } 1667 }
1668 1668
1669 } // namespace blink 1669 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698