| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "content/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "content/browser/renderer_host/backing_store_skia.h" | 8 #include "content/browser/renderer_host/backing_store_skia.h" |
| 9 #include "content/browser/renderer_host/render_widget_host.h" | 9 #include "content/browser/renderer_host/render_widget_host.h" |
| 10 #include "content/browser/renderer_host/web_input_event_aura.h" | 10 #include "content/browser/renderer_host/web_input_event_aura.h" |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 } | 206 } |
| 207 | 207 |
| 208 void RenderWidgetHostViewAura::SetIsLoading(bool is_loading) { | 208 void RenderWidgetHostViewAura::SetIsLoading(bool is_loading) { |
| 209 is_loading_ = is_loading; | 209 is_loading_ = is_loading; |
| 210 UpdateCursorIfOverSelf(); | 210 UpdateCursorIfOverSelf(); |
| 211 } | 211 } |
| 212 | 212 |
| 213 void RenderWidgetHostViewAura::TextInputStateChanged( | 213 void RenderWidgetHostViewAura::TextInputStateChanged( |
| 214 ui::TextInputType type, | 214 ui::TextInputType type, |
| 215 bool can_compose_inline) { | 215 bool can_compose_inline) { |
| 216 // http://crbug.com/102569 |
| 216 NOTIMPLEMENTED(); | 217 NOTIMPLEMENTED(); |
| 217 } | 218 } |
| 218 | 219 |
| 219 void RenderWidgetHostViewAura::ImeCancelComposition() { | 220 void RenderWidgetHostViewAura::ImeCancelComposition() { |
| 221 // http://crbug.com/102569 |
| 220 NOTIMPLEMENTED(); | 222 NOTIMPLEMENTED(); |
| 221 } | 223 } |
| 222 | 224 |
| 223 void RenderWidgetHostViewAura::DidUpdateBackingStore( | 225 void RenderWidgetHostViewAura::DidUpdateBackingStore( |
| 224 const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy, | 226 const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy, |
| 225 const std::vector<gfx::Rect>& copy_rects) { | 227 const std::vector<gfx::Rect>& copy_rects) { |
| 226 if (!window_->IsVisible()) | 228 if (!window_->IsVisible()) |
| 227 return; | 229 return; |
| 228 | 230 |
| 229 if (!scroll_rect.IsEmpty()) | 231 if (!scroll_rect.IsEmpty()) |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 results->depthPerComponent = 8; | 327 results->depthPerComponent = 8; |
| 326 } | 328 } |
| 327 | 329 |
| 328 gfx::Rect RenderWidgetHostViewAura::GetRootWindowBounds() { | 330 gfx::Rect RenderWidgetHostViewAura::GetRootWindowBounds() { |
| 329 return aura::Desktop::GetInstance()->bounds(); | 331 return aura::Desktop::GetInstance()->bounds(); |
| 330 } | 332 } |
| 331 #endif | 333 #endif |
| 332 | 334 |
| 333 void RenderWidgetHostViewAura::SetVisuallyDeemphasized(const SkColor* color, | 335 void RenderWidgetHostViewAura::SetVisuallyDeemphasized(const SkColor* color, |
| 334 bool animate) { | 336 bool animate) { |
| 337 // http://crbug.com/102568 |
| 335 NOTIMPLEMENTED(); | 338 NOTIMPLEMENTED(); |
| 336 } | 339 } |
| 337 | 340 |
| 338 void RenderWidgetHostViewAura::UnhandledWheelEvent( | 341 void RenderWidgetHostViewAura::UnhandledWheelEvent( |
| 339 const WebKit::WebMouseWheelEvent& event) { | 342 const WebKit::WebMouseWheelEvent& event) { |
| 340 NOTIMPLEMENTED(); | 343 // Not needed. Mac-only. |
| 341 } | 344 } |
| 342 | 345 |
| 343 void RenderWidgetHostViewAura::SetHasHorizontalScrollbar( | 346 void RenderWidgetHostViewAura::SetHasHorizontalScrollbar( |
| 344 bool has_horizontal_scrollbar) { | 347 bool has_horizontal_scrollbar) { |
| 345 NOTIMPLEMENTED(); | 348 // Not needed. Mac-only. |
| 346 } | 349 } |
| 347 | 350 |
| 348 void RenderWidgetHostViewAura::SetScrollOffsetPinning( | 351 void RenderWidgetHostViewAura::SetScrollOffsetPinning( |
| 349 bool is_pinned_to_left, bool is_pinned_to_right) { | 352 bool is_pinned_to_left, bool is_pinned_to_right) { |
| 350 NOTIMPLEMENTED(); | 353 // Not needed. Mac-only. |
| 351 } | 354 } |
| 352 | 355 |
| 353 #if defined(OS_WIN) | 356 #if defined(OS_WIN) |
| 354 void RenderWidgetHostViewAura::WillWmDestroy() { | 357 void RenderWidgetHostViewAura::WillWmDestroy() { |
| 355 // Nothing to do. | 358 // Nothing to do. |
| 356 } | 359 } |
| 357 | 360 |
| 358 void RenderWidgetHostViewAura::ShowCompositorHostWindow(bool show) { | 361 void RenderWidgetHostViewAura::ShowCompositorHostWindow(bool show) { |
| 359 // Nothing to do. | 362 // Nothing to do. |
| 360 } | 363 } |
| (...skipping 11 matching lines...) Expand all Loading... |
| 372 // TODO(oshima): The original implementation was broken as | 375 // TODO(oshima): The original implementation was broken as |
| 373 // GtkNativeViewManager doesn't know about NativeWidgetGtk. Figure | 376 // GtkNativeViewManager doesn't know about NativeWidgetGtk. Figure |
| 374 // out if this makes sense without compositor. If it does, then find | 377 // out if this makes sense without compositor. If it does, then find |
| 375 // out the right way to handle. | 378 // out the right way to handle. |
| 376 NOTIMPLEMENTED(); | 379 NOTIMPLEMENTED(); |
| 377 return gfx::kNullPluginWindow; | 380 return gfx::kNullPluginWindow; |
| 378 } | 381 } |
| 379 #endif | 382 #endif |
| 380 | 383 |
| 381 bool RenderWidgetHostViewAura::LockMouse() { | 384 bool RenderWidgetHostViewAura::LockMouse() { |
| 385 // http://crbug.com/102563 |
| 382 NOTIMPLEMENTED(); | 386 NOTIMPLEMENTED(); |
| 383 return false; | 387 return false; |
| 384 } | 388 } |
| 385 | 389 |
| 386 void RenderWidgetHostViewAura::UnlockMouse() { | 390 void RenderWidgetHostViewAura::UnlockMouse() { |
| 391 // http://crbug.com/102563 |
| 387 NOTIMPLEMENTED(); | 392 NOTIMPLEMENTED(); |
| 388 host_->LostMouseLock(); | 393 host_->LostMouseLock(); |
| 389 } | 394 } |
| 390 | 395 |
| 391 //////////////////////////////////////////////////////////////////////////////// | 396 //////////////////////////////////////////////////////////////////////////////// |
| 392 // RenderWidgetHostViewAura, aura::WindowDelegate implementation: | 397 // RenderWidgetHostViewAura, aura::WindowDelegate implementation: |
| 393 | 398 |
| 394 void RenderWidgetHostViewAura::OnBoundsChanged(const gfx::Rect& old_bounds, | 399 void RenderWidgetHostViewAura::OnBoundsChanged(const gfx::Rect& old_bounds, |
| 395 const gfx::Rect& new_bounds) { | 400 const gfx::Rect& new_bounds) { |
| 396 // We don't care about this one, we are always sized via SetSize() or | 401 // We don't care about this one, we are always sized via SetSize() or |
| (...skipping 13 matching lines...) Expand all Loading... |
| 410 if (is_fullscreen_ && event->key_code() == ui::VKEY_ESCAPE) { | 415 if (is_fullscreen_ && event->key_code() == ui::VKEY_ESCAPE) { |
| 411 host_->Shutdown(); | 416 host_->Shutdown(); |
| 412 } else { | 417 } else { |
| 413 NativeWebKeyboardEvent webkit_event(event); | 418 NativeWebKeyboardEvent webkit_event(event); |
| 414 host_->ForwardKeyboardEvent(webkit_event); | 419 host_->ForwardKeyboardEvent(webkit_event); |
| 415 } | 420 } |
| 416 return true; | 421 return true; |
| 417 } | 422 } |
| 418 | 423 |
| 419 gfx::NativeCursor RenderWidgetHostViewAura::GetCursor(const gfx::Point& point) { | 424 gfx::NativeCursor RenderWidgetHostViewAura::GetCursor(const gfx::Point& point) { |
| 420 // TODO(beng): talk to beng before implementing this. | 425 // http://crbug.com/102562 |
| 421 //NOTIMPLEMENTED(); | 426 // NOTIMPLEMENTED(); |
| 422 return gfx::kNullCursor; | 427 return gfx::kNullCursor; |
| 423 } | 428 } |
| 424 | 429 |
| 425 int RenderWidgetHostViewAura::GetNonClientComponent( | 430 int RenderWidgetHostViewAura::GetNonClientComponent( |
| 426 const gfx::Point& point) const { | 431 const gfx::Point& point) const { |
| 427 return HTCLIENT; | 432 return HTCLIENT; |
| 428 } | 433 } |
| 429 | 434 |
| 430 bool RenderWidgetHostViewAura::OnMouseEvent(aura::MouseEvent* event) { | 435 bool RenderWidgetHostViewAura::OnMouseEvent(aura::MouseEvent* event) { |
| 431 if (event->type() == ui::ET_MOUSEWHEEL) | 436 if (event->type() == ui::ET_MOUSEWHEEL) |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 } | 507 } |
| 503 on_compositing_ended_callbacks_.clear(); | 508 on_compositing_ended_callbacks_.clear(); |
| 504 compositor->RemoveObserver(this); | 509 compositor->RemoveObserver(this); |
| 505 } | 510 } |
| 506 #endif | 511 #endif |
| 507 | 512 |
| 508 //////////////////////////////////////////////////////////////////////////////// | 513 //////////////////////////////////////////////////////////////////////////////// |
| 509 // RenderWidgetHostViewAura, private: | 514 // RenderWidgetHostViewAura, private: |
| 510 | 515 |
| 511 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() { | 516 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() { |
| 512 //NOTIMPLEMENTED(); | 517 // http://crbug.com/102562 |
| 518 // NOTIMPLEMENTED(); |
| 513 // TODO(beng): See RenderWidgetHostViewWin. | 519 // TODO(beng): See RenderWidgetHostViewWin. |
| 514 } | 520 } |
| OLD | NEW |