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

Side by Side Diff: Source/modules/screen_orientation/ScreenOrientationController.cpp

Issue 302603005: Regression(r174876): Use OILPAN empty destructor macros (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 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 "modules/screen_orientation/ScreenOrientationController.h" 6 #include "modules/screen_orientation/ScreenOrientationController.h"
7 7
8 #include "core/dom/Document.h" 8 #include "core/dom/Document.h"
9 #include "core/events/Event.h" 9 #include "core/events/Event.h"
10 #include "core/frame/DOMWindow.h" 10 #include "core/frame/DOMWindow.h"
11 #include "core/frame/FrameView.h" 11 #include "core/frame/FrameView.h"
12 #include "core/frame/LocalFrame.h" 12 #include "core/frame/LocalFrame.h"
13 #include "core/frame/Screen.h" 13 #include "core/frame/Screen.h"
14 #include "platform/LayoutTestSupport.h" 14 #include "platform/LayoutTestSupport.h"
15 #include "platform/PlatformScreen.h" 15 #include "platform/PlatformScreen.h"
16 16
17 namespace WebCore { 17 namespace WebCore {
18 18
19 #if !ENABLE(OILPAN)
sof 2014/05/27 18:49:35 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(ScreenOrie
Inactive 2014/05/27 18:51:04 Is it OK to simply remove the destructor like I di
Inactive 2014/05/27 19:08:22 Done.
19 ScreenOrientationController::~ScreenOrientationController() 20 ScreenOrientationController::~ScreenOrientationController()
20 { 21 {
21 } 22 }
23 #endif
22 24
23 ScreenOrientationController& ScreenOrientationController::from(Document& documen t) 25 ScreenOrientationController& ScreenOrientationController::from(Document& documen t)
24 { 26 {
25 ScreenOrientationController* controller = static_cast<ScreenOrientationContr oller*>(DocumentSupplement::from(document, supplementName())); 27 ScreenOrientationController* controller = static_cast<ScreenOrientationContr oller*>(DocumentSupplement::from(document, supplementName()));
26 if (!controller) { 28 if (!controller) {
27 controller = new ScreenOrientationController(document); 29 controller = new ScreenOrientationController(document);
28 DocumentSupplement::provideTo(document, supplementName(), adoptPtrWillBe Noop(controller)); 30 DocumentSupplement::provideTo(document, supplementName(), adoptPtrWillBe Noop(controller));
29 } 31 }
30 return *controller; 32 return *controller;
31 } 33 }
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 blink::WebScreenOrientationType orientationType = screenOrientationType(main Frame->view()); 77 blink::WebScreenOrientationType orientationType = screenOrientationType(main Frame->view());
76 if (orientationType == blink::WebScreenOrientationUndefined) { 78 if (orientationType == blink::WebScreenOrientationUndefined) {
77 // The embedder could not provide us with an orientation, deduce it ours elves. 79 // The embedder could not provide us with an orientation, deduce it ours elves.
78 orientationType = computeOrientation(mainFrame->view()); 80 orientationType = computeOrientation(mainFrame->view());
79 } 81 }
80 ASSERT(orientationType != blink::WebScreenOrientationUndefined); 82 ASSERT(orientationType != blink::WebScreenOrientationUndefined);
81 return orientationType; 83 return orientationType;
82 } 84 }
83 85
84 } // namespace WebCore 86 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698