Changeset 17636 in webkit
- Timestamp:
- Nov 6, 2006 5:09:19 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/ChangeLog
r17610 r17636 1 2006-11-06 Krzysztof Kowalczyk <kkowalczyk@gmail.com> 2 3 Reviewed by Maciej. 4 5 Remove warning about garbage after #else. #else clause applies for all 6 non-mac platforms, not only win. 7 8 * kjs/date_object.cpp: 9 1 10 2006-11-06 Mark Rowe <bdash@webkit.org> 2 11 -
trunk/JavaScriptCore/kjs/date_object.cpp
r17444 r17636 155 155 } 156 156 157 #else if PLATFORM(WIN_OS)157 #else 158 158 159 159 enum LocaleDateTimeFormat { LocaleDateAndTime, LocaleDate, LocaleTime }; -
trunk/WebCore/ChangeLog
r17632 r17636 1 2006-11-06 Krzysztof Kowalczyk <kkowalczyk@gmail.com> 2 3 Reviewed by Maciej. 4 5 Linux\Gdk build fixes. 6 7 * loader/icon/IconDatabase.cpp: 8 * loader/icon/SQLStatement.h: 9 * platform/gdk/ChromeClientGdk.h: Added. 10 (WebCore::ChromeClientGdk::~ChromeClientGdk): 11 * platform/gdk/CursorGdk.cpp: 12 (WebCore::pointerCursor): 13 * platform/gdk/FrameGdk.cpp: 14 (WebCore::doScroll): 15 (WebCore::FrameGdk::FrameGdk): 16 (WebCore::FrameGdk::submitForm): 17 (WebCore::FrameGdk::urlSelected): 18 (WebCore::FrameGdk::openURL): 19 (WebCore::FrameGdk::handleGdkEvent): 20 * platform/gdk/FrameGdk.h: 21 (WebCore::FrameGdk::client): 22 * platform/gdk/RenderPopupMenuGdk.cpp: 23 (WebCore::PopupMenu::updateFromElement): 24 * platform/gdk/ScreenGdk.cpp: 25 * platform/gdk/TemporaryLinkStubs.cpp: 26 (Slider::focusPolicy): 27 (WebCore::ServeSynchronousRequest): 28 (FrameGdk::goBackOrForward): 29 (FrameGdk::getHistoryLength): 30 (FrameGdk::historyURL): 31 (ChromeClientGdk::canRunModal): 32 (ChromeClientGdk::runModal): 33 (WebCore::systemBeep): 34 (WebCore::CachedResource::setPlatformResponse): 35 (Path::transform): 36 (ResourceLoader::loadsBlocked): 37 (IconLoader::notifyIconChanged): 38 * platform/network/gdk/ResourceHandleManager.cpp: 39 (WebCore::writeCallback): 40 (WebCore::ResourceHandleManager::downloadTimerCallback): 41 (WebCore::ResourceHandleManager::remove): 42 (WebCore::ResourceHandleManager::add): 43 1 44 2006-11-06 Geoffrey Garen <ggaren@apple.com> 2 45 -
trunk/WebCore/loader/icon/IconDatabase.cpp
r16615 r17636 39 39 #include <windows.h> 40 40 #include <winbase.h> 41 #else 42 #include <sys/stat.h> 41 43 #endif 42 44 -
trunk/WebCore/loader/icon/SQLStatement.h
r16595 r17636 101 101 } // namespace WebCore 102 102 103 #endif SQLStatement_H103 #endif // SQLStatement_H -
trunk/WebCore/platform/gdk/CursorGdk.cpp
r15124 r17636 62 62 ASSERT(c); 63 63 gdk_cursor_ref(c); 64 } 65 66 const Cursor& pointerCursor() 67 { 68 static Cursor c = gdk_cursor_new(GDK_LEFT_PTR); 69 return c; 64 70 } 65 71 -
trunk/WebCore/platform/gdk/FrameGdk.cpp
r17597 r17636 28 28 #include "config.h" 29 29 #include "FrameGdk.h" 30 30 #include "ChromeClientGdk.h" 31 #include "Document.h" 32 #include "DOMImplementation.h" 33 #include "DOMWindow.h" 31 34 #include "Element.h" 35 #include "FrameView.h" 36 #include "FrameLoadRequest.h" 37 #include "FramePrivate.h" 38 #include "GraphicsContext.h" 39 #include "HitTestResult.h" 40 #include "HitTestRequest.h" 41 #include "HTMLDocument.h" 42 #include "KeyboardCodes.h" 43 #include "MouseEventWithHitTestResults.h" 44 #include "Page.h" 45 #include "PlatformMouseEvent.h" 46 #include "PlatformKeyboardEvent.h" 47 #include "PlatformWheelEvent.h" 48 #include "Plugin.h" 32 49 #include "RenderObject.h" 33 50 #include "RenderWidget.h" 34 51 #include "RenderLayer.h" 35 #include "Page.h"36 #include "Document.h"37 #include "DOMWindow.h"38 #include "DOMImplementation.h"39 #include "Document.h"40 #include "Settings.h"41 #include "Plugin.h"42 #include "FramePrivate.h"43 #include "GraphicsContext.h"44 #include "HTMLDocument.h"45 52 #include "ResourceHandle.h" 46 53 #include "ResourceHandleInternal.h" 47 #include "PlatformMouseEvent.h"48 #include "PlatformKeyboardEvent.h"49 #include "PlatformWheelEvent.h"50 #include "MouseEventWithHitTestResults.h"51 54 #include "SelectionController.h" 55 #include "Settings.h" 56 #include "SSLKeyGenerator.h" 52 57 #include "TypingCommand.h" 53 #include "SSLKeyGenerator.h"54 #include "KeyboardCodes.h"55 #include "FrameLoadRequest.h"56 58 #include <gdk/gdk.h> 57 58 59 59 60 // This function loads resources from WebKit … … 152 153 return; 153 154 154 int x = r->layer()->scrollXOffset() + deltaX;155 int y = r->layer()->scrollYOffset() + deltaY;155 int x = r->layer()->scrollXOffset() + (int)deltaX; 156 int y = r->layer()->scrollYOffset() + (int)deltaY; 156 157 r->layer()->scrollToOffset(x, y, true, true); 157 158 } 158 159 159 160 FrameGdk::FrameGdk(GdkDrawable* gdkdrawable) 160 : Frame(new Page , 0), m_drawable(gdkdrawable)161 : Frame(new Page(new ChromeClientGdk()), 0, 0), m_drawable(gdkdrawable) 161 162 { 162 163 Settings* settings = new Settings; … … 183 184 } 184 185 185 FrameGdk::FrameGdk(Page* page, Element* element )186 : Frame(page,element )186 FrameGdk::FrameGdk(Page* page, Element* element, PassRefPtr<EditorClient> editorClient) 187 : Frame(page,element, editorClient) 187 188 { 188 189 Settings* settings = new Settings; … … 200 201 void FrameGdk::submitForm(const FrameLoadRequest& frameLoadRequest, Event*) 201 202 { 202 ResourceRequest request = frameLoadRequest. m_request;203 ResourceRequest request = frameLoadRequest.resourceRequest(); 203 204 204 205 // FIXME: this is a hack inherited from FrameMac, and should be pushed into Frame … … 209 210 210 211 if (m_client) 211 m_client->submitForm(request.doPost() ? "POST" : "GET", request.url(), &request.postData); 212 m_client->submitForm(request.httpMethod(), request.url(), &request.httpBody()); 213 212 214 clearRecordedFormValues(); 213 215 } … … 215 217 void FrameGdk::urlSelected(const FrameLoadRequest& frameLoadRequest, Event*) 216 218 { 217 ResourceRequest request = frameLoadRequest. m_request;219 ResourceRequest request = frameLoadRequest.resourceRequest(); 218 220 219 221 if (!m_client) … … 222 224 m_client->openURL(request.url()); 223 225 } 226 227 #if 0 228 void FrameGdk::openURL(const KURL& url) 229 { 230 ASSERT(m_client); 231 m_client->openURL(url); 232 } 233 #endif 224 234 225 235 String FrameGdk::userAgent() const … … 262 272 return; 263 273 } 264 RenderObject::NodeInfo nodeInfo(true, true); 265 renderer()->layer()->hitTest(nodeInfo, wheelEvent.pos()); 266 Node* node = nodeInfo.innerNode(); 274 275 HitTestRequest hitTestRequest(true, true); 276 HitTestResult hitTestResult(wheelEvent.pos()); 277 renderer()->layer()->hitTest(hitTestRequest, hitTestResult); 278 Node* node = hitTestResult.innerNode(); 267 279 if (!node) 268 280 return; -
trunk/WebCore/platform/gdk/FrameGdk.h
r17597 r17636 31 31 #include "Frame.h" 32 32 #include "ResourceHandleClient.h" 33 #include "EditorClient.h" 33 34 #include <gdk/gdk.h> 34 35 … … 37 38 class Element; 38 39 class FrameGdk; 40 class EditorClient; 39 41 40 42 class FrameGdkClient { … … 74 76 class FrameGdk : public Frame { 75 77 public: 76 FrameGdk(Page*, Element* );78 FrameGdk(Page*, Element*, PassRefPtr<EditorClient>); 77 79 FrameGdk(GdkDrawable*); 78 80 virtual ~FrameGdk(); … … 147 149 148 150 virtual bool canGoBackOrForward(int distance) const; 151 virtual void goBackOrForward(int distance); 152 virtual int getHistoryLength(); 153 virtual KURL historyURL(int distance); 154 149 155 virtual void handledOnloadEvents(); 150 156 … … 163 169 Widget* createJavaAppletWidget(const IntSize&, Element*, const HashMap<String, String>&); 164 170 171 FrameGdkClient* client() const { return m_client; } 172 165 173 private: 166 174 virtual bool isLoadTypeReload(); -
trunk/WebCore/platform/gdk/RenderPopupMenuGdk.cpp
r17065 r17636 39 39 } 40 40 41 void PopupMenu::clear()42 {43 notImplemented();44 }45 46 void PopupMenu::populate()47 {48 notImplemented();49 }50 51 41 void PopupMenu::show(const IntRect&, FrameView*, int) 52 42 { … … 59 49 } 60 50 61 void PopupMenu:: addSeparator()51 void PopupMenu::updateFromElement() 62 52 { 63 notImplemented(); 64 } 65 66 void PopupMenu::addGroupLabel(HTMLOptGroupElement*) 67 { 68 notImplemented(); 69 } 70 71 void PopupMenu::addOption(HTMLOptionElement*) 72 { 73 notImplemented(); 53 notImplemented(); 74 54 } 75 55 -
trunk/WebCore/platform/gdk/ScreenGdk.cpp
r16382 r17636 29 29 #include "Screen.h" 30 30 31 #include "FloatRect.h" 32 #include "Frame.h" 33 #include "FrameView.h" 31 34 #include "Page.h" 32 #include "Frame.h"33 35 #include "Widget.h" 34 #include "FloatRect.h"35 36 36 37 #include <gdk/gdk.h> -
trunk/WebCore/platform/gdk/TemporaryLinkStubs.cpp
r17471 r17636 28 28 #include "config.h" 29 29 30 #include "AXObjectCache.h" 31 #include "CachedResource.h" 32 #include "ChromeClientGdk.h" 33 #include "CookieJar.h" 34 #include "CString.h" 35 #include "Cursor.h" 36 #include "EditCommand.h" 37 #include "FileChooser.h" 38 #include "Font.h" 39 #include "FrameGdk.h" 40 #include "FrameLoadRequest.h" 41 #include "FrameView.h" 42 #include "GraphicsContext.h" 43 #include "History.h" 44 #include "Icon.h" 45 #include "IconDatabase.h" 46 #include "IconLoader.h" 47 #include "IntPoint.h" 48 #include "KURL.h" 49 #include "Language.h" 50 #include "loader.h" 51 #include "LocalizedStrings.h" 52 #include "Node.h" 53 #include "Page.h" 54 #include "Path.h" 55 #include "PlatformMouseEvent.h" 56 #include "PlatformScrollBar.h" 57 #include "PlugInInfoStore.h" 58 #include "RenderTheme.h" 59 #include "RenderThemeGdk.h" 60 #include "ResourceLoader.h" 61 #include "Screen.h" 62 #include "ScrollBar.h" 63 #include "Slider.h" 64 #include "TextBoundaries.h" 65 #include "TextField.h" 66 #include "Widget.h" 30 67 #include <stdio.h> 31 68 #include <stdlib.h> 32 #include "CString.h"33 #include "Node.h"34 #include "TextField.h"35 #include "FileChooser.h"36 #include "Font.h"37 #include "ListBox.h"38 #include "IntPoint.h"39 #include "Widget.h"40 #include "GraphicsContext.h"41 #include "Slider.h"42 #include "Cursor.h"43 #include "loader.h"44 #include "FrameView.h"45 #include "KURL.h"46 #include "PlatformScrollBar.h"47 #include "ScrollBar.h"48 #include "Path.h"49 #include "PlatformMouseEvent.h"50 #include "CookieJar.h"51 #include "Screen.h"52 #include "History.h"53 #include "Language.h"54 #include "LocalizedStrings.h"55 #include "PlugInInfoStore.h"56 #include "RenderTheme.h"57 #include "FrameGdk.h"58 #include "FrameLoadRequest.h"59 #include "RenderThemeGdk.h"60 #include "TextBoundaries.h"61 #include "AXObjectCache.h"62 #include "EditCommand.h"63 #include "Icon.h"64 #include "IconLoader.h"65 #include "IconDatabase.h"66 #include "CachedResource.h"67 69 68 70 using namespace WebCore; 71 72 #define notImplemented() do { fprintf(stderr, "%s FIXME: UNIMPLEMENTED %s:%d\n", __PRETTY_FUNCTION__, __FILE__, __LINE__); } while(0) 69 73 70 74 namespace WebCore { … … 77 81 }; 78 82 } 79 80 #define notImplemented() do { fprintf(stderr, "FIXME: UNIMPLEMENTED: %s in %s:%d\n", __FUNCTION__, __FILE__, __LINE__); } while(0)81 83 82 84 void FrameView::updateBorder() { notImplemented(); } … … 115 117 double Slider::value() const { notImplemented(); return 0; } 116 118 117 void ListBox::setSelected(int, bool) { notImplemented(); }118 IntSize ListBox::sizeForNumberOfLines(int) const { notImplemented(); return IntSize(); }119 bool ListBox::isSelected(int) const { notImplemented(); return 0; }120 void ListBox::appendItem(DeprecatedString const&, ListBoxItemType, bool) { notImplemented(); }121 void ListBox::doneAppendingItems() { notImplemented(); }122 void ListBox::setWritingDirection(TextDirection) { notImplemented(); }123 void ListBox::setEnabled(bool) { notImplemented(); }124 void ListBox::clear() { notImplemented(); }125 bool ListBox::checksDescendantsForFocus() const { notImplemented(); return 0; }126 127 119 Widget::FocusPolicy Slider::focusPolicy() const { notImplemented(); return NoFocus; } 128 Widget::FocusPolicy ListBox::focusPolicy() const { notImplemented(); return NoFocus; }129 120 Widget::FocusPolicy TextField::focusPolicy() const { notImplemented(); return NoFocus; } 130 121 … … 139 130 140 131 namespace WebCore { 141 142 Vector<char> ServeSynchronousRequest(Loader*,DocLoader*,ResourceHandle*,KURL&,DeprecatedString&) { notImplemented(); return Vector<char>(); } 143 132 Vector<char> ServeSynchronousRequest(Loader *loader, DocLoader *docLoader, const ResourceRequest& request, ResourceResponse& response) { notImplemented(); return Vector<char>(); } 144 133 } 145 134 … … 180 169 Plugin* FrameGdk::createPlugin(Element*, KURL const&, const Vector<String>&, const Vector<String>&, String const&) { notImplemented(); return 0; } 181 170 171 void FrameGdk::goBackOrForward(int distance) { notImplemented(); } 172 int FrameGdk::getHistoryLength() {notImplemented(); return 0; } 173 KURL FrameGdk::historyURL(int distance) { notImplemented(); return KURL(); } 174 bool ChromeClientGdk::canRunModal() { notImplemented(); return 0; } 175 void ChromeClientGdk::runModal() { notImplemented(); } 176 182 177 int WebCore::screenDepthPerComponent(const Page*) { notImplemented(); return 0; } 183 178 bool WebCore::screenIsMonochrome(const Page*) { notImplemented(); return false; } … … 206 201 bool WebCore::PlugInInfoStore::supportsMIMEType(const WebCore::String&) { return false; } 207 202 void WebCore::refreshPlugins(bool) { } 208 209 void WebCore::ResourceHandle::assembleResponseHeaders() const { }210 void WebCore::ResourceHandle::retrieveCharset() const { }211 203 212 204 void FrameGdk::restoreDocumentState() { } … … 232 224 namespace WebCore { 233 225 226 void systemBeep() { notImplemented(); } 227 234 228 bool CheckIfReloading(DocLoader*) { return false; } 235 229 time_t CacheObjectExpiresTime(DocLoader*, PlatformResponse) { return 0; } … … 239 233 bool ResponseIsMultipart(PlatformResponse) { return false; } 240 234 DeprecatedString ResponseMIMEType(PlatformResponse) { return DeprecatedString(); } 241 void CachedResource::set Response(PlatformResponse) { notImplemented(); }235 void CachedResource::setPlatformResponse(PlatformResponse) { notImplemented(); } 242 236 void CachedResource::setAllData(PlatformData) { notImplemented(); } 243 237 … … 297 291 void Path::addRect(const FloatRect&) { } 298 292 void Path::addEllipse(const FloatRect&) { } 293 void Path::transform(const AffineTransform& transform) {} 299 294 300 295 TextField::TextField(TextField::Type) { } … … 327 322 void PlatformScrollbar::setRect(const IntRect&) { } 328 323 329 ListBox::ListBox() { }330 ListBox::~ListBox() { }331 void ListBox::setSelectionMode(ListBox::SelectionMode) { }332 void ListBox::setFont(WebCore::Font const&) { }333 334 324 FileChooser::FileChooser(Document*, RenderFileUploadControl*) { notImplemented(); } 335 325 FileChooser::~FileChooser() { notImplemented(); } … … 353 343 bool RenderThemeGdk::paintTextField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&) { return false; } 354 344 345 bool ResourceLoader::loadsBlocked() { notImplemented(); return false; } 346 355 347 Icon::Icon() { notImplemented(); } 356 348 Icon::~Icon() { notImplemented(); } … … 358 350 void Icon::paint(GraphicsContext*, const IntRect&) { notImplemented(); } 359 351 360 void IconLoader::stopLoading() { notImplemented(); } 361 void IconLoader::startLoading() { notImplemented(); } 362 IconLoader* IconLoader::createForFrame(Frame *frame) { return 0; } 363 364 bool IconDatabase::isIconExpiredForIconURL(const String& url) { return false; } 365 bool IconDatabase::hasEntryForIconURL(const String& url) { return false; } 366 IconDatabase* IconDatabase::sharedIconDatabase() { return 0; } 367 bool IconDatabase::setIconURLForPageURL(const String& iconURL, const String& pageURL) { return false; } 352 void IconLoader::notifyIconChanged(const KURL&) { notImplemented(); } 368 353 369 354 FloatRect Font::selectionRectForComplexText(const TextRun&, const TextStyle&, const IntPoint&, int) const { return FloatRect(); } -
trunk/WebCore/platform/network/gdk/ResourceHandleManager.cpp
r17410 r17636 64 64 ResourceHandleInternal* d = job->getInternal(); 65 65 int totalSize = size * nmemb; 66 d-> client->didReceiveData(job, static_cast<char*>(ptr), totalSize);66 d->m_client->didReceiveData(job, static_cast<char*>(ptr), totalSize); 67 67 return totalSize; 68 68 } … … 87 87 if (res != CURLE_OK) 88 88 printf("Error WITH JOB %d\n", res); 89 d-> client->receivedAllData(job, 0);90 d-> client->didFinishLoading(job);89 d->m_client->receivedAllData(job, 0); 90 d->m_client->didFinishLoading(job); 91 91 curl_easy_cleanup(d->m_handle); 92 92 d->m_handle = 0; … … 170 170 if (jobs->isEmpty()) 171 171 m_downloadTimer.stop(); 172 d-> client->receivedAllData(job, 0);173 d-> client->didFinishLoading(job);172 d->m_client->receivedAllData(job, 0); 173 d->m_client->didFinishLoading(job); 174 174 if (d->m_handle) { 175 175 curl_multi_remove_handle(curlMultiHandle, d->m_handle); … … 183 183 bool startTimer = jobs->isEmpty(); 184 184 ResourceHandleInternal* d = job->getInternal(); 185 DeprecatedString url = d->URL.url();185 DeprecatedString url = job->url().url(); 186 186 d->m_handle = curl_easy_init(); 187 187 curl_easy_setopt(d->m_handle, CURLOPT_PRIVATE, job); … … 204 204 // timeout will occur and do curl_multi_perform 205 205 if (ret && ret != CURLM_CALL_MULTI_PERFORM) { 206 printf("Error %d starting job %s\n", ret, d->URL.url().ascii());206 printf("Error %d starting job %s\n", ret, job->url().url().ascii()); 207 207 job->setError(1); 208 208 startTimer =false; -
trunk/WebKitTools/ChangeLog
r17620 r17636 1 2006-11-06 Krzysztof Kowalczyk <kkowalczyk@gmail.com> 2 3 Reviewed by Maciej. 4 5 Linux\gdk build fixes. 6 7 * GdkLauncher/main.cpp: 8 (LauncherFrameGdk::LauncherFrameGdk): 9 (main): 10 1 11 2006-11-06 Alexey Proskuryakov <ap@nypop.com> 2 12 -
trunk/WebKitTools/GdkLauncher/main.cpp
r17065 r17636 29 29 { 30 30 public: 31 LauncherFrameGdk(Page* page, Element* element ) : FrameGdk(page, element), m_exitAfterLoading(false) {}31 LauncherFrameGdk(Page* page, Element* element, PassRefPtr<EditorClient> editorClient) : FrameGdk(page, element, editorClient), m_exitAfterLoading(false) {} 32 32 LauncherFrameGdk(GdkDrawable* drawable) : FrameGdk(drawable), m_exitAfterLoading(false) {} 33 33 virtual void handledOnloadEvents(); … … 82 82 if (url) { 83 83 printf("OPENING URL == %s \n", url); 84 frame-> openURL(url);84 frame->client()->openURL(url); 85 85 } else { 86 86 #if 0
Note: See TracChangeset
for help on using the changeset viewer.