Changeset 62809 in webkit


Ignore:
Timestamp:
Jul 8, 2010 11:34:15 AM (14 years ago)
Author:
andersca@apple.com
Message:

Add stubbed out PluginView class
​https://bugs.webkit.org/show_bug.cgi?id=41879

Reviewed by Sam Weinig.

WebCore:

Export functions needed by WebKit2.

  • WebCore.exp.in:

WebKit2:

  • WebKit2.xcodeproj/project.pbxproj:

Add PluginView.cpp and PluginView.h

  • WebProcess/Plugins/PluginView.cpp: Added.

(WebKit::PluginView::PluginView):
(WebKit::PluginView::~PluginView):
(WebKit::PluginView::setFrameRect):
(WebKit::PluginView::paint):
(WebKit::PluginView::viewGeometryDidChange):
(WebKit::PluginView::invalidateRect):
Stub out these functions.

  • WebProcess/Plugins/PluginView.h: Added.

(WebKit::PluginView::create):

  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::createPlugin):
Create a plug-in view.

  • win/WebKit2.vcproj:

Add PluginView.cpp and PluginView.h.

Location:
trunk
Files:
3 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r62807 r62809  
     12010-07-08  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        Add stubbed out PluginView class
     6        https://bugs.webkit.org/show_bug.cgi?id=41879
     7
     8        Export functions needed by WebKit2.
     9
     10        * WebCore.exp.in:
     11
    1122010-07-08  Ben Murdoch  <benm@google.com>
    213

  • trunk/WebCore/WebCore.exp.in

    r62792 r62809  
    595595__ZN7WebCore7Console24setShouldPrintExceptionsEb
    596596__ZN7WebCore7IntRect5uniteERKS0_
     597__ZN7WebCore7IntRect9intersectERKS0_
    597598__ZN7WebCore7IntRectC1ERKNS_9FloatRectE
    598599__ZN7WebCore7IntSizeC1ERK7_NSSize
    … …  
    851852__ZNK7WebCore14ResourceLoader11frameLoaderEv
    852853__ZNK7WebCore14SecurityOrigin5equalEPKS0_
     854__ZNK7WebCore15GraphicsContext15platformContextEv
     855__ZNK7WebCore15GraphicsContext16paintingDisabledEv
    853856__ZNK7WebCore15ProgressTracker17estimatedProgressEv
    854857__ZNK7WebCore15ResourceRequest12nsURLRequestEv

  • trunk/WebKit2/ChangeLog

    r62808 r62809  
     12010-07-08  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        Add stubbed out PluginView class
     6        https://bugs.webkit.org/show_bug.cgi?id=41879
     7
     8        * WebKit2.xcodeproj/project.pbxproj:
     9        Add PluginView.cpp and PluginView.h
     10
     11        * WebProcess/Plugins/PluginView.cpp: Added.
     12        (WebKit::PluginView::PluginView):
     13        (WebKit::PluginView::~PluginView):
     14        (WebKit::PluginView::setFrameRect):
     15        (WebKit::PluginView::paint):
     16        (WebKit::PluginView::viewGeometryDidChange):
     17        (WebKit::PluginView::invalidateRect):
     18        Stub out these functions.
     19
     20        * WebProcess/Plugins/PluginView.h: Added.
     21        (WebKit::PluginView::create):
     22        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     23        (WebKit::WebFrameLoaderClient::createPlugin):
     24        Create a plug-in view.
     25       
     26        * win/WebKit2.vcproj:
     27        Add PluginView.cpp and PluginView.h.
     28
    1292010-07-08  Steve Falkenburg  <sfalken@apple.com>
    230

  • trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r62805 r62809  
    4747                1A6FA31111E3921E00DB1371 /* MainMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FA31011E3921E00DB1371 /* MainMac.cpp */; };
    4848                1A6FA31611E3923600DB1371 /* WebKitMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FA31511E3923600DB1371 /* WebKitMain.cpp */; };
     49                1A6FB7AE11E64B6800DB1371 /* PluginView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FB7AC11E64B6800DB1371 /* PluginView.cpp */; };
     50                1A6FB7AF11E64B6800DB1371 /* PluginView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FB7AD11E64B6800DB1371 /* PluginView.h */; };
    4951                1AA1CC5D100FA1A10078DEBC /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */; };
    5052                1AA1CD07100FA1BA0078DEBC /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CD06100FA1BA0078DEBC /* Carbon.framework */; };
    … …  
    301303                1A6FA31011E3921E00DB1371 /* MainMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MainMac.cpp; path = mac/MainMac.cpp; sourceTree = "<group>"; };
    302304                1A6FA31511E3923600DB1371 /* WebKitMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitMain.cpp; sourceTree = "<group>"; };
     305                1A6FB7AC11E64B6800DB1371 /* PluginView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PluginView.cpp; path = Plugins/PluginView.cpp; sourceTree = "<group>"; };
     306                1A6FB7AD11E64B6800DB1371 /* PluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PluginView.h; path = Plugins/PluginView.h; sourceTree = "<group>"; };
    303307                1AA1C79A100E7FC50078DEBC /* WebCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    304308                1AA1C7DE100E846E0078DEBC /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    … …  
    613617                        sourceTree = "<group>";
    614618                };
     619                1A6FB7AA11E64B4900DB1371 /* Plugins */ = {
     620                        isa = PBXGroup;
     621                        children = (
     622                                1A6FB7AC11E64B6800DB1371 /* PluginView.cpp */,
     623                                1A6FB7AD11E64B6800DB1371 /* PluginView.h */,
     624                        );
     625                        name = Plugins;
     626                        sourceTree = "<group>";
     627                };
    615628                1A7E814E1152D2240003695B /* mac */ = {
    616629                        isa = PBXGroup;
    … …  
    694707                        children = (
    695708                                1A6FA01C11E1526300DB1371 /* mac */,
     709                                1A6FB7AA11E64B4900DB1371 /* Plugins */,
    696710                                BC204EDF11C83E72008F3375 /* InjectedBundle */,
    697711                                BC032D5D10F437220058C15A /* WebCoreSupport */,
    … …  
    11561170                                BC72B9FB11E6476B001EB4EA /* WebBackForwardListProxy.h in Headers */,
    11571171                                BC72BA1E11E64907001EB4EA /* WebBackForwardList.h in Headers */,
     1172                                1A6FB7AF11E64B6800DB1371 /* PluginView.h in Headers */,
    11581173                        );
    11591174                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    13371352                                BC72B9FA11E6476B001EB4EA /* WebBackForwardListProxy.cpp in Sources */,
    13381353                                BC72BA1D11E64907001EB4EA /* WebBackForwardList.cpp in Sources */,
     1354                                1A6FB7AE11E64B6800DB1371 /* PluginView.cpp in Sources */,
    13391355                        );
    13401356                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r62590 r62809  
    2727
    2828#include "NotImplemented.h"
     29#include "PluginView.h"
    2930#include "WebCoreArgumentCoders.h"
    3031#include "WebErrors.h"
    … …  
    766767{
    767768    notImplemented();
    768     return 0;
     769    return PluginView::create();
    769770}
    770771

  • trunk/WebKit2/win/WebKit2.vcproj

    r62808 r62809  
    192192                        <Tool
    193193                                Name="VCCLCompilerTool"
    194                                 AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\Platform&quot;;&quot;$(ProjectDir)\..\Platform\CoreIPC&quot;;&quot;$(ProjectDir)\..\Shared&quot;;&quot;$(ProjectDir)\..\Shared\win&quot;;&quot;$(ProjectDir)\..\Shared\CoreIPCSupport&quot;;&quot;$(ProjectDir)\..\UIProcess&quot;;&quot;$(ProjectDir)\..\UIProcess\API\C&quot;;&quot;$(ProjectDir)\..\UIProcess\API\cpp&quot;;&quot;$(ProjectDir)\..\UIProcess\API\win&quot;;&quot;$(ProjectDir)\..\UIProcess\Launcher&quot;;&quot;$(ProjectDir)\..\UIProcess\Plugins&quot;;&quot;$(ProjectDir)\..\UIProcess\win&quot;;&quot;$(ProjectDir)\..\WebProcess&quot;;&quot;$(ProjectDir)\..\WebProcess\WebCoreSupport&quot;;&quot;$(ProjectDir)\..\WebProcess\WebPage&quot;;&quot;$(ProjectDir)\..\WebProcess\WebPage\win&quot;;&quot;$(ProjectDir)\..\WebProcess\InjectedBundle&quot;;&quot;$(ProjectDir)\..\WebProcess\InjectedBundle\API\c&quot;;&quot;$(ProjectDir)\..\WebProcess\InjectedBundle\win&quot;;&quot;$(ProjectDir)\..\WebProcess\win&quot;;&quot;$(WebKitOutputDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include\private&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\Include\private&quot;;&quot;$(WebKitLibrariesDir)\Include\pthreads&quot;;&quot;$(WebKitOutputDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\Include\private\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\private\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders&quot;"
     194                                AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\Platform&quot;;&quot;$(ProjectDir)\..\Platform\CoreIPC&quot;;&quot;$(ProjectDir)\..\Shared&quot;;&quot;$(ProjectDir)\..\Shared\win&quot;;&quot;$(ProjectDir)\..\Shared\CoreIPCSupport&quot;;&quot;$(ProjectDir)\..\UIProcess&quot;;&quot;$(ProjectDir)\..\UIProcess\API\C&quot;;&quot;$(ProjectDir)\..\UIProcess\API\cpp&quot;;&quot;$(ProjectDir)\..\UIProcess\API\win&quot;;&quot;$(ProjectDir)\..\UIProcess\Launcher&quot;;&quot;$(ProjectDir)\..\UIProcess\Plugins&quot;;&quot;$(ProjectDir)\..\UIProcess\win&quot;;&quot;$(ProjectDir)\..\WebProcess&quot;;&quot;$(ProjectDir)\..\WebProcess\WebCoreSupport&quot;;&quot;$(ProjectDir)\..\WebProcess\WebPage&quot;;&quot;$(ProjectDir)\..\WebProcess\WebPage\win&quot;;&quot;$(ProjectDir)\..\WebProcess\InjectedBundle&quot;;&quot;$(ProjectDir)\..\WebProcess\InjectedBundle\API\c&quot;;&quot;$(ProjectDir)\..\WebProcess\InjectedBundle\win&quot;;&quot;$(ProjectDir)\..\WebProcess\Plugins&quot;;&quot;$(ProjectDir)\..\WebProcess\win&quot;;&quot;$(WebKitOutputDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include\private&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\Include\private&quot;;&quot;$(WebKitLibrariesDir)\Include\pthreads&quot;;&quot;$(WebKitOutputDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\Include\private\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\private\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders&quot;"
    195195                                PreprocessorDefinitions="_USRDLL;WEBKIT_EXPORTS;FRAMEWORK_NAME=WebKit2;BUILDING_WEBKIT2"
    196196                                UsePrecompiledHeader="2"
    … …  
    821821                                </Filter>
    822822                        </Filter>
     823                        <Filter
     824                                Name="Plugins"
     825                                >
     826                                <File
     827                                        RelativePath="..\WebProcess\Plugins\PluginView.cpp"
     828                                        >
     829                                </File>
     830                                <File
     831                                        RelativePath="..\WebProcess\Plugins\PluginView.h"
     832                                        >
     833                                </File>
     834                        </Filter>
    823835                </Filter>
    824836                <Filter
Note: See TracChangeset for help on using the changeset viewer.