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

Side by Side Diff: webkit/plugins/ppapi/ppb_scrollbar_impl.h

Issue 7640001: Fix crash with print preview and the new scrollbar code that triggered an assert in WebKit side. ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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
« no previous file with comments | « no previous file | webkit/plugins/ppapi/ppb_scrollbar_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_SCROLLBAR_IMPL_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_SCROLLBAR_IMPL_H_
6 #define WEBKIT_PLUGINS_PPAPI_PPB_SCROLLBAR_IMPL_H_ 6 #define WEBKIT_PLUGINS_PPAPI_PPB_SCROLLBAR_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/task.h"
10 #include "ppapi/thunk/ppb_scrollbar_api.h" 11 #include "ppapi/thunk/ppb_scrollbar_api.h"
11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" 12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScrollbarClient.h" 13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScrollbarClient.h"
13 #include "ui/gfx/rect.h" 14 #include "ui/gfx/rect.h"
14 #include "webkit/plugins/ppapi/ppb_widget_impl.h" 15 #include "webkit/plugins/ppapi/ppb_widget_impl.h"
15 16
16 namespace webkit { 17 namespace webkit {
17 namespace ppapi { 18 namespace ppapi {
18 19
19 class PluginInstance; 20 class PluginInstance;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 virtual void getTickmarks( 70 virtual void getTickmarks(
70 WebKit::WebScrollbar* scrollbar, 71 WebKit::WebScrollbar* scrollbar,
71 WebKit::WebVector<WebKit::WebRect>* tick_marks) const OVERRIDE; 72 WebKit::WebVector<WebKit::WebRect>* tick_marks) const OVERRIDE;
72 73
73 void NotifyInvalidate(); 74 void NotifyInvalidate();
74 75
75 gfx::Rect dirty_; 76 gfx::Rect dirty_;
76 std::vector<WebKit::WebRect> tickmarks_; 77 std::vector<WebKit::WebRect> tickmarks_;
77 scoped_ptr<WebKit::WebScrollbar> scrollbar_; 78 scoped_ptr<WebKit::WebScrollbar> scrollbar_;
78 79
80 // Used so that the post task for Invalidate doesn't keep an extra reference.
81 ScopedRunnableMethodFactory<PPB_Scrollbar_Impl> method_factory_;
82
79 DISALLOW_COPY_AND_ASSIGN(PPB_Scrollbar_Impl); 83 DISALLOW_COPY_AND_ASSIGN(PPB_Scrollbar_Impl);
80 }; 84 };
81 85
82 } // namespace ppapi 86 } // namespace ppapi
83 } // namespace webkit 87 } // namespace webkit
84 88
85 #endif // WEBKIT_PLUGINS_PPAPI_PPB_SCROLLBAR_IMPL_H_ 89 #endif // WEBKIT_PLUGINS_PPAPI_PPB_SCROLLBAR_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | webkit/plugins/ppapi/ppb_scrollbar_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698