diff options
Diffstat (limited to 'WebKit/wx')
| -rw-r--r-- | WebKit/wx/ChangeLog | 36 | ||||
| -rw-r--r-- | WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp | 8 | ||||
| -rw-r--r-- | WebKit/wx/WebKitSupport/FrameLoaderClientWx.h | 5 | ||||
| -rw-r--r-- | WebKit/wx/bindings/python/wscript | 6 | ||||
| -rw-r--r-- | WebKit/wx/wscript | 28 |
5 files changed, 65 insertions, 18 deletions
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog index a40fc5c..e1a6dad 100644 --- a/WebKit/wx/ChangeLog +++ b/WebKit/wx/ChangeLog @@ -1,3 +1,39 @@ +2011-01-07 Adam Barth <abarth@webkit.org> + + Rubber-stamped by Eric Seidel. + + Move WebCore to Source + https://bugs.webkit.org/show_bug.cgi?id=52050 + + * bindings/python/wscript: + * wscript: + +2011-01-01 Adam Barth <abarth@webkit.org> + + Reviewed by Eric Seidel. + + Move JavaScriptCore to Source + https://bugs.webkit.org/show_bug.cgi?id=51604 + + * bindings/python/wscript: + * wscript: + - Point to JavaScriptCore in its new location. + +2010-12-22 Sam Weinig <sam@webkit.org> + + Reviewed by Darin Adler. + + WebKit2 needs to mirror the frame tree in the UIProcess + https://bugs.webkit.org/show_bug.cgi?id=51546 + + - Add client functions to notify that a frame has been added or + removed from the page cache. + + * WebKitSupport/FrameLoaderClientWx.cpp: + (WebCore::FrameLoaderClientWx::didSaveToPageCache): + (WebCore::FrameLoaderClientWx::didRestoreFromPageCache): + * WebKitSupport/FrameLoaderClientWx.h: + 2010-12-20 Eric Seidel <eric@webkit.org> Unreviewed. diff --git a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp index 8748a98..362c726 100644 --- a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp +++ b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp @@ -966,6 +966,14 @@ void FrameLoaderClientWx::transitionToCommittedForNewPage() m_frame->createView(size, backgroundColor, transparent, IntSize(), false); } +void FrameLoaderClientWx::didSaveToPageCache() +{ +} + +void FrameLoaderClientWx::didRestoreFromPageCache() +{ +} + void FrameLoaderClientWx::dispatchDidBecomeFrameset(bool) { } diff --git a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h index cb34b0f..b56a900 100644 --- a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h +++ b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h @@ -151,7 +151,10 @@ namespace WebCore { virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*); virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*); virtual void transitionToCommittedForNewPage(); - + + virtual void didSaveToPageCache(); + virtual void didRestoreFromPageCache(); + virtual void dispatchDidBecomeFrameset(bool); virtual void updateGlobalHistory(); diff --git a/WebKit/wx/bindings/python/wscript b/WebKit/wx/bindings/python/wscript index cd07836..0a1df31 100644 --- a/WebKit/wx/bindings/python/wscript +++ b/WebKit/wx/bindings/python/wscript @@ -30,9 +30,9 @@ import Logs import Options include_paths = [ - os.path.join(wk_root, 'JavaScriptCore'), - os.path.join(wk_root, 'WebCore', 'bindings', 'cpp'), - os.path.join(wk_root, 'WebCore', 'DerivedSources'), + os.path.join(wk_root, 'Source', 'JavaScriptCore'), + os.path.join(wk_root, 'Source', 'WebCore', 'bindings', 'cpp'), + os.path.join(wk_root, 'Source', 'WebCore', 'DerivedSources'), os.path.join(wk_root, 'WebKit', 'wx'), os.path.join(wx_root, 'wxPython', 'include'), os.path.join(wx_root, '..', 'wxPython', 'include'), diff --git a/WebKit/wx/wscript b/WebKit/wx/wscript index fa3e06f..f91a69c 100644 --- a/WebKit/wx/wscript +++ b/WebKit/wx/wscript @@ -30,20 +30,20 @@ from settings import * webkit_dirs = ['.', 'WebKitSupport'] include_paths = webkit_dirs + common_includes + ['.', '..', wk_root, - os.path.join(wk_root, 'JavaScriptCore'), - os.path.join(wk_root, 'WebCore'), - os.path.join(wk_root, 'WebCore', 'bindings', 'wx'), - os.path.join(wk_root, 'WebCore', 'DerivedSources'), + os.path.join(wk_root, 'Source', 'JavaScriptCore'), + os.path.join(wk_root, 'Source', 'WebCore'), + os.path.join(wk_root, 'Source', 'WebCore', 'bindings', 'wx'), + os.path.join(wk_root, 'Source', 'WebCore', 'DerivedSources'), os.path.join(output_dir), - os.path.join(wk_root, 'WebCore', 'page', 'wx'), - os.path.join(wk_root, 'WebCore', 'platform', 'network', 'curl'), - os.path.join(wk_root, 'WebCore', 'platform', 'wx'), - os.path.join(wk_root, 'WebCore', 'platform', 'bridge', 'wx'), - os.path.join(wk_root, 'WebCore', 'platform', 'graphics', 'wx'), + os.path.join(wk_root, 'Source', 'WebCore', 'page', 'wx'), + os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'network', 'curl'), + os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'wx'), + os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'bridge', 'wx'), + os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'graphics', 'wx'), ] if sys.platform.startswith("win"): - include_paths.append(os.path.join(wk_root, 'WebCore','platform','win')) + include_paths.append(os.path.join(wk_root, 'Source', 'WebCore','platform','win')) windows_deps = [ 'lib/pthreadVC2.dll', @@ -54,11 +54,11 @@ windows_deps = [ webcore_include_dirs = [] for dir in webcore_dirs + ['DerivedSources']: - include_paths.append(os.path.join(wk_root, 'WebCore', dir)) + include_paths.append(os.path.join(wk_root, 'Source', 'WebCore', dir)) -js_include_dirs = [os.path.join(wk_root, 'JavaScriptCore', 'assembler')] +js_include_dirs = [os.path.join(wk_root, 'Source', 'JavaScriptCore', 'assembler')] for dir in jscore_dirs: - js_include_dirs.append(os.path.join(wk_root, 'JavaScriptCore', dir)) + js_include_dirs.append(os.path.join(wk_root, 'Source', 'JavaScriptCore', dir)) def set_options(opt): common_set_options(opt) @@ -110,7 +110,7 @@ def build(bld): exts = ['.c', '.cpp'] if sys.platform.startswith('darwin'): exts.append('.mm') - obj.includes += '../mac/WebCoreSupport ../../WebCore/platform/mac' + obj.includes += '../mac/WebCoreSupport ../../Source/WebCore/platform/mac' obj.source = "../mac/WebCoreSupport/WebSystemInterface.mm" obj.find_sources_in_dirs(webkit_dirs) |