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

Side by Side Diff: webkit/glue/plugins/webview_plugin.cc

Issue 3531008: Integrated Pepper3D v2 with the accelerated compositor.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "webkit/glue/plugins/webview_plugin.h" 5 #include "webkit/glue/plugins/webview_plugin.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" 9 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
10 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" 10 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 // Coordinates are relative to the containing window. 129 // Coordinates are relative to the containing window.
130 void WebViewPlugin::updateGeometry( 130 void WebViewPlugin::updateGeometry(
131 const WebRect& frame_rect, const WebRect& clip_rect, 131 const WebRect& frame_rect, const WebRect& clip_rect,
132 const WebVector<WebRect>& cut_out_rects, bool is_visible) { 132 const WebVector<WebRect>& cut_out_rects, bool is_visible) {
133 if (frame_rect != rect_) { 133 if (frame_rect != rect_) {
134 rect_ = frame_rect; 134 rect_ = frame_rect;
135 web_view_->resize(WebSize(frame_rect.width, frame_rect.height)); 135 web_view_->resize(WebSize(frame_rect.width, frame_rect.height));
136 } 136 }
137 } 137 }
138 138
139 unsigned WebViewPlugin::getBackingTextureId() {
140 return container_->plugin()->getBackingTextureId();
141 }
142
139 bool WebViewPlugin::handleInputEvent(const WebInputEvent& event, 143 bool WebViewPlugin::handleInputEvent(const WebInputEvent& event,
140 WebCursorInfo& cursor) { 144 WebCursorInfo& cursor) {
141 current_cursor_ = cursor; 145 current_cursor_ = cursor;
142 bool handled = web_view_->handleInputEvent(event); 146 bool handled = web_view_->handleInputEvent(event);
143 cursor = current_cursor_; 147 cursor = current_cursor_;
144 return handled; 148 return handled;
145 } 149 }
146 150
147 void WebViewPlugin::didReceiveResponse(const WebURLResponse& response) { 151 void WebViewPlugin::didReceiveResponse(const WebURLResponse& response) {
148 DCHECK(response_.isNull()); 152 DCHECK(response_.isNull());
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 WebURLError WebViewPlugin::cancelledError(WebFrame* frame, 197 WebURLError WebViewPlugin::cancelledError(WebFrame* frame,
194 const WebURLRequest& request) { 198 const WebURLRequest& request) {
195 // Return an error with a non-zero reason so isNull() on the corresponding 199 // Return an error with a non-zero reason so isNull() on the corresponding
196 // ResourceError is false. 200 // ResourceError is false.
197 WebURLError error; 201 WebURLError error;
198 error.domain = "WebViewPlugin"; 202 error.domain = "WebViewPlugin";
199 error.reason = -1; 203 error.reason = -1;
200 error.unreachableURL = request.url(); 204 error.unreachableURL = request.url();
201 return error; 205 return error;
202 } 206 }
OLDNEW
« webkit/glue/plugins/pepper_plugin_instance.cc ('K') | « webkit/glue/plugins/webview_plugin.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698