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

Side by Side Diff: Source/web/WebPluginContainerImpl.cpp

Issue 517043003: Move Frame to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Back out non-Oilpan experiment + tidy up by adding frame() ref accessors Created 6 years, 3 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2014 Opera Software ASA. All rights reserved. 3 * Copyright (C) 2014 Opera Software ASA. All rights reserved.
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 are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * 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 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 context->setFillColor(Color(0xCC, 0xCC, 0xCC)); 667 context->setFillColor(Color(0xCC, 0xCC, 0xCC));
668 context->fillRect(intersection(horizontalOverhangArea, dirtyRect)); 668 context->fillRect(intersection(horizontalOverhangArea, dirtyRect));
669 context->fillRect(intersection(verticalOverhangArea, dirtyRect)); 669 context->fillRect(intersection(verticalOverhangArea, dirtyRect));
670 context->restore(); 670 context->restore();
671 return true; 671 return true;
672 } 672 }
673 673
674 // Private methods ------------------------------------------------------------- 674 // Private methods -------------------------------------------------------------
675 675
676 WebPluginContainerImpl::WebPluginContainerImpl(HTMLPlugInElement* element, WebPl ugin* webPlugin) 676 WebPluginContainerImpl::WebPluginContainerImpl(HTMLPlugInElement* element, WebPl ugin* webPlugin)
677 #if ENABLE(OILPAN)
678 : m_frame(element->document().frame())
679 #else
677 : FrameDestructionObserver(element->document().frame()) 680 : FrameDestructionObserver(element->document().frame())
681 #endif
678 , m_element(element) 682 , m_element(element)
679 , m_webPlugin(webPlugin) 683 , m_webPlugin(webPlugin)
680 , m_webLayer(0) 684 , m_webLayer(0)
681 , m_touchEventRequestType(TouchEventRequestTypeNone) 685 , m_touchEventRequestType(TouchEventRequestTypeNone)
682 , m_wantsWheelEvents(false) 686 , m_wantsWheelEvents(false)
683 { 687 {
684 } 688 }
685 689
686 WebPluginContainerImpl::~WebPluginContainerImpl() 690 WebPluginContainerImpl::~WebPluginContainerImpl()
687 { 691 {
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 962
959 return clipRect; 963 return clipRect;
960 } 964 }
961 965
962 bool WebPluginContainerImpl::pluginShouldPersist() const 966 bool WebPluginContainerImpl::pluginShouldPersist() const
963 { 967 {
964 return m_webPlugin->shouldPersist(); 968 return m_webPlugin->shouldPersist();
965 } 969 }
966 970
967 } // namespace blink 971 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698