| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 "android_webview/native/aw_contents.h" | 5 #include "android_webview/native/aw_contents.h" |
| 6 | 6 |
| 7 #include "android_webview/browser/aw_browser_context.h" | 7 #include "android_webview/browser/aw_browser_context.h" |
| 8 #include "android_webview/browser/aw_browser_main_parts.h" | 8 #include "android_webview/browser/aw_browser_main_parts.h" |
| 9 #include "android_webview/browser/browser_view_renderer_impl.h" | 9 #include "android_webview/browser/browser_view_renderer_impl.h" |
| 10 #include "android_webview/browser/gpu_memory_buffer_impl.h" | 10 #include "android_webview/browser/gpu_memory_buffer_impl.h" |
| (...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 604 int scroll_x, int scroll_y) { | 604 int scroll_x, int scroll_y) { |
| 605 browser_view_renderer_->SetScrollForHWFrame(scroll_x, scroll_y); | 605 browser_view_renderer_->SetScrollForHWFrame(scroll_x, scroll_y); |
| 606 } | 606 } |
| 607 | 607 |
| 608 void AwContents::SetPendingWebContentsForPopup( | 608 void AwContents::SetPendingWebContentsForPopup( |
| 609 scoped_ptr<content::WebContents> pending) { | 609 scoped_ptr<content::WebContents> pending) { |
| 610 if (pending_contents_.get()) { | 610 if (pending_contents_.get()) { |
| 611 // TODO(benm): Support holding multiple pop up window requests. | 611 // TODO(benm): Support holding multiple pop up window requests. |
| 612 LOG(WARNING) << "Blocking popup window creation as an outstanding " | 612 LOG(WARNING) << "Blocking popup window creation as an outstanding " |
| 613 << "popup window is still pending."; | 613 << "popup window is still pending."; |
| 614 MessageLoop::current()->DeleteSoon(FROM_HERE, pending.release()); | 614 base::MessageLoop::current()->DeleteSoon(FROM_HERE, pending.release()); |
| 615 return; | 615 return; |
| 616 } | 616 } |
| 617 pending_contents_ = pending.Pass(); | 617 pending_contents_ = pending.Pass(); |
| 618 } | 618 } |
| 619 | 619 |
| 620 void AwContents::FocusFirstNode(JNIEnv* env, jobject obj) { | 620 void AwContents::FocusFirstNode(JNIEnv* env, jobject obj) { |
| 621 web_contents_->FocusThroughTabTraversal(false); | 621 web_contents_->FocusThroughTabTraversal(false); |
| 622 } | 622 } |
| 623 | 623 |
| 624 jint AwContents::ReleasePopupWebContents(JNIEnv* env, jobject obj) { | 624 jint AwContents::ReleasePopupWebContents(JNIEnv* env, jobject obj) { |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 660 if (enabled) { | 660 if (enabled) { |
| 661 mode = invalidation_only ? | 661 mode = invalidation_only ? |
| 662 BrowserViewRenderer::kOnNewPictureInvalidationOnly : | 662 BrowserViewRenderer::kOnNewPictureInvalidationOnly : |
| 663 BrowserViewRenderer::kOnNewPictureEnabled; | 663 BrowserViewRenderer::kOnNewPictureEnabled; |
| 664 } | 664 } |
| 665 | 665 |
| 666 browser_view_renderer_->EnableOnNewPicture(mode); | 666 browser_view_renderer_->EnableOnNewPicture(mode); |
| 667 } | 667 } |
| 668 | 668 |
| 669 } // namespace android_webview | 669 } // namespace android_webview |
| OLD | NEW |