Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(376)

Side by Side Diff: webkit/glue/webframe_impl.cc

Issue 180033: Implement layoutTestController.display() method.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Prettify. Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webkit/tools/test_shell/layout_test_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 1547 matching lines...) Expand 10 before | Expand all | Expand 10 after
1558 GraphicsContext gc(canvas); 1558 GraphicsContext gc(canvas);
1559 WebCore::LocalCurrentGraphicsContext localContext(&gc); 1559 WebCore::LocalCurrentGraphicsContext localContext(&gc);
1560 #elif WEBKIT_USING_SKIA 1560 #elif WEBKIT_USING_SKIA
1561 PlatformContextSkia context(canvas); 1561 PlatformContextSkia context(canvas);
1562 1562
1563 // PlatformGraphicsContext is actually a pointer to PlatformContextSkia 1563 // PlatformGraphicsContext is actually a pointer to PlatformContextSkia
1564 GraphicsContext gc(reinterpret_cast<PlatformGraphicsContext*>(&context)); 1564 GraphicsContext gc(reinterpret_cast<PlatformGraphicsContext*>(&context));
1565 #else 1565 #else
1566 NOTIMPLEMENTED(); 1566 NOTIMPLEMENTED();
1567 #endif 1567 #endif
1568 gc.save();
1568 if (frame_->document() && frameview()) { 1569 if (frame_->document() && frameview()) {
1570 gc.clip(dirty_rect);
1569 frameview()->paint(&gc, dirty_rect); 1571 frameview()->paint(&gc, dirty_rect);
1570 frame_->page()->inspectorController()->drawNodeHighlight(gc); 1572 frame_->page()->inspectorController()->drawNodeHighlight(gc);
1571 } else { 1573 } else {
1572 gc.fillRect(dirty_rect, Color::white); 1574 gc.fillRect(dirty_rect, Color::white);
1573 } 1575 }
1576 gc.restore();
1574 } 1577 }
1575 } 1578 }
1576 1579
1577 void WebFrameImpl::CreateFrameView() { 1580 void WebFrameImpl::CreateFrameView() {
1578 ASSERT(frame_); // If frame_ doesn't exist, we probably didn't init properly. 1581 ASSERT(frame_); // If frame_ doesn't exist, we probably didn't init properly.
1579 1582
1580 WebCore::Page* page = frame_->page(); 1583 WebCore::Page* page = frame_->page();
1581 DCHECK(page); 1584 DCHECK(page);
1582 1585
1583 DCHECK(page->mainFrame() != NULL); 1586 DCHECK(page->mainFrame() != NULL);
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
1873 1876
1874 SecurityOrigin* security_origin = frame_->document()->securityOrigin(); 1877 SecurityOrigin* security_origin = frame_->document()->securityOrigin();
1875 1878
1876 if (!frame_->loader()->isScheduledLocationChangePending()) { 1879 if (!frame_->loader()->isScheduledLocationChangePending()) {
1877 frame_->loader()->stopAllLoaders(); 1880 frame_->loader()->stopAllLoaders();
1878 frame_->loader()->begin(frame_->loader()->url(), true, security_origin); 1881 frame_->loader()->begin(frame_->loader()->url(), true, security_origin);
1879 frame_->loader()->write(script_result); 1882 frame_->loader()->write(script_result);
1880 frame_->loader()->end(); 1883 frame_->loader()->end();
1881 } 1884 }
1882 } 1885 }
OLDNEW
« no previous file with comments | « no previous file | webkit/tools/test_shell/layout_test_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698