Index: Source/modules/screen_orientation/ScreenOrientation.cpp |
diff --git a/Source/modules/screen_orientation/ScreenOrientation.cpp b/Source/modules/screen_orientation/ScreenOrientation.cpp |
index 4b147dd809a0f4ee807ee0cd9fb9fe5145c8ce0e..d7723c404b39d3519bc3ef3bd7b0458104acd68f 100644 |
--- a/Source/modules/screen_orientation/ScreenOrientation.cpp |
+++ b/Source/modules/screen_orientation/ScreenOrientation.cpp |
@@ -11,8 +11,8 @@ |
namespace WebCore { |
-ScreenOrientation::ScreenOrientation(Screen* screen) |
- : DOMWindowProperty(screen->frame()) |
+ScreenOrientation::ScreenOrientation(Screen& screen) |
+ : DOMWindowProperty(screen.frame()) |
{ |
} |
@@ -21,15 +21,14 @@ const char* ScreenOrientation::supplementName() |
return "ScreenOrientation"; |
} |
-ScreenOrientation* ScreenOrientation::from(Screen* screen) |
+ScreenOrientation& ScreenOrientation::from(Screen& screen) |
{ |
ScreenOrientation* supplement = static_cast<ScreenOrientation*>(Supplement<Screen>::from(screen, supplementName())); |
if (!supplement) { |
- ASSERT(screen); |
supplement = new ScreenOrientation(screen); |
provideTo(screen, supplementName(), adoptPtr(supplement)); |
} |
- return supplement; |
+ return *supplement; |
} |
ScreenOrientation::~ScreenOrientation() |
@@ -45,26 +44,26 @@ Screen* ScreenOrientation::screen() const |
return window->screen(); |
} |
-const AtomicString& ScreenOrientation::orientation(Screen* screen) |
+const AtomicString& ScreenOrientation::orientation(Screen& screen) |
{ |
// FIXME: Implement. |
DEFINE_STATIC_LOCAL(const AtomicString, portraitPrimary, ("portrait-primary", AtomicString::ConstructFromLiteral)); |
return portraitPrimary; |
} |
-bool ScreenOrientation::lockOrientation(Screen* screen, const Vector<String>& orientations) |
+bool ScreenOrientation::lockOrientation(Screen& screen, const Vector<String>& orientations) |
{ |
// FIXME: Implement. |
return false; |
} |
-bool ScreenOrientation::lockOrientation(Screen* screen, const AtomicString& orientation) |
+bool ScreenOrientation::lockOrientation(Screen& screen, const AtomicString& orientation) |
{ |
// FIXME: Implement. |
return false; |
} |
-void ScreenOrientation::unlockOrientation(Screen* screen) |
+void ScreenOrientation::unlockOrientation(Screen& screen) |
{ |
// FIXME: Implement. |
} |