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

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

Issue 1186543002: Oilpan: fix build after r197039. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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 | « Source/core/html/canvas/CanvasRenderingContext2DState.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "web/PopupMenuImpl.h" 6 #include "web/PopupMenuImpl.h"
7 7
8 #include "core/HTMLNames.h" 8 #include "core/HTMLNames.h"
9 #include "core/css/CSSFontSelector.h" 9 #include "core/css/CSSFontSelector.h"
10 #include "core/dom/ElementTraversal.h" 10 #include "core/dom/ElementTraversal.h"
(...skipping 11 matching lines...) Expand all
22 #include "platform/geometry/IntRect.h" 22 #include "platform/geometry/IntRect.h"
23 #include "platform/text/PlatformLocale.h" 23 #include "platform/text/PlatformLocale.h"
24 #include "public/platform/Platform.h" 24 #include "public/platform/Platform.h"
25 #include "public/web/WebColorChooser.h" 25 #include "public/web/WebColorChooser.h"
26 #include "web/ChromeClientImpl.h" 26 #include "web/ChromeClientImpl.h"
27 #include "web/WebViewImpl.h" 27 #include "web/WebViewImpl.h"
28 28
29 namespace blink { 29 namespace blink {
30 30
31 class PopupMenuCSSFontSelector : public CSSFontSelector, private CSSFontSelector Client { 31 class PopupMenuCSSFontSelector : public CSSFontSelector, private CSSFontSelector Client {
32 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PopupMenuCSSFontSelector);
32 public: 33 public:
33 static PassRefPtrWillBeRawPtr<PopupMenuCSSFontSelector> create(Document* doc ument, CSSFontSelector* ownerFontSelector) 34 static PassRefPtrWillBeRawPtr<PopupMenuCSSFontSelector> create(Document* doc ument, CSSFontSelector* ownerFontSelector)
34 { 35 {
35 return adoptRefWillBeNoop(new PopupMenuCSSFontSelector(document, ownerFo ntSelector)); 36 return adoptRefWillBeNoop(new PopupMenuCSSFontSelector(document, ownerFo ntSelector));
36 } 37 }
37 38
38 ~PopupMenuCSSFontSelector(); 39 ~PopupMenuCSSFontSelector();
39 40
40 // We don't override willUseFontData() for now because the old PopupListBox 41 // We don't override willUseFontData() for now because the old PopupListBox
41 // only worked with fonts loaded when opening the popup. 42 // only worked with fonts loaded when opening the popup.
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 427
427 void PopupMenuImpl::disconnectClient() 428 void PopupMenuImpl::disconnectClient()
428 { 429 {
429 m_client = nullptr; 430 m_client = nullptr;
430 // Cannot be done during finalization, so instead done when the 431 // Cannot be done during finalization, so instead done when the
431 // layout object is destroyed and disconnected. 432 // layout object is destroyed and disconnected.
432 dispose(); 433 dispose();
433 } 434 }
434 435
435 } // namespace blink 436 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/canvas/CanvasRenderingContext2DState.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698