OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. |
3 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
4 * Copyright (C) 2007 Trolltech ASA | 4 * Copyright (C) 2007 Trolltech ASA |
5 * | 5 * |
6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
8 * are met: | 8 * are met: |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 #import "WebDashboardRegion.h" | 90 #import "WebDashboardRegion.h" |
91 #import "visible_units.h" | 91 #import "visible_units.h" |
92 #import <Carbon/Carbon.h> | 92 #import <Carbon/Carbon.h> |
93 #if USE(JAVASCRIPTCORE_BINDINGS) | 93 #if USE(JAVASCRIPTCORE_BINDINGS) |
94 #import "kjs_proxy.h" | 94 #import "kjs_proxy.h" |
95 #import "kjs_window.h" | 95 #import "kjs_window.h" |
96 #import "WebScriptObjectPrivate.h" | 96 #import "WebScriptObjectPrivate.h" |
97 #import <JavaScriptCore/NP_jsobject.h> | 97 #import <JavaScriptCore/NP_jsobject.h> |
98 #import <JavaScriptCore/npruntime_impl.h> | 98 #import <JavaScriptCore/npruntime_impl.h> |
99 #else | 99 #else |
100 #include <../../../../../webkit/glue/webplugin_impl.h> | 100 #include "webplugin_impl.h" |
101 #include <../../../../../port/bindings/v8/v8_npobject.h> | 101 #include "v8_npobject.h" |
102 #endif | 102 #endif |
103 | 103 |
104 #undef _webcore_TIMING | 104 #undef _webcore_TIMING |
105 | 105 |
106 @interface NSObject (WebPlugIn) | 106 @interface NSObject (WebPlugIn) |
107 - (id)objectForWebScript; | 107 - (id)objectForWebScript; |
108 - (NPObject *)createPluginScriptableObject; | 108 - (NPObject *)createPluginScriptableObject; |
109 @end | 109 @end |
110 | 110 |
111 @interface NSView (WebCoreHTMLDocumentView) | 111 @interface NSView (WebCoreHTMLDocumentView) |
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
717 | 717 |
718 void Frame::setUserStyleSheet(const String& styleSheet) | 718 void Frame::setUserStyleSheet(const String& styleSheet) |
719 { | 719 { |
720 delete d->m_userStyleSheetLoader; | 720 delete d->m_userStyleSheetLoader; |
721 d->m_userStyleSheetLoader = 0; | 721 d->m_userStyleSheetLoader = 0; |
722 if (d->m_doc) | 722 if (d->m_doc) |
723 d->m_doc->setUserStyleSheet(styleSheet); | 723 d->m_doc->setUserStyleSheet(styleSheet); |
724 } | 724 } |
725 | 725 |
726 } // namespace WebCore | 726 } // namespace WebCore |
OLD | NEW |