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

Side by Side Diff: webkit/glue/webkitplatformsupport_impl.cc

Issue 19761007: Move NPAPI implementation out of webkit/plugins/npapi and into content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 7 years, 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "webkit/glue/webkitplatformsupport_impl.h" 5 #include "webkit/glue/webkitplatformsupport_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 30 matching lines...) Expand all
41 #include "third_party/WebKit/public/platform/WebVector.h" 41 #include "third_party/WebKit/public/platform/WebVector.h"
42 #include "third_party/WebKit/public/web/WebFrameClient.h" 42 #include "third_party/WebKit/public/web/WebFrameClient.h"
43 #include "third_party/WebKit/public/web/WebInputEvent.h" 43 #include "third_party/WebKit/public/web/WebInputEvent.h"
44 #include "third_party/WebKit/public/web/WebScreenInfo.h" 44 #include "third_party/WebKit/public/web/WebScreenInfo.h"
45 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" 45 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
46 #include "ui/base/layout.h" 46 #include "ui/base/layout.h"
47 #include "webkit/common/user_agent/user_agent.h" 47 #include "webkit/common/user_agent/user_agent.h"
48 #include "webkit/glue/webkit_glue.h" 48 #include "webkit/glue/webkit_glue.h"
49 #include "webkit/glue/websocketstreamhandle_impl.h" 49 #include "webkit/glue/websocketstreamhandle_impl.h"
50 #include "webkit/glue/weburlloader_impl.h" 50 #include "webkit/glue/weburlloader_impl.h"
51 #include "webkit/plugins/npapi/plugin_instance.h"
52 #include "webkit/plugins/webplugininfo.h" 51 #include "webkit/plugins/webplugininfo.h"
53 52
54 using WebKit::WebAudioBus; 53 using WebKit::WebAudioBus;
55 using WebKit::WebCookie; 54 using WebKit::WebCookie;
56 using WebKit::WebData; 55 using WebKit::WebData;
57 using WebKit::WebLocalizedString; 56 using WebKit::WebLocalizedString;
58 using WebKit::WebPluginListBuilder; 57 using WebKit::WebPluginListBuilder;
59 using WebKit::WebString; 58 using WebKit::WebString;
60 using WebKit::WebSocketStreamHandle; 59 using WebKit::WebSocketStreamHandle;
61 using WebKit::WebURL; 60 using WebKit::WebURL;
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 if (--shared_timer_suspended_ == 0 && 916 if (--shared_timer_suspended_ == 0 &&
918 (!shared_timer_.IsRunning() || 917 (!shared_timer_.IsRunning() ||
919 shared_timer_fire_time_was_set_while_suspended_)) { 918 shared_timer_fire_time_was_set_while_suspended_)) {
920 shared_timer_fire_time_was_set_while_suspended_ = false; 919 shared_timer_fire_time_was_set_while_suspended_ = false;
921 setSharedTimerFireInterval( 920 setSharedTimerFireInterval(
922 shared_timer_fire_time_ - monotonicallyIncreasingTime()); 921 shared_timer_fire_time_ - monotonicallyIncreasingTime());
923 } 922 }
924 } 923 }
925 924
926 } // namespace webkit_glue 925 } // namespace webkit_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698