diff options
author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 18:24:03 +0000 |
---|---|---|
committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 18:24:03 +0000 |
commit | 07b46427420baf9709fb6302ce4c53d76c6d29a2 (patch) | |
tree | 7741f660bc77b11e7a3ce70c13dcce8c41de74c4 /webkit/build | |
parent | 836fc7063dbc85a98ab902ae768bd21d81d8f7ba (diff) | |
download | chromium_src-07b46427420baf9709fb6302ce4c53d76c6d29a2.zip chromium_src-07b46427420baf9709fb6302ce4c53d76c6d29a2.tar.gz chromium_src-07b46427420baf9709fb6302ce4c53d76c6d29a2.tar.bz2 |
what Use third_party/WebKit plugin, pluginarray, mimetype and
mimetypearray. In order to get this working, I had to
change the v8 templates to allow for both void* and
RefPtr<> types.
This has a short-term hack for using namedItem instead
of nameGetter, which I will be able to undo once I fix
https://bugs.webkit.org/show_bug.cgi?id=21606
Also, unforks Navigator.h, which will need some love
from scons/mac folk for updating build files since
Navigator.h/cpp have moved.
Review URL: http://codereview.chromium.org/7373
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
-rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 44 | ||||
-rw-r--r-- | webkit/build/port/port.vcproj | 8 |
2 files changed, 40 insertions, 12 deletions
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index fb61b6b..7a41044 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -369,6 +369,14 @@ RelativePath="..\..\..\third_party\WebKit\WebCore\page\MouseEventWithHitTestResults.h" > </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\Navigator.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\Navigator.h" + > + </File> <File RelativePath="..\..\..\third_party\WebKit\WebCore\page\Page.cpp" > @@ -386,10 +394,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\page\Plugin.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\page\Screen.cpp" > </File> @@ -5986,10 +5990,42 @@ Name="plugins" > <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\MimeType.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\MimeType.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\MimeTypeArray.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\MimeTypeArray.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\npfunctions.h" > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\Plugin.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\Plugin.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\PluginArray.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\PluginArray.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\plugins\PluginData.cpp" > </File> diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj index a4e0856..6be5a6a 100644 --- a/webkit/build/port/port.vcproj +++ b/webkit/build/port/port.vcproj @@ -168,14 +168,6 @@ > </File> <File - RelativePath="..\..\port\page\Navigator.cpp" - > - </File> - <File - RelativePath="..\..\port\page\Navigator.h" - > - </File> - <File RelativePath="..\..\port\dom\ScheduledAction.h" > </File> |