summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-19 16:02:00 +0000
committerpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-19 16:02:00 +0000
commit94ee65445a5b30d0c8bdbb7c655893a0897fb46a (patch)
tree672435f472a8af20bdc36e27122e5cd71ffab8cb
parent23afa0fbdf77203d6ff57394ed0e2c1c3195b2bd (diff)
downloadchromium_src-94ee65445a5b30d0c8bdbb7c655893a0897fb46a.zip
chromium_src-94ee65445a5b30d0c8bdbb7c655893a0897fb46a.tar.gz
chromium_src-94ee65445a5b30d0c8bdbb7c655893a0897fb46a.tar.bz2
Add empty stub to get classname so ImageMac can use it.
Review URL: http://codereview.chromium.org/3169 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2409 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/port/page/WebCoreFrameBridge.mm20
-rw-r--r--webkit/webkit.xcodeproj/project.pbxproj8
2 files changed, 26 insertions, 2 deletions
diff --git a/webkit/port/page/WebCoreFrameBridge.mm b/webkit/port/page/WebCoreFrameBridge.mm
new file mode 100644
index 0000000..cddaf2f
--- /dev/null
+++ b/webkit/port/page/WebCoreFrameBridge.mm
@@ -0,0 +1,20 @@
+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// WebCoreFrameBridge is an ObjC bridge between WebCore and WebKit, which we
+// probably don't need to use for Chromium. If we do, it will probably differ
+// substantially from the Apple implementation since we won't have the JS
+// bindings available.
+//
+// We do, however, need to stub this class because ImageMac needs to find the
+// application bundle so it can load default image resources. It does this
+// by finding the bundle of a known class, and it chooses to use
+// WebCoreFrameBridge. As a result, we have to provide linkage of at least
+// the classname so that the use in ImageMac resolves.
+
+@implementation WebCoreFrameBridge
+
+// nothing needed....
+
+@end
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 192fa91..506784e 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -325,7 +325,6 @@
82761E970E3FA26F0030D324 /* TextCodecMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E91C50D7F3CC2001ECF42 /* TextCodecMac.cpp */; };
82761F850E3FAC700030D324 /* AccessibilityObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82761F810E3FAC700030D324 /* AccessibilityObject.cpp */; };
827E13880E815A0500183614 /* ResourceLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8DC80D7F3C01001ECF42 /* ResourceLoaderMac.mm */; };
- 82A9A8CF0E3E4EE80038C474 /* FrameMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8F000D7F3C48001ECF42 /* FrameMac.mm */; };
E43CE13C0E68621500D8C5B9 /* PausedTimeouts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E43CE13A0E68621500D8C5B9 /* PausedTimeouts.cpp */; };
E45062E10E40B5420025A81A /* SkiaUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45062DF0E40B5420025A81A /* SkiaUtils.cpp */; };
E45063BA0E4104700025A81A /* localized_strings.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8254051A0D92E3DA0006B936 /* localized_strings.cc */; };
@@ -1154,6 +1153,8 @@
E4E4CA470E8027ED009A687C /* FontCacheMacPending.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4E4CA190E80208A009A687C /* FontCacheMacPending.cpp */; };
E4E4CA710E803415009A687C /* DragDataMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E90E00D7F3CC2001ECF42 /* DragDataMac.mm */; };
E4E4CA910E803BB9009A687C /* AXObjectCacheMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4E4CA900E803BB9009A687C /* AXObjectCacheMac.cpp */; };
+ E4E4CCF50E83F328009A687C /* FrameMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8F000D7F3C48001ECF42 /* FrameMac.mm */; };
+ E4E4CD180E84018A009A687C /* WebCoreFrameBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4E4CD170E84018A009A687C /* WebCoreFrameBridge.mm */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -3707,6 +3708,7 @@
E4E4CA190E80208A009A687C /* FontCacheMacPending.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FontCacheMacPending.cpp; path = mac/FontCacheMacPending.cpp; sourceTree = "<group>"; };
E4E4CA900E803BB9009A687C /* AXObjectCacheMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AXObjectCacheMac.cpp; sourceTree = "<group>"; };
E4E4CAE60E805325009A687C /* webkit_staticlib.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = webkit_staticlib.xcconfig; path = build/webkit_staticlib.xcconfig; sourceTree = SOURCE_ROOT; };
+ E4E4CD170E84018A009A687C /* WebCoreFrameBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreFrameBridge.mm; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -6766,6 +6768,7 @@
children = (
E4E4CA900E803BB9009A687C /* AXObjectCacheMac.cpp */,
E4A9708A0E36150500E8EF3B /* ChromeClientWin.h */,
+ E4E4CD170E84018A009A687C /* WebCoreFrameBridge.mm */,
);
path = page;
sourceTree = "<group>";
@@ -7488,7 +7491,7 @@
E45624860E268E87005E4685 /* FormState.cpp in Sources */,
E45624A40E268E87005E4685 /* Frame.cpp in Sources */,
E45624870E268E87005E4685 /* FrameLoader.cpp in Sources */,
- 82A9A8CF0E3E4EE80038C474 /* FrameMac.mm in Sources */,
+ E4E4CCF50E83F328009A687C /* FrameMac.mm in Sources */,
E45624A50E268E87005E4685 /* FrameTree.cpp in Sources */,
E45624A60E268E87005E4685 /* FrameView.cpp in Sources */,
E45624880E268E87005E4685 /* FTPDirectoryDocument.cpp in Sources */,
@@ -8157,6 +8160,7 @@
E45062E10E40B5420025A81A /* SkiaUtils.cpp in Sources */,
E45627E70E2694B8005E4685 /* SkPaintContext.cpp in Sources */,
E45627E40E2694B8005E4685 /* V8Bridge.cpp in Sources */,
+ E4E4CD180E84018A009A687C /* WebCoreFrameBridge.mm in Sources */,
E45627EC0E2694B8005E4685 /* XBMImageDecoder.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;